wxruby3 0.9.4 → 0.9.5

data/lib/wx/core/combo_ctrl.rb

@@ -0,0 +1,171 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+
+module Wx
+
+  module ComboPopup
+
+    def self.included(mod)
+      unless mod == Wx::ComboPopupWx
+        mod.class_eval { include Wx::ComboPopup::Methods }
+      end
+    end
+
+    module Methods
+      # Returns pointer to the associated parent {Wx::ComboCtrl}.
+      # @return [Wx::ComboCtrl]
+      # def get_combo_ctrl; end
+
+      # The including class must implement this to initialize its internal variables.
+      #
+      # This method is called immediately after construction finishes. m_combo member variable has been initialized before the call.
+      # @return [void]
+      def init
+      end
+
+      # The including class may implement this to return true if it wants to delay call to {Wx::ComboPopup#create} until the popup is shown for the first time.
+      #
+      # It is more efficient, but on the other hand it is often more convenient to have the control created immediately.
+      #
+      # <div class="wxrb-remark">
+      # <b>Remark:</b>
+      # <p>Base implementation returns false.
+      # </p>
+      # </div>
+      # @return [Boolean]
+      def lazy_create
+        false
+      end
+
+      # The including class must implement this to create the popup control.
+      #
+      # true if the call succeeded, false otherwise.
+      # @param parent [Wx::Window]
+      # @return [Boolean]
+      def create(parent)
+        false
+      end
+
+      # You only need to implement this member function if you create your popup class in non-standard way.
+      #
+      # The default implementation can handle both multiple-inherited popup control (as seen in {Wx::ComboCtrl} samples) and one allocated separately in heap.
+      # If you do completely re-implement this function, make sure it calls Destroy() for the popup control and also deletes this object (usually as the last thing).
+      # @return [void]
+      def destroy_popup
+      end
+
+      # Implement to customize matching of value string to an item container entry.
+      #
+      # <div class="wxrb-remark">
+      # <b>Remark:</b>
+      # <p>Default implementation always return true and does not alter trueItem.
+      # </p>
+      # </div>
+      # @param item [String]  String entered, usually by user or from SetValue() call.
+      # @param trueItem [Boolean] if true the true item string should be returned in case matching but different
+      # @return [Boolean, String] Returns true if a match is found or false if not. If trueItem == true and item matches an entry, but the entry's string representation is not exactly the same (case mismatch, for example), then the true item string should be returned as the match result.
+      def find_item(item, trueItem=false)
+        true
+      end
+
+      # The including class may implement this to return adjusted size for the popup control, according to the variables given.
+      #
+      # <div class="wxrb-remark">
+      # <b>Remark:</b>
+      # <p>This function is called each time popup is about to be shown.
+      # </p>
+      # </div>
+      # @param minWidth [Integer]  Preferred minimum width.
+      # @param prefHeight [Integer]  Preferred height. May be -1 to indicate no preference.
+      # @param maxHeight [Integer]  Max height for window, as limited by screen size.
+      # @return [Wx::Size]
+      def get_adjusted_size(minWidth, prefHeight, maxHeight)
+        Wx::Size.new(minWidth, prefHeight)
+      end
+
+      # The including class must implement this to return pointer to the associated control created in {Wx::ComboPopup#create}.
+      # @return [Wx::Window]
+      def get_control
+      end
+
+      # The including class must implement this to receive string value changes from {Wx::ComboCtrl}.
+      # @param value [String]
+      # @return [void]
+      def set_string_value(value)
+      end
+
+      # The including class must implement this to return string representation of the value.
+      # @return [String]
+      def get_string_value
+        nil
+      end
+
+      # The including class may implement this to do something when the parent {Wx::ComboCtrl} gets double-clicked.
+      # @return [void]
+      def on_combo_double_click
+      end
+
+      # The including class may implement this to receive key down events from the parent {Wx::ComboCtrl}.
+      #
+      # Events not handled should be skipped, as usual.
+      # @param event [Wx::KeyEvent]
+      # @return [void]
+      def on_combo_key_event(event)
+        event.skip
+      end
+
+      # The including class may implement this to receive char events from the parent {Wx::ComboCtrl}.
+      #
+      # Events not handled should be skipped, as usual.
+      # @param event [Wx::KeyEvent]
+      # @return [void]
+      def on_combo_char_event(event)
+        event.skip
+      end
+
+      # The including class may implement this to do special processing when popup is hidden.
+      # @return [void]
+      def on_dismiss
+      end
+
+      # The including class may implement this to do special processing when popup is shown.
+      # @return [void]
+      def on_popup
+      end
+
+      # The including class may implement this to paint the parent {Wx::ComboCtrl}.
+      # This is called to custom paint in the combo control itself (ie. not the popup).
+      #
+      # Default implementation draws value as string.
+      # @param dc [Wx::DC]
+      # @param rect [Wx::Rect]
+      # @return [void]
+      def paint_combo_control(dc, rect)
+        combo = get_combo_ctrl
+        if combo.get_window_style.allbits?(Wx::CB_READONLY) # ie. no textctrl
+          combo.prepare_background(dc, rect,0)
+
+          dc.draw_text(combo.get_value,
+                       rect.x + combo.get_margin_left,
+                       (rect.height-dc.get_char_height)/2 + rect.y)
+        end
+      end
+
+    end
+
+  end
+
+  class ComboPopupWx
+
+    include ComboPopup
+
+    # this method has not been wrapped as a default popup control will always already have been
+    # initialized before returned from #get_combo_control
+    # just do nothing here (or should we raise an exception?)
+    def init; end
+
+  end
+
+end

