wxruby3 0.9.0.pre.rc.2 → 0.9.0

data/rakelib/lib/director/hyperlink_ctrl.rb

@@ -0,0 +1,32 @@
+# 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 HyperlinkCtrl < Window
+
+      def setup
+        super
+        if Config.instance.wx_version <= '3.3.0'
+          # XML docs (< 3.3) incorrectly declare these pure virtual
+          spec.ignore 'wxHyperlinkCtrl::GetVisited', 'wxHyperlinkCtrl::SetVisited', ignore_doc: false
+          # replace by correct declarations
+          spec.extend_interface 'wxHyperlinkCtrl',
+                                'virtual bool wxHyperlinkCtrl::GetVisited() const',
+                                'virtual void wxHyperlinkCtrl::SetVisited(bool visited = true)'
+        end
+      end
+    end # class HyperlinkCtrl
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/hyperlink_event.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event'

data/rakelib/lib/director/icon.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/image.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -17,8 +20,13 @@ module WXRuby3
         spec.ignore [
           'wxImage::wxImage(wxInputStream &,wxBitmapType,int)',
           'wxImage::wxImage(wxInputStream &,const wxString &,int)',
+          'wxImage::wxImage(const char *const *)',
           'wxImage::GetImageCount(wxInputStream &,wxBitmapType)'
           ]
+        # ignore original signature
+        spec.ignore 'wxImage::SetAlpha(unsigned char *,bool)', ignore_doc: false
+        # add custom signature to aid type mapping
+        spec.extend_interface 'wxImage', 'void SetAlpha(unsigned char *alpha_or_null=NULL, bool static_data=false)'
         spec.rename_for_ruby(
           'LoadStream' => ['wxImage::LoadFile(wxInputStream &, wxBitmapType, int)', 'wxImage::LoadFile(wxInputStream &,const wxString &, int)'],
           'Write' => ['wxImage::SaveFile(wxOutputStream &, wxBitmapType) const', 'wxImage::SaveFile(wxOutputStream &,const wxString &) const'],
@@ -77,6 +85,19 @@ module WXRuby3
             return ext_ary;
           }
 
+          static VALUE mime_types()
+          {
+            VALUE ext_ary = rb_ary_new();
+            wxList& hnd_lst = wxImage::GetHandlers();
+            for (wxList::compatibility_iterator node = hnd_lst.GetFirst();
+                    node; node = node->GetNext())
+            {
+              wxImageHandler *handler = (wxImageHandler *) node->GetData();
+              rb_ary_push(ext_ary, WXSTR_TO_RSTR(handler->GetMimeType()));
+            }
+            return ext_ary;
+          }
+
           static VALUE handler_extensions()
           {
             VALUE ext_hash = rb_hash_new();
@@ -101,7 +122,7 @@ module WXRuby3
         # The GetRgbData and GetAlphaData methods require special handling using %extend;
         spec.ignore %w[wxImage::GetData wxImage::GetAlpha]
         # The SetRgbData and SetAlphaData are dealt with by typemaps (see below).
-        # For Image#set_rgb_data, Image#set_alpha_data and Image.new with raw data arg:
+        # For Image#set_rgb_data, Image#set_alpha_data and Image.new/create with raw data arg:
         # copy raw string data from a Ruby string to a memory block that will be
         # managed by wxWidgets (see static_data typemap below)
         spec.map 'unsigned char* data', 'unsigned char* alpha', as: 'String' do
@@ -112,12 +133,27 @@ module WXRuby3
                 $1 = (unsigned char*)malloc(data_len);
                 memcpy($1, StringValuePtr($input), data_len);
               }
-            else if ( $input == Qnil ) // Needed for SetAlpha, an error for SetData
+            else
+              SWIG_exception_fail(SWIG_ERROR, 
+                                  "String required as raw Image data argument");
+            __CODE
+          map_typecheck precedence: 'POINTER', code: '$1 = (TYPE($input) == T_STRING);'
+        end
+        spec.map 'unsigned char* alpha_or_null', as: 'String' do
+          map_in code: <<~__CODE
+            if ( TYPE($input) == T_STRING )
+              {
+                int data_len = RSTRING_LEN($input);
+                $1 = (unsigned char*)malloc(data_len);
+                memcpy($1, StringValuePtr($input), data_len);
+              }
+            else if ( $input == Qnil ) // Needed for SetAlpha
               $1 = NULL;
             else
               SWIG_exception_fail(SWIG_ERROR, 
                                   "String required as raw Image data argument");
             __CODE
