wxruby3 0.9.0 → 0.9.2

data/rakelib/lib/director/pgeditor.rb

@@ -51,7 +51,7 @@ module WXRuby3
               int res = SWIG_ConvertPtr(rb_ary_entry($input, 0), &ptr, SWIGTYPE_p_wxWindow, 0 |  0);
               if (!SWIG_IsOK(res)) 
               {
-                Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(res)), "in primary output value of type 'wxWindow *'");
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", SWIG_ErrorType(SWIG_ArgError(res)), "in primary output value of type 'wxWindow *'");
               }
               $result = wxPGWindowList(static_cast<wxWindow*>(ptr));
               if (RARRAY_LEN($input) > 1)
@@ -59,7 +59,7 @@ module WXRuby3
                 res = SWIG_ConvertPtr(rb_ary_entry($input, 1), &ptr, SWIGTYPE_p_wxWindow, 0 |  0);
                 if (!SWIG_IsOK(res)) 
                 {
-                  Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(res)), "in secundary output value of type 'wxWindow *'");
+                  Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", SWIG_ErrorType(SWIG_ArgError(res)), "in secundary output value of type 'wxWindow *'");
                 }
                 $result.SetSecondary(static_cast<wxWindow*>(ptr));
               }

data/rakelib/lib/director/pgproperties.rb

@@ -141,7 +141,7 @@ module WXRuby3
           spec.map_apply 'int * OUTPUT' => 'int* pIndex'
         end
         # for UIntProperty and IntProperty
-        if Config.instance.features_set?('wxUSE_LONGLONG')
+        if Config.instance.features_set?('USE_LONGLONG')
           # wxLongLong mapping to be considered before considering 'long' (see typecheck precedence)
           spec.map 'const wxLongLong&' => 'Integer' do
             map_in temp: 'wxLongLong tmp', code: <<~__CODE
@@ -174,7 +174,7 @@ module WXRuby3
             void* argp$argnum = NULL;
             if ( TYPE($input) == T_DATA )
             {
-              if (SWIG_IsOK(SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, $argnum-1)) && argp$argnum)
+              if (SWIG_IsOK(SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, 0)) && argp$argnum)
               {
                 $1 = reinterpret_cast< $1_basetype * >(argp$argnum);
               }
@@ -200,7 +200,7 @@ module WXRuby3
               }
               else
               {
-                Swig::DirectorTypeMismatchException::raise(rb_eTypeError, 
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError, 
                                                            "on_custom_string_edit should return a string, or nil");
               }
             }

data/rakelib/lib/director/pgproperty.rb

@@ -54,7 +54,30 @@ module WXRuby3
             {
               return (*self)[idx];
             }
-          __HEREDOC
+
+            VALUE each_label()
+            {
+              VALUE rc = Qnil;
+              for (unsigned int i=0; i<$self->GetCount() ;++i)
+              {
+                VALUE rb_lbl = WXSTR_TO_RSTR($self->GetLabel(i));
+                rc = rb_yield(rb_lbl);
+              }
+              return rc;
+            }
+
+            VALUE each_entry()
+            {
+              VALUE rc = Qnil;
+              for (unsigned int i=0; i<$self->GetCount() ;++i)
+              {
+                wxPGChoiceEntry *entry = &($self->Item(i));
+                VALUE rb_entry = SWIG_NewPointerObj(SWIG_as_voidptr(entry), SWIGTYPE_p_wxPGChoiceEntry, 0);
+                rc = rb_yield(rb_entry);
+              }
+              return rc;
+            }
+            __HEREDOC
           # for GetIndicesForStrings
           spec.map 'wxArrayString *unmatched' => 'Array,nil' do
 

data/rakelib/lib/director/property_grid_interface.rb

@@ -39,16 +39,11 @@ module WXRuby3
         spec.extend_interface 'wxPropertyGridInterface',
                               'void SetPropertyValues(const wxVariant &list, const wxPGPropArgCls& defaultCategory = 0)'
         # optionals