data/lib/wx/doc/comboctrl.rb

@@ -7,11 +7,136 @@
 
 module Wx
 
-  class OwnerDrawnComboBox < ComboCtrl
+  # In order to use a custom popup with {Wx::ComboCtrl}, a class must include {Wx::ComboPopup}.
+  #
+  # For more information on how to use it, see {Wx::ComboCtrl Setting Custom Popup for Wx::ComboCtrl}.
+  module ComboPopup
 
-    alias :get_item_data :get_client_object
+    # Returns pointer to the associated parent {Wx::ComboCtrl}.
+    # @return [Wx::ComboCtrl]
+    def get_combo_ctrl; end
 
-    alias :set_item_data :set_client_object
+    # The including class must implement this to initialize its internal variables.
+    #
+    # This method is called immediately after construction finishes. m_combo member variable has been initialized before the call.
+    # @return [void]
+    def init; end
+
+    # The including class may implement this to return true if it wants to delay call to {Wx::ComboPopup#create} until the popup is shown for the first time.
+    #
+    # It is more efficient, but on the other hand it is often more convenient to have the control created immediately.
+    #
+    # <div class="wxrb-remark">
+    # <b>Remark:</b>
+    # <p>Base implementation returns false.
+    # </p>
+    # </div>
+    # @return [Boolean]
+    def lazy_create; end
+
+    # The including class must implement this to create the popup control.
+    #
+    # true if the call succeeded, false otherwise.
+    # @param parent [Wx::Window]
+    # @return [Boolean]
+    def create(parent) end
+
+    # You only need to implement this member function if you create your popup class in non-standard way.
+    #
+    # The default implementation can handle both multiple-inherited popup control (as seen in {Wx::ComboCtrl} samples) and one allocated separately in heap.
+    # If you do completely re-implement this function, make sure it calls Destroy() for the popup control and also deletes this object (usually as the last thing).
+    # @return [void]
+    def destroy_popup; end
+
+    # Implement to customize matching of value string to an item container entry.
+    #
+    # <div class="wxrb-remark">
+    # <b>Remark:</b>
+    # <p>Default implementation always return true and does not alter trueItem.
+    # </p>
+    # </div>
+    # @param item [String]  String entered, usually by user or from SetValue() call.
+    # @param trueItem [Boolean] if true the true item string should be returned in case matching but different
+    # @return [Boolean, String] Returns true if a match is found or false if not. If trueItem == true and item matches an entry, but the entry's string representation is not exactly the same (case mismatch, for example), then the true item string should be returned as the match result.
+    def find_item(item, trueItem=false) end
+
+    # The including class may implement this to return adjusted size for the popup control, according to the variables given.
+    #
+    # <div class="wxrb-remark">
+    # <b>Remark:</b>
+    # <p>This function is called each time popup is about to be shown.
+    # </p>
+    # </div>
+    # @param minWidth [Integer]  Preferred minimum width.
+    # @param prefHeight [Integer]  Preferred height. May be -1 to indicate no preference.
+    # @param maxHeight [Integer]  Max height for window, as limited by screen size.
+    # @return [Wx::Size]
+    def get_adjusted_size(minWidth, prefHeight, maxHeight) end
+
+    # The including class must implement this to return pointer to the associated control created in {Wx::ComboPopup#create}.
+    # @return [Wx::Window]
+    def get_control; end
+
+    # The including class must implement this to receive string value changes from {Wx::ComboCtrl}.
+    # @param value [String]
+    # @return [void]
+    def set_string_value(value) end
+
+    # The including class must implement this to return string representation of the value.
+    # @return [String]
+    def get_string_value; end
+
+    # The including class may implement this to do something when the parent {Wx::ComboCtrl} gets double-clicked.
+    # @return [void]
+    def on_combo_double_click; end
+
+    # The including class may implement this to receive key down events from the parent {Wx::ComboCtrl}.
+    #
+    # Events not handled should be skipped, as usual.
+    # @param event [Wx::KeyEvent]
+    # @return [void]
+    def on_combo_key_event(event) end
+
+    # The including class may implement this to receive char events from the parent {Wx::ComboCtrl}.
+    #
+    # Events not handled should be skipped, as usual.
+    # @param event [Wx::KeyEvent]
+    # @return [void]
+    def on_combo_char_event(event) end
+
+    # The including class may implement this to do special processing when popup is hidden.
+    # @return [void]
+    def on_dismiss; end
+
+    # The including class may implement this to do special processing when popup is shown.
+    # @return [void]
+    def on_popup; end
+
+    # The including class may implement this to paint the parent {Wx::ComboCtrl}.
+    # This is called to custom paint in the combo control itself (ie. not the popup).
+    #
+    # Default implementation draws value as string.
+    # @param dc [Wx::DC]
+    # @param rect [Wx::Rect]
+    # @return [void]
+    def paint_combo_control(dc, rect) end
+
+  end
+
+  # A Ruby interface class for default comboctrl popup classes used by {Wx::OwnerDrawnComboBox} and
+  # {Wx::RichTextStyleListBox}.
+  #
+  # If no custom popup control has been installed with {Wx::ComboCtrl#SetPopupControl} an instance of this
+  # class will be returned when {Wx::ComboCtrl#GetPopupControl} is called for either of the widgets mentioned
+  # above.
+  # <div class="wxrb-remark">
+  # <b>Remark:</b>
+  # <p>This is an abstract class that cannot be derived from.
+  # </p>
+  # </div>
+  class ComboPopupWx
+
+    include ComboPopup
 
   end
 