+          map_typecheck precedence: 'POINTER', code: '$1 = NIL_P($input) || (TYPE($input) == T_STRING);'
         end
         # Image.new(data...) and Image#set_alpha_data both accept a static_data
         # argument to specify whether wxWidgets should delete the data
@@ -157,6 +193,25 @@ module WXRuby3
             return rb_str_new( (const char*)rgb_data, length);
           }
           __HEREDOC
+        # ignore this so we do not have to wrap wxImageHistogram
+        spec.ignore 'wxImage::ComputeHistogram'
+        # add custom method simply returning Hash; finish off in pure Ruby
+        spec.add_extend_code 'wxImage', <<~__HEREDOC
+          VALUE compute_histogram()
+          {
+            VALUE rb_img_hist = rb_hash_new();
+            wxImageHistogram img_hist;
+            $self->ComputeHistogram(img_hist);
+            for (auto pair : img_hist)
+            {
+              VALUE rb_hist_entry = rb_ary_new();
+              rb_ary_push(rb_hist_entry, ULL2NUM(pair.second.index));
+              rb_ary_push(rb_hist_entry, ULL2NUM(pair.second.value));
+              rb_hash_aset(rb_img_hist, ULL2NUM(pair.first), rb_hist_entry);
+            }
+            return rb_img_hist;
+          }
+          __HEREDOC
         spec.do_not_generate(:functions)
       end
     end # class Image

data/rakelib/lib/director/image_list.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -14,6 +17,7 @@ module WXRuby3
         if Config.instance.windows? || Config.instance.macosx?
           spec.ignore('wxImageList::Add(const wxIcon &)', ignore_doc: false)
         end
+        spec.ignore 'wxImageList::GetSize(int , int &, int &) const'
         super
       end
     end # class ImageList

data/rakelib/lib/director/info_bar.rb

@@ -0,0 +1,26 @@
+# 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 InfoBar < Window
+
+      def setup
+        super
+        # no need to wrap this here as we do not proxy this
+        spec.ignore 'wxInfoBar::SetFont'
+      end
+    end # class InfoBar
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/list_ctrl.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'
@@ -52,12 +55,13 @@ module WXRuby3
             (void)self->EditLabel(item);
           }
         __HEREDOC
-        spec.set_only_for 'wxHAS_LISTCTRL_COLUMN_ORDER',
-                          %w[wxListCtrl::GetColumnIndexFromOrder
-                             wxListCtrl::GetColumnOrder
-                             wxListCtrl::GetColumnsOrder
-                             wxListCtrl::SetColumnsOrder]
-        # these are protected so ignored by defaylt but we want them here
+        unless Config.instance.features_set?('wxHAS_LISTCTRL_COLUMN_ORDER')
+          spec.ignore %w[wxListCtrl::GetColumnIndexFromOrder
+                         wxListCtrl::GetColumnOrder
+                         wxListCtrl::GetColumnsOrder
+                         wxListCtrl::SetColumnsOrder]
+        end
+        # these are protected so ignored by default but we want them here
         spec.regard %w[
             wxListCtrl::OnGetItemAttr
             wxListCtrl::OnGetItemColumnAttr
@@ -79,6 +83,34 @@ module WXRuby3
                     'wxListCtrl::SetItemData',
                     'wxListCtrl::SetItemPtrData',
                     'wxListCtrl::SortItems'
+        spec.map 'const wxVector<wxBitmapBundle>& images' => 'Array<Wx::ImageBundle>' do
+          map_in temp: 'wxVector<wxBitmapBundle> tmp', code: <<~__CODE
+            if ($input != Qnil)
+            {
+              if (TYPE($input) == T_ARRAY)
+              {
+                for (int i=0; i<RARRAY_LEN($input) ;++i)
+                {
+                  void* ptr;
+                  VALUE rb_image = rb_ary_entry($input, i);
+                  int res = SWIG_ConvertPtr(rb_image, &ptr, wxRuby_GetSwigTypeForClassName("BitmapBundle"), 0);
+                  if (!SWIG_IsOK(res)) 
+                  {
+                    VALUE msg = rb_inspect(rb_image);
+                    rb_raise(rb_eTypeError, "Expected Wx::ImageBundle at index %d but got %s", i, StringValuePtr(msg));
+                  }
+                  tmp.push_back(*static_cast<wxBitmapBundle*>(ptr));
+                }
+              }
+              else
+              {
+                VALUE msg = rb_inspect($input);
+                rb_raise(rb_eArgError, "Expected Array of Wx::ImageBundle for $argnum but got %s", StringValuePtr(msg));
+              }
+            }
+            $1 = &tmp;
+            __CODE
+        end
         # required for GetItemRect and GetSubItemRect
         spec.map 'wxRect &rect' => 'Wx::Rect' do
           map_in ignore: true, code: '$1 = new wxRect();'
@@ -100,6 +132,7 @@ module WXRuby3
             VALUE items = rb_ary_new();
             rb_ary_push(items, (VALUE)item1);
             rb_ary_push(items, (VALUE)item2);
+            rb_ary_push(items, (VALUE)data);
             VALUE the_order = rb_yield(items);
             return NUM2INT(the_order);
           }
