wxruby3 1.3.1 → 1.4.2

data/rakelib/gem.rb

@@ -214,16 +214,18 @@ module WXRuby3
             end
           elsif uri.scheme == 'http' || uri.scheme == 'https'
             # download the binary release package
-            $stdout.puts "Downloading #{uri.path}..."
+            $stdout.puts "Downloading #{uri}..."
             filename = File.basename(uri.path)
-            if WXRuby3.config.download_file(uri.path, filename)
+            if WXRuby3.config.download_file(uri.to_s, filename)
               sha_file = File.basename(filename, '.*')+DIGEST_EXT
-              uri.path = File.join(File.dirname(uri.path), sha_file)
-              unless WXRuby3.config.download_file(uri.path, sha_file)
+              sha_uri = File.join(File.dirname(uri.to_s), sha_file)
+              unless WXRuby3.config.download_file(sha_uri, sha_file)
                 $stderr.puts "ERROR: Unable to download digest signature for binary release package : #{package}"
                 exit(1)
               end
               exit(1) unless install_bin_pkg(filename)
+              # cleanup, remove downloaded files
+              FileUtils.rm_f([filename, sha_file])
               true
             else
               $stderr.puts "ERROR: Unable to download binary release package (#{package})!"
@@ -241,6 +243,8 @@ module WXRuby3
               exit(1)
             end
             exit(1) unless install_bin_pkg(bin_pkg_name+BINPKG_EXT)
+            # cleanup, remove downloaded files
+            FileUtils.rm_f([bin_pkg_name+BINPKG_EXT, bin_pkg_name+DIGEST_EXT])
             true
           else
             if prebuilt_only

data/rakelib/lib/config/mingw.rb

@@ -98,7 +98,7 @@ module WXRuby3
           private
 
           def wx_configure
-            bash('./configure --prefix=`pwd`/install --disable-tests --without-subdirs --without-regex --with-expat=builtin --with-zlib=builtin --disable-debug_info')
+            bash('./configure --prefix=`pwd`/install --disable-tests --without-subdirs --without-regex --without-libcurl --with-expat=builtin --with-zlib=builtin --disable-debug_info')
           end
 
           def wx_make

data/rakelib/lib/director/about_dialog_info.rb

@@ -19,6 +19,7 @@ module WXRuby3
           map_check code: ''
         end
         super
+        spec.ignore 'wxGenericAboutBox' # wrapped with wxGenericAboutDialog
       end
     end # class AboutDialogInfo
 

data/rakelib/lib/director/aui_manager.rb

@@ -18,48 +18,53 @@ module WXRuby3
         super
         spec.gc_as_object 'wxAuiManager'
         if Config.instance.wx_version >= '3.3.0'
-          spec.items << 'wxAuiSerializer' << 'wxAuiDockInfo' << 'wxAuiDeserializer'
-          spec.gc_as_untracked 'wxAuiSerializer', 'wxAuiDockInfo'
-          spec.regard 'wxAuiDockInfo::rect',
-                      'wxAuiDockInfo::dock_direction',
-                      'wxAuiDockInfo::dock_layer',
-                      'wxAuiDockInfo::dock_row',
-                      'wxAuiDockInfo::size',
-                      'wxAuiDockInfo::min_size',
-                      'wxAuiDockInfo::resizable',
-                      'wxAuiDockInfo::toolbar',
-                      'wxAuiDockInfo::fixed',
-                      'wxAuiDockInfo::reserved1'
-          spec.make_readonly 'wxAuiDockInfo::rect',
-                             'wxAuiDockInfo::dock_direction',
-                             'wxAuiDockInfo::dock_layer',
-                             'wxAuiDockInfo::dock_row',
-                             'wxAuiDockInfo::size',
-                             'wxAuiDockInfo::min_size',
-                             'wxAuiDockInfo::resizable',
-                             'wxAuiDockInfo::toolbar',
-                             'wxAuiDockInfo::fixed',
-                             'wxAuiDockInfo::reserved1'
-          spec.add_extend_code 'wxAuiDockInfo', <<~__HEREDOC
-            VALUE each_pane()
+          spec.items  << 'wxAuiSerializer' << 'wxAuiDockLayoutInfo' << 'wxAuiPaneLayoutInfo' << 'wxAuiTabLayoutInfo' << 'wxAuiDeserializer'
+          spec.gc_as_untracked 'wxAuiSerializer', 'wxAuiDeserializer', 'wxAuiDockLayoutInfo', 'wxAuiPaneLayoutInfo', 'wxAuiTabLayoutInfo'
+          spec.regard 'wxAuiDockLayoutInfo::dock_direction',
+                      'wxAuiDockLayoutInfo::dock_layer',
+                      'wxAuiDockLayoutInfo::dock_row',
+                      'wxAuiDockLayoutInfo::dock_pos',
+                      'wxAuiDockLayoutInfo::dock_proportion',
+                      'wxAuiDockLayoutInfo::dock_size',
+                      'wxAuiPaneLayoutInfo::name',
+                      'wxAuiPaneLayoutInfo::floating_pos',
+                      'wxAuiPaneLayoutInfo::floating_size',
+                      'wxAuiPaneLayoutInfo::is_maximized'
+          spec.add_extend_code 'wxAuiTabLayoutInfo', <<~__HEREDOC
+            VALUE get_pages()
             {
-              wxAuiPaneInfoPtrArray panes = self->panes;
-              VALUE rc = Qnil;
-              for (wxAuiPaneInfo* pane : panes)
+              VALUE rc = rb_ary_new();
+              for (int page : self->pages)
               {
-                VALUE r_pane = SWIG_NewPointerObj(pane, SWIGTYPE_p_wxAuiPaneInfo, 0);
-                rc = rb_yield(r_pane);
-              }	
+                rb_ary_push(rc, INT2NUM(page));
+              }
               return rc;
             }