-        unless Config.instance.features_set?('wxUSE_LONGLONG')
-          spec.ignore 'wxPropertyGridInterface::GetPropertyValueAsLongLong',
-                      'wxPropertyGridInterface::GetPropertyValueAsULongLong'
-        end
-        unless Config.instance.features_set?('wxUSE_DATETIME')
-          spec.ignore 'wxPropertyGridInterface::GetPropertyValueAsDateTime'
-        end
-        unless Config.instance.features_set?('wxUSE_VALIDATORS')
-          spec.ignore 'wxPropertyGridInterface::GetPropertyValidator'
-        end
+        spec.ignore_unless 'USE_LONGLONG',
+                           'wxPropertyGridInterface::GetPropertyValueAsLongLong',
+                           'wxPropertyGridInterface::GetPropertyValueAsULongLong'
+        spec.ignore_unless 'USE_DATETIME', 'wxPropertyGridInterface::GetPropertyValueAsDateTime'
+        spec.ignore_unless 'USE_VALIDATORS', 'wxPropertyGridInterface::GetPropertyValidator'
         # fix incorrect XML documentation
         spec.ignore 'wxPropertyGridInterface::SetPropertyImage', ignore_doc: false # ignore non-const BitmapBundle arg decl
         # and add correct decl

data/rakelib/lib/director/richtext_buffer.rb

@@ -224,7 +224,7 @@ module WXRuby3
               int res = SWIG_ConvertPtr(rb_ary_entry(rb_int_arr, i), &ptr,SWIGTYPE_p_wxRichTextAttr, 0);
               if (!SWIG_IsOK(res)) 
               {
-                Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(res)), "in output value of type '""Wx::RTC::RichTextAttr""'");
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", SWIG_ErrorType(SWIG_ArgError(res)), "in output value of type '""Wx::RTC::RichTextAttr""'");
               }
               wxRichTextAttr* wx_att = static_cast< wxRichTextAttr* >(ptr);
               $1.Add(*wx_att);

data/rakelib/lib/director/richtext_composite_object.rb

@@ -45,6 +45,17 @@ module WXRuby3
               }
               return rc;
             }
+
+            VALUE each_child()
+            {
+              VALUE rc = Qnil;
+              for (size_t i=0; i<$self->GetChildCount() ;++i)
+              {
+                wxRichTextObject *rto = $self->GetChild(i);
+                rc = rb_yield(wxRuby_RichTextObject2Ruby(rto, 0));
+              }
+              return rc;
+            }
             __HEREDOC
 
           spec.new_object 'wxRichTextLine::Clone'
@@ -161,6 +172,20 @@ module WXRuby3
               }
               $self->MoveFromList(wx_lst);
             }
+
+            VALUE each_line()
+            {
+              VALUE rc = Qnil;
+              const wxRichTextLineVector &lines = $self->GetLines();
+              int lnr = 0;
+              for (const wxRichTextLine* line : lines)
+              {
+                VALUE rb_ln = SWIG_NewPointerObj(SWIG_as_voidptr(const_cast<wxRichTextLine*> (line)), SWIGTYPE_p_wxRichTextLine, 0);
+                rc = rb_yield(rb_ln);
+                ++lnr;
+              }
+              return rc;
+            }
             __CODE
 
           spec.do_not_generate(:typedefs, :variables, :enums, :defines, :functions)

data/rakelib/lib/director/richtext_ctrl.rb

@@ -15,7 +15,7 @@ module WXRuby3
     class RichTextCtrl < Window
 
       include Typemap::RichText
-      if Config.instance.features_set?('wxUSE_DATETIME')
+      if Config.instance.features_set?('USE_DATETIME')
         include Typemap::DateTime
       end
 
@@ -117,9 +117,7 @@ module WXRuby3
           wxRichTextCtrl::ProcessMouseMovement
           wxRichTextCtrl::ProcessBackKey
           ]
