wxruby3 0.9.0.pre.rc.1 → 0.9.0.pre.rc.3

data/rakelib/lib/config/macosx.rb

@@ -3,4 +3,123 @@
 # Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
-raise "MacOSX platform is unsupported as yet."
+require_relative './unixish'
+
+module WXRuby3
+
+  module Config
+
+    module Platform
+
+      def self.included(base)
+        base.class_eval do
+          include Config::UnixLike
+
+          def debug_command(*args)
+            args.unshift(FileUtils::RUBY)
+            args.unshift('--')
+            args.unshift('lldb')
+            args.join(' ')
+          end
+
+          def dll_mask
+            "{#{dll_ext},dylib}"
+          end
+
+          def get_rpath_origin
+            "@loader_path"
+          end
+
+          def check_rpath_patch
+            # no need to check anything; install_name_tool is part of XCode cmdline tools
+            # and without these we couldn't build anything
+            true
+          end
+
+          def patch_rpath(shlib, *rpath)
+            # don't leave old rpath-s behind
+            sh("install_name_tool -delete_rpath '@loader_path/../lib' #{shlib} 2>/dev/null", verbose: false) { |_,_| }
+            # add deployment rpath-s
+            sh("install_name_tool #{rpath.collect {|rp| "-add_rpath '#{rp}'"}.join(' ')} #{shlib} 2>/dev/null", verbose: false) { |_,_| }
+            true
+          end
+
+          def update_shlib_loadpaths(shlib, deplibs)
+            changes = deplibs.collect { |dl| "-change '#{dl}' '@rpath/#{File.basename(dl)}'"}
+            sh("install_name_tool #{changes.join(' ')} #{shlib} 2>/dev/null", verbose: false) { |_,_| }
+            true
+          end
+
+          def get_wx_libs
+            wx_libset = ::Set.new
+            lib_list = wx_config("--libs all").split(' ')
+            until lib_list.empty?
+              s = lib_list.shift
+              if s == '-framework'
+                wx_libset << "#{s} #{lib_list.shift}"
+              else
+                wx_libset << s
+              end
+            end
+            # some weird thing with this; at least sometimes '--libs all' will not output media library even if feature active
+            if features_set?('wxUSE_MEDIACTRL')
+              lib_list = wx_config("--libs media").split(' ')
+              until lib_list.empty?
+                s = lib_list.shift
+                if s == '-framework'
+                  wx_libset << "#{s} #{lib_list.shift}"
+                else
+                  wx_libset << s
+                end
+              end
+            end
+            wx_libset.collect { |s| s.dup }
+          end
+
+          def do_link(pkg)
+            objs = pkg.all_obj_files.collect { |o| File.join('..', o) }.join(' ') + ' '
+            sh "cd lib && #{WXRuby3.config.ld} #{WXRuby3.config.ldflags(pkg.lib_target)} #{objs} " +
+                 "#{WXRuby3.config.libs} #{WXRuby3.config.link_output_flag}#{pkg.lib_target}"
+          end
+
+          private
+
+          def wx_configure
+            bash('./configure --disable-sys-libs --without-liblzma --prefix=`pwd`/install --disable-tests --without-subdirs --disable-debug_info')
+          end
+
+          def wx_make
+            bash('make -j$(sysctl -n hw.logicalcpu) && make install')
+          end
+        end
+      end
+
+      def init_platform
+        init_unix_platform
+
+        @dll_pfx = 'lib'
+
+        if @wx_version
+          @cpp.sub!(/-std=gnu\+\+11/, '-std=gnu++14')
+          @ld.sub!(/-o\s*\Z/, '')
+
+          @extra_cflags.concat %w[-Wno-unused-function -Wno-conversion-null -Wno-sometimes-uninitialized
+                                  -Wno-overloaded-virtual -Wno-deprecated-copy]
+          @extra_cflags << ' -Wno-deprecated-declarations' unless @no_deprecated
+
+          # create a .dylib binary
+          @extra_ldflags << '-dynamic -bundle'
+
+          unless @wx_path.empty?
+            libdirs = @wx_libs.select {|s| s.start_with?('-L')}.collect {|s| s.sub(/^-L/,'')}
+            @exec_env['DYLD_LIBRARY_PATH'] = "#{ENV['DYLD_LIBRARY_PATH']}:#{dest_dir}:#{libdirs.join(':')}"
+          end
+        end
+      end
+      private :init_platform
+
+    end
+
+  end
+
+end

