wxruby3 0.9.0 → 0.9.2

data/rakelib/lib/core/package.rb

@@ -105,7 +105,7 @@ module WXRuby3
       end
 
       def included_directors
-        directors.select { |dir| !Config.instance.excluded_module?(dir.spec) }
+        directors.select { |dir| Package.full_docs? || !Config.instance.excluded_module?(dir.spec) }
       end
 
       def director_for_class(class_name)
@@ -248,7 +248,7 @@ module WXRuby3
         end
 
         # next initialize all modules with classes depending (bases AND mixins) on classes in any modules already
-        # selected until there are no more modules left or none that are left depend on any selected ones
+        # selecteduntil there are no more modules left or none that are left depend on any selected ones
         while dir_inx = inc_dirs.find_index { |dir| !dir.spec.initialize_at_end && is_dir_with_fulfilled_deps?(dir, cls_set) }
           dir = inc_dirs[dir_inx]
           modreg = Spec.module_registry[dir.spec.module_name]
@@ -282,6 +282,7 @@ module WXRuby3
         Stream.transaction do
           fsrc = CodeStream.new(initializer_src)
           fsrc.puts '#include <ruby.h>'
+          fsrc.puts '#include <ruby/version.h>'
           fsrc.puts <<~__HEREDOC
             #ifndef WXRB_EXPORT_FLAG
             # if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
@@ -319,9 +320,11 @@ module WXRuby3
           fsrc.puts "VALUE #{module_variable} = 0;"
           fsrc.puts "WXRB_IMPORT_FLAG VALUE wxRuby_Core();" unless is_core?
           fsrc.puts
-          fsrc.puts '#define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)'
-          fsrc.puts
           if is_core?
+            fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'swigrun.inc'))
+            fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'swigrubyerrors.inc'))
+            fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'swigrubyrun.inc'))
+            fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'swigdirector.inc'))
             fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'funcall.inc'))
             fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'enum.inc'))
             fsrc << File.read(File.join(File.dirname(__FILE__), 'include', 'init.inc'))
