wxruby3 0.9.2 → 0.9.3

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.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

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

@@ -327,6 +327,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 +362,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 +412,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,6 +429,13 @@ 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
+      end
+
       def generate_event_list
         # determine Ruby library events root for package
         rbevt_root = File.join(ruby_classes_path, 'events')
@@ -436,7 +451,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|

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_helper.rb

@@ -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
 

data/rakelib/lib/director/combobox.rb

@@ -29,6 +29,28 @@ module WXRuby3
         spec.rename_for_ruby(
           'SetTextSelectionRange' => 'wxComboBox::SetSelection(long, long)',
           'GetTextSelectionRange' => 'wxComboBox::GetSelection(long *, long *) const')
+        spec.ignore 'wxComboBox::SetSelection(long, long)',
+                    'wxComboBox::GetSelection(long *, long *) const',
+                    ignore_doc: false
+        # workaround because renaming and alias definitions clash
+        spec.add_extend_code 'wxComboBox', <<~__HEREDOC
+          void SetTextSelectionRange(long from, long to)
+          {
+            $self->SetSelection(from, to);
+          }
+
+          void GetTextSelectionRange(long *from, long *to)
+          {
+            $self->GetSelection(from, to);
+          }
+          __HEREDOC
+        # fix override of TextEntry#clear; to be finished in pure Ruby
+        spec.add_extend_code 'wxComboBox', <<~__HEREDOC
+          void ClearItems()
+          {
+            $self->Clear();
+          }
+          __HEREDOC
         spec.map_apply 'long * OUTPUT' => [ 'long *from', 'long *to' ]
       end
 

data/rakelib/lib/director/comboctrl.rb

@@ -16,7 +16,7 @@ module WXRuby3
 
       def setup
         super
-        spec.items << 'wxComboPopup' << 'wxOwnerDrawnComboBox' << 'wxItemContainer'
+        spec.items << 'wxComboPopup'
         # mixin TextEntry
         spec.include_mixin 'wxComboCtrl', { 'Wx::TextEntry' => 'wxTextEntryBase' }
         spec.override_inheritance_chain('wxComboCtrl',
@@ -31,60 +31,6 @@ module WXRuby3
         ]
         # turn wxComboPopup into a mixin module
         spec.make_mixin 'wxComboPopup'
-        # override inheritance chain
-        spec.override_inheritance_chain('wxOwnerDrawnComboBox', %w[wxComboCtrl wxControl wxWindow wxEvtHandler wxObject])
-        spec.fold_bases('wxOwnerDrawnComboBox' => %w[wxItemContainer])
-        spec.regard %w[
-          wxOwnerDrawnComboBox::OnDrawBackground
-          wxOwnerDrawnComboBox::OnDrawItem
-          wxOwnerDrawnComboBox::OnMeasureItem
-          wxOwnerDrawnComboBox::OnMeasureItemWidth
-        ]
-        # unuseful overloads
-        spec.ignore 'wxOwnerDrawnComboBox::wxOwnerDrawnComboBox(wxWindow *, wxWindowID, const wxString &, const wxPoint &, const wxSize &, int, const wxString [], long, const wxValidator &, const wxString &)',
-                    'wxOwnerDrawnComboBox::Create(wxWindow *, wxWindowID, const wxString &, const wxPoint &, const wxSize &, int, const wxString [], long, const wxValidator &, const wxString &)'
-        spec.ignore('wxItemContainer::Append(const wxString &, wxClientData *)',
-                    'wxItemContainer::Append(const std::vector< wxString > &)',
-                    'wxItemContainer::Append(const wxArrayString &, wxClientData **)',
-                    'wxItemContainer::Append(unsigned int, const wxString *)',
-                    'wxItemContainer::Append(unsigned int, const wxString *, void **)',
-                    'wxItemContainer::Append(unsigned int, const wxString *, wxClientData **)',
-                    'wxItemContainer::Insert(const wxString &, unsigned int, wxClientData *)',
-                    'wxItemContainer::Insert(const std::vector< wxString > &)',
-                    'wxItemContainer::Insert(const wxArrayString &, unsigned int, wxClientData **)',
-                    'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int)',
-                    'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int, void **)',
-                    'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int, wxClientData **)',
-                    'wxItemContainer::Set(const std::vector< wxString > &)',
-                    'wxItemContainer::Set(const wxArrayString &, wxClientData **)',
-                    'wxItemContainer::Set(unsigned int, const wxString *)',
-                    'wxItemContainer::Set(unsigned int, const wxString *, void **)',
-                    'wxItemContainer::Set(unsigned int, const wxString *, wxClientData **)',
-                    'wxItemContainer::DetachClientObject',
-                    'wxItemContainer::HasClientObjectData',
-                    'wxItemContainer::GetClientObject',
-                    'wxItemContainer::SetClientObject',
-                    'wxItemContainer::HasClientUntypedData',
-                    'wxItemContainer::Clear')
-        spec.ignore('wxItemContainer::Append(const wxArrayString &, void **)',
-                    'wxItemContainer::Insert(const wxArrayString &, unsigned int, void **)',
-                    'wxItemContainer::Set(const wxArrayString &, void **)', ignore_doc: false)
-        # ambiguous
-        spec.ignore 'wxOwnerDrawnComboBox::IsEmpty', ignore_doc: false
-        # for doc only
-        spec.map 'void** clientData' => 'Array', swig: false do
-          map_in code: ''
-        end
-        spec.ignore(%w[wxItemContainer::GetClientData wxItemContainer::SetClientData], ignore_doc: false) # keep docs
-        # Replace the old Wx definition of this method (which segfaults)
-        # Only need the setter as we cache data in Ruby and the getter
-        # therefor can be pure Ruby
-        spec.add_extend_code 'wxOwnerDrawnComboBox', <<~__HEREDOC
-            VALUE set_client_data(int n, VALUE item_data) {
-              self->SetClientData(n, (void *)item_data);
-              return item_data;
-            }
-        __HEREDOC
       end
 
     end # class ComboCtrl