wxruby3 0.9.0.pre.beta.13 → 0.9.0.pre.rc.1

data/rakelib/lib/core/mapping.rb

@@ -223,13 +223,13 @@ module WXRuby3
         def map_to(typedef)
           if ::Hash === typedef
             typedef.each_pair do |argmasks, type|
-              pattern = @patterns.detect { |ps| ps == argmasks }
+              pattern = @map.patterns.detect { |ps| ps == argmasks }
               raise "Unknown parameter set [#{argmasks}] for [#{@map}]" unless pattern
-              @to[pattern] = type
+              @to[pattern] = _get_mapped_type(type)
             end
           else
-            @patterns.inject(@to) do |map, pattern|
-              map[pattern] = typedef
+            @map.patterns.inject(@to) do |map, pattern|
+              map[pattern] = _get_mapped_type(typedef)
               map
             end
           end
@@ -422,7 +422,7 @@ module WXRuby3
       end
 
       def map_out(ignore: nil, to: nil, temp: nil, code: nil, &block)
-        @out = Out.new(self, ignore: ignore, to: nil, temp: temp, code: code, &block)
+        @out = Out.new(self, ignore: ignore, to: to, temp: temp, code: code, &block)
       end
 
       def map_freearg(temp: nil, code: nil, &block)

data/rakelib/lib/core/spec.rb

@@ -250,12 +250,12 @@ module WXRuby3
         self
       end
 
-      def gc_as_temporary(*names)
+      def gc_as_untracked(*names)
         if names.empty?
-          @gc_type = :GC_MANAGE_AS_TEMP
+          @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_TEMP }
+          names.each {|n| @gc_type[n] = :GC_MANAGE_AS_UNTRACKED }
         end
         self
       end
@@ -291,6 +291,10 @@ module WXRuby3
         @abstracts.has_key?(cls) && !@abstracts[cls]
       end
 
+      def concretes
+        @abstracts.keys.select { |cls| concrete?(cls) }
+      end
+
       def mixin?(cls)
         @mixins.include?(cls)
       end

data/rakelib/lib/core/spec_helper.rb

@@ -153,6 +153,10 @@ module WXRuby3
       ifspec.abstract?(class_def.name) || (class_def.abstract && !ifspec.concrete?(class_def.name))
     end
 
+    def explicit_concretes
+      ifspec.concretes
+    end
+
     def mixins
       ifspec.mixins
     end
@@ -183,12 +187,16 @@ module WXRuby3
           return :GC_MANAGE_AS_SIZER if classdef.is_derived_from?('wxSizer') || classdef.name == 'wxSizer'
           return :GC_MANAGE_AS_REFCOUNTED if classdef.is_derived_from?('wxRefCounter')
           return :GC_MANAGE_AS_OBJECT if classdef.is_derived_from?('wxObject') || classdef.name == 'wxObject'
-          return :GC_MANAGE_AS_TEMP
+          return :GC_MANAGE_AS_UNTRACKED
         end
       end
       ifspec.gc_type(classdef.name) || :GC_NEVER
     end
 
+    def is_tracked?(classdef)
+      gc_type(classdef) != :GC_MANAGE_AS_UNTRACKED
+    end
+
     def includes
       ifspec.includes
     end

data/rakelib/lib/director/accelerator.rb

@@ -37,7 +37,7 @@ module WXRuby3
             }
           }
           __HEREDOC
