wxruby3 0.9.0.pre.rc.2 → 0.9.0.pre.rc.3

data/lib/wx/doc/image.rb

@@ -11,23 +11,53 @@ module Wx
     # @return [Array<String>]
     def self.extensions; end
 
+    # Returns an array with the supported mime types of the available image handlers.
+    # @return [Array<String>]
+    def self.mime_types; end
+
     # returns a Hash with all supported extensions per available BitmapType
     # @return [Hash]
     def self.handler_extensions; end
 
-    # Searches for an art file with basename 'name' and creates an Image if found.
-    # Raises an ArgumentError if not found.
-    # Wx::ArtLocator::find_art is used to look up the art file using ::Kernel#caller_locations to
-    # determine the values for the 'art_path' and 'art_owner' arguments ('art_path' is set to the
-    # absolute path to the folder holding the caller's code and 'art_owner' to the basename of the
-    # caller's source file). The 'art_type' argument is set to <code>:icon</code>.
-    # @param [String,Symbol] name base name of art file
-    # @param [Wx::BitmapType,nil] bmp_type bitmap type for art file (nil means any supported type)
-    # @param [Integer] index  Index of the image to load in the case that the image file contains multiple images. This is only used by GIF, ICO and TIFF handlers. The default value (-1) means "choose the default image" and is interpreted as the first image (index=0) by the GIF and TIFF handler and as the largest and most colourful one by the ICO handler.
-    # @return [Wx::Image]
-    # @see Wx::ArtLocator::find_art
-    def self.Image(name, bmp_type = nil, index=-1); end
+    module Histogram
+
+      # Calculate an image histogram key from given RGB values.
+      # @param [Integer] r Red value
+      # @param [Integer] g Green value
+      # @param [Integer] b Blue value
+      # @return [Integer] key value
+      def make_key(r,g,b) end
+
+      # Find first colour that is not used in the image and has higher RGB values than RGB(r, g, b)
+      # @param [Integer] r Red value
+      # @param [Integer] g Green value
+      # @param [Integer] b Blue value
+      # @return [Array(Integer,Integer,Integer),nil] RGB values of first unused colour or nil if none found
+      def find_first_unused_colour(r=1, g=0, b=0) end
+
+    end
+
+    # Computes the histogram of the image and fills a hash table, indexed
+    # with integer keys built as 0xRRGGBB, containing pairs (Array) of integer values.
+    # For each pair the first value is the index of the first pixel in the colour in the image
+    # and the second value the number of pixels having the colour in the image.
+    # The returned Hash object is extended with the {Wx::Image::Histogram} mixin.
+    # @return [Hash] hash object extended with {Wx::Image::Histogram}
+    def compute_histogram; end
 
   end
 
+  # Searches for an art file with basename 'name' and creates an Image if found.
+  # Raises an ArgumentError if not found.
+  # Wx::ArtLocator::find_art is used to look up the art file using ::Kernel#caller_locations to
+  # determine the values for the 'art_path' and 'art_owner' arguments ('art_path' is set to the
+  # absolute path to the folder holding the caller's code and 'art_owner' to the basename of the
+  # caller's source file). The 'art_type' argument is set to <code>:icon</code>.
+  # @param [String,Symbol] name base name of art file
+  # @param [Wx::BitmapType,nil] bmp_type bitmap type for art file (nil means any supported type)
+  # @param [Integer] index  Index of the image to load in the case that the image file contains multiple images. This is only used by GIF, ICO and TIFF handlers. The default value (-1) means "choose the default image" and is interpreted as the first image (index=0) by the GIF and TIFF handler and as the largest and most colourful one by the ICO handler.
+  # @return [Wx::Image]
+  # @see Wx::ArtLocator::find_art
+  def self.Image(name, bmp_type = nil, index=-1); end
+
 end

data/lib/wx/doc/list_ctrl.rb