data/lib/wx/doc/owner_drawn_combobox.rb

@@ -7,7 +7,11 @@
 
 module Wx
 
-  class OwnerDrawnComboBox
+  class OwnerDrawnComboBox < ComboCtrl
+
+    alias :get_item_data :get_client_object
+
+    alias :set_item_data :set_client_object
 
     # Returns the label of the selected item or an empty string if no item is selected.
     #

data/lib/wx/version.rb

@@ -3,5 +3,5 @@
 # This software is released under the MIT license.
 
 module Wx
-  WXRUBY_VERSION    = '0.9.4'
+  WXRUBY_VERSION    = '0.9.5'
 end

data/rakelib/lib/core/include/funcall.inc

@@ -22,7 +22,8 @@ namespace Swig
     DirectorRubyException(VALUE error, VALUE rcvr, ID fn_id)
       : DirectorException(Qnil)
     {
-      VALUE msg = rb_sprintf("Caught exception in SWIG director method for %s#%s", rb_class2name(CLASS_OF(rcvr)), rb_id2name(fn_id));
+      VALUE msg = rb_sprintf("Caught exception in SWIG director method for %s#%s : ", rb_class2name(CLASS_OF(rcvr)), rb_id2name(fn_id));
+      rb_str_append(msg, rb_funcall(error, rb_intern("message"), 0));
       this->swig_msg = StringValuePtr(msg);
       swig_error = rb_exc_new_str(rb_eRuntimeError, msg);
       VALUE bt = rb_funcall(error, rb_intern("backtrace"), 0);

data/rakelib/lib/director/comboctrl.rb

@@ -14,9 +14,10 @@ module WXRuby3
 
     class ComboCtrl < Window
 
+      include Typemap::ComboPopup
+
       def setup
         super
-        spec.items << 'wxComboPopup'
         # mixin TextEntry
         spec.include_mixin 'wxComboCtrl', { 'Wx::TextEntry' => 'wxTextEntryBase' }
         spec.override_inheritance_chain('wxComboCtrl',
@@ -29,8 +30,108 @@ module WXRuby3
           wxComboCtrl::DoSetPopupControl
           wxComboCtrl::DoShowPopup
         ]
-        # turn wxComboPopup into a mixin module
-        spec.make_mixin 'wxComboPopup'
+        spec.add_header_code <<~__HEREDOC
+          #include "wxruby-ComboPopup.h"
+
+          static VALUE g_rb_mWxComboPopup = Qnil;
+          static VALUE g_rb_cComboPopupWx = Qnil;
+
+          WXRUBY_EXPORT wxComboPopup* wxRuby_ComboPopupFromRuby(VALUE popup)
+          {
+            if (!NIL_P(popup) && !rb_obj_is_kind_of(popup, g_rb_mWxComboPopup))
+            {
+              rb_raise(rb_eArgError, "Expected a Wx::ComboPopup or nil for 1");
+              return nullptr;
+            }
+
+            wxComboPopup* cpp = nullptr; 
+            if (!NIL_P(popup))
+            {
+              VALUE rb_cp_proxy = rb_iv_get(popup, "@_wx_combo_popup_proxy");
+              if (NIL_P(rb_cp_proxy))
+              {
+                cpp = new WxRubyComboPopup(popup);
+                rb_cp_proxy = Data_Wrap_Struct(rb_cObject, 0, 0, cpp);
+                rb_iv_set(popup, "@_wx_combo_popup_proxy", rb_cp_proxy);
+              }
+              else
+              {
+                Data_Get_Struct(rb_cp_proxy, wxComboPopup, cpp);
+              }
+            }
+            return cpp;
+          }
+
+          WXRUBY_EXPORT VALUE wxRuby_ComboPopupToRuby(wxComboPopup* cpp)
+          {
+            VALUE rb_cpp = Qnil;
+            if (cpp)
+            {
+              WxRubyComboPopup *wxrb_cpp = dynamic_cast<WxRubyComboPopup*> (cpp);
+              if (wxrb_cpp)
+              {
+                rb_cpp = wxrb_cpp->GetRubyComboPopup();
+              }
+              else
+              {
+                // in this case we're probably working for a wxOwnerDrawnComboBox or wxRichTextListbox 
+                // with default popup control which is a C++ implemented class without any Ruby linkage.
+                // wrap this in the Wx::ComboPopupWx class to provide a Ruby interface
+                rb_cpp = Data_Wrap_Struct(g_rb_cComboPopupWx, 0, 0, cpp); // do not own or track
+              }
+            }
+            return rb_cpp;
+          }
+
+          static void wxRuby_markComboPopups()
+          {
+            WxRubyComboPopup::GC_mark_combo_popups();
+          }
+          __HEREDOC
+        # ignore these
+        spec.ignore 'wxComboCtrl::SetPopupControl',
+                    'wxComboCtrl::GetPopupControl',
+                    ignore_doc: false
+        # for GetPopupControl docs only
+        spec.map 'wxComboPopup*' => 'Wx::ComboPopup', swig: false do
+          map_out code: ''
+        end
+        # and replace
+        spec.add_extend_code 'wxComboCtrl', <<~__HEREDOC
+          void SetPopupControl(VALUE popup)
+          {
+            wxComboPopup* cpp = wxRuby_ComboPopupFromRuby(popup);
+            $self->SetPopupControl(cpp);
+          }
+      
+          VALUE GetPopupControl()
+          {
+            return wxRuby_ComboPopupToRuby($self->GetPopupControl());
+          }
+          __HEREDOC
+        spec.add_init_code <<~__HEREDOC
+          wxRuby_AppendMarker(wxRuby_markComboPopups);
+
+          g_rb_mWxComboPopup = rb_define_module_under(mWxCore, "ComboPopup");
+          rb_define_method(g_rb_mWxComboPopup, "get_combo_ctrl", VALUEFUNC(wx_combo_popup_get_combo_ctrl), -1);
+
+          g_rb_cComboPopupWx = rb_define_class_under(mWxCore, "ComboPopupWx", rb_cObject);
+          rb_undef_alloc_func(g_rb_cComboPopupWx);
+          rb_define_method(g_rb_cComboPopupWx, "lazy_create", VALUEFUNC(combo_popup_wx_lazy_create), -1);
+          rb_define_method(g_rb_cComboPopupWx, "create", VALUEFUNC(combo_popup_wx_create), -1);
+          rb_define_method(g_rb_cComboPopupWx, "get_combo_ctrl", VALUEFUNC(combo_popup_wx_get_combo_ctrl), -1);
+          rb_define_method(g_rb_cComboPopupWx, "find_item", VALUEFUNC(combo_popup_wx_find_item), -1);
+          rb_define_method(g_rb_cComboPopupWx, "get_adjusted_size", VALUEFUNC(combo_popup_wx_get_adjusted_size), -1);
+          rb_define_method(g_rb_cComboPopupWx, "get_control", VALUEFUNC(combo_popup_wx_get_control), -1);
+          rb_define_method(g_rb_cComboPopupWx, "set_string_value", VALUEFUNC(combo_popup_wx_set_string_value), -1);
+          rb_define_method(g_rb_cComboPopupWx, "get_string_value", VALUEFUNC(combo_popup_wx_get_string_value), -1);
+          rb_define_method(g_rb_cComboPopupWx, "on_combo_double_click", VALUEFUNC(combo_popup_wx_on_combo_double_click), -1);
+          rb_define_method(g_rb_cComboPopupWx, "on_combo_key_event", VALUEFUNC(combo_popup_wx_on_combo_key_event), -1);
+          rb_define_method(g_rb_cComboPopupWx, "on_combo_char_event", VALUEFUNC(combo_popup_wx_on_combo_char_event), -1);
+          rb_define_method(g_rb_cComboPopupWx, "on_dismiss", VALUEFUNC(combo_popup_wx_on_dismiss), -1);
+          rb_define_method(g_rb_cComboPopupWx, "on_popup", VALUEFUNC(combo_popup_wx_on_popup), -1);
+          rb_define_method(g_rb_cComboPopupWx, "paint_combo_control", VALUEFUNC(combo_popup_wx_paint_combo_control), -1);
+          __HEREDOC
       end
 
     end # class ComboCtrl

data/rakelib/lib/director/defs.rb

@@ -32,9 +32,7 @@ module WXRuby3
           wxDELETEA
           wxSwap
         }
