wxruby3 0.9.0.pre.rc.3 → 0.9.1

data/rakelib/lib/typemap/points_list.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 Common typemap definitions
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative '../core/mapping'
@@ -26,28 +29,26 @@ module WXRuby3
           add_header_code <<~__CODE
             static void wxRuby_PointArrayRubyToC(VALUE rb_arr, wxPoint wx_arr[]) 
             {
-              wxPoint *wx_point;
               VALUE rb_item;
               for (int i = 0; i < RARRAY_LEN(rb_arr); i++)
               {
                 rb_item = rb_ary_entry (rb_arr, i);
                 if (TYPE(rb_item) == T_DATA)
                 {
+                    wxPoint *wx_point;
                     SWIG_ConvertPtr (rb_item, (void **) &wx_point,
-                                     SWIGTYPE_p_wxPoint, 1);
+                                     SWIGTYPE_p_wxPoint, 0);
+                    wx_arr[i] = *wx_point;
                 }
                 else if (TYPE(rb_item) == T_ARRAY && RARRAY_LEN(rb_item) == 2)
                 {
-                  wx_point = new wxPoint (NUM2INT( rb_ary_entry(rb_item, 0)),
-                    NUM2INT(rb_ary_entry (rb_item, 1)));
-                  // Create a ruby object so the C++ obj is freed when GC runs
-                  SWIG_NewPointerObj (wx_point, SWIGTYPE_p_wxPoint, 1);
+                  wx_arr[i] = wxPoint (NUM2INT( rb_ary_entry(rb_item, 0)),
+                                       NUM2INT(rb_ary_entry (rb_item, 1)));
                 }
                 else
                 {
                   rb_raise(rb_eTypeError, "Wrong type for wxPoint parameter %i", i);
                 }
-                wx_arr[i] = *wx_point;
               }
             }
             __CODE

data/rakelib/lib/typemap/richtext.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 Common typemap definitions
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative '../core/mapping'
@@ -14,12 +17,6 @@ module WXRuby3
 
       include Typemap::Module
 
-      def self.on_include(including_mod)
-        # Used by several classes to load and save rich text content to files
-        # and streams.
-        including_mod.include(Typemap::IOStreams)
-      end
-
       define do
 
         # The wxWidgets RichText API in several places represents and returns
@@ -28,10 +25,10 @@ module WXRuby3
         # typemaps
         map 'wxRichTextRange&' => 'Range' do
 
-          map_in code: <<~__CODE
+          map_in temp: 'wxRichTextRange rng', code: <<~__CODE
             int start = NUM2INT( rb_funcall( $input, rb_intern("begin"), 0));
             int end   = NUM2INT( rb_funcall( $input, rb_intern("end"), 0));
-            wxRichTextRange rng = wxRichTextRange(start, end);
+            rng = wxRichTextRange(start, end);
             $1 = &rng;
             __CODE
 
@@ -55,8 +52,185 @@ module WXRuby3
 
         end
 