data/rakelib/lib/config/mingw.rb

@@ -21,8 +21,8 @@ module WXRuby3
     module Platform
 
       def self.included(base)
-        base.include Config::UnixLike
         base.class_eval do
+          include Config::UnixLike
 
           attr_reader :rescomp
 
@@ -52,6 +52,10 @@ module WXRuby3
 
           private
 
+          def wx_make
+            bash('make && make install')
+          end
+
           def wx_generate_xml
             chdir(File.join(ext_path, 'wxWidgets', 'docs', 'doxygen')) do
               sh({ 'WX_SKIP_DOXYGEN_VERSION_CHECK' => '1' }, 'regen.bat xml')
@@ -107,6 +111,7 @@ module WXRuby3
 
           @ruby_ldflags.each { |flags| flags.sub!(' $(DEFFILE)', '') } # cleanup for older RubyInstaller versions
           @ruby_ldflags.each { |flags| flags.gsub!(/-s(\s|\Z)/, '') } if @debug_build # do not strip debug symbols for debug build
+          @ruby_ldflags << '-s' if @release_build  # strip debug symbols for release build
           @ruby_cppflags << RB_CONFIG['debugflags'] if @debug_build
           @ruby_cppflags.each { |flags| flags.gsub!(/-O\d/, '-O0') } if @debug_build # disable optimizations for debug build
 

data/rakelib/lib/config/unixish.rb

@@ -52,6 +52,10 @@ module WXRuby3
              "#{WXRuby3.config.libs} #{WXRuby3.config.link_output_flag}#{pkg.lib_target}"
       end
 
+      def get_rpath_origin
+        "$ORIGIN"
+      end
+
       private
 
       def wx_checkout
@@ -76,6 +80,14 @@ module WXRuby3
         end
       end
 
+      def wx_configure
+        bash('./configure --prefix=`pwd`/install --disable-tests --without-subdirs --disable-debug_info')
+      end
+
+      def wx_make
+        bash('make -j$(nproc) && make install')
+      end
+
       def wx_build
         # initialize submodules
         unless sh('git submodule update --init')
@@ -83,12 +95,12 @@ module WXRuby3
           exit(1)
         end
         # configure wxWidgets
-        unless bash('./configure --prefix=`pwd`/install --disable-tests --without-subdirs --disable-debug_info')
+        unless wx_configure
           STDERR.puts "ERROR: Failed to configure wxWidgets."
           exit(1)
         end
         # make and install wxWidgets
-        unless bash('make && make install')
+        unless wx_make
           STDERR.puts "ERROR: Failed to build wxWidgets libraries."
           exit(1)
         end
@@ -117,6 +129,16 @@ module WXRuby3
         get_cfg_string('wxxml')
       end
 
+      def get_wx_libs
+        wx_libset = ::Set.new
+        wx_libset.merge wx_config("--libs all").split(' ')
+        # some weird thing with this; at least sometimes '--libs all' will not output media library even if feature active
+        if features_set?('wxUSE_MEDIACTRL')
+          wx_libset.merge wx_config("--libs media").split(' ')
+        end
+        wx_libset.collect { |s| s.dup }
+      end
+
       def init_unix_platform
         # Allow specification of custom wxWidgets build (mostly useful for
         # static wxRuby3 builds)
@@ -155,13 +177,7 @@ module WXRuby3
 
           @cpp         = wx_config("--cxx")
           @ld          = wx_config("--ld")
-          wx_libset = ::Set.new
-          wx_libset.merge wx_config("--libs all").split(' ')
-          # some weird thing with this; at least sometimes '--libs all' will not output media library even if feature active
-          if features_set?('wxUSE_MEDIACTRL')
-            wx_libset.merge wx_config("--libs media").split(' ')
-          end
-          @wx_libs = wx_libset.collect { |s| s.dup }
+          @wx_libs     = get_wx_libs
 
           # remove all warning flags provided by Ruby config
           @ruby_cppflags = @ruby_cppflags.collect { |flags| flags.split(' ') }.flatten.
@@ -169,8 +185,7 @@ module WXRuby3
           @ruby_cppflags.concat %w[-Wall -Wextra -Wno-unused-parameter]   # only keep these
           # add include flags
           @ruby_cppflags.concat ['-I.', *@ruby_includes.collect { |inc| "-I#{inc}" }]
