wxruby3 0.9.1 → 0.9.2

data/rakelib/lib/director/app_traits.rb

@@ -38,8 +38,8 @@ module WXRuby3
           wxAppTraits::IsUsingUniversalWidgets
           wxAppTraits::ShowAssertDialog
           wxAppTraits::SafeMessageBox
-          wxAppTraits::GetAssertStackTrace
         ], ignore_doc: false
+        spec.ignore('wxAppTraits::GetAssertStackTrace', ignore_doc: 'USE_STACKWALKER')
         # redefine
         spec.extend_interface 'wxAppTraits',
                               'wxString GetDesktopEnvironment() const',
@@ -48,21 +48,19 @@ module WXRuby3
                               'bool IsUsingUniversalWidgets() const',
                               'bool ShowAssertDialog(const wxString& msg)',
                               'bool SafeMessageBox(const wxString &text, const wxString &title)'
-        if Config.instance.features_set?('wxUSE_STACKWALKER')
+        if Config.instance.features_set?('USE_STACKWALKER')
           spec.extend_interface 'wxAppTraits', 'wxString GetAssertStackTrace()'
         end
         spec.map_apply 'int * OUTPUT' => ['int *major', 'int *minor', 'int *micro']
 
-        unless Config.platform == :mingw
-          spec.ignore 'wxStandardPaths::DontIgnoreAppSubDir',
-                      'wxStandardPaths::IgnoreAppSubDir',
-                      'wxStandardPaths::IgnoreAppBuildSubDirs',
-                      'wxStandardPaths::MSWGetShellDir'
-        end
-        unless Config.platform == :linux
-          spec.ignore 'wxStandardPaths::SetInstallPrefix',
-                      'wxStandardPaths::GetInstallPrefix'
-        end
+        spec.ignore_unless('WXMSW',
+                           'wxStandardPaths::DontIgnoreAppSubDir',
+                           'wxStandardPaths::IgnoreAppSubDir',
+                           'wxStandardPaths::IgnoreAppBuildSubDirs',
+                           'wxStandardPaths::MSWGetShellDir')
+        spec.ignore_unless('WXGTK',
+                           'wxStandardPaths::SetInstallPrefix',
+                           'wxStandardPaths::GetInstallPrefix')
       end
     end
 

data/rakelib/lib/director/ctrl_with_items.rb

@@ -51,9 +51,11 @@ module WXRuby3
             'wxItemContainer::Append(const wxArrayString &, void **)',
             'wxItemContainer::Insert(const wxArrayString &, unsigned int, void **)',
             'wxItemContainer::Set(const wxArrayString &, void **)'], ignore_doc: false)
-          # add undocumented method
-          spec.extend_interface 'wxControlWithItems',
-                                'bool IsSorted() const'
+          if Config.instance.wx_version < '3.3.0'
+            # add undocumented method
+            spec.extend_interface 'wxControlWithItems',
+                                  'bool IsSorted() const'
+          end
           # for doc only
           spec.map 'void** clientData' => 'Array', swig: false do
             map_in code: ''
@@ -62,13 +64,23 @@ module WXRuby3
           # Replace the old Wx definition of this method (which segfaults)
           # Only need the setter as we cache data in Ruby and the getter
           # therefor can be pure Ruby
-          spec.add_extend_code('wxControlWithItems', <<~__HEREDOC
+          spec.add_extend_code 'wxControlWithItems', <<~__HEREDOC
             VALUE set_client_data(int n, VALUE item_data) {
               self->SetClientData(n, (void *)item_data);
               return item_data;
             }
+
+            VALUE each_string()
+            {
+              VALUE rc = Qnil;
+              for (unsigned int i=0; i<$self->GetCount() ;++i)
+              {
+                VALUE rb_s = WXSTR_TO_RSTR($self->GetString(i));
+                rc = rb_yield(rb_s);
+              }
+              return rc;
+            }
             __HEREDOC
-            )
        end
       end
 

data/rakelib/lib/director/data_format.rb

@@ -20,7 +20,7 @@ module WXRuby3
           # The formal signature for these is NativeFormat; this is required on
           # MSVC as otherwise an impermissible implicit cast is tried, and so
           # doesn't compile