-        # Used as in/out parameters by some other selection-getting methods
-        map_apply 'int *OUTPUT' => [ 'long * from' , 'long * to' ]
+        map 'const wxRichTextRangeArray &' => 'Array<Range>' do
+
+          map_in temp: 'wxRichTextRangeArray tmp', code: <<~__CODE
+            if (TYPE($input) == T_ARRAY)
+            {
+              for (int i=0; i<RARRAY_LEN($input) ;++i)
+              {
+                VALUE rb_range = rb_ary_entry($input, i);
+                int start = NUM2INT( rb_funcall(rb_range, rb_intern("begin"), 0));
+                int end   = NUM2INT( rb_funcall(rb_range, rb_intern("end"), 0));
+                tmp.Add(wxRichTextRange(start, end));
+              }
+              $1 = &tmp;
+            }
+            else
+            {
+              rb_raise(rb_eArgError, "Expected Array of Range for %d", $argnum-1);
+            }
+            __CODE
+
+          map_out code: <<~__CODE
+            $result = rb_ary_new();
+            for (size_t i = 0; i < $1->GetCount(); i++)
+            {
+              const wxRichTextRange& range = $1->Item(i);
+              rb_ary_push($result, rb_range_new (LONG2NUM(range.GetStart()),LONG2NUM(range.GetEnd()),0));
+            }
+            __CODE
+
+          map_typecheck precedence: 'POINTER', code: '$1 = TYPE($input) == T_ARRAY;'
+
+        end
+
+        map 'wxRichTextRangeArray' => 'Array<Range>' do
+
+          map_out code: <<~__CODE
+            $result = rb_ary_new();
+            for (size_t i = 0; i < $1.GetCount(); ++i)
+            {
+              const wxRichTextRange& range = $1.Item(i);
+              rb_ary_push($result, rb_range_new (LONG2NUM(range.GetStart()),LONG2NUM(range.GetEnd()),0));
+            }
+            __CODE
+
+        end
+
+        map 'wxRichTextObject *' => 'Wx::RTC::RichTextObject' do
+
+          map_out code: '$result = wxRuby_RichTextObject2Ruby($1, $owner);'
+
+        end
+
+        map 'wxRichTextObject **' => 'Wx::RTC::RichTextObject' do
+
+          map_in ignore: true, temp: 'wxRichTextObject * tmp', code: '$1 = &tmp;'
+
+          map_argout code: '$result = SWIG_Ruby_AppendOutput($result, wxRuby_RichTextObject2Ruby(tmp$argnum, 0));'
+
+        end
+
+        map 'wxArrayInt * partialExtents' => 'Array,nil' do
+          map_in temp: 'wxArrayInt tmp, VALUE rb_arg', code: <<~__CODE
+            rb_arg = $input;
+            if (NIL_P($input) || TYPE($input) == T_ARRAY)
+            {
+              $1 = NIL_P($input) ? nullptr : &tmp; 
+            }
+            else
+            {
+              rb_raise(rb_eArgError, "Expected Array or nil for %d", $argnum-1);
+            }
+            __CODE
+          map_argout by_ref: true, code: <<~__CODE
+              if (!NIL_P(rb_arg$argnum))
+              {
+                for (size_t i=0; i<tmp$argnum.GetCount() ;++i)
+                {
+                  rb_ary_push(rb_arg$argnum, INT2NUM(tmp$argnum.Item(i)));
+                }
+              }
+              __CODE
+
+          map_directorin code: 'VALUE rb_int_arr = $input = ($1 == nullptr ? Qnil : rb_ary_new());'
+          map_directorargout code: <<~__CODE
+            if ($1)
+            {
+              for (int i=0; i<RARRAY_LEN(rb_int_arr) ;++i)
+              {
+                $1->Add(NUM2INT(rb_ary_entry(rb_int_arr, i)));
+              }
+            }
+            output = Qnil;
+            __CODE
+        end
+
+        # Used as out parameters by some other selection-getting methods
+        map_apply 'long * OUTPUT' => [ 'long * from' , 'long * to', 'long *x', 'long *y' ]
+
+        map 'long & end', 'long& textPosition', 'long& wrapPosition', as: 'Integer' do
+
+          map_in temp: 'long tmp', code: 'tmp = NUM2LONG($input); $1 = &tmp;'
+
+          map_argout code: '$result = SWIG_Ruby_AppendOutput($result, LONG2NUM(tmp$argnum));'
+
+          map_directorin code: '$input = LONG2NUM($1);'
+
+          map_directorargout code: <<~__CODE
+              if(output != Qnil)
+              {
+                $1 = NUM2LONG(output);
+              }
+              else
+              {
+                $1 = 0;
+              }
+              __CODE
+
+        end
+
+        map 'bool * recurse' => 'Boolean' do
+
+          map_in temp: 'bool recurse', code: 'recurse = ($input == Qtrue); $1 = &recurse;'
+
+          map_argout code: '$result = SWIG_Ruby_AppendOutput($result, recurse$argnum ? Qtrue : Qfalse);'
+
+        end
+
+        map 'wxRichTextFloatCollector*' => 'Wx::RTC::RichTextFloatCollector' do
+          add_header_code <<~__CODE
+            extern VALUE _wxRuby_Wrap_wxRichTextFloatCollector(wxRichTextFloatCollector* fc);
+            extern wxRichTextFloatCollector* _wxRuby_Unwrap_wxRichTextFloatCollector(VALUE rbfc);
+            extern bool _wxRuby_Is_wxRichTextFloatCollector(VALUE rbfc);
+            __CODE
+          map_in code: '$1 = _wxRuby_Unwrap_wxRichTextFloatCollector($input);'
+          map_out code: '$result = _wxRuby_Wrap_wxRichTextFloatCollector($1);'
+          map_typecheck code: '$1 = _wxRuby_Is_wxRichTextFloatCollector($input);'
+        end
+
+        map 'const wxRichTextObjectList &' => 'Array<Wx::RTC::RichTextObject>' do
+
+          map_out code: <<~__CODE
+            $result = rb_ary_new();
+            for (const wxRichTextObject *wx_rto : *$1)
+            {
+              rb_ary_push($result, wxRuby_RichTextObject2Ruby(wx_rto, 0));
+            }
+            __CODE
+
+        end
+
+
+        map 'wxRichTextObjectList &' => 'Array<Wx::RTC::RichTextObject>' do
+
+          map_in temp: 'wxRichTextObjectList wx_lst, VALUE rb_lst', code: <<~__CODE
+            if (TYPE($input) == T_ARRAY)
+            {
+              $1 = &wx_lst;
+              rb_lst = $input;
+            }
+            else
+            {
+              rb_raise(rb_eArgError, "Expected an Array for %d", $argnum-1);
+            }
+            __CODE
+
+          map_argout by_ref: true, code: <<~__CODE
+            for (const wxRichTextObject *wx_rto : wx_lst$argnum)
+            {
+              rb_ary_push(rb_lst$argnum, SWIG_NewPointerObj(SWIG_as_voidptr(const_cast<wxRichTextObject*> (wx_rto)), SWIGTYPE_p_wxRichTextObject, 0));
+            }
+            __CODE
+
+        end
+
+        map 'wxRichTextStyleDefinition *' => 'Wx::RTC::RichTextStyleDefinition' do
+
+          map_out code: '$result = wxRuby_RichTextStyleDefinition2Ruby($1, $owner);'
+
+        end
 
       end # define
 