@@ -0,0 +1,32 @@
+
+class Wx::ListCtrl
+
+  include Enumerable
+
+  # Iterates all items in the list control passing each item (id) to the given block.
+  # @yieldparam [Integer] item
+  # @return [Object] result of last block iteration
+  def each(&block) end
+
+  # Iterates all selected items in the list control (like #get_next_item(item, Wx::LIST_NEXT_ALL, Wx::LIST_STATE_SELECTED))
+  # passing each item (id) to the given block.
+  # @yieldparam [Integer] item
+  # @return [Object] result of last block iteration
+  def each_selected(&block) end
+
+  # Returns array of selected items.
+  # @return [Array<Integer>] selected items
+  def get_selections; end
+
+  # Call this function to sort the items in the list control.
+  # The sorting method will call the given block repeatedly to compare two items from the list
+  # passing the <b>item data</b> for each item as well as the `data` argument given to the #sort_items method.
+  # The block should return 0 if the items are equal, negative value if the first item is less than the second
+  # one and positive value if the first one is greater than the second one.
+  # @param [Object] data user data to pass on to the sorting block
+  # @yieldparam [Object] item_data1 data for first item
+  # @yieldparam [Object] item_data2 data for second item
+  # @yieldparam [Object] data propagated data argument
+  def sort_items(data = nil, &block) end
+
+end

data/lib/wx/doc/log.rb

@@ -0,0 +1,28 @@
+
+module Wx
+
+  class Log
+
+    # Sets the current component for log info to the given value before executing the
+    # given block and restores the previous component value after the block returns.
+    # @param [String] comp component value for log info
+    def self.for_component(comp, &block) end
+
+  end
+
+  class LogStderr
+
+    # Creates a new LogStderr for the given file handle.
+    # Possible values are 2 for `stderr` and 1 for `stdout`.
+    # @param [Integer] fh file stream handle
+    def initialize(fh = 2) end
+  end
+
+  class LogNull
+
+    # Suspends logging before executing the given block and restarts logging when the block returns.
+    def self.no_log(&block) end
+
+  end
+
+end

data/lib/wx/doc/prt/printer_dc.rb

@@ -8,7 +8,7 @@ module Wx::PRT
     # @param [Wx::PRT::PrintData] print_data print_data defining the print settings
     # @yieldparam [Wx::PrinterDC] dc the PrinterDC instance to paint on
     # @return [Object] result of the block
-    def self.draw_on(win) end
+    def self.draw_on(print_data) end
 
   end
 
@@ -19,7 +19,7 @@ module Wx::PRT
     # @param [Wx::PRT::PrintData] print_data print_data defining the print settings
     # @yieldparam [Wx::PostScriptDC] dc the PostScriptDC instance to paint on
     # @return [Object] result of the block
-    def self.draw_on(win) end
+    def self.draw_on(print_data) end
 
   end
 

data/lib/wx/doc/scaled_dc.rb

@@ -1,5 +1,5 @@
 
-class Wx
+module Wx
 
   class ScaledDC < Wx::DC
 

data/lib/wx/doc/text_validator.rb

@@ -0,0 +1,12 @@
+
+class Wx::TextValidator
+
+  # @overload initialize(validator)
+  #   Copy constructor.
+  #   @param [Wx::TextValidator] validator validator to copy
+  # @overload initialize(style=Wx::FILTER_NONE)
+  #   Constructor taking a style.
+  #   @param [Integer] style One or more of the {Wx::TextValidatorStyle} styles. See #set_style.
+  def initialize(*args) end
+
+end

data/lib/wx/version.rb

@@ -1,3 +1,3 @@
 module Wx
-  WXRUBY_VERSION    = '0.9.0-rc.2'
+  WXRUBY_VERSION    = '0.9.0-rc.3'
 end

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

@@ -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

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

@@ -28,6 +28,31 @@ 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
           if Config.platform == :macosx && Config.instance.wx_version < '3.3'

data/rakelib/lib/director/event_loop.rb

@@ -0,0 +1,26 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+module WXRuby3
+
+  class Director
+
+    class GUIEventLoop < Director
+
+      def setup
+        super
+        spec.items << 'wxEventLoopBase'
+        spec.gc_as_untracked
+        spec.disable_proxies
+        spec.make_concrete 'wxGUIEventLoop'
+        spec.fold_bases 'wxGUIEventLoop' => 'wxEventLoopBase'
+        spec.ignore 'wxEventLoopBase::GetActive',
+                    'wxEventLoopBase::SetActive'
+      end
+    end # class GUIEventLoop
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/functions.rb

@@ -30,93 +30,89 @@ module WXRuby3
           // sprintf in ruby, then pass the composed message directly to the
           // log. This also avoids format string attacks.
           
