wxruby3 0.9.0.pre.rc.3 → 0.9.0

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();'

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,14 +13,15 @@ module WXRuby3
     class Log < Director
 
       def setup
-        spec.gc_as_object %w[wxLog wxLogChain wxLogInterposer wxLogInterposerTemp]
-        spec.items.concat(%w[wxLogBuffer wxLogChain wxLogGui wxLogStderr wxLogStream wxLogTextCtrl wxLogInterposer wxLogInterposerTemp wxLogWindow wxLogNull wxLogRecordInfo])
+        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 wxLogInterposerTemp])
+        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
@@ -32,7 +36,48 @@ module WXRuby3
             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
@@ -43,8 +88,8 @@ module WXRuby3
         # are installed as ActiveTarget on construction and so wxWidgets has ownership
         spec.allocate_disowned 'wxLogChain'
         spec.allocate_disowned 'wxLogInterposer'
-        spec.allocate_disowned 'wxLogInterposerTemp'
         spec.allocate_disowned 'wxLogWindow'
+
         # for ActiveTarget methods
         spec.ignore 'wxLog::SetThreadActiveTarget'
         spec.disown 'wxLog *logtarget'

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'

data/rakelib/lib/director/palette.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,7 +16,56 @@ module WXRuby3
         super
         spec.disable_proxies
         spec.gc_as_untracked 'wxPalette'
-        if Config.instance.wx_port == :wxQT
+        spec.ignore 'wxPalette::GetRGB(int,unsigned char *,unsigned char *,unsigned char *) const', ignore_doc: false
+        spec.extend_interface 'wxPalette', 'bool GetRGB(int pixel,unsigned char *red_out,unsigned char *green_out,unsigned char *blue_out) const'
+        # for GetRGB
+        spec.map 'unsigned char *red_out', 'unsigned char *green_out', 'unsigned char *blue_out', as: 'Integer' do
+          map_in ignore: true, temp: 'unsigned char cv', code: '$1 = &cv;'
+          map_argout code: '$result = SWIG_Ruby_AppendOutput($result, UINT2NUM(cv$argnum));'
+        end
+        # for ctor and Create
+        spec.map 'int n, const unsigned char *red' => 'Array<Integer>' do
+          map_in temp: 'std::unique_ptr<unsigned char[]> arr, int _global_len', code: <<~__CODE
+            if (TYPE($input) == T_ARRAY)
+            {
+              _global_len = $1 = RARRAY_LEN($input);
+              arr = std::make_unique<unsigned char[]>($1);
+              $2 = arr.get ();
+              for (int i=0; i<$1 ;++i)
+              {
+                $2[i] = NUM2UINT(rb_ary_entry($input, i));
+              }
+            }
+            else
+            {
+              rb_raise(rb_eArgError, "Expected an array of integers for %d", $argnum-1);
+            }
+          __CODE
+          map_typecheck precedence: 'POINTER', code: '$1 = (TYPE($input) == T_ARRAY);'
+        end
+        spec.map 'const unsigned char *green', 'const unsigned char *blue', as: 'Array<Integer>' do
+          map_in temp: 'std::unique_ptr<unsigned char[]> arr', code: <<~__CODE
+            if (TYPE($input) == T_ARRAY && _global_len == RARRAY_LEN($input))
+            {
+              int len = RARRAY_LEN($input);
+              arr = std::make_unique<unsigned char[]>(len);
+              $1 = arr.get ();
+              for (int i=0; i<len ;++i)
+              {
+                $1[i] = NUM2UINT(rb_ary_entry($input, i));
+              }
+            }
+            else
+            {
+              if (TYPE($input) == T_ARRAY)
+                rb_raise(rb_eArgError, "Expected an array of integers of size %d for %d", _global_len, $argnum-1);
+              else
+                rb_raise(rb_eArgError, "Expected an array of integers for %d", $argnum-1);
+            }
+          __CODE
+          map_typecheck precedence: 'POINTER', code: '$1 = (TYPE($input) == T_ARRAY);'
+        end
+        if Config.instance.wx_port == :wxqt
           # mismatched implementation which does nothing anyway
           spec.ignore 'wxPalette::wxPalette(int, const unsigned char *, const unsigned char *, const unsigned char *)'
           spec.ignore 'wxPalette::Create(int, const unsigned char *, const unsigned char *, const unsigned char *)'

