wxruby3 1.6.0 → 1.7.0

data/rakelib/lib/director/aui_tab_ctrl.rb

@@ -12,120 +12,78 @@ module WXRuby3
 
   class Director
 
-    class AuiTabCtrl < Window
+    class AuiTabCtrl < Director
 
       def setup
-        # first let Director::Window do it's stuff
         super
-        # now replace items because wxAuiTabCtrl is actually not documented (!!!)
-        spec.items.replace %w[wxAuiTabContainerButton]
-        spec.gc_as_untracked 'wxAuiTabContainerButton'
-        spec.no_proxy %w[wxAuiTabCtrl wxAuiTabContainerButton]
-        spec.swig_import %w[swig/classes/include/wxObject.h swig/classes/include/wxEvtHandler.h swig/classes/include/wxWindow.h swig/classes/include/wxControl.h]
-        # cannot use #add_extend_code because we do not have an actual parsed XML item
-        spec.add_swig_code <<~__CODE
-          GC_MANAGE_AS_WINDOW(wxAuiTabCtrl);
-
-          %extend wxAuiTabCtrl {
-            VALUE TabHitTest(int x, int y)
-            {
-              wxWindow* hit = 0;
-              if (self->TabHitTest(x, y, &hit))
-              {
-                return wxRuby_WrapWxObjectInRuby(hit);
-              }
-              else
-              {
-                return Qnil;
-              }
-            }
-            VALUE ButtonHitTest(int x, int y)
-            {
-              wxAuiTabContainerButton* hit = 0;
-              if (self->ButtonHitTest(x, y, &hit))
-              {
-                wxAuiTabContainerButton* rc_hit = new wxAuiTabContainerButton(*hit);
-                // return owned copy 
-                return SWIG_NewPointerObj(SWIG_as_voidptr(rc_hit), SWIGTYPE_p_wxAuiTabContainerButton, 1);
-              }
-              else
-              {
-                return Qnil;
-              }
-            }
-          };
-          __CODE
-        # add the missing interface spec (with the wxAuiTabContainer interface folded in minus replaced/shadowed methods)
-        # also add wxAuiTabContainerButton manually here
-        spec.add_interface_code <<~__HEREDOC
-          class wxAuiTabContainerButton
+        spec.items.clear
+        # create a lightweight, but typesafe, wrapper for AuiTabCtrl
+        spec.add_init_code <<~__HEREDOC
+          // define AuiTabCtrl wrapper class
+          VALUE cWxAuiTabCtrl = rb_define_class_under(mWxAUI, "AuiTabCtrl", rb_cObject);
+          rb_undef_alloc_func(cWxAuiTabCtrl);
+          rb_define_method(cWxAuiTabCtrl, "is_ok", VALUEFUNC(_wxRuby_wxAuiTabCtrl_IsOk), 0);
+          rb_define_method(cWxAuiTabCtrl, "ok?", VALUEFUNC(_wxRuby_wxAuiTabCtrl_IsOk), 0);
+          rb_define_method(cWxAuiTabCtrl, "==", VALUEFUNC(_wxRuby_wxAuiTabCtrl_IsEqual), 1);
+          rb_define_alias(cWxAuiTabCtrl, "eql?", "==");
+          __HEREDOC
+
+        spec.add_header_code <<~__HEREDOC
+          #include <wx/aui/auibook.h>
+
+          VALUE _wxRuby_Wrap_wxAuiTabCtrl(const wxAuiTabCtrl& rbATC);
+          wxAuiTabCtrl* _wxRuby_Unwrap_wxAuiTabCtrl(VALUE rbATC);
+          __HEREDOC
+
+        spec.add_wrapper_code <<~__HEREDOC
+          // wxAuiTabCtrl wrapper class definition and helper functions
+          static size_t __wxAuiTabCtrl_size(const void* data)
           {
-          public:
-              int id;
-              int curState;
-              int location;
-              wxBitmapBundle bitmap;
-              wxBitmapBundle disBitmap;
-              wxRect rect;
+            return 0;
+          }
+
+          #include <ruby/version.h> 
+
+          static const rb_data_type_t __wxAuiTabCtrl_type = {
+            "AuiTabCtrl",
+          #if RUBY_API_VERSION_MAJOR >= 3
+            { NULL, NULL, __wxAuiTabCtrl_size, 0, {}},
+          #else
+            { NULL, NULL, __wxAuiTabCtrl_size, {}},
+          #endif 
+            NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
           };
 