-        unless Config.instance.features_set?('wxUSE_DATETIME')
-          spec.ignore %w[wxRichTextCtrl::GetDragStartTime wxRichTextCtrl::SetDragStartTime]
-        end
+        spec.ignore_unless 'USE_DATETIME', %w[wxRichTextCtrl::GetDragStartTime wxRichTextCtrl::SetDragStartTime]
         spec.add_header_code 'extern VALUE wxRuby_RichTextObject2Ruby(const wxRichTextObject *wx_rto, int own);'
         spec.swig_import('swig/classes/include/wxTextAttr.h',
                          'swig/classes/include/wxRichTextObject.h',
@@ -153,7 +151,7 @@ module WXRuby3
               }
               else
               {
-                Swig::DirectorTypeMismatchException::raise(rb_eTypeError, 
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError, 
                                                            "expected an Integer, or nil on failure");
               }
             }
@@ -208,6 +206,18 @@ module WXRuby3
             __CODE
 
         end
+        spec.add_extend_code 'wxRichTextCtrl', <<~__HEREDOC
+          VALUE each_line()
+          {
+            VALUE rc = Qnil;
+            for (int i=0; i<$self->GetNumberOfLines() ;++i)
+            {
+              VALUE rb_ln = WXSTR_TO_RSTR($self->GetLineText(i));
+              rc = rb_yield(rb_ln);
+            }
+            return rc;
+          }
+          __HEREDOC
       end
     end # class RichTextCtrl
 

data/rakelib/lib/director/richtext_formatting_dialog.rb

@@ -27,11 +27,13 @@ module WXRuby3
           wxRichTextFormattingDialog::SetStyle
           wxRichTextFormattingDialog::SetStyleDefinition
         ]
-        # add undocumented methods
-        spec.extend_interface 'wxRichTextFormattingDialog',
-                              'wxRichTextObject* GetObject() const',
-                              'void SetObject(wxRichTextObject* obj)',
-                              'virtual bool ApplyStyle(wxRichTextCtrl* ctrl, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO)'
+        if Config.instance.wx_version < '3.3.0'
+          # add undocumented methods
+          spec.extend_interface 'wxRichTextFormattingDialog',
+                                'wxRichTextObject* GetObject() const',
+                                'void SetObject(wxRichTextObject* obj)',
+                                'virtual bool ApplyStyle(wxRichTextCtrl* ctrl, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO)'
+        end
         spec.add_header_code 'extern VALUE wxRuby_RichTextObject2Ruby(const wxRichTextObject *wx_rto, int own);'
         spec.disown 'wxRichTextFormattingDialogFactory *factory'
         spec.suppress_warning(473, 'wxRichTextFormattingDialogFactory::CreatePage')

data/rakelib/lib/director/richtext_paragraph_layout_box.rb

@@ -83,13 +83,15 @@ module WXRuby3
                   return rb_rtsd;
               }
               __HEREDOC
-          # add undocumented convenience method
-          spec.extend_interface 'wxRichTextListStyleDefinition',
-                                'void SetAttributes(int i, int leftIndent, int leftSubIndent, int bulletStyle, const wxString& bulletSymbol = wxEmptyString)'
-          # undocumented methods
-          spec.extend_interface 'wxRichTextStyleSheet',
-                                'wxRichTextStyleSheet(const wxRichTextStyleSheet& sheet)',
-                                'void Copy(const wxRichTextStyleSheet& sheet)'
+          if Config.instance.wx_version < '3.3.0'
+            # add undocumented convenience method
+            spec.extend_interface 'wxRichTextListStyleDefinition',
+                                  'void SetAttributes(int i, int leftIndent, int leftSubIndent, int bulletStyle, const wxString& bulletSymbol = wxEmptyString)'
+            # undocumented methods
+            spec.extend_interface 'wxRichTextStyleSheet',
+                                  'wxRichTextStyleSheet(const wxRichTextStyleSheet& sheet)',
+                                  'void Copy(const wxRichTextStyleSheet& sheet)'
+          end
           # redefine these since we need to be able to selectively specify 'disown'
           spec.ignore 'wxRichTextStyleSheet::AddCharacterStyle',
                       'wxRichTextStyleSheet::AddListStyle',

