wxruby3 0.9.2-x64-mingw-ucrt → 0.9.3-x64-mingw-ucrt

data/lib/wx/doc/validator.rb

@@ -0,0 +1,113 @@
+# :stopdoc:
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# :startdoc:
+
+
+module Wx
+
+  class Validator < EvtHandler
+
+    # @overload initialize()
+    #   Constructor.
+    #   @return [Wx::Validator]
+    # @overload initialize(other)
+    #   Copy constructor.
+    #   @param [Wx::Validator] other
+    #   @return [Wx::Validator]
+    def initialize(*arg) end
+
+    # Method called when transferring data from window.
+    # Should retrieve and return the data from the associated window (#get_window).
+    # By default returns nil (which indicates there is no custom data to transfer).
+    # Overload for customized functionality.
+    # @return [Object] retrieved data from window
+    def do_transfer_from_window; end
+    protected :do_transfer_from_window
+
+    # Method called when transferring data to window.
+    # Should transfer the given data to the associated window and return true if successful.
+    # By default does nothing and just returns true.
+    # Overload for customized functionality.
+    # @param [Object] data
+    # @return [Boolean]
+    def do_transfer_to_window(data) end
+    protected :do_transfer_to_window
+
+    # Mixin module providing data binding options for validators.
+    module Binding
+
+      # Installs a callback handler to capture the data retrieved from the associated window.
+      # The callback handler can be specified as a (name of a) method, a Proc or a block.
+      #
+      # @example This can be used to implement data binding like:
+      #   class MyValidator < Wx::Validator
+      #     def initialize(data_store)
+      #       @data_store = data_store
+      #       self.on_transfer_from_window :store_data
+      #       self.on_transfer_to_window :load_data
+      #     end
+      #     protected
+      #     def store_data(data)
+      #       @data_store.save_the_data(data)
+      #     end
+      #     def load_data
+      #       @data_store.get_the_data
+      #     end
+      #   end
+      #   val = MyValidator.new(a_data_store)
+      #   win.set_validator(val)
+      #
+      # @param [String,Symbol,Method,Proc] meth (name of) method or event handling proc; to be supplied when no block is given
+      # @yieldparam [Object] data the data retrieved from the window
+      def on_transfer_from_window(meth=nil, &block) end
+
+      # Installs a callback handler to provide the data to transfer to the associated window.
+      # The callback handler can be specified as a (name of a) method, a Proc or a block.
+      #
+      # @example This can be used to implement data binding like:
+      #   class MyValidator < Wx::Validator
+      #     def initialize(data_store)
+      #       @data_store = data_store
+      #       self.on_transfer_from_window :store_data
+      #       self.on_transfer_to_window :load_data
+      #     end
+      #     protected
+      #     def store_data(data)
+      #       @data_store.save_the_data(data)
+      #     end
+      #     def load_data
+      #       @data_store.get_the_data
+      #     end
+      #   end
+      #   val = MyValidator.new(a_data_store)
+      #   win.set_validator(val)
+      #
+      # @param [String,Symbol,Method,Proc] meth (name of) method or event handling proc; to be supplied when no block is given
+      # @yieldreturn [Object] the data to transfer to the window
+      def on_transfer_to_window(meth=nil, &block) end
+
+      # Method called with data transferred from window.
+      # By default will call the on_transfer_from_window handler if defined.
+      # Returns true if successful or none defined.
+      # @param [Object] data
+      # @return [Boolean]
+      def do_on_transfer_from_window(data) end
+      protected :do_on_transfer_from_window
+
+      # Method called to get data to transfer to window.
+      # By default will call the on_transfer_to_window handler if defined.
+      # Returns the handler's result if successful.
+      # Otherwise returns nil.
+      # @return [Object]
+      def do_on_transfer_to_window; end
+      protected :do_on_transfer_to_window
+
+    end
+
+    include Binding
+
+  end
+
+end

data/lib/wx/doc/window.rb

@@ -9,6 +9,36 @@ module Wx
 
   class Window
 