-          class wxAuiTabCtrl : public wxControl
+          VALUE _wxRuby_Wrap_wxAuiTabCtrl(wxAuiTabCtrl* wxATC)
           {
-          public:
-              wxAuiTabCtrl(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0);
-              ~wxAuiTabCtrl();
-          
-              bool IsDragging() const;
-              void SetRect(const wxRect& rect);
-
-              void SetArtProvider(wxAuiTabArt* art);
-              wxAuiTabArt* GetArtProvider() const;
-          
-              void SetFlags(unsigned int flags);
-              unsigned int GetFlags() const;
-          
-              bool AddPage(wxWindow* page, const wxAuiNotebookPage& info);
-              bool InsertPage(wxWindow* page, const wxAuiNotebookPage& info, size_t idx);
-              bool MovePage(wxWindow* page, size_t newIdx);
-              bool RemovePage(wxWindow* page);
-              bool SetActivePage(wxWindow* page);
-              bool SetActivePage(size_t page);
-              void SetNoneActive();
-              int GetActivePage() const;
-              wxWindow* GetWindowFromIdx(size_t idx) const;
-              int GetIdxFromWindow(const wxWindow* page) const;
-              size_t GetPageCount() const;
-              wxAuiNotebookPage& GetPage(size_t idx);
-              const wxAuiNotebookPage& GetPage(size_t idx) const;
-              wxAuiNotebookPageArray& GetPages();
-              void SetNormalFont(const wxFont& normalFont);
-              void SetSelectedFont(const wxFont& selectedFont);
-              void SetMeasuringFont(const wxFont& measuringFont);
-              void SetColour(const wxColour& colour);
-              void SetActiveColour(const wxColour& colour);
-              void DoShowHide();
-          
-              void RemoveButton(int id);
-              void AddButton(int id, int location, const wxBitmapBundle& normalBitmap = wxBitmapBundle(), const wxBitmapBundle& disabledBitmap = wxBitmapBundle());
-          
-              size_t GetTabOffset() const;
-              void SetTabOffset(size_t offset);
-          
-              bool IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWindow* wnd);
-          
-              void MakeTabVisible(int tabPage, wxWindow* win);
-          };
+            VALUE ret = TypedData_Wrap_Struct(mWxAuiTabCtrl, &__wxAuiTabCtrl_type, wxATC);
+            return ret;
+          } 
+
+          wxAuiTabCtrl* _wxRuby_Unwrap_wxAuiTabCtrl(VALUE rbATC)
+          {
+            wxAuiTabCtrl* wxATC = nullptr;
+            TypedData_Get_Struct(rbATC, wxAuiTabCtrl, &__wxAuiTabCtrl_type, wxATC);
+            return wxATC;
+          }
+
+          bool _wxRuby_Is_wxAuiTabCtrl(VALUE rbATC)
+          {
+            return rb_typeddata_is_kind_of(rbATC, &__wxAuiTabCtrl_type) == 1;
+          } 
+
+          VALUE _wxRuby_wxAuiTabCtrl_IsOk(VALUE self)
+          {
+            wxAuiTabCtrl* wxATC = _wxRuby_Unwrap_wxAuiTabCtrl(self);
+            return wxATC ? Qtrue : Qfalse;
+          }
+
+          VALUE _wxRuby_wxAuiTabCtrl_IsEqual(VALUE self, VALUE other)
+          {
+            return rb_typeddata_is_kind_of(other, &__wxAuiTabCtrl_type) == 1 && 
+                _wxRuby_Unwrap_wxAuiTabCtrl(self) == _wxRuby_Unwrap_wxAuiTabCtrl(other);
+          } 
           __HEREDOC