-          @ruby_ldflags << '-s' if @release_build                         # strip debug symbols for release build
-          @ruby_ldflags << "-Wl,-rpath,\\$ORIGIN/../lib"                  # add default rpath
+          @ruby_ldflags << "-Wl,-rpath,'#{get_rpath_origin}/../lib'"      # add default rpath
           @ruby_libs <<  "-L#{RB_CONFIG['libdir']}"                       # add ruby lib dir
           # add ruby defined shared ruby lib(s); not any other flags
           @ruby_libs.concat RB_CONFIG['LIBRUBYARG_SHARED'].split(' ').select { |s| s.start_with?('-l')}

data/rakelib/lib/config.rb

@@ -245,11 +245,19 @@ module WXRuby3
     def do_link(_pkg)
     end
 
+    def get_rpath_origin
+      ''
+    end
+
     def check_rpath_patch
       true
     end
 
-    def patch_rpath(_shlib, _rpath)
+    def patch_rpath(_shlib, *)
+      true
+    end
+
+    def update_shlib_loadpaths(_shlib, _deplibs)
       true
     end
 
@@ -389,11 +397,12 @@ module WXRuby3
             @rb_docgen_path = File.join(Config.wxruby_root, @rb_docgen_dir)
 
             # Extra swig helper files to be built
-            @helper_modules = if macosx?
-                                %w|RubyStockObjects Mac|
-                              else
-                                %w|RubyStockObjects|
-                              end
+            @helper_modules = %w|RubyStockObjects|
+              # if macosx?
+              #                   %w|RubyStockObjects Mac|
+              #                 else
+              #                   %w|RubyStockObjects|
+              #                 end
             # helper to initialize on startup (stock objects can only be initialized after App creation)
             @helper_inits = @helper_modules - %w|RubyStockObjects|
 

data/rakelib/lib/core/mapping.rb

@@ -61,11 +61,16 @@ module WXRuby3
       "VOID_#{ctype.tr(' ', '_').upcase}"
     end
 
+    def self.strip_type_decl(ctype)
+      ctype = ctype.gsub(/const\s+/, '')
+      ctype.gsub!(/\s+(\*|&)/, '\1')
+      ctype.strip!
+      ctype.tr!('*&', '')
+      ctype
+    end
+
     def self.wx_type_to_rb(typestr)
-      c_type = typestr.gsub(/const\s+/, '')
-      c_type.gsub!(/\s+(\*|&)/, '\1')
-      c_type.strip!
-      c_type.tr!('*&', '')
+      c_type = strip_type_decl(typestr)
       (std_type_maps[c_type] || c_type).sub(/\Awx/, 'Wx::')
     end
 
@@ -854,15 +859,15 @@ module WXRuby3
         if @pattern.param_masks.first == parameters.first
           # just 'map' the parameter to itself
           param = parameters.shift # loose the 'mapped' parameter
-          return [RubyArg[Typemap.wx_type_to_rb(param.type), param_offset], nil]
+          return [RubyArg[nil, param_offset], nil]
         end
         nil
       end
 
       def map_output(type)
-        if matches?(type)
-          return Typemap.wx_type_to_rb(type)
-        end
+        # if matches?(type)
+        #   return Typemap.wx_type_to_rb(type)
+        # end
         nil
       end
 
@@ -994,7 +999,7 @@ module WXRuby3
             if result
               arg_in, arg_out = result
             else
-              arg_in = RubyArg.new(Typemap.wx_type_to_rb(parameters.first.type), param_offset)
+              arg_in = RubyArg.new(nil, param_offset)
               parameters.shift # loose the mapped param
             end
             # store mapped param
@@ -1009,7 +1014,7 @@ module WXRuby3
         def map_output(type)
           result = nil
           list.reverse_each.detect { |map| result = map.map_output(type) }
-          result || Typemap.wx_type_to_rb(type)
+          result
         end
 
         def to_swig

data/rakelib/lib/core/package.rb

@@ -182,7 +182,7 @@ module WXRuby3
               # any included mixins for this class?
               !mixins.has_key?(cls) ||
                 # if so, are all initialized?
-                mixins[cls].all? do |modname|
+                mixins[cls].keys.all? do |modname|
                   # same package?
                   if modname.start_with?(cls_helper.package.fullname)
                     wx_name = "wx#{modname.split('::').last}"
@@ -585,6 +585,9 @@ module WXRuby3
                 # Integer constant reflecting the sub-release number of the wxWidgets release used to build wxRuby
                 WXWIDGETS_SUBRELEASE_NUMBER = \#{Wx::WXWIDGETS_SUBRELEASE_NUMBER}
               