+    # Lowers the window to the bottom of the window hierarchy (Z-order).
+    # This method has been renamed in wxRuby to be consistent with the renamed #raise_window method.
+    #
+    # <div class="wxrb-remark">
+    # <b>Remark:</b>
+    # <p>This function only works for {Wx::TopLevelWindow}-derived classes.
+    # </p>
+    # </div>
+    # @see Wx::Window#raise_window
+    # @return [void]
+    def lower_window; end
+    alias :send_to_back :lower_window
+
+    # Raises the window to the top of the window hierarchy (Z-order).
+    # This method has been renamed in wxRuby to avoid clashing with the standard Kernel#raise method.
+    #
+    # Notice that this function only requests the window manager to raise this window to the top of Z-order. Depending
+    # on its configuration, the window manager may raise the window, not do it at all or indicate that a window
+    # requested to be raised in some other way, e.g. by flashing its icon if it is minimized.
+    #
+    # <div class="wxrb-remark">
+    # <b>Remark:</b>
+    # <p>This function only works for {Wx::TopLevelWindow}-derived classes.
+    # </p>
+    # </div>
+    # @see Wx::Window#lower_window
+    # @return [void]
+    def raise_window; end
+    alias :bring_to_front :raise_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

data/lib/wx/html/events/evt_list.rb

@@ -24,14 +24,4 @@ class Wx::EvtHandler
   # from wxHtmlWindow
   # from wxHtmlListBox
   # from wxSimpleHtmlListBox
-  self.register_event_type EventType[
-      'evt_listbox', 1,
-      Wx::HTML::EVT_LISTBOX,
-      Wx::HTML::SimpleHtmlListBox
-    ] if Wx::HTML.const_defined?(:EVT_LISTBOX)
-  self.register_event_type EventType[
-      'evt_listbox_dclick', 1,
-      Wx::HTML::EVT_LISTBOX_DCLICK,
-      Wx::HTML::SimpleHtmlListBox
-    ] if Wx::HTML.const_defined?(:EVT_LISTBOX_DCLICK)
 end

data/lib/wx/html/simple_html_listbox.rb

@@ -4,105 +4,38 @@
 
 class Wx::HTML::SimpleHtmlListBox
 
-  # Make this a Ruby enumerable so find, find_all, map etc are available
-  include Enumerable
-
-  # Passes each valid item index into the passed block
-  def each
-    get_count.times { | i | yield i }
-  end
-
-  # We need to cache client data in Ruby variables as we cannot access items
-  # during the GC mark phase as for some platforms (WXMSW at least) that would
-  # involve calling methods that would break in that phase.
-
-  def client_data_store
-    @client_data ||= []
-  end
-  private :client_data_store
-
-  wx_set_client_data = instance_method :set_client_data
-  define_method :set_client_data do |item, data|
-    item = item.to_i
-    wx_set_client_data.bind(self).call(item, data)
-    client_data_store[item] = data
-  end
-
-  def get_client_data(item)
-    client_data_store[item.to_i]
-  end
-
-  wx_append = instance_method :append
-  define_method :append do |item, data=nil|
-    if data
-      if ::Array === item
-        if !(::Array === data)
-          ::Kernel.raise ::TypeError.new("Expected Array for argument 3")
-        elsif data.size != item.size
-          ::Kernel.raise ::ArgumentError.new("item and data array must be equal size")
-        end
-        offs = get_count
-        wx_append.bind(self).call(item)
-        item.size.times { |ix| set_client_data(offs+ix, data[ix]) }
-      else
-        wx_append.bind(self).call(item, data)
-        client_data_store[get_count-1] = data
-      end
+  # make sure to honor the inherited common overloads
+  wx_get_client_object = instance_method :get_client_object
+  define_method :get_client_object do |*args|
+    if args.empty?
+      super()
     else
-      wx_append.bind(self).call(item)
-      # no changes to data store
+      wx_get_client_object.bind(self).call(*args)
     end
   end
