wxruby3 0.9.0.pre.rc.3 → 0.9.0

data/rakelib/lib/director/date_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'
@@ -98,7 +101,7 @@ module WXRuby3
             {
                 if (ruby_value == Qnil)
                 {
-                    return new wxDateTime();
+                    return new wxDateTime(wxDefaultDateTime.GetValue());
                 }
                 else
                 {
@@ -130,6 +133,10 @@ module WXRuby3
             __HEREDOC
         elsif spec.module_name == 'wxCalendarEvent'
           spec.override_inheritance_chain('wxCalendarEvent', 'wxDateEvent', {'wxCommandEvent' => 'wxEvent'}, 'wxEvent', 'wxObject', doc_override: false)
+          spec.ignore 'wxCalendarEvent::SetWeekDay' # only internal use; saves us from exposing/mapping wxDateTime::WeekDay
+          spec.map 'wxDateTime::WeekDay' => 'Integer' do
+            map_out code: '$result = INT2NUM(static_cast<int> ($1));'
+          end
           # inconsistent definitions
           spec.add_swig_code %Q{%constant wxEventType wxEVT_CALENDAR = wxEVT_CALENDAR_DOUBLECLICKED;}
         end

data/rakelib/lib/director/date_picker_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/dc.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
@@ -13,11 +16,18 @@ module WXRuby3
 
       def setup
         super
+        spec.items << 'wxFontMetrics'
         # it's not safe to track DC objects as these are often created on the stack in C++
         # before being passed to Ruby methods
         # as we cannot capture their deletion in anyway this would leave the tracked items
         # registered and reused when future stack allocated DC's happen to have the same address
         spec.gc_as_untracked
+        spec.regard 'wxFontMetrics::height',
+                    'wxFontMetrics::ascent',
+                    'wxFontMetrics::descent',
+                    'wxFontMetrics::internalLeading',
+                    'wxFontMetrics::externalLeading',
+                    'wxFontMetrics::averageWidth'
         spec.ignore [
           'wxDC::GetPartialTextExtents',
           'wxDC::DrawLines(const wxPointList *,wxCoord,wxCoord)',
@@ -26,6 +36,12 @@ module WXRuby3
           'wxDC::GetLogicalOrigin(wxCoord *,wxCoord *) const',
           'wxDC::GetHandle'
         ]
+        # ignore Matrix Transformation methods until someone asks for them
+        # TODO : possibly wrap at a later time
+        spec.ignore 'wxDC::SetTransformMatrix',
+                    'wxDC::GetTransformMatrix',
+                    'wxDC::ResetTransformMatrix',
+                    'wxDC::CanUseTransformMatrix'
         spec.disable_proxies
         spec.rename_for_ruby({
           'GetDimensions' => 'wxDC::GetSize(wxCoord *, wxCoord *) const',
@@ -47,6 +63,8 @@ module WXRuby3
             return rb_result;
           }
           __HEREDOC
+        # for GetUserScale and GetLogicalScale
+        spec.map_apply 'double * OUTPUT' => 'double *'
         spec.swig_import 'swig/classes/include/wxGDICommon.h'
       end
     end # class DC

data/rakelib/lib/director/defs.rb

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

data/rakelib/lib/director/derived_dc.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
@@ -179,7 +182,7 @@ module WXRuby3
               }
               return rc;
             }
-            static VALUE draw_on(wxWindow* tgt, wxBitmap &buffer=wxNullBitmap, int style=wxBUFFER_CLIENT_AREA)
+            static VALUE draw_on(wxWindow* tgt, wxBitmap &buffer, int style=wxBUFFER_CLIENT_AREA)
             {
               if (!wxRuby_IsAppRunning()) 
                 rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
@@ -275,6 +278,28 @@ module WXRuby3
           # like all DC this should best always be a temporary stack object
           # we do not allow creation in Ruby but rather provide class
           # methods for block execution on a temp dc
+          unless Config.platform == :linux
+            spec.add_extend_code 'wxGCDC', <<~__HEREDOC
+              static VALUE draw_on(const wxPrinterDC& dc)
+              {
+                if (!wxRuby_IsAppRunning()) 
+                  rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+                VALUE rc = Qnil;
+                if (rb_block_given_p ())
+                {
+                  // Somehow there seems to be a problem with the Ruby GCDC value 
+                  // being GC-ed unless we block GC for the duration of the block
+                  // execution. Unclear why. We have similar code for other objects
+                  // where this issue does not come up.
+                  wxGCDC gc_dc(dc);
+                  wxGCDC* dc_ptr = &gc_dc;
+                  VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxGCDC, 0);
+                  rc = rb_yield(rb_dc);
+                }
+                return rc;
+              }
+              __HEREDOC
+          end
           spec.add_extend_code 'wxGCDC', <<~__HEREDOC
             static VALUE draw_on(const wxWindowDC& dc)
             {
@@ -312,24 +337,6 @@ module WXRuby3
               }
               return rc;
             }