@@ -183,9 +216,9 @@ module WXRuby3
             return Qnil;
           }	
           
-          void sort_items()
+          void sort_items(VALUE data = Qnil)
           {
-            self->SortItems(wxListCtrl_SortByYielding, 0);
+            $self->SortItems(wxListCtrl_SortByYielding, static_cast<wxIntPtr> (data));
           }
           __HEREDOC
         super

data/rakelib/lib/director/listbox.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './ctrl_with_items'

data/rakelib/lib/director/locale.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -24,10 +27,10 @@ module WXRuby3
           wxLanguageInfo::Description
           wxLanguageInfo::DescriptionNative
           wxLanguageInfo::LayoutDirection
-          wxLanguageInfo::WinLang
-          wxLanguageInfo::WinSublang
           ]
-        spec.set_only_for('__WIN32__', 'wxLanguageInfo::WinLang', 'wxLanguageInfo::WinSublang')
+        if Config.instance.features_set?('__WXMSW__')
+          spec.regard('wxLanguageInfo::WinLang', 'wxLanguageInfo::WinSublang')
+        end
       end
     end # class Locale
 

data/rakelib/lib/director/log.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -10,19 +13,121 @@ module WXRuby3
     class Log < Director
 
       def setup
-        spec.gc_as_object
-        spec.items.concat(%w[wxLogBuffer wxLogChain wxLogGui wxLogStderr wxLogStream wxLogTextCtrl wxLogInterposer wxLogInterposerTemp wxLogWindow])
-        spec.no_proxy(%w[wxLogBuffer wxLogChain wxLogGui wxLogStderr wxLogTextCtrl wxLogInterposer wxLogInterposerTemp wxLogWindow])
+        spec.gc_as_object %w[wxLog wxLogChain wxLogInterposer wxLogWindow]
+        spec.items.concat(%w[wxLogBuffer wxLogChain wxLogGui wxLogStderr wxLogStream wxLogTextCtrl wxLogInterposer wxLogWindow wxLogNull wxLogRecordInfo])
+        spec.no_proxy(%w[wxLogBuffer wxLogGui wxLogStderr wxLogTextCtrl wxLogWindow])
+        spec.force_proxy(%w[wxLogInterposer])
+        spec.ignore 'wxLog::SetFormatter'
+        spec.regard %w[wxLog::DoLogRecord wxLog::DoLogTextAtLevel wxLog::DoLogText]
         spec.ignore 'wxLogBuffer::Flush'
         spec.ignore 'wxLogGui::Flush'
-        if Config.instance.features_set?(%w[wxUSE_STD_IOSTREAM])
+        if Config.instance.features_set?('wxUSE_STD_IOSTREAM')
           spec.ignore 'wxLogStream'
         end
