wxruby3 0.9.0.pre.rc.3 → 0.9.0

data/rakelib/lib/director/pgvalidation_info.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -15,6 +18,11 @@ module WXRuby3
         spec.gc_as_untracked 'wxPGValidationInfo'
         if Config.instance.wx_version < '3.3.0'
           spec.ignore 'wxPGVFBFlags' # not a constant but a rather a clumsy typedef
+          spec.map 'wxPGVFBFlags' => 'Integer' do
+            map_in code: '$1 = (unsigned char)NUM2UINT($input);'
+            map_out code: '$result = UINT2NUM((unsigned int)$1);'
+          end
+        else # from 3.3.0 this is an enum but docs are still missing
         end
       end
     end # class PGValidationInfo

data/rakelib/lib/director/pickerbase.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'

data/rakelib/lib/director/platform_info.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -12,6 +15,11 @@ module WXRuby3
       def setup
         super
         spec.gc_as_untracked
+        spec.items << 'wxVersionInfo' << 'wxLinuxDistributionInfo'
+        spec.regard 'wxLinuxDistributionInfo::Id',
+                    'wxLinuxDistributionInfo::Release',
+                    'wxLinuxDistributionInfo::CodeName',
+                    'wxLinuxDistributionInfo::Description'
         spec.make_abstract('wxPlatformInfo')
         spec.ignore 'wxPlatformInfo::wxPlatformInfo',
                     'wxPlatformInfo::operator==',

data/rakelib/lib/director/popup_window.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'
@@ -32,6 +35,16 @@ module WXRuby3
         # for upcalls
         spec.extend_interface('wxPopupWindow',
                               'virtual bool Show(bool show = true) override')
+        # For ProcessLeftDown
+        spec.map 'wxMouseEvent &' => 'Wx::MouseEvent' do
+          map_directorin code: <<~__CODE
+            #ifdef __WXRB_DEBUG__
+            $input = wxRuby_WrapWxEventInRuby(this, static_cast<wxEvent*> (&$1));
+            #else
+            $input = wxRuby_WrapWxEventInRuby(static_cast<wxEvent*> (&$1));
+            #endif
+            __CODE
+        end
       end
 
     end # class PopupWindow

data/rakelib/lib/director/preview_frame.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './frame'
@@ -57,7 +60,7 @@ module WXRuby3
         spec.rename_for_ruby('init' => 'wxPreviewFrame::Initialize')
         # We do not wrap the (undocumented) wxPrintPreviewBase so map this to wxPrintPreview what
         # in all cases will be the actual base being used.
-        spec.ignore 'wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase *, wxWindow *,const wxString &,const wxPoint &,const wxSize &,long,const wxString &)'
+        spec.ignore 'wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase *, wxWindow *,const wxString &,const wxPoint &,const wxSize &,long,const wxString &)', ignore_doc: false
         spec.extend_interface('wxPreviewFrame',
             'wxPreviewFrame(wxPrintPreview *preview, wxWindow *parent, const wxString &title="Print Preview", const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE, const wxString &name=wxFrameNameStr)')
         # non-functional map for doc gen

data/rakelib/lib/director/print_data.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/print_dialog.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/printer.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -28,14 +31,19 @@ module WXRuby3
         spec.add_header_code <<~__HEREDOC
           static void GC_mark_wxPrintPreview(void *ptr)
           {
-            wxPrintPreview* print_preview = (wxPrintPreview*)ptr;
-            wxPrintout* printout = print_preview->GetPrintout();
-            rb_gc_mark( SWIG_RubyInstanceFor(printout) );
-            wxPrintout* printout_for_printing = print_preview->GetPrintoutForPrinting();
-            rb_gc_mark( SWIG_RubyInstanceFor(printout_for_printing) );
+            if (ptr)
+            {
+              wxPrintPreview* print_preview = (wxPrintPreview*)ptr;
+              wxPrintout* printout = print_preview->GetPrintout();
+              rb_gc_mark( SWIG_RubyInstanceFor(printout) );
+              wxPrintout* printout_for_printing = print_preview->GetPrintoutForPrinting();
+              rb_gc_mark( SWIG_RubyInstanceFor(printout_for_printing) );
+            }
           }
           __HEREDOC
         spec.add_swig_code '%markfunc wxPrintPreview "GC_mark_wxPrintPreview";'
