wxruby3 0.9.1 → 0.9.3

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

@@ -327,7 +327,12 @@ module WXRuby3
       end
 
       def ignore(*names, ignore_doc: true)
-        names.flatten.each {|n| @ignores[n] = ignore_doc}
+        names.flatten.each { |n| @ignores[n] = {ignore: true, ignore_doc: ignore_doc} }
+        self
+      end
+
+      def ignore_unless(feature_set, *names)
+        names.flatten.each { |n| @ignores[n] = {ignore: feature_set} }
         self
       end
 

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/accelerator.rb

@@ -47,9 +47,8 @@ module WXRuby3
                    (TYPE($input) == T_STRING && RSTRING_LEN($input) == 1) );
             __CODE
         end
-        unless Config.instance.features_set?('__WXMSW__')
-          spec.ignore('wxAcceleratorTable::wxAcceleratorTable(const wxString &)')
-        end
+        spec.ignore_unless('WXMSW',
+                           'wxAcceleratorTable::wxAcceleratorTable(const wxString &)')
         spec.add_swig_code <<~__HEREDOC
           %warnfilter(509) wxAcceleratorTable::wxAcceleratorTable;
           __HEREDOC

data/rakelib/lib/director/accessible.rb

@@ -0,0 +1,47 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+module WXRuby3
+
+  class Director
+
+    class Accessible < Director
+
+      def setup
+        super
+        spec.make_abstract 'wxAccessible'
+        spec.map 'wxAccessible**' => 'Wx::Accessible' do
+          map_in ignore: true, temp: 'wxAccessible* tmp', code: '$1 = &tmp;'
+          map_argout code: <<~__HEREDOC
+            if (tmp$argnum)
+            {
+              $result = SWIG_Ruby_AppendOutput($result, SWIG_NewPointerObj(SWIG_as_voidptr(tmp$argnum), SWIGTYPE_p_wxAccessible,  0));
+            }
+            __HEREDOC
+
+        end
+        spec.map 'wxString *' => 'String' do
+          map_in ignore: true, temp: 'wxString tmp', code: '$1 = &tmp;'
+          map_argout code: '$result = SWIG_Ruby_AppendOutput($result, WXSTR_TO_RSTR(tmp$argnum));'
+        end
+        spec.map 'wxAccRole *' => 'Wx::AccRole' do
+          map_in ignore: true, temp: 'wxAccRole tmp', code: '$1 = &tmp;'
+          map_argout code: <<~__HEREDOC
+            $result = SWIG_Ruby_AppendOutput($result, wxRuby_GetEnumValueObject("AccRole", static_cast<int>(tmp$argnum)));
+            __HEREDOC
+        end
+        spec.map_apply 'int * OUTPUT' => ['int * childCount', 'int * childId', 'int * toId']
+        spec.map_apply 'long * OUTPUT' => 'long * state'
+      end
+
+    end
+
+  end
+
+end
+

data/rakelib/lib/director/app.rb

@@ -16,6 +16,15 @@ module WXRuby3
 
       def setup
         spec.items << 'wxAppConsole' << 'wxEventFilter'