+
+            void set_pages(VALUE rb_pages)
+            {
+              if (TYPE(rb_pages) == T_ARRAY) 
+              {
+                std::vector<int> pgs;
+                for (int i = 0; i < RARRAY_LEN(rb_pages); i++)
+                {
+                  pgs.push_back(NUM2INT(rb_ary_entry(rb_pages, i)));
+                }
+                self->pages = pgs;
+              }
+              else 
+              {
+                rb_raise(rb_eTypeError, "Expected Array of Integer for 1");
+              }
+            } 
             __HEREDOC
-          spec.map 'std::vector<wxAuiPaneInfo>' => 'Array<Wx::AuiPaneInfo>' do
+          spec.map 'std::vector<wxAuiPaneLayoutInfo>' => 'Array<Wx::AuiPaneLayoutInfo>' do
             map_out code: <<~__CODE
               $result = rb_ary_new();
-              std::vector<wxAuiPaneInfo>& panes = (std::vector<wxAuiPaneInfo>&)$1;
-              for (const wxAuiPaneInfo& pane : panes)
+              std::vector<wxAuiPaneLayoutInfo>& panes = (std::vector<wxAuiPaneLayoutInfo>&)$1;
+              for (const wxAuiPaneLayoutInfo& pane : panes)
               {
-                VALUE r_pane = SWIG_NewPointerObj(new wxAuiPaneInfo(pane), SWIGTYPE_p_wxAuiPaneInfo, SWIG_POINTER_OWN);
+                VALUE r_pane = SWIG_NewPointerObj(new wxAuiPaneLayoutInfo(pane), SWIGTYPE_p_wxAuiPaneLayoutInfo, SWIG_POINTER_OWN);
                 rb_ary_push($result, r_pane);
               }
               __CODE
@@ -70,24 +75,24 @@ module WXRuby3
                 {
                   void *ptr;
                   VALUE r_pane = rb_ary_entry($input, i);
-                  int res = SWIG_ConvertPtr(r_pane, &ptr, SWIGTYPE_p_wxAuiPaneInfo, 0);
+                  int res = SWIG_ConvertPtr(r_pane, &ptr, SWIGTYPE_p_wxAuiPaneLayoutInfo, 0);
                   if (!SWIG_IsOK(res) || !ptr) {
-                    Swig::DirectorTypeMismatchException::raise(swig_get_self(), "load_panes", rb_eTypeError, "in return value. Expected Array of Wx::AuiPaneInfo"); 
+                    Swig::DirectorTypeMismatchException::raise(swig_get_self(), "load_panes", rb_eTypeError, "in return value. Expected Array of Wx::AuiPaneLayoutInfo"); 
                   }
-                  wxAuiPaneInfo *pane = reinterpret_cast< wxAuiPaneInfo * >(ptr);
+                  wxAuiPaneLayoutInfo *pane = reinterpret_cast< wxAuiPaneLayoutInfo * >(ptr);
                   $result.push_back(*pane);
                 }
               }
               __CODE
           end