-        if Config.instance.wx_version >= '3.3.0'
-          spec.ignore 'wxOVERRIDE'
-        end
+        spec.ignore 'wxOVERRIDE'
         super
       end
 

data/rakelib/lib/director/gdicommon.rb

@@ -49,6 +49,12 @@ module WXRuby3
           'wxRect::Intersect(const wxRect &)',
           'wxRect::Union(const wxRect &)'
         ]
+        if Config.instance.wx_version >= '3.3.0'
+          # ignore these as they are supposed to specify unary minus but confuse
+          # SWIG
+          spec.ignore 'wxPoint::operator-(const wxPoint&)',
+                      'wxRealPoint::operator-(const wxRealPoint&)'
+        end
         spec.regard 'wxRect::Offset', regard_doc: false
         # overrule common wxPoint mapping for wxRect ctor to fix ctor ambiguities here wrt wxSize
         spec.map 'const wxPoint& topLeft', 'const wxPoint& bottomRight', as: 'Wx::Point' do

data/rakelib/lib/director/menu_item.rb

@@ -24,7 +24,7 @@ module WXRuby3
         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'
+        if Config.instance.wx_version > '3.2.4'
           spec.ignore_unless('WXMSW', 'wxMenuItem::SetBackgroundColour','wxMenuItem::SetFont','wxMenuItem::SetTextColour')
         end
         super