-            static VALUE draw_on(const wxPrinterDC& dc)
-            {
-              if (!wxRuby_IsAppRunning()) 
-                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
-              VALUE rc = Qnil;
-              if (rb_block_given_p ())
-              {
-                // Somehow there seems to be a problem with the Ruby GCDC value 
-                // being GC-ed unless we block GC for the duration of the block
-                // execution. Unclear why. We have similar code for other objects
-                // where this issue does not come up.
-                wxGCDC gc_dc(dc);
-                wxGCDC* dc_ptr = &gc_dc;
-                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxGCDC, 0);
-                rc = rb_yield(rb_dc);
-              }
-              return rc;
-            }
             static VALUE draw_on(wxGraphicsContext* gc)
             {
               if (!wxRuby_IsAppRunning()) 

data/rakelib/lib/director/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 './top_level_window'
@@ -19,6 +22,10 @@ module WXRuby3
         end
         case spec.module_name
         when 'wxDialog'
+          spec.items << 'wxDialogLayoutAdapter'
+          spec.gc_as_object 'wxDialogLayoutAdapter'
+          spec.disown 'wxDialogLayoutAdapter* adapter'
+          spec.new_object 'wxDialog::SetLayoutAdapter'
           spec.ignore('wxDialog::GetContentWindow',
                       'wxDialog::GetToolBar') # seemingly removed from MSW
           spec.swig_import('swig/classes/include/wxDefs.h')
@@ -123,8 +130,8 @@ module WXRuby3
           # data to each choice. However this would need memory management, and a
           # pure ruby implementation is trivial and likely to be more convenient
           # on a per-case basis so just ignore this argument for Ruby.
-          spec.map 'char** clientData' do
-            map_in ignore: true, code: '$1 = (char **)NULL;'
+          spec.map 'void** clientData' do
+            map_in ignore: true, code: '$1 = nullptr;'
           end
           spec.ignore 'wxSingleChoiceDialog::GetSelectionData'
           spec.do_not_generate(:functions)
@@ -216,6 +223,20 @@ module WXRuby3
           spec.do_not_generate(:variables, :enums, :defines, :functions)
         end
       end
+
+      def process(gendoc: false)
+        defmod = super
+        spec.items.each do |citem|
+          def_item = defmod.find_item(citem)
+          if Extractor::ClassDef === def_item && (citem == 'wxDialog' || spec.is_derived_from?(def_item, 'wxDialog'))
+            spec.no_proxy "#{spec.class_name(citem)}::ShowModal"
+            spec.no_proxy "#{spec.class_name(citem)}::EndModal"
+            spec.no_proxy "#{spec.class_name(citem)}::IsModal"
+          end
+        end
+        defmod
+      end
+
     end # class Dialog
 
   end # class Director

data/rakelib/lib/director/dir_filterlist_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 './ctrl_with_items'

data/rakelib/lib/director/dir_picker_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/drag_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
@@ -9,8 +12,12 @@ module WXRuby3
 
     class DragImage < Director
 
+      include Typemap::TreeItemId
+
       def setup
-        spec.set_only_for('__WXUNIVERSAL__', 'wxDragImage::DoDrawImage', 'wxDragImage::GetImageRect', 'wxDragImage::UpdateBackingFromWindow')
+        unless Config.instance.features_set?('__WXUNIVERSAL__')
+          spec.ignore('wxDragImage::DoDrawImage', 'wxDragImage::GetImageRect', 'wxDragImage::UpdateBackingFromWindow')
+        end
         super
       end
     end # class DragImage

data/rakelib/lib/director/dragdrop.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/editable_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 './window'

data/rakelib/lib/director/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
 ###
 
 module WXRuby3
@@ -26,7 +29,7 @@ module WXRuby3
           spec.extend_interface('wxEvent', 'wxEvent(wxEventType commandType = wxEVT_NULL, int id = 0, int prop_level = wxEVENT_PROPAGATE_NONE)')
           spec.ignore %w[wxEvent::GetEventUserData]
           spec.ignore 'wxEvent::wxEvent(int,wxEventType)'
-          spec.no_proxy 'wxEvent::Clone'
+          spec.no_proxy 'wxEvent::Clone', 'wxCommandEvent::Clone'
           spec.regard 'wxEvent::Clone', regard_doc: false # need updated doc
           # need this to force alloc func
           spec.make_concrete 'wxEvent'
@@ -192,11 +195,14 @@ module WXRuby3
             }
             __HEREDOC
           spec.ignore 'wxQueueEvent'