+          static WxRuby_ID __filename_id("filename");
+          static WxRuby_ID __line_id("line");
+          static WxRuby_ID __func_id("func");
+          static WxRuby_ID __comp_id("component");
+
+          static const char* __wxruby_component = "wxapp";
+
+          // As the wxw logger will only make synchronous use of the filename, func and component pointers while
+          // processing the log entry and never store them we simply gather pointers but no copies 
+          static void do_log(wxLogLevel lvl, int argc, VALUE *argv, ...)
+          {
+            const char* filename = nullptr;
+            int line = 0;
+            const char* func = nullptr;
+            const char* component = __wxruby_component;
+
+            if (argc>1 && TYPE(argv[argc-1]) == T_HASH)
+            {
+              VALUE rb_hash = argv[--argc];
+              VALUE rb_fnm  = rb_hash_aref(rb_hash, ID2SYM(__filename_id.get_id()));
+              if (!NIL_P(rb_fnm) && TYPE(rb_fnm) == T_STRING) filename = StringValuePtr(rb_fnm);
+              VALUE rb_ln   = rb_hash_aref(rb_hash, ID2SYM(__line_id.get_id()));
+              if (!NIL_P(rb_ln) && TYPE(rb_ln) == T_FIXNUM) line = NUM2INT(rb_ln);
+              VALUE rb_func = rb_hash_aref(rb_hash, ID2SYM(__func_id.get_id()));
+              if (!NIL_P(rb_func) && TYPE(rb_func) == T_STRING) func = StringValuePtr(rb_func);
+              VALUE rb_comp = rb_hash_aref(rb_hash, ID2SYM(__comp_id.get_id()));
+              if (!NIL_P(rb_comp) && TYPE(rb_comp) == T_STRING) component = StringValuePtr(rb_comp);
+            }
+
+            VALUE log_msg = argc==1 ? argv[0] : rb_f_sprintf(argc, argv);
+            va_list list;
+            va_start(list, argv); // just a dummy to satisfy wxLogger::LogV 
+            wxLogger(lvl, filename, line, func, component).LogV(RSTR_TO_WXSTR(log_msg), list);
+          }
+
           // Log a Wx message with the given level to the current Wx log output
           static VALUE log_generic(int argc, VALUE *argv, VALUE self)
           {
-            if ( wxLog::IsEnabled() )
-              {
-                wxLogLevel lvl = static_cast<wxLogLevel> (NUM2INT(argv[0]));
-                VALUE log_msg = argc==2 ? argv[1] : rb_f_sprintf(argc-1, &argv[1]);
-                wxLog::OnLog( lvl,
-                              wxString(StringValuePtr(log_msg), wxConvUTF8),
-                              time(NULL) );
-              }
+            wxLogLevel lvl = static_cast<wxLogLevel> (NUM2INT(argv[0]));
+            do_log(lvl, argc-1, &argv[1]);
             return Qnil;
           }
           
           // Log a Wx low prio Message to the current Wx log output
           static VALUE log_info(int argc, VALUE *argv, VALUE self)
           {
-            if ( wxLog::IsEnabled() )
-              {
-                VALUE log_msg = argc==1 ? argv[0] : rb_f_sprintf(argc, argv);
-                wxLog::OnLog( wxLOG_Info,
-                              wxString(StringValuePtr(log_msg), wxConvUTF8),
-                              time(NULL) );
-              }
+            do_log(wxLOG_Info, argc, argv);
             return Qnil;
           }
           
           // Log a Wx verbose Message to the current Wx log output
           static VALUE log_verbose(int argc, VALUE *argv, VALUE self)
           {
-            if ( wxLog::IsEnabled() && wxLog::GetVerbose () )
-              {
-                VALUE log_msg = argc==1 ? argv[0] : rb_f_sprintf(argc, argv);
-                wxLog::OnLog( wxLOG_Info,
-                              wxString(StringValuePtr(log_msg), wxConvUTF8),
-                              time(NULL) );
-              }
+            if (wxLog::GetVerbose ())
+              do_log(wxLOG_Info, argc, argv);
             return Qnil;
           }
           
           // Log a Wx Message to the current Wx log output
           static VALUE log_message(int argc, VALUE *argv, VALUE self)
           {
-            if ( wxLog::IsEnabled() )
-              {
-                VALUE log_msg = argc==1 ? argv[0] : rb_f_sprintf(argc, argv);
-                wxLog::OnLog( wxLOG_Message,
-                              wxString(StringValuePtr(log_msg), wxConvUTF8),
-                              time(NULL) );
-              }
+            do_log(wxLOG_Message, argc, argv);
             return Qnil;
           }
           
           // Log a Wx Warning message to the current Wx log output
           static VALUE log_warning(int argc, VALUE *argv, VALUE self)
           {
-            if ( wxLog::IsEnabled() )
-              {
-                VALUE log_msg = argc==1 ? argv[0] : rb_f_sprintf(argc, argv);
-                wxLog::OnLog( wxLOG_Warning,
-                              wxString(StringValuePtr(log_msg), wxConvUTF8),
-                              time(NULL) );
-              }
+            do_log(wxLOG_Warning, argc, argv);
             return Qnil;
           }
           
           // Log an error message to the current output
           static VALUE log_error(int argc, VALUE *argv, VALUE self)
           {
-            if ( wxLog::IsEnabled() )
-              {
-                VALUE log_msg = argc==1 ? argv[0] : rb_f_sprintf(argc, argv);
-                wxLog::OnLog( wxLOG_Error,
-                              wxString(StringValuePtr(log_msg), wxConvUTF8),
-                              time(NULL) );
-              }
+            do_log(wxLOG_Error, argc, argv);
             return Qnil;
           }
 
           // Log a debug message
           static VALUE log_debug(int argc, VALUE *argv, VALUE self)
           {
-            if (wxLog::IsLevelEnabled(wxLOG_Debug, wxASCII_STR(wxLOG_COMPONENT)))
-            {
-                VALUE log_msg = argc==1 ? argv[0] : rb_f_sprintf(argc, argv);
-                wxLogDebug(wxString(StringValuePtr(log_msg), wxConvUTF8));
-            }
+            do_log(wxLOG_Debug, argc, argv);
             return Qnil;
           }
           