-          spec.ignore 'wxDataFormat::GetType'
+          spec.ignore 'wxDataFormat::GetType', ignore_doc: false
           spec.extend_interface 'wxDataFormat',
                                 'typedef unsigned short NativeFormat',
                                 'wxDataFormat::NativeFormat GetType() const'

data/rakelib/lib/director/derived_dc.rb

@@ -278,7 +278,7 @@ 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
+          if Config.instance.features_set?('USE_PRINTING_ARCHITECTURE', Director.AnyOf(*%w[WXMSW WXOSX USE_GTKPRINT]))
             spec.add_extend_code 'wxGCDC', <<~__HEREDOC
               static VALUE draw_on(const wxPrinterDC& dc)
               {

data/rakelib/lib/director/dialog.rb

@@ -24,6 +24,7 @@ module WXRuby3
         when 'wxDialog'
           spec.items << 'wxDialogLayoutAdapter'
           spec.gc_as_object 'wxDialogLayoutAdapter'
+          spec.suppress_warning(514, 'wxDialogLayoutAdapter')
           spec.disown 'wxDialogLayoutAdapter* adapter'
           spec.new_object 'wxDialog::SetLayoutAdapter'
           spec.ignore('wxDialog::GetContentWindow',

data/rakelib/lib/director/drag_image.rb

@@ -15,9 +15,8 @@ module WXRuby3
       include Typemap::TreeItemId
 
       def setup
-        unless Config.instance.features_set?('__WXUNIVERSAL__')
-          spec.ignore('wxDragImage::DoDrawImage', 'wxDragImage::GetImageRect', 'wxDragImage::UpdateBackingFromWindow')
-        end
+        # If wxRuby ever supports WXUNIVERSAL this should change to #ignore_unless
+        spec.ignore('wxDragImage::DoDrawImage', 'wxDragImage::GetImageRect', 'wxDragImage::UpdateBackingFromWindow')
         super
       end
     end # class DragImage

data/rakelib/lib/director/event.rb

@@ -195,8 +195,8 @@ module WXRuby3
             }
             __HEREDOC
           spec.ignore 'wxQueueEvent'
-          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__')
+          spec.ignore_unless('USE_HOTKEY', 'wxEVT_HOTKEY')
+          spec.ignore_unless('WXMSW', 'wxEVT_MOUSE_CAPTURE_CHANGED', 'wxEVT_MOUSE_CAPTURE_LOST', 'wxEVT_DISPLAY_CHANGED')
           # 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

data/rakelib/lib/director/frame.rb

@@ -21,9 +21,7 @@ module WXRuby3
         when 'wxFrame'
           spec.ignore %w[
             wxFrame::OnCreateStatusBar wxFrame::OnCreateToolBar]
-          unless Config.instance.features_set?(*%w[__WXMSW__ wxUSE_TASKBARBUTTON])
-            spec.ignore('wxFrame::MSWGetTaskBarButton')
-          end
+          spec.ignore_unless(%w[WXMSW USE_TASKBARBUTTON], 'wxFrame::MSWGetTaskBarButton')
           # this reimplemented window base method need to be properly wrapped but
           # is missing from the XML docs
           spec.extend_interface('wxFrame', 'virtual void OnInternalIdle()')

data/rakelib/lib/director/gdicommon.rb

@@ -78,16 +78,14 @@ module WXRuby3
           wxPoint::x wxPoint::y
           wxRealPoint::x wxRealPoint::y
           ]