+        # as we do not support derived previews there is no need to support these
+        spec.ignore 'wxPrintPreview::SetCanvas', 'wxPrintPreview::PaintPage'
         # for GetCanvas
         spec.ignore('wxPrintPreview::GetCanvas', ignore_doc: false)
         spec.extend_interface('wxPrintPreview',

data/rakelib/lib/director/property_grid.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'
@@ -120,6 +123,32 @@ module WXRuby3
                               'wxWindow* GetPrimaryEditor() const',
                               'wxWindow* GetEditorControlSecondary() const',
                               'wxRect GetPropertyRect(const wxPGProperty* p1, const wxPGProperty* p2) const'
+        # for SetSelection
+        spec.map 'const wxArrayPGProperty &newSelection' => 'Array<Wx::PG::PGProperty>' do
+          map_in temp: 'wxArrayPGProperty tmp', code: <<~__CODE
+            if (TYPE($input) == T_ARRAY)
+            {
+              for (int i = 0; i < RARRAY_LEN($input); i++)
+              {
+                void* ptr = 0;
+                VALUE rb_pgprop = rb_ary_entry($input, i);
+                int res = SWIG_ConvertPtr(rb_pgprop, &ptr,SWIGTYPE_p_wxPGProperty, 0);
+                if (!SWIG_IsOK(res)) 
+                {
+                  VALUE msg = rb_inspect($input);
+                  rb_raise(rb_eTypeError, "Expected array of Wx::PG::PGProperty for 1 but got %s", StringValuePtr(msg));
+                }
+                wxPGProperty *pgprop_ptr = reinterpret_cast< wxPGProperty * >(ptr);
+                tmp.push_back(pgprop_ptr);
+              }
+              $1 = &tmp;
+            }
+            else
+            {
+              SWIG_exception_fail(SWIG_TypeError, Ruby_Format_TypeError( "", "Array","$symname", $argnum, $input));
+            } 
+            __CODE
+        end
         # add extension code to retrieve the internal standard editors
         # can't use the global variables directly to create constants as these will
         # only be initialized after the app has started so we add a module method

data/rakelib/lib/director/property_grid_event.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event'
@@ -15,6 +18,13 @@ module WXRuby3
 
       def setup
         super
+        if Config.instance.wx_version < '3.3.0'
+          spec.map 'wxPGVFBFlags' => 'Integer' do
+            map_in code: '$1 = (unsigned char)NUM2UINT($input);'
+            map_out code: '$result = UINT2NUM((unsigned int)$1);'
+          end
+        else # from 3.3.0 this is an enum but docs are still missing
+        end
       end
     end # class PropertyGridEvent
 

data/rakelib/lib/director/property_grid_interface.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -36,11 +39,7 @@ module WXRuby3
         spec.extend_interface 'wxPropertyGridInterface',
                               'void SetPropertyValues(const wxVariant &list, const wxPGPropArgCls& defaultCategory = 0)'
         # optionals
-        if Config.instance.features_set?('wxUSE_LONGLONG')
-          spec.set_only_for 'wxLongLong_t',
-                            'wxPropertyGridInterface::GetPropertyValueAsLongLong',
-                            'wxPropertyGridInterface::GetPropertyValueAsULongLong'
-        else
+        unless Config.instance.features_set?('wxUSE_LONGLONG')
           spec.ignore 'wxPropertyGridInterface::GetPropertyValueAsLongLong',
                       'wxPropertyGridInterface::GetPropertyValueAsULongLong'
         end
@@ -131,6 +130,9 @@ module WXRuby3
             return rc;
           }
         __HEREDOC
+        spec.map 'wxPGProperty::FlagType' => 'Integer' do
+          map_in code: '$1 = NUM2UINT($input);'
+        end
         # type mapping for 'wxArrayPGProperty *targetArr' (GetPropertiesWithFlag)
         spec.map 'wxArrayPGProperty *targetArr' => 'Array<Wx::PG::PGProperty>' do
           map_in ignore: true, temp: 'wxArrayPGProperty tmp', code: '$1 = &tmp;'
@@ -144,6 +146,18 @@ module WXRuby3
             }
             __CODE
         end
+        # for GetSelectedProperties
+        spec.map 'const wxArrayPGProperty &' => 'Array<Wx::PG::PGProperty>' do
+          map_out code: <<~__CODE
+            $result = rb_ary_new();
+            for (size_t i = 0; i < $1->GetCount(); i++)
+            {
+              wxPGProperty* pp = $1->Item(i);
+              VALUE rb_pp = SWIG_NewPointerObj(SWIG_as_voidptr(pp), SWIGTYPE_p_wxPGProperty, 0);
+              rb_ary_push($result, rb_pp);
+            }
+            __CODE
+        end
         # GetState is missing from the XML docs but we want to add a customized version anyway
         # to be able to return either a PropertyGridPage (for PropertyGridManager) or a PropertyGridPageState
         # (for PropertyGrid).

data/rakelib/lib/director/property_grid_manager.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'

data/rakelib/lib/director/property_grid_page.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event_handler'

data/rakelib/lib/director/property_grid_page_state.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/radio_box.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'

data/rakelib/lib/director/rearrange_list.rb