data/rakelib/lib/typemap/tree_itemid.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 Common typemap definitions
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative '../core/mapping'
@@ -23,21 +26,43 @@ module WXRuby3
             // implemented in TreeEvent.cpp
             extern VALUE _wxRuby_Wrap_wxTreeItemId(const wxTreeItemId& id);
             extern wxTreeItemId _wxRuby_Unwrap_wxTreeItemId(VALUE id);
+            extern bool _wxRuby_Is_wxTreeItemId(VALUE id);
             __CODE
 
           map_in temp: 'wxTreeItemId tmpId', code: <<~__CODE
             if ($input != Qnil) tmpId = _wxRuby_Unwrap_wxTreeItemId($input);
             $1 = &tmpId;
             __CODE
+
           map_directorin code: '$input = _wxRuby_Wrap_wxTreeItemId($1);'
+
+          map_typecheck precedence: 'POINTER', code: '$1 = _wxRuby_Is_wxTreeItemId($input);'
         end
 
         map 'wxTreeItemId' => 'Wx::TreeItemId' do
+
+          add_header_code <<~__CODE
+            // implemented in TreeEvent.cpp
+            extern VALUE _wxRuby_Wrap_wxTreeItemId(const wxTreeItemId& id);
+            extern wxTreeItemId _wxRuby_Unwrap_wxTreeItemId(VALUE id);
+            extern bool _wxRuby_Is_wxTreeItemId(VALUE id);
+            __CODE
+
+          map_in temp: 'wxTreeItemId tmpId', code: <<~__CODE
+            if ($input != Qnil) tmpId = _wxRuby_Unwrap_wxTreeItemId($input);
+            $1 = &tmpId;
+            __CODE
+
+          map_directorin code: '$input = _wxRuby_Wrap_wxTreeItemId($1);'
+
           map_out code: '$result = _wxRuby_Wrap_wxTreeItemId($1);'
