wxruby3 0.9.1-x64-mingw-ucrt → 0.9.2-x64-mingw-ucrt

data/lib/wx/doc/window.rb

@@ -5,52 +5,62 @@
 # :startdoc:
 
 
-class Wx::Window
-
-  # Creates an appropriate (temporary) DC to paint on and
-  # passes that to the given block. Deletes the DC when the block returns.
-  # Creates a Wx::PaintDC when called from an evt_paint handler and a
-  # Wx::ClientDC otherwise.
-  # @yieldparam [Wx::PaintDC,Wx::ClientDC] dc dc to paint on
-  # @return [Object] result from block
-  def paint; end
-
-  # Similar to #paint but this time creates a Wx::AutoBufferedPaintDC when called
-  # from an evt_paint handler and a Wx::ClientDC otherwise.
-  # @yieldparam [Wx::AutoBufferedPaintDC,Wx::ClientDC] dc dc to paint on
-  # @return [Object] result from block
-  def paint_buffered; end
-
-  # Locks the window from updates while executing the given block.
-  # @param [Proc] block
-  def locked(&block); end
-
-  # Find the first child window with the given id recursively in the window hierarchy of this window.
-  #
-  # Window with the given id or nil if not found.
-  # @see Wx::Window.find_window_by_id
-  # @param id [Integer]
-  # @return [Wx::Window]
-  def find_window_by_id(id) end
-
-  # Find the first child window with the given label recursively in the window hierarchy of this window.
-  #
-  # Window with the given label or nil if not found.
-  # @see Wx::Window.find_window_by_label
-  # @param label [String]
-  # @return [Wx::Window]
-  def find_window_by_label(label) end
-
-  # Find the first child window with the given name (as given in a window constructor or {Wx::Window#create} function call) recursively in the window hierarchy of this window.
-  #
-  # Window with the given name or nil if not found.
-  # @param name [String]
-  # @return [Wx::Window]
-  def find_window_by_name(name) end
-
-  # Switches the current sizer with the given sizer and detaches and returns the 'old' sizer.
-  # @param [Wx::Sizer] new_sizer new sizer for window
-  # @return [Wx::Sizer] previous window sizer
-  def switch_sizer(new_sizer) end
+module Wx
+
+  class Window
+
+    # Creates an appropriate (temporary) DC to paint on and
+    # passes that to the given block. Deletes the DC when the block returns.
+    # Creates a Wx::PaintDC when called from an evt_paint handler and a
+    # Wx::ClientDC otherwise.
+    # @yieldparam [Wx::PaintDC,Wx::ClientDC] dc dc to paint on
+    # @return [Object] result from block
+    def paint; end
+
+    # Similar to #paint but this time creates a Wx::AutoBufferedPaintDC when called
+    # from an evt_paint handler and a Wx::ClientDC otherwise.
+    # @yieldparam [Wx::AutoBufferedPaintDC,Wx::ClientDC] dc dc to paint on
+    # @return [Object] result from block
+    def paint_buffered; end
+
+    # Yield each child window to the given block.
+    # Returns an Enumerator if no block given.
+    # @yieldparam [Wx::Window] child the child window yielded
+    # @return [Object,Enumerator] last result of block or Enumerator if no block given.
+    def each_child; end
+
+    # Locks the window from updates while executing the given block.
+    # @param [Proc] block
+    def locked(&block); end
+
+    # Find the first child window with the given id recursively in the window hierarchy of this window.
+    #
+    # Window with the given id or nil if not found.
+    # @see Wx::Window.find_window_by_id
+    # @param id [Integer]
+    # @return [Wx::Window]
+    def find_window_by_id(id) end
+
+    # Find the first child window with the given label recursively in the window hierarchy of this window.
+    #
+    # Window with the given label or nil if not found.
+    # @see Wx::Window.find_window_by_label
+    # @param label [String]
+    # @return [Wx::Window]
+    def find_window_by_label(label) end
+
+    # Find the first child window with the given name (as given in a window constructor or {Wx::Window#create} function call) recursively in the window hierarchy of this window.
+    #
+    # Window with the given name or nil if not found.
+    # @param name [String]
+    # @return [Wx::Window]
+    def find_window_by_name(name) end
+
+    # Switches the current sizer with the given sizer and detaches and returns the 'old' sizer.
+    # @param [Wx::Sizer] new_sizer new sizer for window
+    # @return [Wx::Sizer] previous window sizer
+    def switch_sizer(new_sizer) end
+
+  end
 
 end