@@ -0,0 +1,36 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+require_relative './ctrl_with_items'
+
+module WXRuby3
+
+  class Director
+
+    class RearrangeList < ControlWithItems
+
+      include Typemap::ArrayIntSelections
+
+      def setup
+        super
+        setup_ctrl_with_items('wxRearrangeList')
+        spec.override_inheritance_chain('wxRearrangeList',
+                                        %w[wxCheckListBox
+                                           wxListBox
+                                           wxControlWithItems
+                                           wxControl
+                                           wxWindow
+                                           wxEvtHandler
+                                           wxObject])
+      end
+
+    end # class RearrangeList
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/region.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -18,6 +21,7 @@ module WXRuby3
         spec.gc_as_untracked
         spec.ignore 'wxNullRegion' # does not exist in code
         spec.map_apply 'int n, wxPoint points[]' => [ 'size_t, const wxPoint *']
+        spec.ignore 'wxRegion::GetBox(wxCoord &, wxCoord &, wxCoord &, wxCoord &) const'
       end
     end # class Region
 

data/rakelib/lib/director/region_iterator.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/ribbon_art_provider.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -37,6 +40,11 @@ module WXRuby3
             }
             __CODE
         end
+        spec.map 'wxRibbonGalleryItem*' => 'Integer' do
+          map_in code: '$1 = reinterpret_cast<wxRibbonGalleryItem*> ((uintptr_t)NUM2ULL($input));'
+          map_directorin code: '$input = ULL2NUM(reinterpret_cast<uintptr_t> ($1));'
+          map_typecheck precedence: 'INTEGER', code: '$1 = (TYPE($input) == T_FIXNUM);'
+        end
         # add method for correctly wrapping RibbonArtProvider references
         spec.add_header_code <<~__CODE
             extern VALUE mWxRBN; // declare external module reference

data/rakelib/lib/director/ribbon_bar.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'

data/rakelib/lib/director/ribbon_bar_event.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event'

data/rakelib/lib/director/ribbon_button_bar.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'

data/rakelib/lib/director/ribbon_button_bar_event.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event'

data/rakelib/lib/director/ribbon_ctrl.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'

data/rakelib/lib/director/ribbon_gallery.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'
@@ -15,9 +18,11 @@ module WXRuby3
         super
         # exclude these; far better done in pure Ruby
         spec.ignore 'wxRibbonGallery::SetItemClientObject',
-                    'wxRibbonGallery::GetItemClientObject'
+                    'wxRibbonGallery::GetItemClientObject',
+                    'wxRibbonGallery::Append(const wxBitmap &, int, wxClientData *)'
         spec.ignore 'wxRibbonGallery::SetItemClientData',
-                    'wxRibbonGallery::GetItemClientData', ignore_doc: false
+                    'wxRibbonGallery::GetItemClientData',
+                    'wxRibbonGallery::Append(const wxBitmap &, int, void *)', ignore_doc: false
         spec.map 'wxRibbonGalleryItem*' => 'Integer' do
           map_out code: '$result = ULL2NUM(reinterpret_cast<uintptr_t> ($1));'
           map_directorout code: '$result = reinterpret_cast<wxRibbonGalleryItem*> ((uintptr_t)NUM2ULL($1));'

data/rakelib/lib/director/ribbon_gallery_event.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event'

data/rakelib/lib/director/ribbon_page.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'

data/rakelib/lib/director/ribbon_panel.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'

data/rakelib/lib/director/ribbon_panel_event.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event'

data/rakelib/lib/director/ribbon_tool_bar.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'

data/rakelib/lib/director/ribbon_tool_bar_event.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './event'

data/rakelib/lib/director/richtext_box.rb

@@ -0,0 +1,61 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+require_relative './richtext_object'
+
+module WXRuby3
+
+  class Director
+
+    class RichTextBox < RichTextObject
+
+      include Typemap::RichText
+
+      def setup
+        super
+        spec.items << 'wxRichTextCell' << 'wxRichTextTable'
+        spec.include 'wx/richtext/richtextstyles.h'
+
+        spec.map_apply 'int * OUTPUT' => ['int &row', 'int &col']
+
+        spec.map 'wxPosition' => 'Array(Integer,Integer)' do
+
+          map_out code: <<~__CODE
+            $result = rb_ary_new();
+            rb_ary_push($result, INT2NUM($1.GetRow()));
+            rb_ary_push($result, INT2NUM($1.GetColumn()));
+            __CODE
+
+        end
+
+        spec.map 'const wxRichTextObjectPtrArrayArray &' => 'Array<Array<Wx::RTC::RichTextObject>>' do
+
+          map_out code: <<~__CODE
+            $result = rb_ary_new();
+            for (size_t r=0; r<$1->GetCount() ;++r)
+            {
+              VALUE rb_r_arr = rb_ary_new();
+              rb_ary_push($result, rb_r_arr);
+              const wxRichTextObjectPtrArray &r_arr = $1->Item(r);
+              for (size_t c=0; c<r_arr.GetCount() ;++c)
+              {
+                rb_ary_push(rb_r_arr, wxRuby_RichTextObject2Ruby(r_arr.Item(c), 0));
+              }
+            }
+            __CODE
+
+        end
+
+        spec.do_not_generate(:typedefs, :variables, :enums, :defines, :functions)
+      end
+
+    end
+
+  end
+
+end