data/rakelib/lib/director/panel.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/pen.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
@@ -73,7 +76,7 @@ module WXRuby3
             return new_pen;
           }
           __HEREDOC
-        # dealt with below - these require special handling becaause of the use
+        # dealt with below - these require special handling because of the use
         # of wxDash array, which cannot be freed until the pen(info) is disposed of
         # or until a new dash pattern is specified.
         spec.ignore(%w[wxPen::GetDashes wxPen::SetDashes wxPenInfo::GetDashes wxPenInfo::Dashes], ignore_doc: false)

data/rakelib/lib/director/pgarray_editor_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'

data/rakelib/lib/director/pgcell.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/pgeditor.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/pgmulti_button.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/pgproperties.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 './pgproperty'

data/rakelib/lib/director/pgproperty.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
@@ -42,7 +45,8 @@ module WXRuby3
                       'wxPGChoices::Set(size_t, const wxString *, const long *)',
                       'wxPGChoices::Set(const wxChar **, const long *)',
                       'wxPGChoices::wxPGChoices(size_t, const wxString *, const long *)',
-                      'wxPGChoices::wxPGChoices(const wxChar **, const long *)'
+                      'wxPGChoices::wxPGChoices(const wxChar **, const long *)',
+                      'wxPGChoices::GetId'
           # replace by extension
           spec.ignore 'wxPGChoices::operator[]', ignore_doc: false
           spec.add_extend_code 'wxPGChoices', <<~__HEREDOC
@@ -51,6 +55,35 @@ module WXRuby3
               return (*self)[idx];
             }
           __HEREDOC
+          # for GetIndicesForStrings
+          spec.map 'wxArrayString *unmatched' => 'Array,nil' do
+
+            map_in temp: 'wxArrayString tmp, VALUE rb_unmatched', code: <<~__CODE
+              rb_unmatched = $input;
+              if (!NIL_P(rb_unmatched)) 
+              {
+                if (TYPE(rb_unmatched) == T_ARRAY)
+                {
+                  $1 = &tmp;
+                }
+                else
+                {
+                  SWIG_exception_fail(SWIG_TypeError, Ruby_Format_TypeError( "", "Array", "$symname", $argnum, $input ));
+                } 
+              }
+              __CODE
+
+            map_argout by_ref: true, code: <<~__CODE
+              if (!NIL_P(rb_unmatched$argnum))
+              {
+                for (size_t i = 0; i < $1->GetCount(); i++)
+                {
+                  rb_ary_push(rb_unmatched$argnum,WXSTR_TO_RSTR( $1->Item(i) ) );
+                }
+              }
+              __CODE
+
+          end
           spec.disown 'wxPGProperty *prop', 'wxPGProperty *childProperty'
           # do not think this useful for wxRuby (Also; caused GC problems)
           spec.ignore 'wxPGProperty::GetCellRenderer'
@@ -64,7 +97,9 @@ module WXRuby3
           spec.rename_for_ruby 'GetCellOrDefault' => 'wxPGProperty::GetCell(unsigned int) const'
           spec.rename_for_ruby 'get_cell' => 'wxPGProperty::GetOrCreateCell'
           # don't expose wxPGAttributeStorage; add a more Ruby-like extension
-          spec.ignore 'wxPGProperty::GetAttributes'
+          spec.ignore 'wxPGProperty::GetAttributes', # implemented in pure Ruby
+                      'wxPGProperty::SetAttributes',
+                      ignore_doc: false
           spec.add_extend_code 'wxPGProperty', <<~__HEREDOC
             VALUE each_attribute()
             {
@@ -199,6 +234,10 @@ module WXRuby3
           end
         end
         spec.add_header_code 'typedef wxPGProperty::FlagType FlagType;'
+        spec.map 'FlagType' => 'Integer' do
+          map_in code: '$1 = NUM2UINT($input);'
+          map_typecheck precedence: 'INTEGER', code: '$1 = TYPE($input) == T_FIXNUM || TYPE($input) == T_BIGNUM;'
+        end
       end
     end # class PGProperty