+                # Integer constant reflecting the wxWidgets wxDEBUG_LEVEL
+                WXWIDGETS_DEBUG_LEVEL = \#{Wx::WXWIDGETS_DEBUG_LEVEL}
+
                 # Boolean constant indicating if wxRuby was build in debug (true) or release (false) mode
                 DEBUG = \#{Wx::DEBUG}
               

data/rakelib/lib/core/spec.rb

@@ -43,6 +43,7 @@ module WXRuby3
         @interface_extensions = ::Hash.new
         @folded_bases = ::Hash.new
         @abstracts = ::Hash.new
+        @disowned_alloc = ::Set.new
         @mixins = ::Set.new
         @included_mixins = ::Hash.new
         @items = [modname]
@@ -165,7 +166,7 @@ module WXRuby3
           @gc_type = :GC_NEVER
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_NEVER }
+          names.flatten.each {|n| @gc_type[n] = :GC_NEVER }
         end
         self
       end
@@ -175,7 +176,7 @@ module WXRuby3
           @gc_type = :GC_MANAGE_AS_OBJECT
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_MANAGE_AS_OBJECT }
+          names.flatten.each {|n| @gc_type[n] = :GC_MANAGE_AS_OBJECT }
         end
         self
       end
@@ -185,7 +186,7 @@ module WXRuby3
           @gc_type = :GC_MANAGE_AS_WINDOW
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_MANAGE_AS_WINDOW }
+          names.flatten.each {|n| @gc_type[n] = :GC_MANAGE_AS_WINDOW }
         end
         self
       end
@@ -195,7 +196,7 @@ module WXRuby3
           @gc_type = :GC_MANAGE_AS_FRAME
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_MANAGE_AS_FRAME }
+          names.flatten.each {|n| @gc_type[n] = :GC_MANAGE_AS_FRAME }
         end
         self
       end
@@ -205,7 +206,7 @@ module WXRuby3
           @gc_type = :GC_MANAGE_AS_DIALOG
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_MANAGE_AS_DIALOG }
+          names.flatten.each {|n| @gc_type[n] = :GC_MANAGE_AS_DIALOG }
         end
         self
       end
@@ -215,7 +216,7 @@ module WXRuby3
           @gc_type = :GC_MANAGE_AS_EVENT
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_MANAGE_AS_EVENT }
+          names.flatten.each {|n| @gc_type[n] = :GC_MANAGE_AS_EVENT }
         end
         self
       end
@@ -225,7 +226,7 @@ module WXRuby3
           @gc_type = :GC_MANAGE_AS_SIZER
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_MANAGE_AS_SIZER }
+          names.flatten.each {|n| @gc_type[n] = :GC_MANAGE_AS_SIZER }
         end
         self
       end
@@ -235,7 +236,7 @@ module WXRuby3
           @gc_type = :GC_MANAGE_AS_REFCOUNTED
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_MANAGE_AS_REFCOUNTED }
+          names.flatten.each {|n| @gc_type[n] = :GC_MANAGE_AS_REFCOUNTED }
         end
         self
       end
@@ -245,7 +246,7 @@ module WXRuby3
           @gc_type = :GC_MANAGE_AS_UNTRACKED_REFCOUNTED
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_MANAGE_AS_UNTRACKED_REFCOUNTED }
+          names.flatten.each {|n| @gc_type[n] = :GC_MANAGE_AS_UNTRACKED_REFCOUNTED }
         end
         self
       end
@@ -255,7 +256,7 @@ module WXRuby3
           @gc_type = :GC_MANAGE_AS_UNTRACKED
         else
           @gc_type = ::Hash.new unless @gc_type.is_a?(::Hash)
-          names.each {|n| @gc_type[n] = :GC_MANAGE_AS_UNTRACKED }
+          names.flatten.each {|n| @gc_type[n] = :GC_MANAGE_AS_UNTRACKED }
         end
         self
       end
@@ -283,6 +284,16 @@ module WXRuby3
         self
       end
 
+      def allocate_disowned(cls)
+        @disowned_alloc << cls
+        post_processors << :fix_disowned_alloc unless post_processors.include? :fix_disowned_alloc
+        self
+      end
+
+      def allocate_disowned?(cls)
+        @disowned_alloc.include?(cls)
+      end
+
       def abstract?(cls)
         @abstracts.has_key?(cls) && @abstracts[cls]
       end