-          spec.map 'std::vector<wxAuiDockInfo>' => 'Array<Wx::AuiDockInfo>' do
+          spec.map 'std::vector<wxAuiTabLayoutInfo>' => 'Array<Wx::AuiTabLayoutInfo>' do
             map_out code: <<~__CODE
               $result = rb_ary_new();
-              std::vector<wxAuiDockInfo>& docks = (std::vector<wxAuiDockInfo>&)$1;
-              for (const wxAuiDockInfo& dock : docks)
+              std::vector<wxAuiTabLayoutInfo>& tabs = (std::vector<wxAuiTabLayoutInfo>&)$1;
+              for (const wxAuiTabLayoutInfo& tab : tabs)
               {
-                VALUE r_dock = SWIG_NewPointerObj(new wxAuiDockInfo(dock), SWIGTYPE_p_wxAuiDockInfo, SWIG_POINTER_OWN);
-                rb_ary_push($result, r_dock);
+                VALUE r_tab = SWIG_NewPointerObj(new wxAuiTabLayoutInfo(tab), SWIGTYPE_p_wxAuiTabLayoutInfo, SWIG_POINTER_OWN);
+                rb_ary_push($result, r_tab);
               }
               __CODE
             map_directorout code: <<~__CODE
@@ -96,13 +101,13 @@ module WXRuby3
                 for (int i = 0; i < RARRAY_LEN($input); i++)
                 {
                   void *ptr;
-                  VALUE r_dock = rb_ary_entry($input, i);
-                  int res = SWIG_ConvertPtr(r_dock, &ptr, SWIGTYPE_p_wxAuiDockInfo, 0);
+                  VALUE r_tab = rb_ary_entry($input, i);
+                  int res = SWIG_ConvertPtr(r_tab, &ptr, SWIGTYPE_p_wxAuiTabLayoutInfo, 0);
                   if (!SWIG_IsOK(res) || !ptr) {
-                    Swig::DirectorTypeMismatchException::raise(swig_get_self(), "load_docks", rb_eTypeError, "in return value. Expected Array of Wx::AuiDockInfo"); 
+                    Swig::DirectorTypeMismatchException::raise(swig_get_self(), "load_docks", rb_eTypeError, "in return value. Expected Array of Wx::AuiTabLayoutInfo"); 
                   }
-                  wxAuiDockInfo *dock = reinterpret_cast< wxAuiDockInfo * >(ptr);
-                  $result.push_back(*dock);
+                  wxAuiTabLayoutInfo *tab = reinterpret_cast< wxAuiTabLayoutInfo * >(ptr);
+                  $result.push_back(*tab);
                 }
               }
               __CODE
@@ -215,17 +220,18 @@ module WXRuby3
 
       def gen_class_doc_members(fdoc, clsdef, cls_members, alias_methods)
         super
-        if Config.instance.wx_version >= '3.3.0' && clsdef.name == 'wxAuiDockInfo'
-          fdoc.doc.puts 'Yield each pane to the given block.'
-          fdoc.doc.puts 'If no block passed returns an Enumerator.'
-          fdoc.doc.puts '@yieldparam [Wx::AUI::AuiPaneInfo] pane the Aui pane info yielded'
-          fdoc.doc.puts '@return [::Object, ::Enumerator] result of last block execution or enumerator'
-          fdoc.puts 'def each_pane; end'
+        if Config.instance.wx_version >= '3.3.0' && clsdef.name == 'wxAuiTabLayoutInfo'
+          fdoc.doc.puts 'Returns the indices of the pages in this tab control in their order on screen.'
+          fdoc.doc.puts 'If this array is empty, it means that the tab control contains all notebook pages in natural order.'
+          fdoc.doc.puts '@return [::Array<Integer>] indices of the pages in this tab control'
+          fdoc.puts 'def get_pages; end'
+          fdoc.puts 'alias :pages :get_pages'
           fdoc.puts
-          fdoc.doc.puts 'Returns an array of Wx::AuiPaneInfo for all panes managed by the frame manager.'
-          fdoc.doc.puts '@return [Array<Wx::AUI::AuiPaneInfo>] info for all managed panes'
-          fdoc.puts 'def get_panes; end'
-          fdoc.puts 'alias_method :panes, :get_panes'
+          fdoc.doc.puts 'Set the indices of the pages in this tab control in their order on screen.'
+          fdoc.doc.puts 'If this array is empty, it means that the tab control contains all notebook pages in natural order.'
+          fdoc.doc.puts '@param [::Array<Integer>] pages indices of the pages in this tab control'
+          fdoc.puts 'def set_pages(pages) end'
+          fdoc.puts 'alias :pages= :set_pages'
         end
       end
 