+        # wxLogStderr
+        spec.ignore 'wxLogStderr::wxLogStderr'
+        spec.add_extend_code 'wxLogStderr', <<~__HEREDOC
+          wxLogStderr(int fh=2)
+          {
+            if (fh == 2)
+            { return new wxLogStderr(); }
+            else if (fh == 1)
+            { return new wxLogStderr(stdout); }
+            rb_raise(rb_eArgError, "Expected 1 (for stdout) or 2 (for stderr).");
+          }
+          __HEREDOC
+
+        # for wxLogChain
+
+        # In C++ wxLogChain releases it's redirection chain when destructed.
+        # In wxRuby this does not work as expected as GC collection cannot be exactly predicted.
+        # Therefor extend the class here with an explicit 'release' method.
+        spec.add_extend_code 'wxLogChain', <<~__CODE
+          void release()
+          {
+            wxLog::SetActiveTarget($self->GetOldLog());
+            $self->DetachOldLog();
+            // Make Ruby own the object again so it will be deleted when GC collected 
+            VALUE rb_self = SWIG_RubyInstanceFor($self);
+            if (!NIL_P(rb_self))
+            {
+              swig_type_info* swig_type = wxRuby_GetSwigTypeForClass(CLASS_OF(rb_self));
+              RDATA(rb_self)->dfree = ((swig_class *)swig_type->clientdata)->destroy;
+            }
+          }
+          __CODE
+        # In this case we have a mix of C++ marking and Ruby caching to manage GC collection.
+        # The 'Old Log' reference is managed from C++ as it is captured and accessible there.
+        # The 'New Log' reference is cached in Ruby as the LogChain class does not provide
+        # access to this after setting (private member).
+        spec.add_header_code <<~__HEREDOC
+          static void GC_mark_wxLogChain(void* ptr)
+          {
+            if (ptr )
+            {
+              wxLogChain* logChain = reinterpret_cast<wxLogChain*> (ptr);
+              wxLog* oldLog = logChain->GetOldLog();
+              VALUE rb_old_log = SWIG_RubyInstanceFor(oldLog);
+              if (!NIL_P(rb_old_log))
+              {
+                rb_gc_mark(rb_old_log);
+              } 
+            } 
+          }
+          __HEREDOC
+        spec.add_swig_code '%markfunc wxLogChain "GC_mark_wxLogChain";',
+                           '%markfunc wxLogInterposer "GC_mark_wxLogChain";',
+                           '%markfunc wxLogWindow "GC_mark_wxLogChain";'
+        spec.disown 'wxLog *logger'
+        spec.ignore 'wxLogChain::DetachOldLog' # too much potential trouble
+        # add override decl missing from xml specs
+        spec.extend_interface 'wxLogChain',
+                              'virtual void DoLogRecord(wxLogLevel level, const wxString& msg, const wxLogRecordInfo& info) override',
+                              visibility: 'protected'
+        # wxLogChain and derivatives need to be allocated disowned because new instances of these classes
+        # are installed as ActiveTarget on construction and so wxWidgets has ownership
+        spec.allocate_disowned 'wxLogChain'
+        spec.allocate_disowned 'wxLogInterposer'
+        spec.allocate_disowned 'wxLogWindow'
+
+        # for ActiveTarget methods
         spec.ignore 'wxLog::SetThreadActiveTarget'
         spec.disown 'wxLog *logtarget'
+        spec.new_object 'wxLog::SetActiveTarget'
         spec.do_not_generate(:functions)
         spec.make_concrete('wxLog')
-        spec.extend_interface('wxLog', '  virtual ~wxLog ();')
+        spec.extend_interface('wxLog', 'virtual ~wxLog ()')
+        spec.gc_as_untracked 'wxLogRecordInfo'
+        spec.add_extend_code 'wxLogRecordInfo', <<~__HEREDOC
+          VALUE filename()
+          {
+            return $self->filename ? WXSTR_TO_RSTR(wxString($self->filename)) : Qnil;
+          }
+          VALUE line()
+          {
+            return INT2NUM($self->line);
+          }
+          VALUE func()
+          {
+            return $self->func ? WXSTR_TO_RSTR(wxString($self->func)) : Qnil;
+          }
+          VALUE component()
+          {
+            return $self->component ? WXSTR_TO_RSTR(wxString($self->component)) : Qnil;
+          }
+          __HEREDOC
+        spec.make_abstract 'wxLogNull'
+        spec.ignore 'wxLogNull::wxLogNull'
+        spec.add_extend_code 'wxLogNull', <<~__HEREDOC__
+          static void no_log()
+          {
+            if (rb_block_given_p ())
+            {
+              wxLogNull noLog;
+              rb_yield(Qnil);
+            }
+          }
+          __HEREDOC__
         super
       end
     end # class Log

data/rakelib/lib/director/mdi_frame.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './frame'

data/rakelib/lib/director/media_ctrl.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'

data/rakelib/lib/director/menu.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -44,8 +47,18 @@ module WXRuby3
                                                         SWIGTYPE_p_wxMenuItem, 0);
                 rb_ary_push($result, rb_menu_item);
             }
+          __CODE
+        end
+        # for FindItem
+        spec.map 'wxMenu **' => 'Wx::Menu' do
+          map_in ignore: true, temp: 'wxMenu *tmp', code: '$1 = &tmp;'
+          map_argout code: <<~__CODE
+            void *ptr = tmp$argnum;
+            $result = SWIG_Ruby_AppendOutput($result, SWIG_NewPointerObj(ptr, SWIGTYPE_p_wxMenu, 0));
             __CODE
         end