@@ -299,8 +310,8 @@ module WXRuby3
         @mixins.include?(cls)
       end
 
-      def include_mixin(cls, *module_names)
-        (@included_mixins[cls] ||= ::Set.new).merge module_names.flatten
+      def include_mixin(cls, mixin_module)
+        (@included_mixins[cls] ||= {}).merge!(mixin_module.is_a?(::Hash) ? mixin_module : {mixin_module => nil})
         self
       end
 

data/rakelib/lib/core/spec_helper.rb

@@ -171,6 +171,12 @@ module WXRuby3
       ifspec.included_mixins
     end
 
+    def allocate_disowned?(classdef_or_name)
+      class_def = (Extractor::ClassDef === classdef_or_name ?
+                     classdef_or_name : classdef_for_name(classdef_or_name))
+      ifspec.allocate_disowned?(class_def.name)
+    end
+
     def has_virtuals?(classdef_or_name)
       class_def = (Extractor::ClassDef === classdef_or_name ?
                      classdef_or_name : classdef_for_name(classdef_or_name))

data/rakelib/lib/director/app.rb

@@ -71,6 +71,35 @@ module WXRuby3
             return dynamic_cast<const wxRubyApp*>(self)->IsRunning();
           }
           __HEREDOC
+        if Config.platform == :macosx
+          # add accessor methods for the standard OSX menu items
+          spec.add_extend_code 'wxApp', <<~__HEREDOC
+            void set_mac_about_menu_itemid(long menu_itemid)
+            {
+              $self->s_macAboutMenuItemId = menu_itemid;
+            }
+            long get_mac_about_menu_itemid(long menu_itemid)
+            {
+              return $self->s_macAboutMenuItemId;
+            }
+            void set_mac_preferences_menu_itemid(long menu_itemid)
+            {
+              $self->s_macPreferencesMenuItemId = menu_itemid;
+            }
+            long get_mac_preferences_menu_itemid(long menu_itemid)
+            {
+              return $self->s_macPreferencesMenuItemId;
+            }
+            void set_mac_exit_menu_itemid(long menu_itemid)
+            {
+              $self->s_macExitMenuItemId = menu_itemid;
+            }
+            long get_mac_exit_menu_itemid(long menu_itemid)
+            {
+              return $self->s_macExitMenuItemId;
+            }
+            __HEREDOC
+        end
         spec.ignore [
           'wxEntry(int &,wxChar **)',
           'wxEntry(HINSTANCE,HINSTANCE,char *,int)'
@@ -339,7 +368,7 @@ module WXRuby3
             }
           
             // 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)
+            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))

data/rakelib/lib/director/aui_toolbar.rb

@@ -13,6 +13,47 @@ module WXRuby3
 
       def setup
         super
+        # for #set_custom_overflow_items
+        spec.map 'const wxAuiToolBarItemArray&' => 'Array<Wx::AUI::AuiToolbarItem>,nil' do
+          map_in temp: 'wxAuiToolBarItemArray tmp', code: <<~__CODE
+            if (!NIL_P($input))
+            {
+              if (TYPE($input) == T_ARRAY)
+              {
+                for (int i=0; i<RARRAY_LEN($input) ;++i)
+                {
+                  VALUE rb_el = rb_ary_entry($input, i);
+                  void* ptr = 0;
+                  int res = SWIG_ConvertPtr(rb_el, &ptr, SWIGTYPE_p_wxAuiToolBarItem,  0);
+                  if (!SWIG_IsOK(res) || ptr == 0) 
+                  {
+                    const char* msg;
+                    VALUE rb_msg;
+                    if (ptr)
+                    {
+                      rb_msg = rb_inspect(rb_el);
+                      msg = StringValuePtr(rb_msg);
+                    }
+                    else
+                    {
+                      msg = "null reference";
+                    }
+                    rb_raise(rb_eTypeError, "$symname : expected Wx::AUI::AuiToolbarItem for array element for $argnum but got %s",
+                             msg);
+                  }
+                  tmp.Add(*reinterpret_cast< wxAuiToolBarItem * >(ptr));
+                }
+              }
+              else
+              {
+                VALUE msg = rb_inspect($input);
+                rb_raise(rb_eArgError, "$symname : expected array for $argnum but got %s",
+                         StringValuePtr(msg));
+              }
+            }
+            $1 = &tmp;
+          __CODE
+        end
         spec.do_not_generate(:variables, :defines, :enums, :functions) # with AuiToolBarEvent
       end
     end # class AuiToolBar