data/rakelib/lib/director/aui_notebook.rb

@@ -25,6 +25,13 @@ module WXRuby3
                          wxAuiNotebookPage::bitmap
                          wxAuiNotebookPage::rect
                          wxAuiNotebookPage::active]
+          if Config.instance.wx_version >= '3.3.0'
+            spec.items << 'wxAuiNotebookPosition'
+            spec.regard 'wxAuiNotebookPosition::tabctrl',
+                        'wxAuiNotebookPosition::page'
+            spec.make_readonly 'wxAuiNotebookPosition::tabctrl',
+                               'wxAuiNotebookPosition::page'
+          end
           # reset type mapping done in BookCtrls as the non-const arg is used for query-ing here (FindTab)
           # (wxWidgets should have made this a const arg)
           spec.map_apply 'SWIGTYPE *' => 'wxWindow* page'

data/rakelib/lib/director/colour.rb

@@ -16,7 +16,7 @@ module WXRuby3
         spec.gc_as_untracked('wxColour')
         spec.require_app 'wxColour::wxColour(const wxColour&)'
         spec.ignore(%w[
-          wxColour::GetPixel wxTransparentColour wxColour::operator!=
+          wxColour::GetPixel wxTransparentColour wxColour::operator!= wxColour::operator==
           wxBLACK wxBLUE wxCYAN wxGREEN wxYELLOW wxLIGHT_GREY wxRED wxWHITE
           ])
         spec.map 'unsigned char *' => 'Integer' do

data/rakelib/lib/director/data_format.rb

@@ -15,7 +15,7 @@ module WXRuby3
       def setup
         super
         spec.gc_as_object
-        spec.ignore 'wxDataFormat::operator ==(wxDataFormatId)'
+        spec.ignore 'wxDataFormat::operator=='
         if Config.platform == :mingw
           # The formal signature for these is NativeFormat; this is required on
           # MSVC as otherwise an impermissible implicit cast is tried, and so

data/rakelib/lib/director/event.rb

@@ -47,6 +47,7 @@ module WXRuby3
               if (class_name == "wxEvent" || class_name == "wxCommandEvent")
               {
                 // special clones for Ruby derived events are already managed and tracked
+                // (this also covers Wx::AsyncProcCallEvent)
                 return SWIG_RubyInstanceFor((void *)wx_evt);
               }
 

data/rakelib/lib/director/event_handler.rb

@@ -29,45 +29,21 @@ module WXRuby3
           # have TryBefore and TryAfter to handle this much cleaner
           spec.no_proxy 'wxEvtHandler::ProcessEvent'
           spec.regard('wxEvtHandler::ProcessEvent', regard_doc: false) # we provide customized docs
+          # Do not see much use for allowing overrides for these either as wxWidgets do not either
+          spec.no_proxy 'wxEvtHandler::QueueEvent',
+                        'wxEvtHandler::AddPendingEvent'
+          # Do not see much point in allowing/supporting these to be overridden
+          spec.no_proxy 'wxEvtHandler::SetNextHandler',
+                        'wxEvtHandler::SetPreviousHandler'
+          # no doc for set_previous_handler
+          spec.regard('wxEvtHandler::SetPreviousHandler', regard_doc: false)
           # make SWIG aware of these
           spec.regard 'wxEvtHandler::TryBefore', 'wxEvtHandler::TryAfter'
           # Special type mapping for wxEvtHandler::QueueEvent which assumes ownership of the C++ event.