-        spec.map 'wxAuiNotebookPageArray&' => 'Array<Wx::AUI::AuiNotebookPage>' do
-          map_out code: <<~__CODE
-            $result = rb_ary_new();
-            for (size_t i = 0; i < $1->GetCount(); i++)
-            {
-              wxAuiNotebookPage* np = new wxAuiNotebookPage($1->Item(i));
-              rb_ary_push($result, SWIG_NewPointerObj(SWIG_as_voidptr(&np), SWIGTYPE_p_wxAuiNotebookPage, SWIG_POINTER_OWN));
-            }
-            __CODE
-        end
       end
     end # class AuiTabCtrl
 

data/rakelib/lib/director/bitmap_combobox.rb

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

data/rakelib/lib/director/calendar_ctrl.rb

@@ -77,23 +77,81 @@ module WXRuby3
         spec.disown 'wxCalendarDateAttr* attr'
 
         spec.add_extend_code 'wxCalendarCtrl', <<~__HEREDOC
-        VALUE hit_test(wxPoint& pos)
-        {
-          wxDateTime hit_date;
-          wxDateTime::WeekDay hit_wkday;
-          wxCalendarHitTestResult hit = $self->HitTest(pos, &hit_date, &hit_wkday);
-          if ( hit == wxCAL_HITTEST_HEADER ) {
-            return(INT2NUM(hit_wkday));
-          }
-          else if ( hit == wxCAL_HITTEST_DAY ) {
-            return(wxRuby_wxDateTimeToRuby(hit_date));
+          VALUE hit_test(wxPoint& pos)
+          {
+            wxDateTime hit_date;
+            wxDateTime::WeekDay hit_wkday;
+            wxCalendarHitTestResult hit = $self->HitTest(pos, &hit_date, &hit_wkday);
+            if ( hit == wxCAL_HITTEST_HEADER ) {
+              return(INT2NUM(hit_wkday));
+            }
+            else if ( hit == wxCAL_HITTEST_DAY ) {
+              return(wxRuby_wxDateTimeToRuby(hit_date));
+            }
+            // Assume that hit == wxCAL_HITTEST_NOWHERE
+            return Qnil;
           }
-          // Assume that hit == wxCAL_HITTEST_NOWHERE
-          return Qnil;
-        }
-        __HEREDOC
+          __HEREDOC
         spec.do_not_generate(:variables, :enums, :defines, :functions)
       end
+
+      def process(gendoc: false)
+        defmod = super
+        # create definition for wxGenericCalendarCtrl except for WXOSX where
+        # wxCalendarCtrl is simply an alias for that
+        unless Config.instance.features_set?('WXOSX')
+          spec.include 'wx/generic/calctrlg.h'
+          def_calctrl = defmod.find_item('wxCalendarCtrl')
+          # create a definition for 'wxGenericStaticBitmap' which is not documented
+          def_gencalctrl = def_calctrl.dup
+          def_gencalctrl.name = 'wxGenericCalendarCtrl'
+          def_gencalctrl.brief_doc = nil
+          def_gencalctrl.detailed_doc = nil
+          def_gencalctrl.items = def_gencalctrl.items.collect { |itm| itm.dup }
+          def_gencalctrl.items.each do |itm|
+            if itm.is_a?(Extractor::MethodDef)
+              itm.overloads = itm.overloads.collect { |ovl| ovl.dup }
+              itm.all.each do |ovl|
+                ovl.name = 'wxGenericCalendarCtrl' if ovl.is_ctor
+                ovl.class_name = 'wxGenericCalendarCtrl'
+                ovl.update_attributes(klass: def_gencalctrl)
+              end
+            end
+          end
+          defmod.items << def_gencalctrl
+          # as we already called super before adding wxGenericCalendarCtrl the no_proxy settings from the
+          # base Window director are missing; just copy all those set for wxStaticBitmap
+          list = spec.no_proxies.select { |name| name.start_with?('wxCalendarCtrl::') }
+          spec.no_proxy(*list.collect { |name| name.sub(/\AwxCalendarCtrl::/, 'wxGenericCalendarCtrl::')})
+          # other specs as for wxCalendarCtrl
+          # handled; can be suppressed
+          spec.suppress_warning(473,
+                                'wxGenericCalendarCtrl::GetAttr',
+                                'wxGenericCalendarCtrl::GetHeaderColourBg',
+                                'wxGenericCalendarCtrl::GetHeaderColourFg',
+                                'wxGenericCalendarCtrl::GetHighlightColourBg',
+                                'wxGenericCalendarCtrl::GetHighlightColourFg',
+                                'wxGenericCalendarCtrl::GetHolidayColourBg',
+                                'wxGenericCalendarCtrl::GetHolidayColourFg')
+          spec.add_extend_code 'wxGenericCalendarCtrl', <<~__HEREDOC
+            VALUE hit_test(wxPoint& pos)
+            {
+              wxDateTime hit_date;
+              wxDateTime::WeekDay hit_wkday;
+              wxCalendarHitTestResult hit = $self->HitTest(pos, &hit_date, &hit_wkday);
+              if ( hit == wxCAL_HITTEST_HEADER ) {
+                return(INT2NUM(hit_wkday));
+              }
+              else if ( hit == wxCAL_HITTEST_DAY ) {
+                return(wxRuby_wxDateTimeToRuby(hit_date));
+              }
+              // Assume that hit == wxCAL_HITTEST_NOWHERE
+              return Qnil;
+            }
+            __HEREDOC
+        end
+        defmod
+      end
     end # class CalendarCtrl
 
   end # class Director

data/rakelib/lib/director/clipboard.rb

@@ -32,6 +32,8 @@ module WXRuby3
             return SWIG_NewPointerObj(wxTheClipboard, SWIGTYPE_p_wxClipboard, 0);
           }
           __HEREDOC