data/lib/wx/doc/window_disabler.rb

@@ -5,12 +5,16 @@
 # :startdoc:
 
 
-class Wx::WindowDisabler
+module Wx
 
-  # Disables all top level windows of the application (maybe with the exception of one of them) in
-  # and enables them back after the given block has returned.
-  # @param [Wx::Window,nil] to_skip window to exclude from disabling
-  # @return [void]
-  def self.disable(to_skip = nil) end
+  class WindowDisabler
+
+    # Disables all top level windows of the application (maybe with the exception of one of them) in
+    # and enables them back after the given block has returned.
+    # @param [Wx::Window,nil] to_skip window to exclude from disabling
+    # @return [void]
+    def self.disable(to_skip = nil) end
+
+  end
 
 end

data/lib/wx/grid/grid.rb

@@ -12,12 +12,35 @@ module Wx
       alias :set_table :assign_table
       alias :table= :assign_table
 
-      wx_selected_blocks = instance_method :selected_blocks
-      define_method :selected_blocks do
+      wx_each_selected_block = instance_method :each_selected_block
+      define_method :each_selected_block do
         if block_given?
-          wx_selected_blocks.bind(self).call
+          wx_each_selected_block.bind(self).call
         else
-          ::Enumerator.new { |y| wx_selected_blocks.bind(self).call { |sb| y << sb } }
+          ::Enumerator.new { |y| wx_each_selected_block.bind(self).call { |sb| y << sb } }
+        end
+      end
+
+      def get_selected_blocks
+        each_selected_block.to_a
+      end
+      alias :selected_blocks :get_selected_blocks
+
+      wx_each_selected_row_block = instance_method :each_selected_row_block
+      define_method :each_selected_row_block do
+        if block_given?
+          wx_each_selected_row_block.bind(self).call
+        else
+          ::Enumerator.new { |y| wx_each_selected_row_block.bind(self).call { |sb| y << sb } }
+        end
+      end
+
+      wx_each_selected_col_block = instance_method :each_selected_col_block
+      define_method :each_selected_col_block do
+        if block_given?
+          wx_each_selected_col_block.bind(self).call
+        else
+          ::Enumerator.new { |y| wx_each_selected_col_block.bind(self).call { |sb| y << sb } }
         end
       end
 

data/lib/wx/pg/pg_property.rb

@@ -37,4 +37,26 @@ module Wx::PG
     alias :attributes= :set_attributes
   end
 
+  class PGChoices
+
+    wx_each_label = instance_method :each_label
+    define_method :each_label do
+      if block_given?
+        wx_each_label.bind(self).call
+      else
+        ::Enumerator.new { |y| wx_each_label.bind(self).call { |lbl| y << lbl } }
+      end
+    end
+
+    wx_each_entry = instance_method :each_entry
+    define_method :each_entry do
+      if block_given?
+        wx_each_entry.bind(self).call
+      else
+        ::Enumerator.new { |y| wx_each_entry.bind(self).call { |entry| y << entry } }
+      end
+    end
+    
+  end
+  
 end

data/lib/wx/rtc/require.rb

@@ -7,7 +7,10 @@
 require_relative './ext'
 require_relative './events/evt_list'
 require_relative './keyword_defs'
+require_relative './rich_text_ctrl'
 require_relative './richtext_buffer'
+require_relative './rich_text_composite_object'
+require_relative './rich_text_paragraph'
 require_relative './richtext_formatting_dialog'
 require_relative './symbol_picker_dialog'
 require_relative './richtext_style_organiser_dialog'

data/lib/wx/rtc/rich_text_composite_object.rb

@@ -0,0 +1,25 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+module Wx
+
+  module RTC
+
+    class RichTextCompositeObject
+
+      # Overload to provide Enumerator without block
+      wx_each_child = instance_method :each_child
+      define_method :each_child do |&block|
+        if block
+          wx_each_child.bind(self).call(&block)
+        else
+          ::Enumerator.new { |y| wx_each_child.bind(self).call { |rto| y << rto } }
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/wx/rtc/rich_text_ctrl.rb

