wxruby3 0.9.2 → 0.9.4

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/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.4'
 end

data/rakelib/build.rb

@@ -48,7 +48,7 @@ if WXRuby3.is_bootstrapped?
       end
 
       # The main source module - which needs to initialize all the other modules in the package
-      file pkg.initializer_src => pkg.all_swig_files do |t|
+      file pkg.initializer_src => (pkg.all_swig_files + (pkg.parent ? [pkg.parent.initializer_src] : [])) do |t|
         pkg.generate_initializer
       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

data/rakelib/lib/core/include/client_data.inc

@@ -0,0 +1,65 @@
+// Copyright (c) 2023 M.J.N. Corino, The Netherlands
+//
+// This software is released under the MIT license.
+
+#ifndef WXRUBY_EXPORT
+#define WXRUBY_EXPORT WXRB_EXPORT_FLAG
+#endif
+
+#include "wxruby-ClientData.h"
+
+#include <set>
+
+static std::set<wxRubyClientData*> __s_WxRubyClientDataSet;
+static std::set<wxRubyUserData*> __s_WxRubyUserDataSet;
+
+WXRB_EXPORT_FLAG void wxRuby_RegisterClientData(wxRubyClientData* pcd)
+{
+  __s_WxRubyClientDataSet.insert(pcd);
+}
+
+WXRB_EXPORT_FLAG void wxRuby_RegisterUserData(wxRubyUserData* pud)
+{
+  __s_WxRubyUserDataSet.insert(pud);
+}
+
+static ID client_data_unlinked_id()
+{
+  static ID __s_client_data_unlinked_id {};
+  if (__s_client_data_unlinked_id == ID())
+  {
+    __s_client_data_unlinked_id = rb_intern("client_data_unlinked");
+  }
+  return __s_client_data_unlinked_id;
+}
+
+WXRB_EXPORT_FLAG void wxRuby_UnregisterClientData(wxRubyClientData* pcd)
+{
+  VALUE rbcd = pcd->GetData();
+  __s_WxRubyClientDataSet.erase(pcd);
+  if (!NIL_P(rbcd) && rb_respond_to(rbcd, client_data_unlinked_id()))
+  {
+    wxRuby_Funcall(rbcd, client_data_unlinked_id(), 0);
+  }
+}
+
+WXRB_EXPORT_FLAG void wxRuby_UnregisterUserData(wxRubyUserData* pud)
+{
+  VALUE rbud = pud->GetData();
+  __s_WxRubyUserDataSet.erase(pud);
+  if (!NIL_P(rbud) && rb_respond_to(rbud, client_data_unlinked_id()))
+  {
+    wxRuby_Funcall(rbud, client_data_unlinked_id(), 0);
+  }
+}
+
+static void wxRuby_GC_mark_ClientData()
+{
+  for (wxRubyClientData* pcd : __s_WxRubyClientDataSet)
+    rb_gc_mark(pcd->GetData());
+  for (wxRubyUserData* pud : __s_WxRubyUserDataSet)
+    rb_gc_mark(pud->GetData());
+}
+
+typedef void (*WXRBMarkFunction)();
+WXRUBY_EXPORT void wxRuby_AppendMarker(WXRBMarkFunction marker);

data/rakelib/lib/core/include/funcall.inc

@@ -16,7 +16,7 @@ VALUE rb_get_backtrace(VALUE);
 
 namespace Swig
 {
-  class DirectorRubyException : public DirectorException
+  class WXRB_EXPORT_FLAG DirectorRubyException : public DirectorException
   {
   public:
     DirectorRubyException(VALUE error, VALUE rcvr, ID fn_id)

data/rakelib/lib/core/package.rb

@@ -6,6 +6,8 @@
 # wxRuby3 extension library Package class
 ###
 
+require 'monitor'
+
 module WXRuby3
 
   class Director
@@ -327,6 +329,7 @@ module WXRuby3
             fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'swigdirector.inc'))
             fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'funcall.inc'))
             fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'enum.inc'))
+            fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'client_data.inc'))
             fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'init.inc'))
             fsrc.puts
           end