+        # obsolete alias for SetData; simply create alias in Ruby
+        spec.ignore 'wxClipboard::AddData', ignore_doc: false
       end
     end # class Clipboard
 

data/rakelib/lib/director/data_object.rb

@@ -67,24 +67,32 @@ module WXRuby3
           typedef std::map<wxDataObjectComposite*, data_object_list_t> composite_data_object_map_t;
           static composite_data_object_map_t CompositeDataObject_Map;
 
+          WXRUBY_TRACE_GUARD(WxRubyTraceGCCompositeDataObject, "GC_MARK_DATAOBJECT_COMPOSITE")
+
           static void GC_mark_wxCompositeDataObject(void* ptr)
           {
+            WXRUBY_TRACE_IF(WxRubyTraceGCCompositeDataObject, 2)
+              WXRUBY_TRACE("> GC_mark_wxCompositeDataObject : " << ptr)
+            WXRUBY_TRACE_END
+
             composite_data_object_map_t::iterator it = CompositeDataObject_Map.find(static_cast<wxDataObjectComposite*> (ptr));
             if (it != CompositeDataObject_Map.end())
             {
               data_object_list_t &do_list = it->second;
               for (VALUE data_obj : do_list)
               {
-          #ifdef __WXRB_DEBUG__
-                if (wxRuby_TraceLevel()>1)
-                {
-                  void *c_ptr = (TYPE(data_obj) == T_DATA ? DATA_PTR(data_obj) : 0);
-                  std::wcout << "**** wxRuby_markCompositeDataObjects : " << it->first << "|" << (void*)c_ptr << std::endl;
-                }
-          #endif               
+                WXRUBY_TRACE_IF(WxRubyTraceGCCompositeDataObject, 2)
+                  WXRUBY_TRACE_WITH(void *c_ptr = (TYPE(data_obj) == T_DATA ? DATA_PTR(data_obj) : 0))
+                  WXRUBY_TRACE("| GC_mark_wxCompositeDataObject : " << it->first << "|" << (void*)c_ptr)
+                WXRUBY_TRACE_END
+
                 rb_gc_mark(data_obj);
               }
             }
+
+            WXRUBY_TRACE_IF(WxRubyTraceGCCompositeDataObject, 2)
+              WXRUBY_TRACE("< GC_mark_wxCompositeDataObject : " << ptr)
+            WXRUBY_TRACE_END
           }
 
           // custom implementation for wxRuby so we can handle de-registering composites