data/rakelib/lib/director/num_validator.rb

@@ -383,13 +383,11 @@ module WXRuby3
         # hardcoded interface declarations
         spec.add_interface_code <<~__HEREDOC
           // Bit masks used for numeric validator styles.
-          enum wxNumValidatorStyle
-          {
-              wxNUM_VAL_DEFAULT               = 0x0,
-              wxNUM_VAL_THOUSANDS_SEPARATOR   = 0x1,
-              wxNUM_VAL_ZERO_AS_BLANK         = 0x2,
-              wxNUM_VAL_NO_TRAILING_ZEROES    = 0x4
-          };
+          enum wxNumValidatorStyle;
+          %constant int NumValidatorStyle_wxNUM_VAL_DEFAULT             = 0x0;
+          %constant int NumValidatorStyle_wxNUM_VAL_THOUSANDS_SEPARATOR = 0x1;
+          %constant int NumValidatorStyle_wxNUM_VAL_ZERO_AS_BLANK       = 0x2;
+          %constant int NumValidatorStyle_wxNUM_VAL_NO_TRAILING_ZEROES  = 0x4;
 
           %alias WXIntegerValidator::GetMin "min";
           %alias WXIntegerValidator::SetMin "min=";

data/rakelib/lib/director/owner_drawn_combobox.rb