+        # for FindChildItem
+        spec.map_apply 'size_t * OUTPUT' => 'size_t * pos'
         spec.add_header_code <<~__HEREDOC
           // Mark Function
           // Need to protect MenuItems which are included in the Menu, including
@@ -71,7 +84,7 @@ module WXRuby3
         __HEREDOC
         spec.add_swig_code <<~__HEREDOC
           %markfunc wxMenu "mark_wxMenu";
-          __HEREDOC
+        __HEREDOC
         # fix SWIG's problems with const& return value
         spec.ignore('wxMenu::GetTitle', ignore_doc: false) # keep doc
         spec.add_extend_code 'wxMenu', <<~__HEREDOC
@@ -79,7 +92,7 @@ module WXRuby3
             wxString const& title = $self->GetTitle();
             return &const_cast<wxString&> (title);
           }
-          __HEREDOC
+        __HEREDOC
         super
       end
     end # class Menu

data/rakelib/lib/director/menu_bar.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'
@@ -12,6 +15,7 @@ module WXRuby3
     class MenuBar < Window
 
       def setup
+        super
         spec.no_proxy('wxMenuBar::FindItem',
                 'wxMenuBar::Remove',
                 'wxMenuBar::Replace')
@@ -22,7 +26,14 @@ module WXRuby3
         unless Config.instance.wx_version >= '3.3' || Config.instance.wx_abi_version > '3.0.0'
           spec.ignore 'wxMenuBar::OSXGetAppleMenu'
         end
-        super
+        # for FindItem
+        spec.map 'wxMenu **' => 'Wx::Menu' do
+          map_in ignore: true, temp: 'wxMenu *tmp', code: '$1 = &tmp;'
+          map_argout code: <<~__CODE
+            void *ptr = tmp$argnum;
+            $result = SWIG_Ruby_AppendOutput($result, SWIG_NewPointerObj(ptr, SWIGTYPE_p_wxMenu, 0));
+            __CODE
+        end
       end
     end # class MenuBar
 

data/rakelib/lib/director/menu_item.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -18,14 +21,11 @@ module WXRuby3
         spec.ignore(%w[wxMenuItem::GetLabel wxMenuItem::GetName wxMenuItem::GetText wxMenuItem::SetText wxMenuItem::GetLabelFromText])
         # ignore this as there is no implementation anymore
         spec.ignore 'wxMenuItem::GetAccelFromString'
-        spec.set_only_for 'wxUSE_ACCEL', 'wxMenuItem::GetAccel'
+        spec.ignore('wxMenuItem::GetAccel') unless Config.instance.features_set?('wxUSE_ACCEL')
         spec.no_proxy 'wxMenuItem::GetAccel'
         spec.ignore 'wxMenuItem::GetBitmap(bool)' # not portable
         if Config.instance.wx_version >= '3.3.0'
-          spec.set_only_for '__WXMSW__',
-                            'wxMenuItem::SetBackgroundColour',
-                            'wxMenuItem::SetFont',
-                            'wxMenuItem::SetTextColour'
+          spec.ignore('wxMenuItem::SetBackgroundColour','wxMenuItem::SetFont','wxMenuItem::SetTextColour') unless Config.instance.features_set?('__WXMSW__')
         end
         super
       end

data/rakelib/lib/director/mouse_state.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -12,7 +15,7 @@ module WXRuby3
       def setup
         super
         spec.ignore 'wxMouseState::GetPosition(int*,int*)'
-        spec.do_not_generate(:variables, :enums, :defines, :functions)
+        spec.do_not_generate(:variables, :defines, :functions)
       end
     end # class MouseState
 

data/rakelib/lib/director/numeric_property_validator.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event_handler'

data/rakelib/lib/director/object.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -11,7 +14,7 @@ module WXRuby3
 
       def setup
         spec.make_abstract('wxObject')
-        spec.ignore %w[wxObject::Ref wxObject::UnRef wxObject::GetRefData wxObject::IsKindOf wxObject::GetClassInfo]
+        spec.ignore %w[wxObject::Ref wxObject::UnRef wxObject::GetRefData wxObject::IsKindOf wxObject::GetClassInfo wxObject::SetRefData]
         spec.no_proxy 'wxObject'
         spec.add_extend_code 'wxObject', <<~__HEREDOC
           // Returns the string name of the C++ wx class which this object is wrapping.

data/rakelib/lib/director/page_setup_dialog.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './dialog'