@@ -0,0 +1,25 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+module Wx
+
+  module RTC
+
+    class RichTextCtrl
+
+      # Overload to provide Enumerator without block
+      wx_each_line = instance_method :each_line
+      define_method :each_line do |&block|
+        if block
+          wx_each_line.bind(self).call(&block)
+        else
+          ::Enumerator.new { |y| wx_each_line.bind(self).call { |ln| y << ln } }
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/wx/rtc/rich_text_paragraph.rb

@@ -0,0 +1,25 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+module Wx
+
+  module RTC
+
+    class RichTextParagraph
+
+      # Overload to provide Enumerator without block
+      wx_each_line = instance_method :each_line
+      define_method :each_line do |&block|
+        if block
+          wx_each_line.bind(self).call(&block)
+        else
+          ::Enumerator.new { |y| wx_each_line.bind(self).call { |ln| y << ln } }
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/wx/stc/require.rb

@@ -6,5 +6,6 @@
 
 require_relative './events/evt_list'
 require_relative './keyword_defs'
+require_relative './styled_text_ctrl'
 
 Wx::Dialog.setup_dialog_functors(Wx::STC)

data/lib/wx/stc/styled_text_ctrl.rb

@@ -0,0 +1,25 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+module Wx
+
+  module STC
+
+    class StyledTextCtrl
+
+      # Overload to provide Enumerator without block
+      wx_each_line = instance_method :each_line
+      define_method :each_line do |&block|
+        if block
+          wx_each_line.bind(self).call(&block)
+        else
+          ::Enumerator.new { |y| wx_each_line.bind(self).call { |ln| y << ln } }
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/wx/version.rb

@@ -3,5 +3,5 @@
 # This software is released under the MIT license.
 
 module Wx
-  WXRUBY_VERSION    = '0.9.1'
+  WXRUBY_VERSION    = '0.9.2'
 end

data/rakelib/lib/config/linux.rb

@@ -65,9 +65,6 @@ module WXRuby3
           # create a .so binary
           @extra_ldflags << '-shared'
 
-          # This class is not available on linux ports (wxGTK/wxQT/wxX11/wxMotif)
-          exclude_module('wxPrinterDC')
-
           unless @wx_path.empty?
             libdirs = @wx_libs.select {|s| s.start_with?('-L')}.collect {|s| s.sub(/^-L/,'')}
             @exec_env['LD_LIBRARY_PATH'] = "#{ENV['LD_LIBRARY_PATH']}:#{dest_dir}:#{libdirs.join(':')}"

data/rakelib/lib/config/macosx.rb

@@ -65,7 +65,7 @@ module WXRuby3
               end
             end
             # some weird thing with this; at least sometimes '--libs all' will not output media library even if feature active
-            if features_set?('wxUSE_MEDIACTRL')
+            if features_set?('USE_MEDIACTRL')
               lib_list = wx_config("--libs media").split(' ')
               until lib_list.empty?
                 s = lib_list.shift
@@ -107,7 +107,7 @@ module WXRuby3
           @ld.sub!(/-o\s*\Z/, '')
 
           @extra_cflags.concat %w[-Wno-unused-function -Wno-conversion-null -Wno-sometimes-uninitialized
-                                  -Wno-overloaded-virtual -Wno-deprecated-copy -Wno-format-security]
+                                  -Wno-overloaded-virtual -Wno-deprecated-copy]
           @extra_cflags << ' -Wno-deprecated-declarations' unless @no_deprecated
 
           # create a .dylib binary

data/rakelib/lib/config/mingw.rb

@@ -35,7 +35,7 @@ module WXRuby3
           end
 
           def debug_command(*args)
-            args.unshift(FileUtils::RUBY)
+            args.unshift(nix_path(FileUtils::RUBY))
             args.unshift('--args')
             args.unshift('gdb')
             args.join(' ')

data/rakelib/lib/config/unixish.rb

@@ -136,7 +136,7 @@ module WXRuby3
         wx_libset = ::Set.new
         wx_libset.merge wx_config("--libs all").split(' ')
         # some weird thing with this; at least sometimes '--libs all' will not output media library even if feature active
-        if features_set?('wxUSE_MEDIACTRL')
+        if features_set?('USE_MEDIACTRL')
           wx_libset.merge wx_config("--libs media").split(' ')
         end
         wx_libset.collect { |s| s.dup }