data/rakelib/lib/director/brush.rb

@@ -20,7 +20,16 @@ module WXRuby3
         # these are defined and loaded in RubyStockObjects.i
         spec.ignore %w[
           wxBLUE_BRUSH wxGREEN_BRUSH wxYELLOW_BRUSH wxWHITE_BRUSH wxBLACK_BRUSH wxGREY_BRUSH
-          wxMEDIUM_GREY_BRUSH wxLIGHT_GREY_BRUSH wxTRANSPARENT_BRUSH wxCYAN_BRUSH wxRED_BRUSH wxTheBrushList]
+          wxMEDIUM_GREY_BRUSH wxLIGHT_GREY_BRUSH wxTRANSPARENT_BRUSH wxCYAN_BRUSH wxRED_BRUSH]
+        # do not expose this
+        spec.ignore 'wxTheBrushList'
+        # provide it's functionality as a class method of Brush instead
+        spec.add_extend_code 'wxBrush', <<~__HEREDOC
+          static wxBrush* find_or_create_brush(const wxColour &colour, wxBrushStyle style=wxBRUSHSTYLE_SOLID)
+          {
+            return wxTheBrushList->FindOrCreateBrush(colour, style);
+          }
+          __HEREDOC
       end
     end # class Brush
 

data/rakelib/lib/director/combobox.rb

@@ -15,7 +15,7 @@ module WXRuby3
         super
         setup_ctrl_with_items('wxComboBox')
         # mixin TextEntry
-        spec.include_mixin 'wxComboBox', 'Wx::TextEntry'
+        spec.include_mixin 'wxComboBox', { 'Wx::TextEntry' => 'wxTextEntryBase' }
         spec.override_inheritance_chain('wxComboBox',
                                         %w[wxControlWithItems
                                            wxControl

data/rakelib/lib/director/context_help_button.rb

@@ -0,0 +1,23 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require_relative './button'
+
+module WXRuby3
+
+  class Director
+
+    class ContextHelpButton < Button
+
+      def setup
+        super
+        spec.items << 'wxContextHelp'
+        spec.no_proxy 'wxContextHelp'
+      end
+    end # class ContextHelpButton
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/dialog.rb

@@ -28,10 +28,41 @@ module WXRuby3
             }
           __HEREDOC
         when 'wxMessageDialog'
+          spec.ignore 'wxMessageDialog::ButtonLabel'
+          spec.map 'const ButtonLabel&' => 'String,Integer' do
+            add_header_code 'typedef wxMessageDialog::ButtonLabel ButtonLabel;'
+            map_in temp: 'std::unique_ptr<wxMessageDialog::ButtonLabel> tmp', code: <<~__CODE
+              if (TYPE($input) == T_STRING)
+              {
+                tmp = std::make_unique<wxMessageDialog::ButtonLabel> (RSTR_TO_WXSTR($input));
+              }
+              else if (TYPE($input) == T_FIXNUM || wxRuby_IsAnEnum($input))
+              {
+                tmp = std::make_unique<wxMessageDialog::ButtonLabel> (NUM2INT($input));
+              }
+              else
+              {
+                rb_raise(rb_eArgError, "Expected string or stock id for %d", $argnum-1);
+              }
+              $1 = tmp.get();
+              __CODE
+            map_directorin code: <<~__CODE
+              if ($1.GetStockId() != wxID_NONE)
+              { $input = INT2NUM($1.GetStockId()); }
+              else
+              { $input = WXSTR_TO_RSTR($1.GetAsString()); }
+              __CODE
+          end
         when 'wxFontDialog'
           # ignore the non-const version
-          spec.ignore 'wxFontDialog::GetFontData'
-          spec.regard 'wxFontDialog::GetFontData() const'
+          if Config.platform == :macosx && Config.instance.wx_version < '3.3'
+            # MacOSX implementation is incorrect so we need to use
+            # the non-const definition here
+            spec.ignore 'wxFontDialog::GetFontData() const'
+          else
+            spec.ignore 'wxFontDialog::GetFontData'
+            spec.regard 'wxFontDialog::GetFontData() const'
+          end
         when 'wxFileDialog'
           # override the wxArrayString& typemap for GetFilenames and GetPaths
           spec.map 'wxArrayString&' => 'Array<String>' do