data/rakelib/lib/director/date_picker_ctrl.rb

@@ -20,7 +20,10 @@ module WXRuby3
         super
         # Custom implementation for Ruby
         spec.ignore 'wxDatePickerCtrl::GetRange'
-
+        if Config.instance.features_set?('WXGTK')
+          spec.extend_interface('wxDatePickerCtrl',
+                                'virtual bool Destroy() override')
+        end
         spec.add_extend_code 'wxDatePickerCtrl', <<~__HEREDOC
           VALUE get_range() 
           {

data/rakelib/lib/director/display.rb

@@ -0,0 +1,81 @@
+# 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 Display < Director
+
+      def setup
+        super
+        spec.items << 'wxVideoMode'
+        # type mapping for 'wxArrayVideoModes'
+        if Config.instance.wx_version_check('3.3.0') >= 0
+          spec.map 'wxArrayVideoModes' => 'Array<Wx::VideoMode>' do
+            map_out code: <<~__CODE
+              $result = rb_ary_new();
+              std::vector<wxVideoMode>* vmarr = &$1;
+              for (const wxVideoMode& vm : *vmarr)
+              {
+                wxVideoMode* pvm = new wxVideoMode(vm);
+                VALUE rb_vm = SWIG_NewPointerObj(SWIG_as_voidptr(pvm), SWIGTYPE_p_wxVideoMode, 1);
+                rb_ary_push($result, rb_vm);
+              }
+              __CODE
+          end
+        else
+          spec.map 'wxArrayVideoModes' => 'Array<Wx::VideoMode>' do
+            map_out code: <<~__CODE
+              $result = rb_ary_new();
+              wxArrayVideoModes* vmarr = &$1;
+              for (size_t ix=0; ix < vmarr->Count(); ++ix)
+              {
+                wxVideoMode* pvm = new wxVideoMode(vmarr->Item(ix));
+                VALUE rb_vm = SWIG_NewPointerObj(SWIG_as_voidptr(pvm), SWIGTYPE_p_wxVideoMode, 1);
+                rb_ary_push($result, rb_vm);
+              }
+              __CODE
+          end
+        end
+        # add Ruby-style accessors for public attr
+        spec.add_extend_code 'wxVideoMode', <<~__HEREDOC
+          VALUE get_w()
+          {
+            return INT2NUM($self->w);
+          }
+          VALUE get_h()
+          {
+            return INT2NUM($self->h);
+          }
+          VALUE get_bpp()
+          {
+            return INT2NUM($self->bpp);
+          }
+          VALUE get_refresh()
+          {
+            return INT2NUM($self->refresh);
+          }
+          __HEREDOC
+        spec.make_readonly 'wxVideoMode::w',
+                           'wxVideoMode::h',
+                           'wxVideoMode::bpp',
+                           'wxVideoMode::refresh'
+        # make sure to get docs for public attr
+        spec.ignore 'wxVideoMode::w',
+                    'wxVideoMode::h',
+                    'wxVideoMode::bpp',
+                    'wxVideoMode::refresh',
+                    ignore_doc: false
+      end
+
+    end
+
+  end
+
+end

data/rakelib/lib/director/event.rb

@@ -40,12 +40,22 @@ module WXRuby3
               __CODE
           end
           spec.add_header_code <<~__HEREDOC
+            WXRUBY_TRACE_GUARD(WxRubyTraceGCWrapEvents, "GC_WRAP_EVENTS")
+
             static VALUE Evt_Type_Map = NULL;
             static VALUE wxRuby_WrapClonedWxEvent(wxEvent* wx_evt)
             {
+              WXRUBY_TRACE_IF(WxRubyTraceGCWrapEvents, 2)
+                WXRUBY_TRACE("> wxRuby_WrapClonedWxEvent - " << wx_evt)
+              WXRUBY_TRACE_END
+
               wxString class_name( wx_evt->GetClassInfo()->GetClassName() );
               if (class_name == "wxEvent" || class_name == "wxCommandEvent")
               {
+                WXRUBY_TRACE_IF(WxRubyTraceGCWrapEvents, 2)
+                  WXRUBY_TRACE("< wxRuby_WrapClonedWxEvent - returning managed Ruby derived event")
+                WXRUBY_TRACE_END
+
                 // special clones for Ruby derived events are already managed and tracked
                 // (this also covers Wx::AsyncProcCallEvent)
                 return SWIG_RubyInstanceFor((void *)wx_evt);
@@ -82,10 +92,9 @@ module WXRuby3
               // do not forget to mark the instance with the mangled swig type name
               rb_iv_set(rb_evt, "@__swigtype__", rb_str_new2(type->name));
             
-            #if __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>1)
-                std::wcout << "* wxRuby_WrapClonedWxEvent - wrapped cloned event " << wx_evt << "{" << type->name << "}" << std::endl;
-            #endif
+              WXRUBY_TRACE_IF(WxRubyTraceGCWrapEvents, 2)
+                WXRUBY_TRACE("< wxRuby_WrapClonedWxEvent - wrapped cloned event " << wx_evt << "{" << type->name << "}")
+              WXRUBY_TRACE_END
             
               return rb_evt;
             }
@@ -202,6 +211,15 @@ module WXRuby3
               bool has_ruby_data_ {};
             };
 
+            // helper function for event handler QueueEvent
+            WXRUBY_EXPORT bool wxRuby_Is_RubyEvent(wxEvent* wx_event)
+            {
+              return (nullptr != dynamic_cast<wxRubyEvent*> (wx_event) ||
+                         (wx_event->IsCommandEvent() && 
+                          nullptr != dynamic_cast<wxRubyCommandEvent*> (wx_event)));
+            }
+
+            WXRUBY_TRACE_GUARD(WxRubyTraceGCMarkEvents, "GC_MARK_EVENTS")
 
             // wxRuby must preserve ruby objects attached as the ClientData of
             // command events that have been user-defined in ruby. Some of the
@@ -210,17 +228,17 @@ module WXRuby3
             // not a ruby object, and will thus crash.
             WXRUBY_EXPORT void GC_mark_wxEvent(void *ptr)
             {
-            #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>1)
-                std::wcout << "> GC_mark_wxEvent : " << ptr << std::endl;
-            #endif
+              WXRUBY_TRACE_IF(WxRubyTraceGCMarkEvents, 2)
+                WXRUBY_TRACE("> GC_mark_wxEvent : " << ptr)
+              WXRUBY_TRACE_END
             
               if ( ! ptr ) return;
               wxEvent* wx_event = (wxEvent*)ptr;
-            #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>2)
-                std::wcout << "* GC_mark_wxEvent(" << ptr << ":{" << wx_event->GetEventType() << "})" << std::endl;
-            #endif
+
+              WXRUBY_TRACE_IF(WxRubyTraceGCMarkEvents, 3)
+                WXRUBY_TRACE("| GC_mark_wxEvent(" << ptr << ":{" << wx_event->GetEventType() << "})")
+              WXRUBY_TRACE_END
+
               if (wx_event->IsCommandEvent())
               {
                 wxCommandEvent* wx_cm_event = (wxCommandEvent*)ptr;
@@ -235,10 +253,9 @@ module WXRuby3
                 }
               }
             
-            #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>1)
-                std::wcout << "< GC_mark_wxEvent : " <<  ptr << std::endl;
-            #endif
+              WXRUBY_TRACE_IF(WxRubyTraceGCMarkEvents, 2)
+                WXRUBY_TRACE("< GC_mark_wxEvent : " << ptr)
+              WXRUBY_TRACE_END
             }
             __HEREDOC
           # CommandEvent requires custom handling of client data.