data/rakelib/lib/director/sash_event.rb

@@ -0,0 +1,42 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+require_relative './event'
+
+module WXRuby3
+
+  class Director
+
+    class SashEvent < Event
+
+      def setup
+        super
+        spec.disable_proxies
+        # missing from interface docs
+        spec.add_swig_code '%constant int EVT_SASH_DRAGGED_RANGE = wxEVT_SASH_DRAGGED;'
+      end
+
+      def doc_generator
+        SashEventDocGenerator.new(self)
+      end
+
+    end # class SashEvent
+
+  end # class Director
+
+  class SashEventDocGenerator < DocGenerator
+
+    protected def gen_constants_doc(fdoc)
+      super
+      xref_table = package.all_modules.reduce(DocGenerator.constants_db) { |db, mod| db[mod] }
+      gen_constant_doc(fdoc, 'EVT_SASH_DRAGGED_RANGE', xref_table['EVT_SASH_DRAGGED'], '')
+    end
+
+  end
+
+end # module WXRuby3

data/rakelib/lib/director/sizer.rb

@@ -14,7 +14,6 @@ module WXRuby3
 
       def setup
         # Any nested sizers passed to Add() in are owned by C++, not GC'd by Ruby
-        spec.disown 'wxSizer* sizer'
         case spec.module_name
         when 'wxSizer'
           spec.items << 'wxSizerFlags'
@@ -26,6 +25,79 @@ module WXRuby3
                       'wxSizer::Insert(size_t, wxSizerItem *)',
                       'wxSizer::Prepend(wxSizerItem *)'
           spec.ignore 'wxSizer::Remove(wxWindow *)' # long time deprecated
+          # need to adjust sizer arg name to apply disown specs
+          spec.ignore 'wxSizer::Add(wxSizer *, const wxSizerFlags &)',
+                      'wxSizer::Add(wxSizer *, int, int, int, wxObject *)',
+                      'wxSizer::Insert(size_t, wxSizer *, const wxSizerFlags &)',
+                      'wxSizer::Insert(size_t, wxSizer *, int, int, int, wxObject *)',
+                      'wxSizer::Prepend(wxSizer *, const wxSizerFlags &)',
+                      'wxSizer::Prepend(wxSizer *, int, int, int, wxObject *)',
+                      ignore_doc: false
+          spec.extend_interface 'wxSizer',
+                                'wxSizerItem* Add(wxSizer *sizer_disown, const wxSizerFlags &flags)',
+                                'wxSizerItem* Add(wxSizer *sizer_disown, int proportion=0, int flag=0, int border=0, wxObject *userData=NULL)',
+                                'wxSizerItem* Insert(size_t index, wxSizer *sizer_disown, const wxSizerFlags &flags)',
+                                'wxSizerItem* Insert(size_t index, wxSizer *sizer_disown, int proportion=0, int flag=0, int border=0, wxObject *userData=NULL)',
+                                'wxSizerItem* Prepend(wxSizer *sizer_disown, const wxSizerFlags &flags)',
+                                'wxSizerItem* Prepend(wxSizer *sizer_disown, int proportion=0, int flag=0, int border=0, wxObject *userData=NULL)'
+          spec.disown 'wxSizer* sizer_disown'
+          # needs custom impl to transfer ownership of detached items
+          spec.ignore 'wxSizer::Detach(wxSizer*)',
+                      'wxSizer::Detach(int)', ignore_doc: false
+          spec.add_extend_code 'wxSizer', <<~__HEREDOC
+            bool detach(wxSizer* szr)
+            {
+              if ($self->Detach(szr))
+              {
+                VALUE rb_szr = SWIG_RubyInstanceFor(szr);
+                if (rb_szr && !NIL_P(rb_szr))
+                {
+                  // transfer ownership to Ruby
+                  RDATA(rb_szr)->dfree = GcSizerFreeFunc;            
+                }
+                return true;
+              }
+              return false;
+            }
+
+            bool detach(int itm_nr)
+            {
+              wxSizerItem* itm = $self->GetItem(itm_nr);
+              if (itm)
+              {
+                VALUE rb_szr = Qnil;
+                if (itm->IsSizer())
+                {
+                  rb_szr = SWIG_RubyInstanceFor(itm->GetSizer());
+                }
+                if ($self->Detach(itm_nr))
+                {
+                  if (rb_szr && !NIL_P(rb_szr))
+                  {
+                    // transfer ownership to Ruby
+                    RDATA(rb_szr)->dfree = GcSizerFreeFunc;            
+                  }
+                  return true;
+                }
+              }
+              return false;
+            }
+
+            VALUE each_child()
+            {
+              const wxSizerItemList& child_list = self->GetChildren();
+              VALUE rc = Qnil;
+              wxSizerItemList::compatibility_iterator node = child_list.GetFirst();
+              while (node)
+              {
+                wxSizerItem *wx_si = node->GetData();
+                VALUE rb_si = SWIG_NewPointerObj(wx_si, SWIGTYPE_p_wxSizerItem, 0);
+                rc = rb_yield(rb_si);
+                node = node->GetNext();
+              }
+              return rc;
+            }
+            __HEREDOC
           # Typemap for GetChildren - convert to array of Sizer items
           spec.map 'wxSizerItemList&' => 'Array<Wx::SizerItem>' do
             map_out code: <<~__CODE