data/rakelib/lib/director/image.rb

@@ -77,6 +77,19 @@ module WXRuby3
             return ext_ary;
           }
 
+          static VALUE mime_types()
+          {
+            VALUE ext_ary = rb_ary_new();
+            wxList& hnd_lst = wxImage::GetHandlers();
+            for (wxList::compatibility_iterator node = hnd_lst.GetFirst();
+                    node; node = node->GetNext())
+            {
+              wxImageHandler *handler = (wxImageHandler *) node->GetData();
+              rb_ary_push(ext_ary, WXSTR_TO_RSTR(handler->GetMimeType()));
+            }
+            return ext_ary;
+          }
+
           static VALUE handler_extensions()
           {
             VALUE ext_hash = rb_hash_new();
@@ -157,6 +170,25 @@ module WXRuby3
             return rb_str_new( (const char*)rgb_data, length);
           }
           __HEREDOC
+        # ignore this so we do not have to wrap wxImageHistogram
+        spec.ignore 'wxImage::ComputeHistogram'
+        # add custom method simply returning Hash; finish off in pure Ruby
+        spec.add_extend_code 'wxImage', <<~__HEREDOC
+          VALUE compute_histogram()
+          {
+            VALUE rb_img_hist = rb_hash_new();
+            wxImageHistogram img_hist;
+            $self->ComputeHistogram(img_hist);
+            for (auto pair : img_hist)
+            {
+              VALUE rb_hist_entry = rb_ary_new();
+              rb_ary_push(rb_hist_entry, ULL2NUM(pair.second.index));
+              rb_ary_push(rb_hist_entry, ULL2NUM(pair.second.value));
+              rb_hash_aset(rb_img_hist, ULL2NUM(pair.first), rb_hist_entry);
+            }
+            return rb_img_hist;
+          }
+          __HEREDOC
         spec.do_not_generate(:functions)
       end
     end # class Image

data/rakelib/lib/director/list_ctrl.rb

@@ -100,6 +100,7 @@ module WXRuby3
             VALUE items = rb_ary_new();
             rb_ary_push(items, (VALUE)item1);
             rb_ary_push(items, (VALUE)item2);
+            rb_ary_push(items, (VALUE)data);
             VALUE the_order = rb_yield(items);
             return NUM2INT(the_order);
           }
@@ -183,9 +184,9 @@ module WXRuby3
             return Qnil;
           }	
           
-          void sort_items()
+          void sort_items(VALUE data = Qnil)
           {
-            self->SortItems(wxListCtrl_SortByYielding, 0);
+            $self->SortItems(wxListCtrl_SortByYielding, static_cast<wxIntPtr> (data));
           }
           __HEREDOC
         super