-          spec.set_only_for 'wxUSE_HOTKEY', 'wxEVT_HOTKEY'
+          spec.ignore('wxEVT_HOTKEY') unless Config.instance.features_set?('wxUSE_HOTKEY')
+          spec.ignore('wxEVT_MOUSE_CAPTURE_CHANGED', 'wxEVT_MOUSE_CAPTURE_LOST', 'wxEVT_DISPLAY_CHANGED') unless Config.instance.features_set?('__WXMSW__')
           # make sure this event constant definition exists
           spec.add_swig_code %Q{%constant wxEventType wxEVT_MENU_HIGHLIGHT_ALL = wxEVT_MENU_HIGHLIGHT;}
           # add event type constant missing from interface defs
           spec.add_swig_code %Q{%constant wxEventType wxEVT_NC_PAINT = wxEVT_NC_PAINT;}
+          # add undocumented global function
+          spec.add_swig_code 'wxWindow* wxFindFocusDescendant(wxWindow* ancestor);'
         end
         super
       end
@@ -207,6 +213,7 @@ module WXRuby3
           spec.items.each do |citem|
             def_item = defmod.find_item(citem)
             if Extractor::ClassDef === def_item
+              spec.no_proxy "#{citem}::Clone"
               if def_item.hierarchy.has_key?('wxEvent')
                 spec.override_inheritance_chain(citem, {'wxEvent' => 'wxEvent'}, 'wxObject')
               elsif def_item.hierarchy.has_key?('wxCommandEvent')
@@ -223,6 +230,7 @@ module WXRuby3
               else
                 # need this to force alloc func
                 spec.make_concrete(citem)
+                spec.no_proxy(citem)
               end
             end
           end

data/rakelib/lib/director/event_blocker.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/event_filter.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/event_handler.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
@@ -86,7 +89,7 @@ module WXRuby3
               }
               if (!SWIG_IsOK(res)) 
               {
-                SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "wxEventFilter *","wxEvtHandler::$symname", 1, $input)); 
+                SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "wxEventFilter *","$symname", 1, $input)); 
               }
               __CODE
           end
@@ -356,17 +359,31 @@ module WXRuby3
             }
             __HEREDOC
           spec.do_not_generate :typedefs, :variables, :enums, :defines, :functions
-        else
-          spec.items.each do |itm|
-            # Avoid adding unneeded directors
-            spec.no_proxy("#{spec.class_name(itm)}::ProcessEvent") unless /\.h\Z/ =~ itm
+        end
+      end
+
+      def process(gendoc: false)
+        defmod = super
+        unless spec.module_name == 'wxEvtHandler'
+          is_evt_handler = false
+          spec.items.each do |citem|
+            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"
+              is_evt_handler = true
+            end
+          end
+          # only once
+          if is_evt_handler
+            spec.add_header_code <<~__HEREDOC
+              static WxRuby_ID __wxrb_try_before_id("try_before");
+              static WxRuby_ID __wxrb_try_after_id("try_after");
+              __HEREDOC
           end
-          spec.add_header_code <<~__HEREDOC
-            static WxRuby_ID __wxrb_try_before_id("try_before");
-            static WxRuby_ID __wxrb_try_after_id("try_after");
-            __HEREDOC
         end
+        defmod
       end
+
     end # class EvtHandler
 
   end # class Director
@@ -410,7 +427,7 @@ module WXRuby3
                 // reroute directly to C++ method
                 if (Qnil == wxRuby_FindTracking(this) || wxRuby_IsNativeMethod(swig_get_self(), __wxrb_try_#{director_method_id.downcase}_id()))
                 {
-                  return this->#{director_wx_class}::Try#{director_method_id}(event);
+                  return this->#{class_implementation(director_wx_class)}::Try#{director_method_id}(event);
                 }
                 __CODE
                 line << "\n  " << code.split("\n").join("\n  ")

data/rakelib/lib/director/event_loop.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/events.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'
@@ -25,7 +28,7 @@ module WXRuby3
           wxWindowDestroyEvent wxHelpEvent wxClipboardTextEvent wxContextMenuEvent wxChildFocusEvent
           ])
         spec.fold_bases('wxMouseEvent' => %w[wxMouseState wxKeyboardState], 'wxKeyEvent' => 'wxKeyboardState')
-        spec.set_only_for 'WXWIN_COMPATIBILITY_2_8', 'wxShowEvent::GetShow', 'wxIconizeEvent::Iconized'
+        spec.ignore 'wxShowEvent::GetShow', 'wxIconizeEvent::Iconized'
         spec.ignore 'wxKeyEvent::GetPosition(wxCoord *,wxCoord *) const'
         spec.ignore 'wxMouseState::GetPosition(int *,int *)'
         spec.ignore 'wxShowEvent::GetShow', 'wxIconizeEvent::Iconized'