-          # We need to create a shallow copy of the Ruby event instance (copying it's Ruby members if any),
-          # pass linkage of the C++ event to the copy and remove it from the original (input) Ruby
-          # instance (so it can not delete/or reference it anymore); also start tracking the copy
-          # (which effectively removes the tracking for the original).
-          # Queued (pending) events are cleaned up (deleted) by wxWidgets after (failing) handling
-          # which will automatically unlink and un-track them releasing the Ruby instance to be GC-ed.
-          spec.map 'wxEvent *event' => 'Wx::Event' do
-            map_in code: <<~__CODE
-              // get the wrapped wxEvent*
-              wxEvent *wx_ev = (wxEvent*)DATA_PTR($input);
-              // check if this a user defined event
-              if ( wx_ev->GetEventType() > wxEVT_USER_FIRST )
-              {
-                // we need to preserve the Ruby state
-                // create a shallow copy of the Ruby object
-                VALUE r_evt_copy = rb_obj_clone($input);
-                // pass the wxEvent* over to the copy
-                DATA_PTR(r_evt_copy) = wx_ev;
-                // unlink the input
-                DATA_PTR($input) = 0;
-                // track the copy (this overwrites the record for the 
-                // original, effectively untracking it)
-                wxRuby_AddTracking( (void*)wx_ev, r_evt_copy);
-              }
-              else
-              {
-                // std wx event; no need to preserve the Ruby state
-                // simply untrack and unlink the input
-                wxRuby_RemoveTracking( (void*)wx_ev);
-                DATA_PTR($input) = 0;
-                // and just pass on the C++ event                
-              }
-              // Queue the C++ event
-              $1 = wx_ev;
-              __CODE
-          end
+          # We need to disown Ruby with respect to the C++ event object but remain tracking the pair to keep
+          # the Ruby event object alive.
+          spec.disown 'wxEvent *event'
+
           # add special mapping for event filters so we can accept the app instance as well
           # although Wx::App is not derived from Wx::EventFilter in wxRuby (no multiple inheritance)
           spec.map 'wxEventFilter*' => 'Wx::EventFilter,Wx::App' do
@@ -225,6 +201,10 @@ module WXRuby3
             }
             __HEREDOC
           spec.add_header_code <<~__HEREDOC
+            static VALUE WxRuby_GetAsyncProcCallEvent_Class();
+            static void GC_mark_AsyncMethodCallEvent(void *ptr);
+            static void free_AsyncMethodCallEvent(void *ptr);
+
             class RbAsyncProcCallEvent : public wxAsyncMethodCallEvent
             {
             public:
@@ -245,7 +225,14 @@ module WXRuby3
   
               virtual wxEvent *Clone() const wxOVERRIDE
               {
-                return new RbAsyncProcCallEvent(*this);
+                RbAsyncProcCallEvent* wx_ev = new RbAsyncProcCallEvent(*this);
+                // Create a new Ruby event object (owned) 
+                VALUE rb_evt = Data_Wrap_Struct(WxRuby_GetAsyncProcCallEvent_Class(), 
+                                                VOIDFUNC(GC_mark_AsyncMethodCallEvent), 
+                                                VOIDFUNC(free_AsyncMethodCallEvent), 
+                                                wx_ev);
+                wxRuby_AddTracking( (void*)wx_ev, rb_evt);
+                return wx_ev;
               }
           
               virtual void Execute() wxOVERRIDE
@@ -257,12 +244,22 @@ module WXRuby3
                 if (TYPE(m_rb_call) == T_ARRAY)
                 {
                   VALUE proc = rb_ary_entry(m_rb_call, 0);
-                  VALUE args = rb_ary_subseq(m_rb_call, 1, RARRAY_LEN(m_rb_call)-1);
-                  rc = wxRuby_Funcall(ex_caught, proc, call_id(), args);
+                  if (RARRAY_LEN(m_rb_call) > 1)
+                  {
+                    VALUE args = rb_ary_subseq(m_rb_call, 1, RARRAY_LEN(m_rb_call)-1);
+                    rc = wxRuby_Funcall(ex_caught, proc, call_id(), args);
+                  }
+                  else
+                  {
+                    rc = wxRuby_Funcall(ex_caught, proc, call_id(), (int)0);
+                  } 
                 }
                 else
                 {
-                  rc = wxRuby_Funcall(ex_caught, m_rb_call, call_id(), (int)0);
+                  // should never happen
+                  VALUE ex = rb_eval_string("x = RuntimeError.new('UNEXPECTED ERROR: Asynchronous Proc Event has invalid call spec!'); x.set_backtrace(caller); x"); 
+                  wxRuby_PrintException(ex);
+                  exit(1);
                 }
                 if (ex_caught)
                 {
@@ -276,9 +273,39 @@ module WXRuby3
                 }
               }
           
+              void GC_Mark()
+              {
+                rb_gc_mark(m_rb_call);
+              }
+
             private:
               VALUE m_rb_call;
             };