@@ -50,6 +122,12 @@ module WXRuby3
           spec.gc_as_untracked 'wxGBSpan', 'wxGBPosition'
           # cannot use this with wxRuby
           spec.ignore 'wxGridBagSizer::Add(wxGBSizerItem *)'
+          # need to adjust sizer arg name to apply disown specs
+          spec.ignore 'wxGridBagSizer::Add(wxSizer *, const wxGBPosition &, const wxGBSpan &, int, int, wxObject *)',
+                      ignore_doc: false
+          spec.extend_interface 'wxGridBagSizer',
+                                'wxSizerItem *Add(wxSizer *sizer_disown, const wxGBPosition &pos, const wxGBSpan &span=wxDefaultSpan, int flag=0, int border=0, wxObject *userData=NULL)'
+          spec.disown 'wxSizer* sizer_disown'
         end
         # no real use for allowing these to be overloaded but a whole lot of grieve
         # if we do allow it

data/rakelib/lib/director/sizer_item.rb

@@ -22,6 +22,28 @@ module WXRuby3
           # ignore constructors
           spec.ignore 'wxSizerItem::wxSizerItem'
           spec.ignore(%w[wxSizerItem::SetSizer wxSizerItem::SetSpacer wxSizerItem::SetWindow])
+          # need to adjust sizer arg name to apply disown specs
+          spec.ignore 'wxSizerItem::AssignSizer(wxSizer *)', ignore_doc: false
+          spec.extend_interface 'wxSizerItem',
+                                'void AssignSizer(wxSizer *sizer_disown)'
+          spec.disown 'wxSizer *sizer_disown'
+          # needs custom impl to properly transfer ownership to Ruby
+          spec.ignore 'wxSizerItem::DetachSizer', ignore_doc: false
+          spec.add_extend_code 'wxSizerItem', <<~__HEREDOC
+            void detach_sizer()
+            {
+              if ($self->IsSizer())
+              {
+                VALUE rb_szr = SWIG_RubyInstanceFor($self->GetSizer());
+                if (rb_szr && !NIL_P(rb_szr))
+                {
+                  // transfer ownership to Ruby
+                  RDATA(rb_szr)->dfree = GcSizerFreeFunc;            
+                }
+                $self->DetachSizer();
+              }              
+            }
+            __HEREDOC
         when 'wxGBSizerItem'
           spec.make_abstract 'wxGBSizerItem'
           # ignore constructors