data/rakelib/lib/director/file_dialog_custom_control.rb

@@ -0,0 +1,28 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+require_relative './event_handler'
+
+module WXRuby3
+
+  class Director
+
+    class FileDialogCustomControl < EvtHandler
+
+      def setup
+        spec.items.concat %w[wxFileDialogButton wxFileDialogCheckBox wxFileDialogRadioButton wxFileDialogChoice wxFileDialogTextCtrl wxFileDialogStaticText]
+        super
+        spec.gc_as_object
+        spec.make_abstract %w[wxFileDialogCustomControl wxFileDialogButton wxFileDialogCheckBox wxFileDialogRadioButton wxFileDialogChoice wxFileDialogTextCtrl wxFileDialogStaticText]
+        spec.no_proxy %w[wxFileDialogCustomControl wxFileDialogButton wxFileDialogCheckBox wxFileDialogRadioButton wxFileDialogChoice wxFileDialogTextCtrl wxFileDialogStaticText]
+      end
+    end # class FileDialogCustomControl
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/file_dialog_customize_hook.rb

@@ -0,0 +1,28 @@
+# 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 FileDialogCustomizeHook < Director
+
+      def setup
+        super
+        spec.items << 'wxFileDialogCustomize'
+        spec.gc_as_untracked 'wxFileDialogCustomizeHook'
+        spec.gc_never 'wxFileDialogCustomize'
+        spec.make_abstract 'wxFileDialogCustomize'
+      end
+    end # class FileDialogCustomizeHook
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/file_picker_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/file_system.rb

@@ -0,0 +1,45 @@
+# 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 FileSystem < Director
+
+      def setup
+        super
+        spec.items << 'wxFileSystemHandler' << 'wxArchiveFSHandler' << 'wxMemoryFSHandler'
+        spec.disable_proxies
+        spec.make_abstract 'wxFileSystem'
+        spec.gc_as_untracked 'wxFileSystem'
+        # ignore all instance methods
+        # we only want the static methods to be able to add/remove file system handlers
+        spec.ignore %w[
+          wxFileSystem::ChangePathTo
+          wxFileSystem::FindFileInPath
+          wxFileSystem::FindFirst
+          wxFileSystem::FindNext
+          wxFileSystem::GetPath
+          wxFileSystem::OpenFile
+        ]
+        # redefine to allow more precise arg disown
+        spec.ignore 'wxFileSystem::AddHandler (wxFileSystemHandler *)', ignore_doc: true
+        spec.extend_interface 'wxFileSystem', 'static void AddHandler (wxFileSystemHandler *in_handler)'
+        spec.disown 'wxFileSystemHandler *in_handler'
+        spec.make_abstract 'wxFileSystemHandler'
+        # ignore unuseful methods
+        spec.ignore 'wxMemoryFSHandler::AddFile (const wxString &, const void *, size_t)',
+                    'wxMemoryFSHandler::AddFileWithMimeType(const wxString &, const void *, size_t, const wxString &)'
+        spec.do_not_generate :enums
+      end
+    end # class FileSystem
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/find_dialog_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/find_replace_data.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/font.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
@@ -25,8 +28,9 @@ module WXRuby3
                          'wxFont::SetDefaultEncoding'
         spec.rename_for_ruby 'create' => 'wxFont::New'
         spec.ignore [ 'wxFont::SetNativeFontInfo(const wxNativeFontInfo &)', 'wxFont::GetNativeFontInfo', 'wxFont::operator!=' ]
-        spec.ignore 'wxFont::wxFont(const wxNativeFontInfo &)'
-        if Config.instance.wx_port == :wxQT
+        spec.ignore 'wxFont::wxFont(const wxNativeFontInfo &)',
+                    'wxFont::New(const wxNativeFontInfo &)'
+        if Config.instance.wx_port == :wxqt
           # not implemented
           spec.ignore 'wxFont::AddPrivateFont'
         end

data/rakelib/lib/director/font_data.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
@@ -15,6 +18,11 @@ module WXRuby3
         # add copy ctor missing from XML docs
         spec.extend_interface 'wxFontData',
                               'wxFontData(const wxFontData & other)'
+        spec.add_swig_code <<~__HEREDOC
+          %constant int wxFONTRESTRICT_NONE = wxFONTRESTRICT_NONE;
+          %constant int wxFONTRESTRICT_SCALABLE = wxFONTRESTRICT_SCALABLE;
+          %constant int wxFONTRESTRICT_FIXEDPITCH = wxFONTRESTRICT_FIXEDPITCH;
+          __HEREDOC
       end
     end # class FontData