-        spec.ignore('wxStockCursor.wxCURSOR_DEFAULT') unless Config.instance.features_set?('__WXGTK__')
-        unless Config.instance.features_set?('__X__')
-          spec.ignore %w{
-            wxStockCursor.wxCURSOR_CROSS_REVERSE
-            wxStockCursor.wxCURSOR_DOUBLE_ARROW
-            wxStockCursor.wxCURSOR_BASED_ARROW_UP
-            wxStockCursor.wxCURSOR_BASED_ARROW_DOWN
-          }
-        end
-        spec.ignore('wxStockCursor.wxCURSOR_COPY_ARROW') unless Config.instance.features_set?('__WXOSX__')
+        spec.ignore_unless('WXGTK', 'wxStockCursor.wxCURSOR_DEFAULT')
+        spec.ignore_unless 'WXX11', %w{
+          wxStockCursor.wxCURSOR_CROSS_REVERSE
+          wxStockCursor.wxCURSOR_DOUBLE_ARROW
+          wxStockCursor.wxCURSOR_BASED_ARROW_UP
+          wxStockCursor.wxCURSOR_BASED_ARROW_DOWN
+        }
+        spec.ignore_unless('WXOSX', 'wxStockCursor.wxCURSOR_COPY_ARROW')
         spec.add_extend_code 'wxRect', <<~__HEREDOC
           wxRect add(const wxRect &rect) const {
             return (*(const wxRect*)$self) + rect;

data/rakelib/lib/director/graphics_context.rb

@@ -34,9 +34,7 @@ module WXRuby3
                     'wxGraphicsContext::DrawLines(size_t, const wxPoint2DDouble *, wxPolygonFillMode)',
                     'wxGraphicsContext::StrokeLines(size_t, const wxPoint2DDouble *)',
                     'wxGraphicsContext::StrokeLines (size_t, const wxPoint2DDouble *, const wxPoint2DDouble *)'
-        if Config.platform == :linux
-          spec.ignore 'wxGraphicsContext::Create(const wxPrinterDC &)'
-        end
+        spec.ignore_unless(Config::AnyOf.new('WXMSW', 'WXOSX', 'USE_GTKPRINT'), 'wxGraphicsContext::Create(const wxPrinterDC &)')
         spec.add_header_code <<~__HEREDOC
           // special free funcs are needed to clean up Dashes array if it has been
           // set; wxWidgets does not do this automatically so will leak if not
@@ -229,7 +227,7 @@ module WXRuby3
             __CODE
         end
         # add convenience method providing efficient gc memory management
-        unless Config.platform == :linux
+        if Config.instance.features_set?('USE_PRINTING_ARCHITECTURE', Director.AnyOf(*%w[WXMSW WXOSX USE_GTKPRINT]))
           spec.add_extend_code 'wxGraphicsContext', <<~__HEREDOC
             static VALUE draw_on(const wxPrinterDC& dc)
             {

data/rakelib/lib/director/grid_ctrl.rb

@@ -87,10 +87,13 @@ module WXRuby3
             __CODE
         end
 
-        spec.ignore 'wxGrid::GetSelectedBlocks' # ignore
+        spec.ignore 'wxGrid::GetSelectedBlocks', ignore_doc: false  # ignore
+        spec.map 'wxGridBlocks' => 'Array<Wx::GRID::GridBlockCoords>', swig: false do
+          map_out code: ''
+        end
         # add rubified API (finish in pure Ruby)
         spec.add_extend_code 'wxGrid', <<~__HEREDOC
-          VALUE selected_blocks()
+          VALUE each_selected_block()
           {
             VALUE rc = Qnil;
             if (rb_block_given_p())
@@ -103,6 +106,34 @@ module WXRuby3
             }
             return rc;  
           }
+
+          VALUE each_selected_row_block()
+          {
+            VALUE rc = Qnil;
+            if (rb_block_given_p())
+            {
+              wxGridBlockCoordsVector sel = $self->GetSelectedRowBlocks();
+              for (const wxGridBlockCoords& gbc : sel)
+              {
+                rc = rb_yield (SWIG_NewPointerObj(new wxGridBlockCoords(gbc), SWIGTYPE_p_wxGridBlockCoords, SWIG_POINTER_OWN));
+              }
+            }
+            return rc;  
+          }
+
+          VALUE each_selected_col_block()
+          {
+            VALUE rc = Qnil;
+            if (rb_block_given_p())
+            {
+              wxGridBlockCoordsVector sel = $self->GetSelectedColBlocks();
+              for (const wxGridBlockCoords& gbc : sel)
+              {
+                rc = rb_yield (SWIG_NewPointerObj(new wxGridBlockCoords(gbc), SWIGTYPE_p_wxGridBlockCoords, SWIG_POINTER_OWN));
+              }
+            }
+            return rc;  
+          }
           __HEREDOC
 
         spec.ignore 'wxGrid::GetGridWindowOffset(const wxGridWindow *, int &, int &) const'
@@ -113,7 +144,7 @@ module WXRuby3
           typedef wxGrid::TabBehaviour TabBehaviour;
           __HEREDOC
 
-        spec.map 'wxGridBlockCoordsVector' => 'Array<Wx::GRID::GridBlockCoords' do
+        spec.map 'wxGridBlockCoordsVector' => 'Array<Wx::GRID::GridBlockCoords>' do
           map_out code: <<~__CODE
             $result = rb_ary_new();
             for (const wxGridBlockCoords& gbc: $1)

data/rakelib/lib/director/icon.rb

@@ -25,9 +25,12 @@ module WXRuby3
         spec.ignore('wxIcon::wxIcon(const char *const *)', 'wxIcon::wxIcon(const char[],int,int)')
         # xml specs incorrectly list this method for MWS while it does not exist anymore
         spec.ignore('wxIcon::ConvertToDisabled')
-        unless Config.platform == :mingw
+        if Config.platform == :mingw
+          spec.ignore 'wxIconBundle::wxIconBundle(const wxString &, WXHINSTANCE)',
+                      'wxIconBundle::AddIcon(const wxString&,WXHINSTANCE)',
+                      'wxIcon::CreateFromHICON'
+        else
           spec.override_inheritance_chain('wxIcon', %w[wxBitmap wxGDIObject wxObject])
-          spec.ignore 'wxIconBundle::wxIconBundle(const wxString &, WXHINSTANCE)'
         end
         super
       end

data/rakelib/lib/director/list_ctrl.rb

@@ -55,12 +55,11 @@ module WXRuby3
             (void)self->EditLabel(item);
           }
         __HEREDOC