+        if Config.instance.wx_version >= '3.3.0'
+          spec.items << 'wxDarkModeSettings'
+          spec.ignore_unless('WXMSW', 'wxDarkModeSettings', 'wxMenuColour')
+          if Config.instance.features_set?('WXMSW')
+            spec.disown 'wxDarkModeSettings *settings'
+            # wxDarkModeSettings does has have virt dtor; it's just not documented
+            spec.suppress_warning(514, 'wxDarkModeSettings')
+          end
+        end
         spec.fold_bases('wxApp' => 'wxAppConsole', 'wxAppConsole' => 'wxEventFilter')
         spec.override_inheritance_chain('wxApp', %w[wxEvtHandler wxObject])
         spec.ignore %w{
@@ -134,339 +143,23 @@ module WXRuby3
           extern "C" void Init_wxRubyStockObjects();
           extern void wxRuby_MarkProtectedEvtHandlerProcs();
 
-          #ifdef __WXMSW__
-          extern "C"
-          {
-            WXDLLIMPEXP_BASE HINSTANCE wxGetInstance();
-          }
-          #endif
-
           static wxVector<WXRBMarkFunction> WXRuby_Mark_List;
 
           WXRUBY_EXPORT void wxRuby_AppendMarker(WXRBMarkFunction marker)
           {
             WXRuby_Mark_List.push_back(marker);
           }
-          
-          class wxRubyApp : public wxApp
-          {
-          private:
-            static wxRubyApp* instance_;
-
-            bool is_running_ = false;
-          public:
-            static wxRubyApp* GetInstance () { return instance_; }
-
-            virtual ~wxRubyApp()
-            {
-          #ifdef __WXTRACE__
-            std::wcout << "~wxRubyApp" << std::endl;
-          #endif
-              // unlink
-              VALUE the_app = rb_const_get(#{spec.package.module_variable}, rb_intern("THE_APP"));
-              if (the_app != Qnil) 
-              {
-                DATA_PTR(the_app) = 0;
-              }
-            }
-          
-            // special event handler for destruction of windows which is done
-            // automatically by wxWidgets. Tag the object as having been destroyed
-            // by WxWidgets.
-            void OnWindowDestroy(wxWindowDestroyEvent &event)
-            {
-              wxObject* wx_obj = event.GetEventObject();
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "<= OnWindowDestroy [" << wx_obj << "]" << std::endl;
-          #endif
-              GC_SetWindowDeleted((void *)wx_obj);
-              event.Skip();
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "=> OnWindowDestroy [" << wx_obj << "]" << std::endl;
-          #endif
-            }
 
-            bool IsRunning() const { return this->is_running_; }
-          
-            // When ruby's garbage collection runs, if the app is still active, it
-            // cycles through all currently known SWIG objects and calls this
-            // function on each to preserve still active Wx::Windows, and also
-            // pending Wx::Events which have been queued from the Ruby side (the
-            // only sort of events that will be in the tracking hash.
-            static void markIterate(void* ptr, VALUE rb_obj)
-            {
-              // Check if it's a valid object (sometimes SWIG doesn't return what we're
-              // expecting), a descendant of Wx::Window (but not a Dialog), and if it has not yet been
-              // deleted by WxWidgets; if so, mark it.
-              if ( TYPE(rb_obj) == T_DATA )
-              {
-                if ( rb_obj_is_kind_of(rb_obj, wxRuby_GetWindowClass()) )
-                {
-                  rb_gc_mark(rb_obj);
-                }
-                else if (rb_obj_is_kind_of(rb_obj, wxRuby_GetDefaultEventClass()) )
-                  rb_gc_mark(rb_obj);
-              }
-              else if (TYPE(rb_obj) == T_ARRAY )
-              {
-                VALUE proc = rb_ary_entry(rb_obj, 0);
-                if (rb_obj_is_kind_of(proc, rb_cProc) || rb_obj_is_kind_of(proc, rb_cMethod))
-                {
-                  // keep the async call alive
-                  rb_gc_mark(rb_obj);
-                }
-              }
-            }
-          
-            // Implements GC protection across wxRuby. Always called because
-            // Wx::THE_APP is a constant so always checked in GC mark phase.
-            static void mark_wxRubyApp(void *ptr)
-            {
-          
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "=== Starting App GC mark phase" << std::endl;
-          #endif
-          
-              // If the App has ended, the ruby object will have been unlinked from
-              // the C++ one; this implies that all Windows have already been destroyed
-              // so there is no point trying to mark them, and doing so may cause
-              // errors.
-              if ( !wxRubyApp::GetInstance() || !wxRubyApp::GetInstance()->IsRunning() )
-              {
-          #ifdef __WXRB_DEBUG__
-                if (wxRuby_TraceLevel()>0)
-                  std::wcout << "=== App has ended, skipping mark phase" << std::endl;
-          #endif
-                return;
-              }
-          
-              // Mark any active (tracked) log target
-              wxLog* curLog = wxLog::GetActiveTarget();
-              VALUE rb_cur_log = wxRuby_FindTracking(curLog);
-              if (!NIL_P(rb_cur_log))
-              {
-                rb_gc_mark(rb_cur_log);
-              }
-
-              // Mark evt handler procs associated with live windows - see
-              // classes/EvtHandler.i
-              wxRuby_MarkProtectedEvtHandlerProcs();
-
-              // run registered markers
-              for (wxVector<WXRBMarkFunction>::iterator it = WXRuby_Mark_List.begin();
-                    it != WXRuby_Mark_List.end() ;++it)
-              {
-                (*it) ();
-              }
-          
-              // To do the main marking, primarily of Windows, iterate over SWIG's
-              // list of tracked objects
-              wxRuby_IterateTracking(&wxRubyApp::markIterate);
-          
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "=== App GC mark phase completed" << std::endl;
-          #endif
-            }
-          
-            // This is the method run when main_loop is called in Ruby
-            // wxEntry calls the C++ App::OnInit method
-            int main_loop()
-            {
-              VALUE rb_app = SWIG_RubyInstanceFor(this);
-              rb_define_const(#{spec.package.module_variable}, "THE_APP", rb_app);
-              this->Connect(wxEVT_DESTROY,
-                    wxWindowDestroyEventHandler(wxRubyApp::OnWindowDestroy));
-          
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "Calling wxEntry, this=" << this << std::endl;
-          #endif
-          
-          #ifdef __WXMSW__
-              extern int wxEntry(HINSTANCE hInstance,
-                         HINSTANCE WXUNUSED(hPrevInstance),
-                         wxCmdLineArgType WXUNUSED(pCmdLine),
-                         int nCmdShow);
-              wxEntry(wxGetInstance(),
-                      (HINSTANCE)0,
-                      (wxCmdLineArgType)"",
-                      (int)true);
-          #else
-              int argc = 1;
-              const char* argv[2] = { "ruby", 0 };
-              wxEntry(argc, const_cast<char**>(&argv[0]));
-          #endif
-          
-              rb_const_remove(#{spec.package.module_variable}, rb_intern("THE_APP"));
-
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "returned from wxEntry..." << std::endl;
-          #endif
-              rb_gc_start();
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "survived gc" << std::endl;
-          #endif
-
-              VALUE exc = rb_iv_get(rb_app, "@exception");
-              if (!NIL_P(exc))
-              {
-                rb_exc_raise(exc);
-              }
-              return 0;
-            }
-          
-            // This method initializes the stock objects (Pens, Brushes, Fonts)
-            // before yielding to ruby by calling the App's on_init method.
-            // Note that as of wxWidget 2.8, the stock fonts in particular cannot
-            // be initialized any earlier than this without crashing
-            bool OnInit() override
-            {
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "OnInit..." << std::endl;
-          #endif
-              // set standard App name
-              this->SetAppName(wxString("wxruby"));
-              // Signal that we've started              
-              wxRubyApp::instance_ = this; // there should ALWAYS EVER be only 1 app instance running/created
-              this->is_running_ = true;
-              // Set up the GDI objects
-              Init_wxRubyStockObjects();
-              // Get the ruby representation of the App object, and call the
-              // ruby on_init method to set up the initial window state
-              VALUE the_app = rb_const_get(#{spec.package.module_variable}, rb_intern("THE_APP"));
-              bool ex_caught = false;
-              VALUE result  = wxRuby_Funcall(ex_caught, the_app, rb_intern("on_ruby_init"), 0, 0);
-
-              if (ex_caught)
-              {
-          #ifdef __WXRB_DEBUG__
-                wxRuby_PrintException(result);
-          #endif
-                rb_iv_set(the_app, "@exception", result);
-                result = Qfalse; // exit app
-              }
-        
-              // If on_init return any (ruby) true value, signal to wxWidgets to
-              // enter the main event loop by returning true, else return false
-              // which will make wxWidgets exit.
-              if ( result == Qfalse || result == Qnil )
-              {
-                wxRubyApp::instance_ = 0;
-                this->is_running_ = false;
-                return false;
-              }
-              else
-              {
-                return true;
-              }
-            }
-          
-            int OnExit() override
-            {
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "OnExit..." << std::endl;
-          #endif
-
-              // Get the ruby representation of the App object, and call the
-              // ruby on_exit method (if any) for application level cleanup
-              VALUE the_app = rb_const_get(#{spec.package.module_variable}, rb_intern("THE_APP"));
-              ID on_exit_id = rb_intern("on_exit");
-              if (rb_funcall(the_app, rb_intern("respond_to?"), 1, ID2SYM(on_exit_id)) == Qtrue)
-              {
-                bool ex_caught = false;
-                VALUE rc = wxRuby_Funcall(ex_caught, the_app, on_exit_id, 0, 0);
-                if (ex_caught)
-                {
-          #ifdef __WXRB_DEBUG__
-                  wxRuby_PrintException(rc);
-          #endif
-                  rb_iv_set(the_app, "@exception", rc);
-                }
-              }
-
-              // perform wxRuby cleanup
-              _wxRuby_Cleanup();
-      
-              // execute base wxWidgets functionality 
-              return this->wxApp::OnExit();
-            }
-          
-            // actually implemented in ruby in classes/app.rb
-            virtual void OnAssertFailure(const wxChar *file, int line, const wxChar *func, const wxChar *cond, const wxChar *msg) override
-            {
-              VALUE rb_app = SWIG_RubyInstanceFor(this);
-              if (rb_during_gc() || NIL_P(rb_app))
-              {
-                std::wcout << file << "(" << line << "): ASSERT " << cond 
-                           << (NIL_P(rb_app) ? " fired without THE_APP in " : " fired during GC phase in ") 
-                           << func << "() with message [" << msg << "]" << std::endl;
-              }
-              else
-              {
-                VALUE obj0 = Qnil ;
-                VALUE obj1 = Qnil ;
-                VALUE obj2 = Qnil ;
-                VALUE obj3 = Qnil ;
-                VALUE obj4 = Qnil ;
-                
-                obj0 = rb_str_new2((const char *)wxString(file).utf8_str());
-                obj1 = INT2NUM(line);
-                obj2 = rb_str_new2((const char *)wxString(func).utf8_str());
-                obj3 = rb_str_new2((const char *)wxString(cond).utf8_str());
-                obj4 = rb_str_new2((const char *)wxString(msg).utf8_str());
-                (void)wxRuby_Funcall(rb_app, rb_intern("on_assert_failure"), 5,obj0,obj1,obj2,obj3,obj4);
-              }
-            }
-
-            void _wxRuby_Cleanup()
-            {
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "wxRuby_Cleanup..." << std::endl;
-          #endif
-              // Note in a global variable that the App has ended, so that we
-              // can skip any GC marking later
-              wxRubyApp::instance_ = 0;
-              this->is_running_ = false;
-      
-              // if a Ruby implemented logger has been installed clean that up
-              // before we exit, otherwise let wxWidgets handle things
-              wxLog *oldlog = wxLog::GetActiveTarget();
-              if (wxRuby_FindTracking(oldlog) != Qnil)
-              {
-                oldlog = wxLog::SetActiveTarget(new wxLogStderr);
-              }
-              else
-              {
-                oldlog = 0;
-              }
-              SetTopWindow(0);
-              if ( oldlog )
-              {
-                SWIG_RubyUnlinkObjects(oldlog);
-                SWIG_RubyRemoveTracking(oldlog);
-                delete oldlog;
-              }
-            }
-          };
-          wxRubyApp* wxRubyApp::instance_ = 0;
+          #include "wxRubyApp.h"          
 
           WXRUBY_EXPORT bool wxRuby_IsAppRunning()
           {
-            return wxRubyApp::GetInstance() != 0 && wxRubyApp::GetInstance()->IsRunning();  
+            return wxRubyApp::GetInstance() && wxRubyApp::GetInstance()->IsRunning();  
           }
 
           WXRUBY_EXPORT void wxRuby_ExitMainLoop(VALUE exception)
           {
-            if (wxRubyApp::GetInstance() != 0 && wxRubyApp::GetInstance()->IsRunning())
+            if (wxRubyApp::GetInstance() && wxRubyApp::GetInstance()->IsRunning())
             {
               if (!NIL_P(exception))
               {
@@ -496,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'
 
@@ -38,8 +40,8 @@ module WXRuby3
           wxAppTraits::IsUsingUniversalWidgets
           wxAppTraits::ShowAssertDialog
           wxAppTraits::SafeMessageBox
-          wxAppTraits::GetAssertStackTrace
         ], ignore_doc: false
+        spec.ignore('wxAppTraits::GetAssertStackTrace', ignore_doc: 'USE_STACKWALKER')
         # redefine
         spec.extend_interface 'wxAppTraits',
                               'wxString GetDesktopEnvironment() const',
@@ -48,21 +50,19 @@ module WXRuby3
                               'bool IsUsingUniversalWidgets() const',
                               'bool ShowAssertDialog(const wxString& msg)',
                               'bool SafeMessageBox(const wxString &text, const wxString &title)'
-        if Config.instance.features_set?('wxUSE_STACKWALKER')
+        if Config.instance.features_set?('USE_STACKWALKER')
           spec.extend_interface 'wxAppTraits', 'wxString GetAssertStackTrace()'
         end
         spec.map_apply 'int * OUTPUT' => ['int *major', 'int *minor', 'int *micro']
 
-        unless Config.platform == :mingw
-          spec.ignore 'wxStandardPaths::DontIgnoreAppSubDir',
-                      'wxStandardPaths::IgnoreAppSubDir',
-                      'wxStandardPaths::IgnoreAppBuildSubDirs',
-                      'wxStandardPaths::MSWGetShellDir'
-        end
-        unless Config.platform == :linux
-          spec.ignore 'wxStandardPaths::SetInstallPrefix',
-                      'wxStandardPaths::GetInstallPrefix'
-        end
+        spec.ignore_unless('WXMSW',
+                           'wxStandardPaths::DontIgnoreAppSubDir',
+                           'wxStandardPaths::IgnoreAppSubDir',
+                           'wxStandardPaths::IgnoreAppBuildSubDirs',
+                           'wxStandardPaths::MSWGetShellDir')
+        spec.ignore_unless('WXGTK',
+                           'wxStandardPaths::SetInstallPrefix',
+                           'wxStandardPaths::GetInstallPrefix')
       end
     end
 

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