data/rakelib/lib/director/static_box.rb

@@ -16,11 +16,10 @@ module WXRuby3
 
       def setup
         super
-        if Config.instance.wx_port == :wxqt || Config.platform == :macosx
-          # missing from implementation currently
-          spec.ignore 'wxStaticBox::wxStaticBox(wxWindow *, wxWindowID, wxWindow *, const wxPoint &, const wxSize &, long, const wxString &)',
-                      'wxStaticBox::Create(wxWindow *, wxWindowID, wxWindow *, const wxPoint &, const wxSize &, long, const wxString &)'
-        end
+        # missing from implementation currently for WXOSX (and WXQT)
+        spec.ignore_unless(Config::AnyOf.new(*%w[WXMSW WXGTK]),
+                           'wxStaticBox::wxStaticBox(wxWindow *, wxWindowID, wxWindow *, const wxPoint &, const wxSize &, long, const wxString &)',
+                           'wxStaticBox::Create(wxWindow *, wxWindowID, wxWindow *, const wxPoint &, const wxSize &, long, const wxString &)')
       end
     end # class StaticBox
 

data/rakelib/lib/director/styled_text_ctrl.rb

@@ -87,6 +87,18 @@ module WXRuby3
         # TODO : these will need some sort of stream solution to be useful
         spec.ignore 'wxStyledTextCtrl::GetCharacterPointer',
                     'wxStyledTextCtrl::GetRangePointer'
+        spec.add_extend_code 'wxStyledTextCtrl', <<~__HEREDOC
+          VALUE each_line()
+          {
+            VALUE rc = Qnil;
+            for (int i=0; i<$self->GetNumberOfLines() ;++i)
+            {
+              VALUE rb_ln = WXSTR_TO_RSTR($self->GetLineText(i));
+              rc = rb_yield(rb_ln);
+            }
+            return rc;
+          }
+          __HEREDOC
         spec.do_not_generate(:variables, :enums, :defines, :functions)
       end
     end # class StyledTextCtrl

data/rakelib/lib/director/task_bar_button.rb

@@ -0,0 +1,30 @@
+# 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 TaskBarButton < Director
+
+      def setup
+        super
+        spec.items << 'wxThumbBarButton'
+        spec.no_proxy 'wxTaskBarButton'
+        spec.gc_as_untracked 'wxTaskBarButton', 'wxThumbBarButton'
+        spec.disown 'wxThumbBarButton *button'
+        # superfluous and causing trouble for disown policy (re-implemented in pure Ruby)
+        spec.ignore 'wxTaskBarButton::RemoveThumbBarButton(wxThumbBarButton*)', ignore_doc: false
+        spec.new_object 'wxTaskBarButton::RemoveThumbBarButton(int)'
+      end
+
+    end
+
+  end
+
+end

data/rakelib/lib/director/task_bar_icon.rb

@@ -16,7 +16,7 @@ module WXRuby3
 
       def setup
         super
-        spec.gc_never
+        spec.gc_as_object
         # need a custom implementation to handle event handler proc cleanup
         spec.add_header_code <<~__HEREDOC
           class WXRubyTaskBarIcon : public wxTaskBarIcon
@@ -26,9 +26,11 @@ module WXRuby3
             virtual ~WXRubyTaskBarIcon() 
             {
               wxRuby_ReleaseEvtHandlerProcs(this);
-            }               
+              SWIG_RubyUnlinkObjects(this);
+              SWIG_RubyRemoveTracking(this);
+            }
           };
-        __HEREDOC
+          __HEREDOC
         spec.use_class_implementation 'wxTaskBarIcon', 'WXRubyTaskBarIcon'
         # this one is protected so ignored by default but we want it here
         # (we do not want GetPopupMenu available for override in Ruby)