-        unless Config.instance.features_set?('wxHAS_LISTCTRL_COLUMN_ORDER')
-          spec.ignore %w[wxListCtrl::GetColumnIndexFromOrder
-                         wxListCtrl::GetColumnOrder
-                         wxListCtrl::GetColumnsOrder
-                         wxListCtrl::SetColumnsOrder]
-        end
+        spec.ignore_unless 'HAS_LISTCTRL_COLUMN_ORDER',
+                           %w[wxListCtrl::GetColumnIndexFromOrder
+                              wxListCtrl::GetColumnOrder
+                              wxListCtrl::GetColumnsOrder
+                              wxListCtrl::SetColumnsOrder]
         # these are protected so ignored by default but we want them here
         spec.regard %w[
             wxListCtrl::OnGetItemAttr

data/rakelib/lib/director/locale.rb

@@ -28,9 +28,7 @@ module WXRuby3
           wxLanguageInfo::DescriptionNative
           wxLanguageInfo::LayoutDirection
           ]
-        if Config.instance.features_set?('__WXMSW__')
-          spec.regard('wxLanguageInfo::WinLang', 'wxLanguageInfo::WinSublang')
-        end
+        spec.ignore_unless('WXMSW', 'wxLanguageInfo::WinLang', 'wxLanguageInfo::WinSublang')
       end
     end # class Locale
 

data/rakelib/lib/director/log.rb

@@ -14,16 +14,13 @@ module WXRuby3
 
       def setup
         spec.gc_as_object %w[wxLog wxLogChain wxLogInterposer wxLogWindow]