data/rakelib/lib/config.rb

@@ -589,7 +589,7 @@ module WXRuby3
           private :any_feature_set?
 
           def features_set?(*featureset)
-            featureset.all? do |feature|
+            featureset.flatten.all? do |feature|
               if AnyOf === feature
                 any_feature_set?(*feature.features)
               else
@@ -615,9 +615,19 @@ module WXRuby3
           def _retrieve_features(wxwidgets_setup_h)
             features = {}
 
-            File.read(wxwidgets_setup_h).scan(/^\s*#define\s+(wx\w+|__\w+__)\s+([01])/) do | define |
-              features[$1] = $2.to_i.zero? ? false : true
-            end if is_configured? && wxwidgets_setup_h
+            if is_configured? && wxwidgets_setup_h
+              File.read(wxwidgets_setup_h).scan(/^\s*#define\s+(wx\w+|__\w+__)\s+([01])/) do | define |
+                feat_val = $2.to_i.zero? ? false : true
+                feat_id = $1.sub(/\Awx/i, '').gsub(/\A__|__\Z/, '')
+                features[feat_id] = feat_val
+              end
+              # make sure correct platform defines are included as well which will not be the case always
+              # (for example __WXMSW__ and __WXOSX__ are not in setup.h)
+              features['WXMSW'] = true if features['GNUWIN32']
+              features['WXOSX'] = true if features['DARWIN']
+              # prior to wxWidgets 3.3 this feature was not set for wxGTK builds
+              features['WXGTK'] = true if features['LINUX'] && !features['WXGTK'] && wx_port == :wxgtk
+            end
 
             features
           end

data/rakelib/yard/templates/default/fulldoc/html/css/wxruby3.css

@@ -1,7 +1,79 @@
 
-blockquote {
+div.wxrb-note {
     background: #f7f7f9;
-    border-left: .25em solid #e1e1e8;
+    border-left: .6em solid #f3ba6f;
+    border-radius: 3px;
     margin: 14px;
     padding-left: 14px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+
+div.wxrb-remark {
+    background: #f7f7f9;
+    border-left: .6em solid #f6f4ab;
+    border-radius: 3px;
+    margin: 14px;
+    padding-left: 14px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+
+div.wxrb-note p,
+div.wxrb-remark p {
+    margin: 0;
+}
+
+div.wxrb-logo {
+    float: right;
+    padding-top: 12px;
+}
+
+div.wxrb-logo img {
+    vertical-align: middle;
+}
+
+div.wxrb-logo span.wxrb-name {
+    font-size: large;
+    font-weight: bold;
+    margin-left: 10px;
+}
+
+div.wxrb-logo span.wxrb-name a {
+    color: black;
+}
+
+div.wxrb-logo span.wxrb-version {
+    font-size: medium;
+    font-weight: normal;
+    margin-right: 15px;
+}
+
+div.wxrb-logo span.wxrb-wxver {
+    font-size: 0.9em;
+    font-weight: normal;
+    margin-right: 15px;
+}
+
+div.wxrb-logo table {
+    display: inline;
+}
+
+div.wxrb-logo table td {
+    margin: 0;
+}
+
+.discussion div.note {
+    background: #f7f7f9;
+    border-left: .6em solid #f3ba6f;
+    margin: 14px;
+}
+
+.tags span.wxrb-require {
+    border-radius: 5px;
+    border: 1px solid #E1E1E8;
+    padding: 0px 3px 0px 3px;
+    background: #f3ba6f;
+    font-weight: bold;
+    font-size: 0.9em;
 }

data/rakelib/yard/templates/default/fulldoc/html/full_list.erb

@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta charset="<%= charset %>" />
+    <% stylesheets_full_list.each do |stylesheet| %>
+      <link rel="stylesheet" href="<%= mtime_url(stylesheet) %>" type="text/css" media="screen" />
+    <% end %>
+
+    <% javascripts_full_list.each do |javascript| %>
+      <script type="text/javascript" charset="utf-8" src="<%= mtime_url(javascript) %>"></script>
+    <% end %>
+
+    <title><%= @list_title %></title>
+    <base id="base_target" target="_parent" />
+  </head>
+  <body>
+    <div id="content">
+      <div class="fixed_header">
+        <%= logo_and_version %>
+        <h1 id="full_list_header"><%= @list_title %></h1>
+        <div id="full_list_nav">
+          <% menu_lists.each do |list| %>
+            <span><a target="_self" href="<%= url_for_list list[:type] %>">
+              <%= list[:title] %>
+            </a></span>
+          <% end %>
+        </div>
+
+        <div id="search">Search: <input type="text" /></div>
+      </div>
+
+      <ul id="full_list" class="<%= @list_class || @list_type %>">
+        <%= erb "full_list_#{@list_type}" %>
+      </ul>
+    </div>
+  </body>
+</html>

data/rakelib/yard/templates/default/fulldoc/html/setup.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+def init
+  # It seems YARD messes things up so that a number of classes are not properly
+  # registered in their enclosing namespaces.
+  # This hack makes sure that if that is the case we fix that here.
+  all_classes = Registry.all(:class)
+  all_classes.each do |c|
+    if (ns = c.namespace)
+      unless ns.children.any? { |nsc| nsc.path == c.path }
+        ns.children << c # class missing from child list of enclosing namespace -> add here
+      end
+    end
+    if (ns = Registry[c.namespace.path])
+      unless ns.children.any? { |nsc| nsc.path == c.path }
+        ns.children << c # class missing from child list of enclosing namespace -> add here
+      end
+    end
+  end
+  super
+end
+
+def stylesheets_full_list
+  super + %w(css/wxruby3.css)
+end
+
+def logo_and_version
+  wxver = Registry['Wx::WXRUBY_VERSION']
+  wxwver = Registry['Wx::WXWIDGETS_VERSION']
+  <<~__HTML
+  <div class='wxrb-logo'>
+    <img src='assets/logo.png' height='38'/>
+    <table><tbody>
+      <tr><td><span class='wxrb-name'><a href="https://github.com/mcorino/wxRuby3">wxRuby3</a></span></td><td><span class='wxrb-version'>Version: #{::Kernel.eval(wxver.value)}</span></td></tr>
+      <tr><td></td><td><span class="wxrb-wxver">(wxWidgets: #{::Kernel.eval(wxwver.value)})</span></td></tr>
+    </tbody></table>
+  </div>
+  __HTML
+end

data/rakelib/yard/templates/default/tags/html/wxrb_require.erb

@@ -0,0 +1,10 @@
+<% if object.has_tag?(:wxrb_require) %>
+  <p class="tag_title">Requires:</p>
+  <ul class="wxrb-require">
+    <% wxruby_requires.each do |req| %>
+      <li><div class='inline'>
+        <%= req.join(' or ') %>
+      </div></li>
+    <% end %>
+  </ul>
+<% end %>

data/rakelib/yard/templates/default/tags/setup.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+def wxrb_require
+  erb('wxrb_require')
+end
+
+def wxruby_requires
+  object.tags(:wxrb_require).inject([]) do |list, tag|
+    tag.text.split(',').each do |feature|
+      list << feature.split('|').collect do |s|
+        s.split('&').collect { |ss| %Q[<span class="wxrb-require">#{ss.strip}</span>] }.join('&amp;')
+      end
+    end
+    list
+  end
+end

data/rakelib/yard/yard-custom-templates.rb

@@ -1,2 +1,5 @@
 
+YARD::Tags::Library.define_tag("Requirements", :wxrb_require)
+YARD::Tags::Library.visible_tags.place(:wxrb_require).before(:author)
+
 YARD::Templates::Engine.register_template_path File.join(__dir__, 'templates')

data/samples/treectrl/treectrl.rb

@@ -369,7 +369,7 @@ class MyTreeCtrl < Wx::TreeCtrl
       set_item_font(root_id, Wx::ITALIC_FONT)
     end
 
-    ids = get_children(root_id)
+    ids = get_item_children(root_id)
 
     # make the first item blue
     set_item_text_colour(ids[0], Wx::BLUE)

data/tests/test_list_ctrl.rb

@@ -4,7 +4,7 @@
 
 require_relative './lib/wxframe_runner'
 
-class ButtonTests < WxRuby::Test::GUITests
+class ListCtrlTests < WxRuby::Test::GUITests
 
   def setup
     super