-
-  wx_insert = instance_method :insert
-  define_method :insert do |item, pos, data=nil|
-    if data
-      if ::Array === item
-        if !(::Array === data)
-          ::Kernel.raise ::TypeError.new("Expected Array for argument 3")
-        elsif data.size != item.size
-          ::Kernel.raise ::ArgumentError.new("item and data array must be equal size")
-        end
-        wx_insert.bind(self).call(item, pos)
-        client_data_store.insert(pos, *::Array.new(item.size))
-        item.size.times { |ix| set_client_data(pos+ix, data[ix]) }
-      else
-        wx_insert.bind(self).call(item, pos, data)
-        client_data_store.insert(pos, data)
-      end
+  wx_set_client_object = instance_method :set_client_object
+  define_method :set_client_object do |*args|
+    if args.size < 2
+      super(*args)
     else
-      wx_insert.bind(self).call(item, pos)
-      if ::Array === item
-        client_data_store.insert(pos, *::Array.new(item.size))
-      else
-        client_data_store.insert(pos, nil)
-      end
+      wx_set_client_object.bind(self).call(*args)
     end
   end
+  # redefine aliases
+  alias :client_object :get_client_object
+  alias :client_object= :set_client_object
 
-  wx_set = instance_method :set
-  define_method :set do |items, data=nil|
-    if data
-      if !(::Array === data)
-        ::Kernel.raise ::TypeError.new("Expected Array for argument 2")
-      elsif data.size != items.size
-        ::Kernel.raise ::ArgumentError.new("items and data array must be equal size")
-      end
-    end
-    wx_set.bind(self).call(items)
-    client_data_store.clear
-    items.each_with_index { |item, ix| set_client_data(item, data[ix]) }
-  end
+  alias :get_client_data :get_client_object
+  alias :set_client_data :set_client_object
 
-  wx_clear = instance_method :clear
-  define_method :clear do
-    wx_clear.bind(self).call
-    client_data_store.clear
+  # Overload to provide Enumerator without block
+  wx_each_string = instance_method :each_string
+  define_method :each_string do |&block|
+    if block
+      wx_each_string.bind(self).call(&block)
+    else
+      ::Enumerator.new { |y| wx_each_string.bind(self).call { |ln| y << ln } }
+    end
   end
 
-  wx_delete = instance_method :delete
-  define_method :delete do |item|
-    wx_delete.bind(self).call(item.to_i)
-    client_data_store.slice!(item.to_i)
-  end
 end

data/lib/wx/keyword_defs.rb

@@ -290,7 +290,12 @@ end
 # A button which stays pressed when clicked by user.
 Wx::define_keyword_ctors(Wx::ToggleButton) do
   wx_ctor_params :id, :label, :pos, :size, :style
-  wx_ctor_params :validator, :name => 'checkBox'
+  wx_ctor_params :validator, :name => 'toggleButton'
+end
+
+Wx::define_keyword_ctors(Wx::BitmapToggleButton) do
+  wx_ctor_params :id, :label, :pos, :size, :style
+  wx_ctor_params :validator, :name => 'bitmapToggleButton'
 end
 
 # Control showing an entire calendar month
@@ -320,6 +325,12 @@ Wx::define_keyword_ctors(Wx::CheckListBox) do
   wx_ctor_params :validator, :name => 'listBox'
 end
 
+# wxEditableListBox - an editable listbox is composite control that lets the user easily enter, delete and reorder a list of strings.
+Wx::define_keyword_ctors(Wx::EditableListBox) do
+  wx_ctor_params :id, :label, :pos, :size, :style => Wx::EL_DEFAULT_STYLE
+  wx_ctor_params :name => 'editableListBox'
+end
+
 # wxChoice 	Choice control (a combobox without the editable area)
 Wx::define_keyword_ctors(Wx::Choice) do
   wx_ctor_params :id, :pos, :size, :choices, :style
@@ -349,6 +360,14 @@ Wx::define_keyword_ctors(Wx::ComboCtrl) do
   wx_ctor_params :validator, :name => 'comboCtrl'
 end
 