-        spec.map 'int keyCode' => 'Integer' do
+        spec.map 'int keyCode' => 'Integer,String' do
           map_in code: '$1 = wxRuby_RubyStringOrIntToKeyCode($input);'
           map_typecheck precedence: 'INT32', code: <<~__CODE
             $1 = ( (TYPE($input) == T_FIXNUM) || wxRuby_IsAnEnum($input) ||

data/rakelib/lib/director/app.rb

@@ -12,8 +12,8 @@ module WXRuby3
     class App < EvtHandler
 
       def setup
-        spec.items << 'wxAppConsole'
-        spec.fold_bases('wxApp' => 'wxAppConsole')
+        spec.items << 'wxAppConsole' << 'wxEventFilter'
+        spec.fold_bases('wxApp' => 'wxAppConsole', 'wxAppConsole' => 'wxEventFilter')
         spec.override_inheritance_chain('wxApp', %w[wxEvtHandler wxObject])
         spec.ignore %w{
           wxApp.ProcessMessage
@@ -78,6 +78,7 @@ module WXRuby3
         spec.no_proxy %w{
           wxApp::GetDisplayMode
           wxApp::GetTopWindow
+          wxApp::OnAssertFailure
         }
         spec.include %w{
           wx/init.h
@@ -340,7 +341,28 @@ 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)
             {
-              std::wcout << "ASSERT fired" << std::endl;
+              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()

data/rakelib/lib/director/art_provider.rb

@@ -15,7 +15,11 @@ module WXRuby3
         spec.use_class_implementation('wxArtProvider', 'wxRubyArtProvider')
         spec.ignore('wxArtProvider::Insert') # deprecated and problematic
         spec.ignore('wxArtProvider::Remove') # problematic as adding disowns the art provider, use Delete
-        spec.no_proxy('wxArtProvider')
+        # regard protected methods
+        spec.regard 'wxArtProvider::DoGetSizeHint',
+                    'wxArtProvider::CreateBitmap',
+                    'wxArtProvider::CreateBitmapBundle',
+                    'wxArtProvider::CreateIconBundle'
         spec.include('wx/artprov.h')
         spec.add_swig_code <<~__HEREDOC
           // ArtId and ArtClient are basically just strings ...

data/rakelib/lib/director/aui_pane_info.rb

@@ -11,7 +11,7 @@ module WXRuby3
 
       def setup
         spec.disable_proxies
-        spec.gc_as_temporary
+        spec.gc_as_untracked
         spec.regard %w[
           wxAuiPaneInfo::name
           wxAuiPaneInfo::caption

data/rakelib/lib/director/aui_tab_ctrl.rb

@@ -16,7 +16,7 @@ module WXRuby3
         super
         # now replace items because wxAuiTabCtrl is actually not documented (!!!)
         spec.items.replace %w[wxAuiTabContainerButton]
-        spec.gc_as_temporary 'wxAuiTabContainerButton'
+        spec.gc_as_untracked 'wxAuiTabContainerButton'
         spec.no_proxy %w[wxAuiTabCtrl wxAuiTabContainerButton]
         spec.swig_import %w[swig/classes/include/wxObject.h swig/classes/include/wxEvtHandler.h swig/classes/include/wxWindow.h swig/classes/include/wxControl.h]
         # cannot use #add_extend_code because we do not have an actual parsed XML item

data/rakelib/lib/director/bitmap.rb

@@ -11,7 +11,8 @@ module WXRuby3
 
       def setup
         spec.items << 'wxBitmapBundle' << 'wxMask'
-        spec.gc_as_object 'wxBitmapBundle'
+        spec.gc_as_untracked 'wxBitmap'
+        spec.gc_as_untracked 'wxBitmapBundle'
         spec.require_app 'wxBitmap',
                          'wxBitmapBundle',
                          'wxMask'

data/rakelib/lib/director/bitmap_combobox.rb

@@ -0,0 +1,32 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require_relative './ctrl_with_items'
+
+module WXRuby3
+
+  class Director
+
+    class BitmapComboBox < ControlWithItems
+
+      def setup
+        super
+        setup_ctrl_with_items('wxBitmapComboBox')
+        spec.override_inheritance_chain('wxBitmapComboBox',
+                                        %w[wxComboBox
+                                           wxControlWithItems
+                                           wxControl
+                                           wxWindow
+                                           wxEvtHandler
+                                           wxObject])
+        spec.ignore 'wxBitmapComboBox::Insert(const wxString &, const wxBitmap &, unsigned int, wxClientData *)',
+                    'wxBitmapComboBox::Append(const wxString &, const wxBitmap &, wxClientData *)'
+      end
+
+    end # class BitmapComboBox
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/brush.rb

@@ -12,6 +12,7 @@ module WXRuby3
       def setup
         super
         spec.disable_proxies
+        spec.gc_as_untracked 'wxBrush'
         # all but the default ctor require a running App
         spec.require_app 'wxBrush::wxBrush(const wxColour &colour, wxBrushStyle style)',
                          'wxBrush::wxBrush(const wxBitmap &stippleBitmap)',

data/rakelib/lib/director/busy_info.rb

@@ -13,7 +13,7 @@ module WXRuby3
         super
         spec.items << 'wxBusyInfoFlags'
         spec.disable_proxies
-        spec.gc_as_temporary 'wxBusyInfo', 'wxBusyInfoFlags'
+        spec.gc_as_untracked 'wxBusyInfo', 'wxBusyInfoFlags'
         # again C++ type guards do not work with Ruby
         # need to Rubify this
         spec.make_abstract 'wxBusyInfo'

data/rakelib/lib/director/choice.rb

@@ -23,6 +23,7 @@ module WXRuby3
         # redundant with good typemaps
         spec.ignore('wxChoice::wxChoice(wxWindow *,wxWindowID,const wxPoint &,const wxSize &,int,const wxString[],long,const wxValidator &,const wxString &)')
         spec.ignore('wxChoice::Create(wxWindow *,wxWindowID,const wxPoint &,const wxSize &,int,const wxString[],long,const wxValidator &,const wxString &)')
+        spec.ignore('wxChoice::IsSorted') # provided by ControlWithItems
       end
 
     end # class Choice

data/rakelib/lib/director/clipboard.rb

@@ -13,7 +13,7 @@ module WXRuby3
 
       def setup
         super
-        spec.gc_as_temporary # don't even track Clipboard objects
+        spec.gc_as_untracked # don't even track Clipboard objects
         # there is no need or support for clipboard derivatives
         # not least because wxRuby only ever allows a single global clipboard
         spec.disable_proxies

data/rakelib/lib/director/colour.rb

@@ -10,6 +10,7 @@ module WXRuby3
     class Colour < Director
 
       def setup
+        spec.gc_as_untracked('wxColour')
         spec.require_app 'wxColour::wxColour(const wxColour&)'
         spec.ignore(%w[
           wxColour::GetPixel wxTransparentColour wxColour::operator!=

data/rakelib/lib/director/colour_picker_ctrl.rb

@@ -13,7 +13,7 @@ module WXRuby3
 
       def setup
         super
-        spec.add_swig_code '%feature("notabstract") wxColourPickerCtrl;'
+        spec.make_concrete 'wxColourPickerCtrl'
         spec.do_not_generate(:variables, :defines, :enums, :functions) # with ColourPickerEvent
       end
     end # class ColourPickerCtrl

data/rakelib/lib/director/combobox.rb

@@ -22,8 +22,7 @@ module WXRuby3
                                            wxWindow
                                            wxEvtHandler
                                            wxObject])
-        spec.ignore(%w[
-          wxComboBox::IsEmpty])
+        spec.ignore('wxComboBox::IsEmpty')    # ambiguous ControlWithItems<>TextEntry
         spec.rename_for_ruby(
           'SetTextSelectionRange' => 'wxComboBox::SetSelection(long, long)',
           'GetTextSelectionRange' => 'wxComboBox::GetSelection(long *, long *) const')

data/rakelib/lib/director/ctrl_with_items.rb

@@ -47,6 +47,9 @@ 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'
           # for doc only
           spec.map 'void** clientData' => 'Array', swig: false do
             map_in code: ''

data/rakelib/lib/director/cursor.rb

@@ -10,6 +10,7 @@ module WXRuby3
     class Cursor < Director
 
       def setup
+        spec.gc_as_untracked 'wxCursor'
         # all but the default ctor require a running App
         spec.require_app 'wxCursor::wxCursor(const wxString &, wxBitmapType, int, int)',
                          'wxCursor::wxCursor(wxStockCursor)',

data/rakelib/lib/director/data_object.rb

@@ -44,13 +44,11 @@ module WXRuby3
         spec.ignore 'wxTextDataObject::GetAllFormats'
 
         %w[wxDataObjectComposite wxBitmapDataObject wxFileDataObject wxTextDataObject wxImageDataObject wxURLDataObject].each do |kls|
-          spec.add_swig_code <<~__HEREDOC
-            // SWIG gets confused and doesn't realise that various virtual methods
-            // from wxDataObject are implemented fully in this subclass, and so,
-            // believing it to be abstract doesn't provide an allocator for this
-            // class. This undocumented feature overrides this.
-            %feature("notabstract") #{kls};
-            __HEREDOC
+          # SWIG gets confused and doesn't realise that various virtual methods
+          # from wxDataObject are implemented fully in these subclasses, and so,
+          # believing it to be abstract doesn't provide an allocator for this
+          # class. This overrides this.
+          spec.make_concrete kls
         end
 
         # Once a DataObject has been added, it belongs to the wxDataObjectComposite object,

data/rakelib/lib/director/dc.rb

@@ -13,8 +13,12 @@ module WXRuby3
 
       def setup
         super
+        # it's not safe to track DC objects as these are often created on the stack in C++
+        # before being passed to Ruby methods
+        # as we cannot capture their deletion in anyway this would leave the tracked items
+        # registered and reused when future stack allocated DC's happen to have the same address
+        spec.gc_as_untracked
         spec.ignore [
-          'wxDC::StartPage',
           'wxDC::GetPartialTextExtents',
           'wxDC::DrawLines(const wxPointList *,wxCoord,wxCoord)',
           'wxDC::DrawPolygon(const wxPointList *,wxCoord,wxCoord,wxPolygonFillMode)',

data/rakelib/lib/director/defs.rb

@@ -25,6 +25,9 @@ module WXRuby3
           wxINT64_MAX
           wxUINT64_MAX
           wxVaCopy
+          wxDELETE
+          wxDELETEA
+          wxSwap
         }
         if Config.instance.wx_version >= '3.3.0'
           spec.ignore 'wxOVERRIDE'