+
+            static void GC_mark_AsyncMethodCallEvent(void *ptr)
+            {
+              if (ptr)
+              {
+                RbAsyncProcCallEvent* evt = (RbAsyncProcCallEvent*)ptr;
+                evt->GC_Mark();
+              }
+            }
+
+            static void free_AsyncMethodCallEvent(void *ptr)
+            {
+              RbAsyncProcCallEvent *wx_evt = (RbAsyncProcCallEvent *)ptr;
+              delete wx_evt;
+            }
+
+            static VALUE WxRuby_GetAsyncProcCallEvent_Class()
+            {
+              static VALUE WxRuby_cAsyncProcCallEvent = Qnil;
+              if (WxRuby_cAsyncProcCallEvent == Qnil)
+              {
+                WxRuby_cAsyncProcCallEvent = rb_eval_string("Wx::AsyncProcCallEvent");
+              } 
+              return WxRuby_cAsyncProcCallEvent;
+            }
             __HEREDOC
           spec.add_extend_code 'wxEvtHandler', <<~__HEREDOC
             // This provides the public Ruby 'connect' method
@@ -333,18 +360,23 @@ module WXRuby3
             void call_after(VALUE call)
             {
               // valid call object?
-              VALUE proc;
-              if (TYPE(call) == T_ARRAY && 
-                    (rb_obj_is_kind_of(proc = rb_ary_entry(call, 0), rb_cProc)
+              VALUE proc = TYPE(call) == T_ARRAY ? rb_ary_entry(call, 0) : Qnil;
+              if (!NIL_P(proc) && 
+                    (rb_obj_is_kind_of(proc, rb_cProc)
                      ||
                      rb_obj_is_kind_of(proc, rb_cMethod)))
               {
                 // create C++ event
                 RbAsyncProcCallEvent * evt = new RbAsyncProcCallEvent(self, call);
+                // Create a new Ruby event object (leave ownership to wxWidgets C++) 
+                VALUE rb_evt = Data_Wrap_Struct(WxRuby_GetAsyncProcCallEvent_Class(), 
+                                                VOIDFUNC(GC_mark_AsyncMethodCallEvent), 
+                                                0, 
+                                                evt);
                 // track it and the call object
-                wxRuby_AddTracking( (void*)evt, call);
-                // queue it
-                self->QueueEvent(evt);
+                wxRuby_AddTracking( (void*)evt, rb_evt);
+                // queue it (wxWidgets takes ownership of C++ event object)
+                self->wxEvtHandler::QueueEvent(evt);
               }
             }
             __HEREDOC
@@ -371,6 +403,10 @@ module WXRuby3
             def_item = defmod.find_item(citem)
             if Extractor::ClassDef === def_item && spec.is_derived_from?(def_item, 'wxEvtHandler')
               spec.no_proxy "#{spec.class_name(citem)}::ProcessEvent"
+              spec.no_proxy "#{spec.class_name(citem)}::QueueEvent"
+              spec.no_proxy "#{spec.class_name(citem)}::AddPendingEvent"
+              spec.no_proxy "#{spec.class_name(citem)}::SetNextHandler"
+              spec.no_proxy "#{spec.class_name(citem)}::SetPreviousHandler"
               is_evt_handler = true
             end
           end

data/rakelib/lib/director/functions.rb

@@ -204,9 +204,6 @@ module WXRuby3
         spec.add_interface_code <<~__HEREDOC
           bool wxSafeYield(wxWindow* win = NULL, bool onlyIfNeeded = false);
           
-          // Mouse / keyboard information
-          wxWindow * wxGetActiveWindow();
-          
           // Dialog shortcuts
           wxString wxFileSelector (const wxString &message,
                                    const wxString &default_path=wxEmptyString,

data/rakelib/lib/director/list_ctrl.rb

@@ -148,7 +148,7 @@ module WXRuby3
             
             wxListCtrl* wx_lc = (wxListCtrl*) ptr;
             
-            // First check if there's ImageLists and mark if found
+            // First check if there are ImageLists and mark if found
             wxImageList* img_list;
             img_list= wx_lc->GetImageList(wxIMAGE_LIST_NORMAL);
             if ( img_list ) rb_gc_mark(SWIG_RubyInstanceFor(img_list));
@@ -161,18 +161,22 @@ module WXRuby3
             if ( wx_lc->GetWindowStyle() & wxLC_VIRTUAL )
               return;
             
-            int count = wx_lc->GetItemCount();
-            if ( count == 0 ) return;
-            
-            for (int i = 0; i < count; ++i)
+            // only mark items if window fully created
+            if (wx_lc->GetId() != wxID_ANY)
             {
-              wxUIntPtr data = wx_lc->GetItemData(i);
-              VALUE object = reinterpret_cast<VALUE> (data);
-              if ( object && object != Qnil ) 
+              int count = wx_lc->GetItemCount();
+              if ( count == 0 ) return;
+              
+              for (int i = 0; i < count; ++i)
               {
-                rb_gc_mark(object);
+                wxUIntPtr data = wx_lc->GetItemData(i);
+                VALUE object = reinterpret_cast<VALUE> (data);
+                if ( object && object != Qnil ) 
+                {
+                  rb_gc_mark(object);
+                }
               }
-            }
+            } 
           }
           __HEREDOC
         spec.add_extend_code 'wxListCtrl', <<~__HEREDOC

data/rakelib/lib/director/locale.rb

@@ -29,6 +29,8 @@ module WXRuby3
           wxLanguageInfo::LayoutDirection
           ]
         spec.ignore_unless('WXMSW', 'wxLanguageInfo::WinLang', 'wxLanguageInfo::WinSublang')