data/rakelib/lib/director/event_handler.rb

@@ -43,6 +43,29 @@ module WXRuby3
           # 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'
+          spec.map 'wxEvent *event' => 'Wx::Event' do
+            add_header_code 'WXRUBY_EXPORT bool wxRuby_Is_RubyEvent(wxEvent* wx_event);'
+            # Due to the fact that QueueEvent takes ownership of the event object and the fact that wxRuby3
+            # tracks event objects we need some special handling.
+            # As WxW defined system events are not extensible in wxRuby3 need to have tracking removed and the
+            # Ruby object unlinked as WxW will take care of removing the C++ object later on and that will invalidate
+            # the tracking register.
+            # User defined events however need to maintain their tracking register as we need to keep
+            # the state of the linked Ruby objects. As WxW will clean up later we can however release ownership.
+            map_in code: <<~__CODE
+              $1 = (wxEvent*)DATA_PTR($input);
+              if (!wxRuby_Is_RubyEvent($1))
+              {
+                SWIG_RubyUnlinkObjects((void*)$1);
+                wxRuby_RemoveTracking((void*)$1);
+              }
+              else
+              {
+                // no need to do anything as c++ dtor will untrack/unlink
+                RDATA($input)->dfree = 0;
+              }
+              __CODE
+          end
 
           # 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)