@@ -356,8 +359,7 @@ module WXRuby3
               # generate constant definitions for feature defines from setup.h
               fsrc.puts %Q{VALUE mWxSetup = rb_define_module_under(#{module_variable}, "Setup");}
               Config.instance.features.each do |feature, val|
-                const_name = rb_wx_name(feature).gsub(/\A__|__\Z/, '')
-                fsrc.puts %Q{rb_define_const(mWxSetup, "#{const_name}", Q#{val});}
+                fsrc.puts %Q{rb_define_const(mWxSetup, "#{feature}", Q#{val});}
               end
             else
               fsrc.puts %Q{#{module_variable} = rb_define_module_under(wxRuby_Core(), "#{name}");}
@@ -520,10 +522,12 @@ module WXRuby3
             # ----------------------------------------------------------------------------
 
   
-            class Wx::EvtHandler
+            module Wx
 
-          __HEREDOC
-          fdoc.indent do
+              class EvtHandler
+
+            __HEREDOC
+          fdoc.indent(2) do
             fdoc.doc.puts "@!group #{name} Event handler methods"
             fdoc.puts
             evts_handled = ::Set.new
@@ -554,6 +558,8 @@ module WXRuby3
             fdoc.doc.puts '@!endgroup'
           end
           fdoc.puts
+          fdoc.puts '  end'
+          fdoc.puts
           fdoc.puts 'end'
         end
       end
@@ -631,6 +637,10 @@ module WXRuby3
       end
       private :generate_core_doc
 
+      def self.full_docs?
+        !!ENV['WXRUBY_FULLDOCS']
+      end
+
       def generate_docs
         # make sure all modules have been extracted from xml
         included_directors.each {|dir| dir.extract_interface(false, gendoc: true) }

data/rakelib/lib/core/parameter.rb

@@ -16,6 +16,9 @@ module WXRuby3
       CONST_RE = /(\A|\W)const(\W|\Z)/
       MULTI_WORD_TYPES = %w[char short int long]
       def initialize(param)
+        # prevent unwanted splitting on whitespaces in template type decls
+        param = param.gsub(/\<\s+/, '<')
+        param.gsub!(/\s+\>/, '>')
         @array = false
         if ::Array === param
           @ctype, @name, arr = param

data/rakelib/lib/core/spec.rb

@@ -327,7 +327,12 @@ module WXRuby3
       end
 
       def ignore(*names, ignore_doc: true)
-        names.flatten.each {|n| @ignores[n] = ignore_doc}
+        names.flatten.each { |n| @ignores[n] = {ignore: true, ignore_doc: ignore_doc} }
+        self
+      end
+
+      def ignore_unless(feature_set, *names)
+        names.flatten.each { |n| @ignores[n] = {ignore: feature_set} }
         self
       end
 

data/rakelib/lib/director/accelerator.rb

@@ -47,9 +47,8 @@ module WXRuby3
                    (TYPE($input) == T_STRING && RSTRING_LEN($input) == 1) );
             __CODE
         end
-        unless Config.instance.features_set?('__WXMSW__')
-          spec.ignore('wxAcceleratorTable::wxAcceleratorTable(const wxString &)')
-        end
+        spec.ignore_unless('WXMSW',
+                           'wxAcceleratorTable::wxAcceleratorTable(const wxString &)')
         spec.add_swig_code <<~__HEREDOC
           %warnfilter(509) wxAcceleratorTable::wxAcceleratorTable;
           __HEREDOC
@@ -69,7 +68,7 @@ module WXRuby3
               for (int i = 0; i < RARRAY_LEN($input); i++)
               {
                 SWIG_ConvertPtr(rb_ary_entry($input,i), (void **) &wx_acc_ent, 
-                                SWIGTYPE_p_wxAcceleratorEntry, 1);
+                                SWIGTYPE_p_wxAcceleratorEntry, 0);
                 if (wx_acc_ent == NULL) 
                   rb_raise(rb_eTypeError, "Reference to null wxAcceleratorEntry");
                 arr[i] = *wx_acc_ent;

data/rakelib/lib/director/accessible.rb

@@ -0,0 +1,47 @@
+# 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 Accessible < Director
+
+      def setup
+        super
+        spec.make_abstract 'wxAccessible'
+        spec.map 'wxAccessible**' => 'Wx::Accessible' do
+          map_in ignore: true, temp: 'wxAccessible* tmp', code: '$1 = &tmp;'
+          map_argout code: <<~__HEREDOC
+            if (tmp$argnum)
+            {
+              $result = SWIG_Ruby_AppendOutput($result, SWIG_NewPointerObj(SWIG_as_voidptr(tmp$argnum), SWIGTYPE_p_wxAccessible,  0));
+            }
+            __HEREDOC
+
+        end
+        spec.map 'wxString *' => 'String' do
+          map_in ignore: true, temp: 'wxString tmp', code: '$1 = &tmp;'
+          map_argout code: '$result = SWIG_Ruby_AppendOutput($result, WXSTR_TO_RSTR(tmp$argnum));'
+        end
+        spec.map 'wxAccRole *' => 'Wx::AccRole' do
+          map_in ignore: true, temp: 'wxAccRole tmp', code: '$1 = &tmp;'
+          map_argout code: <<~__HEREDOC
+            $result = SWIG_Ruby_AppendOutput($result, wxRuby_GetEnumValueObject("AccRole", static_cast<int>(tmp$argnum)));
+            __HEREDOC
+        end
+        spec.map_apply 'int * OUTPUT' => ['int * childCount', 'int * childId', 'int * toId']
+        spec.map_apply 'long * OUTPUT' => 'long * state'
+      end
+
+    end
+
+  end
+
+end
+

data/rakelib/lib/director/animation.rb

@@ -60,7 +60,7 @@ module WXRuby3
             void* ptr = 0;
             int res$argnum = SWIG_ConvertPtr($result, &ptr, SWIGTYPE_p_wxImage,  0 );
             if (!SWIG_IsOK(res$argnum)) {
-              Swig::DirectorTypeMismatchException::raise(rb_eTypeError, "Expected Wx::Image result");
+              Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError, "Expected Wx::Image result");
             }
             *$1 = *reinterpret_cast<wxImage*> (ptr);
           __CODE

data/rakelib/lib/director/animation_ctrl.rb

@@ -18,6 +18,26 @@ module WXRuby3
 
       def setup
         super
+        if Config.instance.wx_version >= '3.3.0'
+          spec.items << 'wxAnimationBundle'
+          spec.ignore 'wxAnimationBundle::GetAll', ignore_doc: false
+          spec.add_extend_code 'wxAnimationBundle', <<~__HEREDOC
+            VALUE get_all() const
+            {
+              const std::vector<wxAnimation>& ani_list = $self->GetAll();
+              VALUE rb_ani_list = rb_ary_new();
+              for (const wxAnimation& ani : ani_list)
+              {
+                VALUE rb_ani = SWIG_NewPointerObj(new wxAnimation(ani), SWIGTYPE_p_wxAnimation, SWIG_POINTER_OWN);
+                rb_ary_push(rb_ani_list, rb_ani);
+              }
+              return rb_ani_list;
+            }
+            __HEREDOC
+          spec.map 'const std::vector<wxAnimation>&' => 'Array<Wx::Animation>', swig: false do
+            map_out code: ''
+          end
+        end
         spec.do_not_generate :variables, :enums, :defines, :functions
       end
     end # class AnimationCtrl

data/rakelib/lib/director/app.rb

@@ -16,6 +16,15 @@ module WXRuby3
 
       def setup
         spec.items << 'wxAppConsole' << 'wxEventFilter'
+        if Config.instance.wx_version >= '3.3.0'
+          spec.items << 'wxDarkModeSettings'
+          spec.ignore_unless('WXMSW', 'wxDarkModeSettings', 'wxMenuColour')
+          if Config.instance.features_set?('WXMSW')
+            spec.disown 'wxDarkModeSettings *settings'
+            # wxDarkModeSettings does has have virt dtor; it's just not documented
+            spec.suppress_warning(514, 'wxDarkModeSettings')
+          end
+        end
         spec.fold_bases('wxApp' => 'wxAppConsole', 'wxAppConsole' => 'wxEventFilter')
         spec.override_inheritance_chain('wxApp', %w[wxEvtHandler wxObject])
         spec.ignore %w{
@@ -134,321 +143,23 @@ module WXRuby3
           extern "C" void Init_wxRubyStockObjects();
           extern void wxRuby_MarkProtectedEvtHandlerProcs();
 
-          #ifdef __WXMSW__
-          extern "C"
-          {
-            WXDLLIMPEXP_BASE HINSTANCE wxGetInstance();
-          }
-          #endif
-
           static wxVector<WXRBMarkFunction> WXRuby_Mark_List;
 
           WXRUBY_EXPORT void wxRuby_AppendMarker(WXRBMarkFunction marker)
           {
             WXRuby_Mark_List.push_back(marker);
           }
-          
-          class wxRubyApp : public wxApp
-          {
-          private:
-            static wxRubyApp* instance_;
-
-            bool is_running_ = false;
-          public:
-            static wxRubyApp* GetInstance () { return instance_; }
-
-            virtual ~wxRubyApp()
-            {
-          #ifdef __WXTRACE__
-            std::wcout << "~wxRubyApp" << std::endl;
-          #endif
-              // unlink
-              VALUE the_app = rb_const_get(#{spec.package.module_variable}, rb_intern("THE_APP"));
-              if (the_app != Qnil) 
-              {
-                DATA_PTR(the_app) = 0;
-              }
-            }
-          
-            // special event handler for destruction of windows which is done
-            // automatically by wxWidgets. Tag the object as having been destroyed
-            // by WxWidgets.
-            void OnWindowDestroy(wxWindowDestroyEvent &event)
-            {
-              wxObject* wx_obj = event.GetEventObject();
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "<= OnWindowDestroy [" << wx_obj << "]" << std::endl;
-          #endif
-              GC_SetWindowDeleted((void *)wx_obj);
-              event.Skip();
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "=> OnWindowDestroy [" << wx_obj << "]" << std::endl;
-          #endif
-            }
-
-            bool IsRunning() const { return this->is_running_; }
-          
-            // When ruby's garbage collection runs, if the app is still active, it
-            // cycles through all currently known SWIG objects and calls this
-            // function on each to preserve still active Wx::Windows, and also
-            // pending Wx::Events which have been queued from the Ruby side (the
-            // only sort of events that will be in the tracking hash.
-            static void markIterate(void* ptr, VALUE rb_obj)
-            {
-              // Check if it's a valid object (sometimes SWIG doesn't return what we're
-              // expecting), a descendant of Wx::Window (but not a Dialog), and if it has not yet been
-              // deleted by WxWidgets; if so, mark it.
-              if ( TYPE(rb_obj) == T_DATA )
-              {
-                if ( rb_obj_is_kind_of(rb_obj, wxRuby_GetWindowClass()) )
-                {
-                  rb_gc_mark(rb_obj);
-                }
-                else if (rb_obj_is_kind_of(rb_obj, wxRuby_GetDefaultEventClass()) )
-                  rb_gc_mark(rb_obj);
-              }
-              else if (TYPE(rb_obj) == T_ARRAY )
-              {
-                VALUE proc = rb_ary_entry(rb_obj, 0);
-                if (rb_obj_is_kind_of(proc, rb_cProc) || rb_obj_is_kind_of(proc, rb_cMethod))
-                {
-                  // keep the async call alive
-                  rb_gc_mark(rb_obj);
-                }
-              }
-            }
-          
-            // Implements GC protection across wxRuby. Always called because
-            // Wx::THE_APP is a constant so always checked in GC mark phase.
-            static void mark_wxRubyApp(void *ptr)
-            {
-          
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "=== Starting App GC mark phase" << std::endl;
-          #endif
-          
-              // If the App has ended, the ruby object will have been unlinked from
-              // the C++ one; this implies that all Windows have already been destroyed
-              // so there is no point trying to mark them, and doing so may cause
-              // errors.
-              if ( !wxRubyApp::GetInstance() || !wxRubyApp::GetInstance()->IsRunning() )
-              {
-          #ifdef __WXRB_DEBUG__
-                if (wxRuby_TraceLevel()>0)
-                  std::wcout << "=== App has ended, skipping mark phase" << std::endl;
-          #endif
-                return;
-              }
-          
-              // Mark any active (tracked) log target
-              wxLog* curLog = wxLog::GetActiveTarget();
-              VALUE rb_cur_log = wxRuby_FindTracking(curLog);
-              if (!NIL_P(rb_cur_log))
-              {
-                rb_gc_mark(rb_cur_log);
-              }
-
-              // Mark evt handler procs associated with live windows - see
-              // classes/EvtHandler.i
-              wxRuby_MarkProtectedEvtHandlerProcs();
-
-              // run registered markers
-              for (wxVector<WXRBMarkFunction>::iterator it = WXRuby_Mark_List.begin();
-                    it != WXRuby_Mark_List.end() ;++it)
-              {
-                (*it) ();
-              }
-          
-              // To do the main marking, primarily of Windows, iterate over SWIG's
-              // list of tracked objects
-              wxRuby_IterateTracking(&wxRubyApp::markIterate);
-          
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "=== App GC mark phase completed" << std::endl;
-          #endif
-            }
-          
-            // This is the method run when main_loop is called in Ruby
-            // wxEntry calls the C++ App::OnInit method
-            int main_loop()
-            {
-              VALUE rb_app = SWIG_RubyInstanceFor(this);
-              rb_define_const(#{spec.package.module_variable}, "THE_APP", rb_app);
-              this->Connect(wxEVT_DESTROY,
-                    wxWindowDestroyEventHandler(wxRubyApp::OnWindowDestroy));
-          
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "Calling wxEntry, this=" << this << std::endl;
-          #endif
-          
-          #ifdef __WXMSW__
-              extern int wxEntry(HINSTANCE hInstance,
-                         HINSTANCE WXUNUSED(hPrevInstance),
-                         wxCmdLineArgType WXUNUSED(pCmdLine),
-                         int nCmdShow);
-              wxEntry(wxGetInstance(),
-                      (HINSTANCE)0,
-                      (wxCmdLineArgType)"",
-                      (int)true);
-          #else
-              int argc = 1;
-              const char* argv[2] = { "ruby", 0 };
-              wxEntry(argc, const_cast<char**>(&argv[0]));
-          #endif
-          
-              rb_const_remove(#{spec.package.module_variable}, rb_intern("THE_APP"));
-
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "returned from wxEntry..." << std::endl;
-          #endif
-              rb_gc_start();
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "survived gc" << std::endl;
-          #endif
-
-              VALUE exc = rb_iv_get(rb_app, "@exception");
-              if (!NIL_P(exc))
-              {
-                rb_exc_raise(exc);
-              }
-              return 0;
-            }
-          
-            // This method initializes the stock objects (Pens, Brushes, Fonts)
-            // before yielding to ruby by calling the App's on_init method.
-            // Note that as of wxWidget 2.8, the stock fonts in particular cannot
-            // be initialized any earlier than this without crashing
-            bool OnInit() override
-            {
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "OnInit..." << std::endl;
-          #endif
-              // set standard App name
-              this->SetAppName(wxString("wxruby"));
-              // Signal that we've started              
-              wxRubyApp::instance_ = this; // there should ALWAYS EVER be only 1 app instance running/created
-              this->is_running_ = true;
-              // Set up the GDI objects
-              Init_wxRubyStockObjects();
-              // Get the ruby representation of the App object, and call the
-              // ruby on_init method to set up the initial window state
-              VALUE the_app = rb_const_get(#{spec.package.module_variable}, rb_intern("THE_APP"));
-              VALUE result  = wxRuby_Funcall(the_app, rb_intern("on_ruby_init"), 0, 0);
-        
-              // If on_init return any (ruby) true value, signal to wxWidgets to
-              // enter the main event loop by returning true, else return false
-              // which will make wxWidgets exit.
-              if ( result == Qfalse || result == Qnil )
-              {
-                wxRubyApp::instance_ = 0;
-                this->is_running_ = false;
-                return false;
-              }
-              else
-              {
-                return true;
-              }
-            }
-          
-            int OnExit() override
-            {
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "OnExit..." << std::endl;
-          #endif
 
-              // Get the ruby representation of the App object, and call the
-              // ruby on_exit method (if any) for application level cleanup
-              VALUE the_app = rb_const_get(#{spec.package.module_variable}, rb_intern("THE_APP"));
-              ID on_exit_id = rb_intern("on_exit");
-              if (rb_funcall(the_app, rb_intern("respond_to?"), 1, ID2SYM(on_exit_id)) == Qtrue)
-              {
-                wxRuby_Funcall(the_app, on_exit_id, 0, 0);
-              }
-
-              // perform wxRuby cleanup
-              _wxRuby_Cleanup();
-      
-              // execute base wxWidgets functionality 
-              return this->wxApp::OnExit();
-            }
-          
-            // actually implemented in ruby in classes/app.rb
-            virtual void OnAssertFailure(const wxChar *file, int line, const wxChar *func, const wxChar *cond, const wxChar *msg) override
-            {
-              VALUE rb_app = SWIG_RubyInstanceFor(this);
-              if (rb_during_gc() || NIL_P(rb_app))
-              {
-                std::wcout << file << "(" << line << "): ASSERT " << cond 
-                           << (NIL_P(rb_app) ? " fired without THE_APP in " : " fired during GC phase in ") 
-                           << func << "() with message [" << msg << "]" << std::endl;
-              }
-              else
-              {
-                VALUE obj0 = Qnil ;
-                VALUE obj1 = Qnil ;
-                VALUE obj2 = Qnil ;
-                VALUE obj3 = Qnil ;
-                VALUE obj4 = Qnil ;
-                
-                obj0 = rb_str_new2((const char *)wxString(file).utf8_str());
-                obj1 = INT2NUM(line);
-                obj2 = rb_str_new2((const char *)wxString(func).utf8_str());
-                obj3 = rb_str_new2((const char *)wxString(cond).utf8_str());
-                obj4 = rb_str_new2((const char *)wxString(msg).utf8_str());
-                (void)wxRuby_Funcall(rb_app, rb_intern("on_assert_failure"), 5,obj0,obj1,obj2,obj3,obj4);
-              }
-            }
-
-            void _wxRuby_Cleanup()
-            {
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "wxRuby_Cleanup..." << std::endl;
-          #endif
-              // Note in a global variable that the App has ended, so that we
-              // can skip any GC marking later
-              wxRubyApp::instance_ = 0;
-              this->is_running_ = false;
-      
-              // if a Ruby implemented logger has been installed clean that up
-              // before we exit, otherwise let wxWidgets handle things
-              wxLog *oldlog = wxLog::GetActiveTarget();
-              if (wxRuby_FindTracking(oldlog) != Qnil)
-              {
-                oldlog = wxLog::SetActiveTarget(new wxLogStderr);
-              }
-              else
-              {
-                oldlog = 0;
-              }
-              SetTopWindow(0);
-              if ( oldlog )
-              {
-                SWIG_RubyUnlinkObjects(oldlog);
-                SWIG_RubyRemoveTracking(oldlog);
-                delete oldlog;
-              }
-            }
-          };
-          wxRubyApp* wxRubyApp::instance_ = 0;
+          #include "wxRubyApp.h"          
 
           WXRUBY_EXPORT bool wxRuby_IsAppRunning()
           {
-            return wxRubyApp::GetInstance() != 0 && wxRubyApp::GetInstance()->IsRunning();  
+            return wxRubyApp::GetInstance() && wxRubyApp::GetInstance()->IsRunning();  
           }
 
           WXRUBY_EXPORT void wxRuby_ExitMainLoop(VALUE exception)
           {
-            if (wxRubyApp::GetInstance() != 0 && wxRubyApp::GetInstance()->IsRunning())
+            if (wxRubyApp::GetInstance() && wxRubyApp::GetInstance()->IsRunning())
             {
               if (!NIL_P(exception))
               {
@@ -470,10 +181,10 @@ module WXRuby3
             VALUE msg = rb_funcall(err, message_id(), 0);
             VALUE err_name = rb_funcall(rb_funcall(err, class_id(), 0), name_id(), 0);
             VALUE bt = rb_funcall(err, backtrace_id(), 0);
-            bt = rb_funcall(bt, join_id(), 1, rb_str_new2("\\n"));
+            bt = rb_funcall(bt, join_id(), 1, rb_str_new2("\\n\\tfrom "));
             std::cerr << std::endl
-                      << ' ' << StringValuePtr(err_name) << ": " << StringValuePtr(msg) << std::endl
-                      << StringValuePtr(bt) << std::endl;
+                      << ' ' << StringValuePtr(msg) << '(' << StringValuePtr(err_name) << ')' << std::endl
+                      << "\\tfrom " << StringValuePtr(bt) << std::endl << std::endl;
           }
           __HEREDOC
         super

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/art_provider.rb

@@ -53,7 +53,7 @@ module WXRuby3
               if ( TYPE(v_ret) == T_DATA )
               {
                 void* ptr;
-                SWIG_ConvertPtr(v_ret, &ptr, SWIGTYPE_p_wxSize, 1);
+                SWIG_ConvertPtr(v_ret, &ptr, SWIGTYPE_p_wxSize, 0);
                 return *reinterpret_cast< wxSize * >(ptr);
               }
               else if ( TYPE(v_ret) == T_ARRAY )

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'