+        # implemented in Ruby
+        spec.ignore 'wxLocale::GetSystemEncodingName'
       end
     end # class Locale
 

data/rakelib/lib/director/num_validator.rb

@@ -370,6 +370,13 @@ module WXRuby3
         spec.new_object 'WXIntegerValidator::Clone',
                         'WXUnsignedValidator::Clone',
                         'WXFloatValidator::Clone'
+        %w[WXIntegerValidator WXUnsignedValidator WXFloatValidator].each do |klass|
+          spec.no_proxy "#{klass}::ProcessEvent"
+          spec.no_proxy "#{klass}::QueueEvent"
+          spec.no_proxy "#{klass}::AddPendingEvent"
+          spec.no_proxy "#{klass}::SetNextHandler"
+          spec.no_proxy "#{klass}::SetPreviousHandler"
+        end
         spec.suppress_warning(473,
                               'WXIntegerValidator::Clone',
                               'WXUnsignedValidator::Clone',

data/rakelib/lib/director/tip_window.rb

@@ -0,0 +1,34 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+require_relative './window'
+
+module WXRuby3
+
+  class Director
+
+    class TipWindow < Window
+
+      def setup
+        super
+        spec.disable_proxies
+        spec.ignore 'wxTipWindow::SetTipWindowPtr'
+        spec.ignore 'wxTipWindow::wxTipWindow'
+        spec.add_extend_code 'wxTipWindow', <<~__HEREDOC
+          wxTipWindow(wxWindow* parent, const wxString& text, wxCoord maxLength = 100)
+          {
+            return new wxTipWindow(parent, text, maxLength);
+          }   
+          __HEREDOC
+      end
+
+    end
+
+  end
+
+end

data/rakelib/lib/director/window.rb

@@ -66,7 +66,6 @@ module WXRuby3
             __CODE
           end
           spec.ignore [
-            'wxWindow::PopEventHandler',
             'wxWindow::SetConstraints',
             'wxWindow::GetHandle',
             'wxWindow::GetSize(int *,int *) const', # no need; prefer the wxSize version
@@ -83,6 +82,15 @@ module WXRuby3
             'wxWindow::Raise',
             'wxWindow::Lower'
           ]
+
+          # Event handler chaining methods; pushed handlers always remain owned by Ruby
+          # wxRuby3 will automatically pop any remaining handlers when windows get deleted
+          # also ignore this
+          spec.ignore 'wxWindow::PopEventHandler', ignore_doc: false
+          # and instead add an argument-less version (will use default argument of C++ impl)
+          # as we do want C++ side to delete any popped handler
+          spec.extend_interface 'wxWindow', 'wxEvtHandler *PopEventHandler()'
+
           # no real docs and can't find actual examples of usage; ignore
           spec.ignore 'wxWindow::GetConstraints', 'wxWindow::SetConstraints'
           # redefine these so a nil parent is accepted

data/rakelib/lib/director.rb

@@ -6,7 +6,6 @@
 # wxRuby3 interface Director class
 ###
 
-require 'ostruct'
 require 'set'
 require 'pathname'
 require 'tempfile'