@@ -15,6 +15,7 @@ module WXRuby3
     class OwnerDrawnComboBox < Window
 
       include Typemap::ClientData
+      include Typemap::ComboPopup
 
       def setup
         super

data/rakelib/lib/director/persistent_window.rb

@@ -14,8 +14,8 @@ module WXRuby3
 
       def setup
         spec.items << 'wxPersistentTLW' << 'wxPersistentBookCtrl' << 'wxPersistentTreeBookCtrl'
-        if Config.instance.wx_version >= '3.3.0'
-          # before 3.3.0 this was not properly available
+        if Config.instance.wx_version > '3.2.4'
+          # only after 3.2.4 properly available
           spec.items << 'wxPersistentComboBox'
         end
         super

data/rakelib/lib/director/pgeditor.rb

@@ -17,7 +17,7 @@ module WXRuby3
         spec.items.concat %w[wxPGCheckBoxEditor wxPGChoiceEditor wxPGChoiceAndButtonEditor wxPGComboBoxEditor
                              wxPGTextCtrlEditor wxPGSpinCtrlEditor wxPGTextCtrlAndButtonEditor wxPGEditorDialogAdapter]
         spec.includes << 'wx/propgrid/propgriddefs.h'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version > '3.2.4'
           # make sure SWIG knows this as enum type
           spec.add_swig_code 'enum wxPGPropertyFlags;'
         end

data/rakelib/lib/director/pgproperties.rb

@@ -65,7 +65,7 @@ module WXRuby3
                     'wxUIntProperty::m_prefix',
                     'wxDateProperty::m_format',
                     'wxDateProperty::m_dpStyle'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version > '3.2.4'
           # currently missing from interface docs
           spec.extend_interface 'wxEnumProperty',
                                 'bool ValueFromString_(wxVariant& value, int* pIndex, const wxString& text,int argFlags) const',
@@ -111,7 +111,7 @@ module WXRuby3
         end
         # make sure the derived Enum property classes provide the protected accessors too
         %w[wxCursorProperty wxEditEnumProperty wxSystemColourProperty wxColourProperty].each do |kls|
-          if Config.instance.wx_version >= '3.3.0'
+          if Config.instance.wx_version > '3.2.4'
             # currently missing from interface docs
             spec.extend_interface kls,
                                   'int GetIndex() const',
@@ -136,7 +136,7 @@ module WXRuby3
                     'wxLongStringProperty::DisplayEditorDialog',
                     'wxMultiChoiceProperty::DisplayEditorDialog',
                     'wxFontProperty::DisplayEditorDialog'