@@ -361,6 +364,9 @@ module WXRuby3
               Config.instance.features.each do |feature, val|
                 fsrc.puts %Q{rb_define_const(mWxSetup, "#{feature}", Q#{val});}
               end
+              fsrc.puts
+              # install wxRubyClientData marker
+              fsrc.puts %Q{wxRuby_AppendMarker(wxRuby_GC_mark_ClientData);}
             else
               fsrc.puts %Q{#{module_variable} = rb_define_module_under(wxRuby_Core(), "#{name}");}
               # record package submodule in main module's list
@@ -408,7 +414,11 @@ module WXRuby3
         item.event_types.each do |evt_hnd, evt_type, evt_arity, evt_klass, _|
           evh_name = evt_hnd.downcase
           unless evts_handled.include?(evh_name)
-            evt_klass ||= item.name
+            evt_klass ||= if item.event
+                            item.name
+                          else
+                            raise "Don't know Event class for #{evh_name} event type (from #{item.name})"
+                          end
             fout.puts '  '+<<~__HEREDOC.split("\n").join("\n  ")
                       self.register_event_type EventType[
                           '#{evh_name}', #{evt_arity},
@@ -421,7 +431,34 @@ module WXRuby3
         end
       end
 
+      class << self
+        # need to share these over all packages since events may be defined in multiple
+        def generated_events
+          @generated_events ||= ::Set.new
+        end
+
+        def event_list_packages
+          unless @event_list_packages
+            @event_list_packages = ::Set.new
+            @event_list_packages.extend(MonitorMixin)
+          end
+          @event_list_packages
+        end
+      end
+
       def generate_event_list
+        # make sure parent package has already generated event list
+        Package.event_list_packages.synchronize do
+          if parent && !Package.event_list_packages.include?(parent)
+            # make sure all included director modules have been extracted
+            parent.included_directors.each do |dir|
+              dir.extract_interface(false) # no need to generate anything here
+            end
+            parent.generate_event_list
+          end
+        end
+        # list ourselves as generated
+        Package.event_list_packages << self
         # determine Ruby library events root for package
         rbevt_root = File.join(ruby_classes_path, 'events')
         # create event list file
@@ -436,7 +473,7 @@ module WXRuby3
   
             class Wx::EvtHandler
           __HEREDOC
-          evts_handled = ::Set.new
+          evts_handled = self.class.generated_events
           # first iterate all event classes
           command_event = nil # special case
           included_directors.each do |dir|
@@ -468,7 +505,6 @@ module WXRuby3
           fout.puts 'end'
         end
       end
-      private :generate_event_list
 
       def find_event_doc(evh_name)
         unless doc = event_docs[evh_name]

data/rakelib/lib/core/parameter.rb

@@ -12,7 +12,7 @@ module WXRuby3
 
     # represents a basic parameter definition
     class ParameterBase
-      PTR_RE = /\A(\*|&)\s*([_a-zA-Z]\w*)?\Z/
+      PTR_RE = /\A([\*&]+)\s*([_a-zA-Z]\w*)?\Z/
       CONST_RE = /(\A|\W)const(\W|\Z)/
       MULTI_WORD_TYPES = %w[char short int long]
       def initialize(param)

data/rakelib/lib/core/spec.rb

@@ -272,6 +272,16 @@ module WXRuby3
         self
       end
 
+      def gc_as_marked(*names)
+        if names.empty?
+          @gc_type = :GC_MANAGE_AS_MARKED
+        else
+          @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
+          names.flatten.each {|n| @gc_type[n] = :GC_MANAGE_AS_MARKED }
+        end
+        self
+      end
+
       def gc_type(name)
         @gc_type.is_a?(::Hash) ? @gc_type[name] : @gc_type
       end

data/rakelib/lib/core/spec_helper.rb

@@ -121,7 +121,7 @@ module WXRuby3
 
     def get_base_module_list(hierarchy, foldedbases, list = ::Set.new)
       hierarchy.each_value do |super_def|
-        list << super_def.module unless foldedbases.include?(super_def.name)
+        list << super_def.module unless foldedbases.include?(super_def.name) || super_def.module == module_name
         get_base_module_list(super_def.supers, folded_bases(super_def.name), list)
       end
       list
@@ -382,7 +382,13 @@ module WXRuby3
 
     def interface_code
       if ifspec.interface_code && !ifspec.interface_code.empty?
-        ifspec.interface_code.join("\n")
+        if warn_filters.empty?
+          ''
+        else
+          "\n" + warn_filters.collect do |warn, decls|
+            decls.collect { |decl| "%warnfilter(#{warn}) #{decl};" }
+          end.flatten.join("\n")
+        end + ifspec.interface_code.join("\n")
       else
         %Q{%include "#{interface_include}"\n}
       end

data/rakelib/lib/director/app.rb

@@ -189,6 +189,24 @@ module WXRuby3
           __HEREDOC
         super
       end
+
+      def process(gendoc: false)
+        defmod = super
+        # fix documentation errors for generic dirctrl events
+        def_item = defmod.find_item('wxApp')
+        if def_item
+          def_item.event_types.each do |evt_spec|
+            case evt_spec.first
+            when 'EVT_DIALUP_CONNECTED', 'EVT_DIALUP_DISCONNECTED'
+              if evt_spec[3].nil?
+                evt_spec[3] = 'wxDialUpEvent' # missing from docs
+              end
+            end
+          end
+        end
+        defmod
+      end
+
     end
 
   end # class Director

data/rakelib/lib/director/app_traits.rb

@@ -15,7 +15,9 @@ module WXRuby3
       def setup
         super
         spec.items << 'wxStandardPaths'
-        spec.gc_as_object 'wxAppTraits', 'wxStandardPaths'
+        spec.gc_as_object 'wxAppTraits'
+        # stack based global; tracking unwanted
+        spec.gc_as_untracked 'wxStandardPaths'
         spec.no_proxy 'wxAppTraits', 'wxStandardPaths'
         spec.make_abstract 'wxAppTraits'
 

data/rakelib/lib/director/bitmap_combobox.rb

@@ -24,8 +24,8 @@ module WXRuby3
                                            wxWindow
                                            wxEvtHandler
                                            wxObject])
-        spec.ignore 'wxBitmapComboBox::Insert(const wxString &, const wxBitmap &, unsigned int, wxClientData *)',
-                    'wxBitmapComboBox::Append(const wxString &, const wxBitmap &, wxClientData *)'
+        spec.ignore 'wxBitmapComboBox::Insert(const wxString &, const wxBitmap &, unsigned int, void *)',
+                    'wxBitmapComboBox::Append(const wxString &, const wxBitmap &, void *)'
         spec.map_apply 'long * OUTPUT' => [ 'long *from', 'long *to' ]
       end