@@ -71,6 +94,8 @@ module WXRuby3
               __CODE
           end
           spec.add_runtime_code <<~__HEREDOC
+            WXRUBY_TRACE_GUARD(WxRubyTraceEventHandlers, "EVENTS_HANDLER");
+            
             static swig_class wxRuby_GetSwigClassWxEvtHandler();
             WXRUBY_EXPORT VALUE wxRuby_GetEventTypeClassMap();
 
@@ -110,7 +135,7 @@ module WXRuby3
                   if (ex_caught)
                   {
             #ifdef __WXRB_DEBUG__                
-                    if (!rb_obj_is_kind_of(rc, rb_eSystemExit) && wxRuby_TraceLevel()>0)
+                    if (!rb_obj_is_kind_of(rc, rb_eSystemExit) && WxRubyTraceEventHandlers.trace_level()>0)
                     {
                       wxRuby_PrintException(rc);
                     }
@@ -264,7 +289,7 @@ module WXRuby3
                 if (ex_caught)
                 {
             #ifdef __WXRB_DEBUG__                
-                  if (!rb_obj_is_kind_of(rc, rb_eSystemExit) && wxRuby_TraceLevel()>0)
+                  if (!rb_obj_is_kind_of(rc, rb_eSystemExit) && WxRubyTraceEventHandlers.trace_level()>0)
                   {
                     wxRuby_PrintException(rc);
                   }

data/rakelib/lib/director/functions.rb

@@ -17,6 +17,9 @@ module WXRuby3
       def setup
         super
         spec.items.clear
+        if Config.instance.wx_version_check('3.3.0') >= 0
+          spec.add_header_code '#include <wx/busycursor.h>'
+        end
         spec.add_header_code <<~__HEREDOC
           #include <wx/image.h>
           #include <wx/app.h>
@@ -201,7 +204,13 @@ module WXRuby3
         end
         spec.map_apply 'int *OUTPUT' => ['int *indexDefaultExtension']
         # hardcoded interface declarations
+        if Config.instance.wx_version_check('3.3.0') >= 0
+          spec.add_interface_code 'void wxBeginBusyCursor(const wxCursorBundle& cursors);'
+        end
         spec.add_interface_code <<~__HEREDOC
+          void wxBeginBusyCursor(const wxCursor* cursor = wxHOURGLASS_CURSOR);
+          void wxEndBusyCursor(); 	
+
           bool wxSafeYield(wxWindow* win = NULL, bool onlyIfNeeded = false);
           
           // Dialog shortcuts

data/rakelib/lib/director/geometry.rb

@@ -173,6 +173,11 @@ module WXRuby3
             (*$self) = rect;
           }
           __HEREDOC
+        if Config.instance.wx_version_check('3.3.0') >= 0
+          # unwanted overloads
+          spec.ignore 'wxRect2DDouble::Inflate(wxDouble,wxDouble) const',
+                      'wxRect2DDouble::Deflate(wxDouble,wxDouble) const'
+        end
         # implement in pure Ruby
         spec.ignore 'wxRect2DDouble::Intersect(const wxRect2DDouble &, const wxRect2DDouble &, wxRect2DDouble *)',
                     'wxRect2DDouble::Union(const wxRect2DDouble &, const wxRect2DDouble &, wxRect2DDouble *)',