-        if Config.instance.wx_version >= '3.3.0'
+        if Config.instance.wx_version > '3.2.4'
           # for wxEnumProperty and derivatives ValueFromString_/ValueFromInt_
           spec.map_apply 'int * OUTPUT' => 'int* pIndex'
         end

data/rakelib/lib/director/pgproperty.rb

@@ -113,7 +113,11 @@ module WXRuby3
           # do not think this useful for wxRuby (Also; caused GC problems)
           spec.ignore 'wxPGProperty::GetCellRenderer'
           # obsolete
-          spec.ignore %w[wxPGProperty::AddChild wxPGProperty::GetValueString]
+          if Config.instance.wx_version < '3.3.0'
+            spec.ignore %w[wxPGProperty::AddChild wxPGProperty::GetValueString]
+          else
+            spec.ignore 'wxPGProperty::AddChild'
+          end
           # not of use in Ruby
           spec.ignore(%w[wxPGProperty::GetClientData wxPGProperty::SetClientData])
           # only keep the const version

data/rakelib/lib/director/richtext_style_listbox.rb

@@ -15,6 +15,7 @@ module WXRuby3
     class RichTextStyleListBox < Window
 
       include Typemap::RichText
+      include Typemap::ComboPopup
 
       def setup
         super
@@ -28,6 +29,10 @@ module WXRuby3
                                            wxWindow
                                            wxEvtHandler
                                            wxObject])
+        # missing from docs; required so proxy calls correct override
+        spec.extend_interface 'wxRichTextStyleComboCtrl',
+                              'virtual void DoSetPopupControl(wxComboPopup* popup)',
+                              visibility: 'protected'
       end
 
     end

data/rakelib/lib/director/sizer.rb

@@ -20,7 +20,7 @@ module WXRuby3
         when 'wxSizer'
           spec.items << 'wxSizerFlags'
           spec.gc_as_untracked('wxSizerFlags')
-          if Config.instance.wx_version < '3.3.0'
+          unless Config.instance.wx_version > '3.2.4'
             # missing from docs
             spec.extend_interface 'wxSizerFlags',
                                   'wxSizerFlags& HorzBorder()'

data/rakelib/lib/director/window.rb

@@ -126,6 +126,10 @@ module WXRuby3
           else
             spec.ignore('wxWindow::SetAccessible',
                         'wxWindow::GetAccessible')
+            if Config.instance.wx_version > '3.2.4'
+              spec.ignore('wxWindow::CreateAccessible',
+                          'wxWindow::GetOrCreateAccessible')
+            end
           end
           spec.ignore_unless('USE_HOTKEY', %w[wxWindow::RegisterHotKey wxWindow::UnregisterHotKey])
           spec.ignore('wxWindow::SetSize(int, int)') # not useful as the wxSize variant will also accept an array

data/rakelib/lib/extractor/module.rb

@@ -117,6 +117,13 @@ module WXRuby3
         when 'file', 'namespace'
           Extractor.extracting_msg(kind, element, 'compoundname')
           element.xpath('sectiondef/memberdef').each { |node| self.add_element(node) }
+          # from doxygen 1.9.7 onwards some members are not included in the same XML file
+          # but referenced from another XML file; so we need to resolve such references
+          # and than add the resolved element
+          element.xpath('sectiondef/member').each do |node|
+            node = self.resolveRefId(node)
+            self.add_element(node)
+          end
 
         else
           raise ExtractorError.new('Unknown module item kind: %s' % kind)
@@ -124,6 +131,14 @@ module WXRuby3
         item
       end
 
+      def resolveRefId(node)
+        refid = node['refid'].split('_')
+        refid.pop
+        fname = File.join(Extractor.xml_dir, refid.join('_')+'.xml')
+        root = File.open(fname) {|f| Nokogiri::XML(f) }.root
+        root.at_xpath(".//sectiondef/memberdef[@id='#{node['refid']}']")
+      end
+
       # Add a new C++ function into the module that is written by hand, not
       # wrapped.
       def add_cpp_function(type, name, argsString, body, doc = nil, **kwargs)