-        spec.items.concat(%w[wxLogBuffer wxLogChain wxLogGui wxLogStderr wxLogStream wxLogTextCtrl wxLogInterposer wxLogWindow wxLogNull wxLogRecordInfo])
+        spec.items.concat(%w[wxLogBuffer wxLogChain wxLogGui wxLogStderr 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?('wxUSE_STD_IOSTREAM')
-          spec.ignore 'wxLogStream'
-        end
         # wxLogStderr
         spec.ignore 'wxLogStderr::wxLogStderr'
         spec.add_extend_code 'wxLogStderr', <<~__HEREDOC

data/rakelib/lib/director/media_ctrl.rb

@@ -16,6 +16,60 @@ module WXRuby3
 
       def setup
         super
+        spec.map 'const wxURI&' => 'URI' do
+          add_header <<~__CODE
+            static VALUE wxRuby_GetRubyURIClass()
+            {
+              static VALUE rb_cURI = Qnil;
+              if (NIL_P(rb_cURI))
+              {
+                rb_require("uri");
+                rb_cURI = rb_const_get(rb_cObject, rb_intern("URI"));
+              }
+              return rb_cURI;
+            }
+            static WxRuby_ID to_s_id("to_s");
+            __CODE
+          map_in temp: 'wxURI tmp', code: <<~__CODE
+            if (rb_obj_is_kind_of($input, wxRuby_GetRubyURIClass()))
+            {
+              VALUE s = rb_funcall($input, to_s_id(), 0);
+              tmp = wxURI(RSTR_TO_WXSTR(s));
+              $1 = &tmp;
+            }
+            else
+            {
+              rb_raise(rb_eArgError, "expected URI for %d", $argnum-1);
+            }                        
+            __CODE
+          map_typecheck precedence: 'POINTER', code: '$1 = rb_obj_is_kind_of($input, wxRuby_GetRubyURIClass());'
+        end
+        spec.map 'wxFileOffset' => 'Integer' do
+          # we need these inline methods here as we do not want SWIG to preprocess the code
+          # as it will do in the type mapping code sections
+          add_header_code <<~__CODE
+            inline wxFileOffset __ruby2wxFileOffset(VALUE num)
+            {
+            #ifdef wxHAS_HUGE_FILES
+              return static_cast<wxFileOffset> (NUM2LL(num));
+            #else
+              return static_cast<wxFileOffset> (NUM2LONG(num));
+            #endif
+            } 
+            inline VALUE __wxFileOffset2ruby(wxFileOffset offs)
+            {
+            #ifdef wxHAS_HUGE_FILES
+              return LL2NUM(offs);
+            #else
+              return LONG2NUM(offs);
+            #endif
+            } 
+            __CODE
+
+          map_in code: '$1 = __ruby2wxFileOffset($input);'
+          map_out code: '$result = __wxFileOffset2ruby($1);'
+          map_typecheck code: '$1 = TYPE($input) == T_FIXNUM;'
+        end
         spec.do_not_generate :variables, :enums, :defines, :functions
       end
     end # class MediaCtrl

data/rakelib/lib/director/menu.rb

@@ -85,6 +85,8 @@ module WXRuby3
         spec.add_swig_code <<~__HEREDOC
           %markfunc wxMenu "mark_wxMenu";
         __HEREDOC
+        # ignore MSW specific method
+        spec.ignore 'wxMenu::MSWCommand'
         # fix SWIG's problems with const& return value
         spec.ignore('wxMenu::GetTitle', ignore_doc: false) # keep doc
         spec.add_extend_code 'wxMenu', <<~__HEREDOC
@@ -92,7 +94,20 @@ module WXRuby3
             wxString const& title = $self->GetTitle();
             return &const_cast<wxString&> (title);
           }
-        __HEREDOC
+
+          VALUE each_item()
+          {
+            VALUE rc = Qnil;
+            for (size_t i=0; i<$self->GetMenuItemCount(); ++i)
+            {
+              wxMenuItem *wx_menu_item = $self->FindItemByPosition(i);
+              VALUE rb_menu_item = SWIG_NewPointerObj(SWIG_as_voidptr(wx_menu_item), 
+                                                      SWIGTYPE_p_wxMenuItem, 0);
+              rc = rb_yield(rb_menu_item);
+            }
+            return rc;
+          }
+          __HEREDOC
         super
       end
     end # class Menu

data/rakelib/lib/director/menu_item.rb

@@ -21,11 +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.ignore('wxMenuItem::GetAccel') unless Config.instance.features_set?('wxUSE_ACCEL')
+        spec.ignore_unless('USE_ACCEL', 'wxMenuItem::GetAccel')
         spec.no_proxy 'wxMenuItem::GetAccel'
         spec.ignore 'wxMenuItem::GetBitmap(bool)' # not portable
         if Config.instance.wx_version >= '3.3.0'
-          spec.ignore('wxMenuItem::SetBackgroundColour','wxMenuItem::SetFont','wxMenuItem::SetTextColour') unless Config.instance.features_set?('__WXMSW__')
+          spec.ignore_unless('WXMSW', 'wxMenuItem::SetBackgroundColour','wxMenuItem::SetFont','wxMenuItem::SetTextColour')
         end
         super
       end

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

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_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',
@@ -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/sizer.rb

@@ -82,6 +82,21 @@ module WXRuby3
               }
               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