+
           map_directorout temp: 'wxTreeItemId tmpId', code: <<~__CODE
             if ($input != Qnil) tmpId = _wxRuby_Unwrap_wxTreeItemId($input);
             $result = &tmpId;
           __CODE
+
+          map_typecheck precedence: 'POINTER', code: '$1 = _wxRuby_Is_wxTreeItemId($input);'
         end
 
       end # define

data/rakelib/lib/util/string.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # String utilities mixin
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -88,14 +91,18 @@ module WXRuby3
       end
 
       def rb_constant_value(name)
-        val = name.sub(/\Awx/, 'Wx::')
-        case val
-        when /NULL|nullptr/
+        name = name.strip
+        case name
+        when /\A(null|nullptr)\Z/i
           'nil'
+        when /\A(true|false)\Z/i
+          name.downcase
         when /EmptyString/
           %q['']
+        when /\A\"/
+          name
         else
-          val
+          "#{name.start_with?('wx') ? 'Wx::' : ''}#{rb_constant_name(name)}"
         end
       end
 
@@ -107,7 +114,7 @@ module WXRuby3
           ids = idstr.split('::')
           if ids.size > 1
             is_scoped = true
-            scoped_name = rb_constant_value(ids.shift)
+            scoped_name = rb_wx_name(ids.shift)
             while ids.size > 1
               scoped_name << '::' << ids.shift
             end
@@ -124,7 +131,7 @@ module WXRuby3
               when 'wxString'
                 '('
               else
-                "#{rb_constant_value(idstr)}.new("
+                "#{idstr.start_with?('wx') ? 'Wx::' : ''}#{rb_wx_name(idstr)}.new("
               end
             end
           else
@@ -140,8 +147,6 @@ module WXRuby3
               # constant
               if /[\-\+\.\d]+/ =~ idstr
                 idstr # numeric constant
-              elsif /\A(true|false|NULL|nullptr)/ =~ idstr
-                ($1 == 'NULL' || $1 == 'nullptr') ? 'nil' : $1
               else
                 if const_xref.has_key?(rb_constant_name(idstr))
                   "#{const_xref[rb_constant_name(idstr)]['mod']}::#{rb_constant_name(idstr)}"

data/rakelib/prepost.rake

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

data/rakelib/prepost.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 rake gem support
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './lib/config'

data/rakelib/run.rake

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

data/samples/aui/aui.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/bigdemo/bigdemo.rb

@@ -1,6 +1,13 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Freely reusable code: see SAMPLES-LICENSE.TXT for details
+
 begin
   require 'rubygems'
 rescue LoadError

data/samples/bigdemo/run.rb

@@ -1,6 +1,13 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Freely reusable code: see SAMPLES-LICENSE.TXT for details
+
 begin
   require 'rubygems' 
 rescue LoadError

data/samples/bigdemo/utils.rb

@@ -1,3 +1,11 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # This module contains various utilities to simplify the implementation of the WxRuby Demo
 
 module WxDemoUtilities
@@ -9,4 +17,4 @@ module WxDemoUtilities
     end
 
     #----------------------------------------------------------
-end
+end

data/samples/calendar/calendar.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'
@@ -77,7 +82,7 @@ class MyFrame < Frame
 
     @calendar_flags = CAL_MONDAY_FIRST | CAL_SHOW_HOLIDAYS
 
-    @calendar = MyCalendar.new(@panel, self, Time.now, @calendar_flags)
+    @calendar = MyCalendar.new(@panel, self, Wx::DEFAULT_DATE_TIME, @calendar_flags)
 
     @sizer = BoxSizer.new(VERTICAL)
     configure_window

data/samples/caret/caret.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/controls/books.rb

@@ -1,5 +1,11 @@
-#!/usr/bin/env ruby
-# Copyright (c) M.J.N. Corino, The Netherlands
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 ###
 
 require 'wx'