+# wxOwnerDrawnComboBox
+Wx::define_keyword_ctors(Wx::OwnerDrawnComboBox) do
+  wx_ctor_params :id, :value => ''
+  wx_ctor_params :pos, :size, :choices => []
+  wx_ctor_params :style
+  wx_ctor_params :validator, :name => 'ownerDrawnComboBox'
+end
+
 # wxGauge 	A control to represent a varying quantity, such as time
 # remaining
 Wx::define_keyword_ctors(Wx::Gauge) do
@@ -421,9 +440,16 @@ Wx::define_keyword_ctors(Wx::StaticBitmap) do
   wx_ctor_params :id
   # autoconvert Bitmaps to BitmapBundles for downward compatibility
   wx_ctor_params :label
-  wx_ctor_params :pos, :size, :style, :name => Wx::StaticBitmapNameStr
+  wx_ctor_params :pos, :size, :style, :name => Wx::STATIC_BITMAP_NAME_STR
 end
 
+# wxGenericStaticBitmap 	A control to display a bitmap
+Wx::define_keyword_ctors(Wx::GenericStaticBitmap) do
+  wx_ctor_params :id
+  # autoconvert Bitmaps to BitmapBundles for downward compatibility
+  wx_ctor_params :label
+  wx_ctor_params :pos, :size, :style, :name => Wx::STATIC_BITMAP_NAME_STR
+end
 
 # wxRadioBox 	A group of radio buttons
 Wx::define_keyword_ctors(Wx::RadioBox) do
@@ -582,3 +608,9 @@ Wx::define_keyword_ctors(Wx::RearrangeCtrl) do
   wx_ctor_params :id, :pos, :size, :order, :items, :style
   wx_ctor_params :validator, :name => 'rearrangeCtrl'
 end
+
+Wx::define_keyword_ctors(Wx::HeaderCtrlSimple) do
+  wx_ctor_params :winid => Wx::ID_ANY
+  wx_ctor_params :pos, :size, :style => Wx::HD_DEFAULT_STYLE
+  wx_ctor_params :name => 'headerCtrlSimple'
+end

data/lib/wx/rbn/ribbon_gallery.rb

@@ -4,27 +4,6 @@
 
 class Wx::RBN::RibbonGallery
 
-  def item_client_data_store
-    @item_client_data ||= {}
-  end
-  private :item_client_data_store
-
-  def set_item_client_data(item, data)
-    item_client_data_store[item] = data
-  end
-
-  def get_item_client_data(item)
-    item_client_data_store[item]
-  end
-  alias :item_client_data :get_item_client_data
-
-  wx_append = instance_method :append
-  define_method :append do |bmp, item_id, data=nil|
-    item = wx_append.bind(self).call(bmp, item_id)
-    set_item_client_data(item, data) if item && data
-    item
-  end
-
   def items
     if block_given?
       count.times { |i| yield item(i) }

data/lib/wx/version.rb

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

data/rakelib/lib/config/mingw.rb

@@ -53,6 +53,18 @@ module WXRuby3
             "{#{dll_ext},dll}"
           end
 
+          def do_link(pkg)
+            # have to use option file for objects to link on windows because command line gets too long
+            ftmp = Tempfile.new('object')
+            ftmp.puts pkg.all_obj_files.collect { |o| File.join('..', o) }.join(' ')
+            ftmp.close # close but do not unlink
+            objs = "@#{ftmp.path}"
+            depsh = pkg.dep_libnames.collect { |dl| "#{dl}.#{dll_ext}" }.join(' ')
+            sh "cd lib && #{WXRuby3.config.ld} #{WXRuby3.config.ldflags(pkg.lib_target)} #{objs} #{depsh} " +
+                 "#{WXRuby3.config.libs} #{WXRuby3.config.link_output_flag}#{pkg.lib_target}"
+            ftmp.unlink # cleanup
+          end
+
           private
 
           def wx_make