@@ -54,23 +56,13 @@ module WXRuby3
               int swig_res = SWIG_ConvertPtr(result, &ptr, $1_descriptor, 0 | SWIG_POINTER_DISOWN);
               if (!SWIG_IsOK(swig_res))
               {
-                Swig::DirectorTypeMismatchException::raise(rb_eTypeError,
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError,
                          "create_popup_menu must return a Wx::Menu, or nil");
               }
               $result = reinterpret_cast < wxMenu * > (ptr);
             }
             __CODE
         end
-        spec.add_extend_code 'wxTaskBarIcon', <<~__HEREDOC
-          // Explicitly dispose of a TaskBarIcon; needed for clean exits on
-          // Windows.
-          VALUE destroy()
-          {
-            delete $self;
-            return Qnil;
-          }
-          __HEREDOC
-        # already generated with TaskBarIconEvent
         spec.do_not_generate :variables, :enums, :defines, :functions
       end
     end # class TaskBarIcon

data/rakelib/lib/director/textctrl.rb

@@ -32,7 +32,7 @@ module WXRuby3
         # we will not wrap it but create a simplified interface when USE_SPELLCHECK is enabled which
         # we will complement in pure Ruby to provide Wx::TextProofOptions class
         spec.ignore('wxTextCtrl::EnableProofCheck', 'wxTextCtrl::GetProofCheckOptions')
-        if Config.instance.features_set?('wxUSE_SPELLCHECK')
+        if Config.instance.features_set?('USE_SPELLCHECK')
           spec.add_extend_code 'wxTextCtrl', <<~__HEREDOC
             VALUE DoEnableProofCheck(bool spelling, bool grammar, const wxString& language)
             {
@@ -99,6 +99,17 @@ module WXRuby3
             else if(TYPE(value)==T_FLOAT)
               *self << (double)(RFLOAT_VALUE(value));
           }
+
+          VALUE each_line()
+          {
+            VALUE rc = Qnil;
+            for (int i=0; i<$self->GetNumberOfLines() ;++i)
+            {
+              VALUE rb_ln = WXSTR_TO_RSTR($self->GetLineText(i));
+              rc = rb_yield(rb_ln);
+            }
+            return rc;
+          }
           __HEREDOC
         spec.swig_import 'swig/classes/include/wxTextAttr.h'
       end

data/rakelib/lib/director/tool_tip.rb

@@ -13,7 +13,7 @@ module WXRuby3
     class ToolTip < Director
 
       def setup
-        spec.ignore('wxToolTip::SetMaxWidth') unless Config.instance.features_set?('__WXMSW__')
+        spec.ignore_unless('WXMSW', 'wxToolTip::SetMaxWidth')
         super
       end
     end # class ToolTip

data/rakelib/lib/director/top_level_window.rb

@@ -41,15 +41,14 @@ module WXRuby3
             wxTopLevelWindow::RestoreToGeometry
             wxTopLevelWindow::GeometrySerializer
           }
-          unless Config.instance.features_set?('__WXUNIVERSAL__')
-            spec.ignore %w{
+          # #ignore_unless if wxRuby one day supports 'WXUNIVERSAL'
+          spec.ignore %w{
             wxTopLevelWindow::IsUsingNativeDecorations
             wxTopLevelWindow::UseNativeDecorations
             wxTopLevelWindow::UseNativeDecorationsByDefault
             }
-          end
-          spec.ignore('wxTopLevelWindow::MSWGetSystemMenu') unless Config.instance.features_set?('__WXMSW__')
-          spec.ignore('wxTopLevelWindow::OSXSetModified','wxTopLevelWindow::OSXIsModified') unless Config.instance.features_set?('__WXOSX__')
+          spec.ignore_unless('WXMSW', 'wxTopLevelWindow::MSWGetSystemMenu')
+          spec.ignore_unless('WXOSX', 'wxTopLevelWindow::OSXSetModified','wxTopLevelWindow::OSXIsModified')
           spec.swig_import 'swig/classes/include/wxDefs.h'
           # incorrectly documented here
           spec.override_events 'wxTopLevelWindow',