wxruby3 0.9.0 → 0.9.2

data/rakelib/lib/typemap/common.rb

@@ -215,7 +215,7 @@ module WXRuby3
             if ( TYPE($input) == T_DATA )
             {
               void* argp$argnum;
-              SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, 1 );
+              SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, 0);
               $1 = reinterpret_cast< $1_basetype * >(argp$argnum);
             }
             else if ( TYPE($input) == T_ARRAY )
@@ -240,6 +240,28 @@ module WXRuby3
             __CODE
         end
 
+        map 'wxSize' => 'Array(Integer, Integer), Wx::Size',
+            'wxPoint' => 'Array(Integer, Integer), Wx::Point' do
+
+          map_directorout code: <<~__CODE
+            if (TYPE($input) == T_ARRAY && RARRAY_LEN($input) == 2)
+            {
+              $result = $1_basetype(NUM2INT( rb_ary_entry($input, 0)),
+                                    NUM2INT( rb_ary_entry($input, 1)));
+            }
+            else
+            {
+              void *ptr;
+              int res = SWIG_ConvertPtr($input, &ptr, $&1_descriptor, SWIG_POINTER_NO_NULL);
+              if (!SWIG_IsOK(res)) {
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", SWIG_ErrorType(SWIG_ArgError(res)), "in output value of type '""$1_type""'");
+              }
+              $result = *(reinterpret_cast< $1_type * >(ptr));
+            }
+            __CODE
+
+        end
+
         # Integer <> wxItemKind type mappings
 
         map 'wxItemKind' => 'Integer' do
@@ -414,6 +436,35 @@ module WXRuby3
           # do not seem to be virtual methods returning that
         end
 
+        # const wxVector<int>&
+
+        map 'const wxVector<int>&' => 'Array<Integer>' do
+          map_in temp: 'wxVector<int> tmp', code: <<~__CODE
+            if (($input == Qnil) || (TYPE($input) != T_ARRAY))
+            {
+              VALUE dump = rb_inspect($input);
+              rb_raise(rb_eArgError, "expected Array of Integer for %d but got %s", 
+                                     $argnum-1, StringValuePtr(dump));
+            }
+            else
+            {
+              for (int i = 0; i < RARRAY_LEN($input); i++)
+              {
+                tmp.push_back(NUM2INT(rb_ary_entry($input,i)));
+              }
+              $1 = &tmp;
+            }
+            __CODE
+          map_directorin code: <<~__CODE
+            $input = rb_ary_new();
+            for (size_t i = 0; i < $1.size(); i++)
+            {
+              rb_ary_push($input,INT2NUM( $1[i] ) );
+            }
+          __CODE
+          map_typecheck precedence: 'INT32_ARRAY', code: '$1 = (TYPE($input) == T_ARRAY);'
+        end
+
         # various enumerator type mappings
 
         map *%w[wxEdge wxRelationship wxKeyCode], as: 'Integer' do
@@ -456,12 +507,10 @@ module WXRuby3
         end
 
 
-        # Validators must be cast to correct subclass, but internal validator
-        # is a clone, and should not be freed, so disown after wrapping.
+        # Validators must be cast to correct subclass, but not owned
         map 'wxValidator*' => 'Wx::Validator' do
           map_out code: <<~__CODE
             $result = wxRuby_WrapWxObjectInRuby($1);
-            if (!NIL_P($result)) RDATA($result)->dfree = SWIG_RubyRemoveTracking;
             __CODE
         end
 
@@ -633,14 +682,9 @@ module WXRuby3
           end
         end
 
-        # special case bc SWIG causes trouble in Window.cpp
-        map 'const wxRegion&', 'const wxRegion*', as: 'Wx::Region' do
-          map_out code: '$result = wxRuby_WrapWxObjectInRuby(new wxRegion(*static_cast<const wxRegion*> ($1)));'
-        end
-
         # add type mapping for wxVariant input args
         intypes = 'nil,String,Integer,Float,Time,Wx::Font,Wx::Colour,Wx::Variant,Array<WxVariant>,Array<String>,Object'
-        if Config.instance.features_set?('wxUSE_PROPGRID')
+        if Config.instance.features_set?('USE_PROPGRID')
           intypes << 'Wx::PG::ColourPropertyValue'
         end
         map 'const wxVariant&' => intypes do

data/rakelib/lib/typemap/data_format.rb

@@ -63,7 +63,7 @@ module WXRuby3
               void* tmp;
               SWIG_ConvertPtr(rb_ary_entry(result, i),
                               &tmp,
-              SWIGTYPE_p_wxDataFormat, 0);
+                              SWIGTYPE_p_wxDataFormat, 0);
               wxDataFormat* fmt = reinterpret_cast< wxDataFormat* >(tmp);
               $1[i] = *fmt;
             }

data/rakelib/lib/typemap/data_object_data.rb

@@ -30,7 +30,7 @@ module WXRuby3
             void* argp$argnum = NULL;
             if ( TYPE($input) == T_DATA )
             {
-              if (SWIG_IsOK(SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, $argnum-1)) && argp$argnum)
+              if (SWIG_IsOK(SWIG_ConvertPtr($input, &argp$argnum, $1_descriptor, 0)) && argp$argnum)
               {
                 $1 = reinterpret_cast< $1_basetype * >(argp$argnum);
               }
@@ -69,7 +69,7 @@ module WXRuby3
               }
               else
               {
-                Swig::DirectorTypeMismatchException::raise(rb_eTypeError, 
+                Swig::DirectorTypeMismatchException::raise(swig_get_self(), "$symname", rb_eTypeError, 
                                                            "get_data_here should return a string, or nil on failure");
               }
             }

data/rakelib/lib/typemap/pgprop_arg.rb

@@ -20,6 +20,11 @@ module WXRuby3
       define do
 
         map 'const wxPGPropArgCls&' => 'String,Wx::PG::PGProperty' do
+
+          add_header_code <<~__CODE
+            static WxRuby_ID s_pg_property_id("PGProperty");
+            __CODE
+
           map_in temp: 'wxPGPropArgCls temp = (wxPGProperty *)0', code: <<~__CODE
             if (!NIL_P($input))
             {
@@ -29,12 +34,12 @@ module WXRuby3
               }
               else if (TYPE($input) == T_DATA)
               {
-                VALUE rb_klass = rb_const_get(mWxPG, rb_intern("PGProperty"));
+                VALUE rb_klass = rb_const_get(mWxPG, s_pg_property_id());
                 if (rb_obj_is_kind_of($input, rb_klass))
                 {
                   swig_type_info* swig_type = wxRuby_GetSwigTypeForClass(rb_klass);
                   wxPGProperty *pgprop = (wxPGProperty *)0;
-                  SWIG_ConvertPtr($input, SWIG_as_voidptrptr(&pgprop), swig_type, SWIG_POINTER_DISOWN);
+                  SWIG_ConvertPtr($input, SWIG_as_voidptrptr(&pgprop), swig_type, 0);
                   temp = wxPGPropArgCls(pgprop);
                 }
                 else

data/rakelib/lib/typemap/points_list.rb

@@ -29,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/util/string.rb

@@ -91,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
 
@@ -110,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
@@ -127,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
@@ -143,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/yard/templates/default/fulldoc/html/css/wxruby3.css

@@ -1,7 +1,79 @@
 
-blockquote {
+div.wxrb-note {
     background: #f7f7f9;
-    border-left: .25em solid #e1e1e8;
+    border-left: .6em solid #f3ba6f;
+    border-radius: 3px;
     margin: 14px;
     padding-left: 14px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+
+div.wxrb-remark {
+    background: #f7f7f9;
+    border-left: .6em solid #f6f4ab;
+    border-radius: 3px;
+    margin: 14px;
+    padding-left: 14px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+
+div.wxrb-note p,
+div.wxrb-remark p {
+    margin: 0;
+}
+
+div.wxrb-logo {
+    float: right;
+    padding-top: 12px;
+}
+
+div.wxrb-logo img {
+    vertical-align: middle;
+}
+
+div.wxrb-logo span.wxrb-name {
+    font-size: large;
+    font-weight: bold;
+    margin-left: 10px;
+}
+
+div.wxrb-logo span.wxrb-name a {
+    color: black;
+}
+
+div.wxrb-logo span.wxrb-version {
+    font-size: medium;
+    font-weight: normal;
+    margin-right: 15px;
+}
+
+div.wxrb-logo span.wxrb-wxver {
+    font-size: 0.9em;
+    font-weight: normal;
+    margin-right: 15px;
+}
+
+div.wxrb-logo table {
+    display: inline;
+}
+
+div.wxrb-logo table td {
+    margin: 0;
+}
+
+.discussion div.note {
+    background: #f7f7f9;
+    border-left: .6em solid #f3ba6f;
+    margin: 14px;
+}
+
+.tags span.wxrb-require {
+    border-radius: 5px;
+    border: 1px solid #E1E1E8;
+    padding: 0px 3px 0px 3px;
+    background: #f3ba6f;
+    font-weight: bold;
+    font-size: 0.9em;
 }

data/rakelib/yard/templates/default/fulldoc/html/full_list.erb

@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta charset="<%= charset %>" />
+    <% stylesheets_full_list.each do |stylesheet| %>
+      <link rel="stylesheet" href="<%= mtime_url(stylesheet) %>" type="text/css" media="screen" />
+    <% end %>
+
+    <% javascripts_full_list.each do |javascript| %>
+      <script type="text/javascript" charset="utf-8" src="<%= mtime_url(javascript) %>"></script>
+    <% end %>
+
+    <title><%= @list_title %></title>
+    <base id="base_target" target="_parent" />
+  </head>
+  <body>
+    <div id="content">
+      <div class="fixed_header">
+        <%= logo_and_version %>
+        <h1 id="full_list_header"><%= @list_title %></h1>
+        <div id="full_list_nav">
+          <% menu_lists.each do |list| %>
+            <span><a target="_self" href="<%= url_for_list list[:type] %>">
+              <%= list[:title] %>
+            </a></span>
+          <% end %>
+        </div>
+
+        <div id="search">Search: <input type="text" /></div>
+      </div>
+
+      <ul id="full_list" class="<%= @list_class || @list_type %>">
+        <%= erb "full_list_#{@list_type}" %>
+      </ul>
+    </div>
+  </body>
+</html>

data/rakelib/yard/templates/default/fulldoc/html/setup.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+def init
+  # It seems YARD messes things up so that a number of classes are not properly
+  # registered in their enclosing namespaces.
+  # This hack makes sure that if that is the case we fix that here.
+  all_classes = Registry.all(:class)
+  all_classes.each do |c|
+    if (ns = c.namespace)
+      unless ns.children.any? { |nsc| nsc.path == c.path }
+        ns.children << c # class missing from child list of enclosing namespace -> add here
+      end
+    end
+    if (ns = Registry[c.namespace.path])
+      unless ns.children.any? { |nsc| nsc.path == c.path }
+        ns.children << c # class missing from child list of enclosing namespace -> add here
+      end
+    end
+  end
+  super
+end
+
+def stylesheets_full_list
+  super + %w(css/wxruby3.css)
+end
+
+def logo_and_version
+  wxver = Registry['Wx::WXRUBY_VERSION']
+  wxwver = Registry['Wx::WXWIDGETS_VERSION']
+  <<~__HTML
+  <div class='wxrb-logo'>
+    <img src='assets/logo.png' height='38'/>
+    <table><tbody>
+      <tr><td><span class='wxrb-name'><a href="https://github.com/mcorino/wxRuby3">wxRuby3</a></span></td><td><span class='wxrb-version'>Version: #{::Kernel.eval(wxver.value)}</span></td></tr>
+      <tr><td></td><td><span class="wxrb-wxver">(wxWidgets: #{::Kernel.eval(wxwver.value)})</span></td></tr>
+    </tbody></table>
+  </div>
+  __HTML
+end

data/rakelib/yard/templates/default/tags/html/wxrb_require.erb

@@ -0,0 +1,10 @@
+<% if object.has_tag?(:wxrb_require) %>
+  <p class="tag_title">Requires:</p>
+  <ul class="wxrb-require">
+    <% wxruby_requires.each do |req| %>
+      <li><div class='inline'>
+        <%= req.join(' or ') %>
+      </div></li>
+    <% end %>
+  </ul>
+<% end %>

data/rakelib/yard/templates/default/tags/setup.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+def wxrb_require
+  erb('wxrb_require')
+end
+
+def wxruby_requires
+  object.tags(:wxrb_require).inject([]) do |list, tag|
+    tag.text.split(',').each do |feature|
+      list << feature.split('|').collect do |s|
+        s.split('&').collect { |ss| %Q[<span class="wxrb-require">#{ss.strip}</span>] }.join('&amp;')
+      end
+    end
+    list
+  end
+end

data/rakelib/yard/yard-custom-templates.rb

@@ -1,2 +1,5 @@
 
+YARD::Tags::Library.define_tag("Requirements", :wxrb_require)
+YARD::Tags::Library.visible_tags.place(:wxrb_require).before(:author)
+
 YARD::Templates::Engine.register_template_path File.join(__dir__, 'templates')

data/samples/text/richtext.rb

@@ -1432,36 +1432,6 @@ class MyFrame < Wx::Frame
 
   end
 
-  # Forward command events to the current rich text control, if any
-  def try_before(event)
-    if event.is_command_event && !event.is_a?(Wx::ChildFocusEvent)
-      # Problem: we can get infinite recursion because the events
-      # climb back up to this frame, and repeat.
-      # Assume that command events don't cause another command event
-      # to be called, so we can rely on inCommand not being overwritten
-
-      if MyFrame.win_id != event.id && MyFrame.event_type != event.event_type
-        MyFrame.event_type = event.event_type
-        MyFrame.win_id = event.id
-        focusWin = Wx.find_focus_descendant(self)
-        focusWin = @richTextCtrl unless focusWin
-
-        if focusWin && focusWin.get_event_handler.process_event(event)
-          MyFrame.event_type = 0
-          MyFrame.win_id = 0
-          return true
-        end
-
-        MyFrame.event_type = 0
-        MyFrame.win_id = 0
-      else
-        return false
-      end
-    end
-
-    false
-  end
-
   # Write text
   def write_initial_text
     r = @richTextCtrl

data/samples/treectrl/treectrl.rb

@@ -369,7 +369,7 @@ class MyTreeCtrl < Wx::TreeCtrl
       set_item_font(root_id, Wx::ITALIC_FONT)
     end
 
-    ids = get_children(root_id)
+    ids = get_item_children(root_id)
 
     # make the first item blue
     set_item_text_colour(ids[0], Wx::BLUE)

data/tests/test_app_exit_exception.rb

@@ -0,0 +1,36 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require 'test/unit'
+require 'wx'
+
+class TestApp < Test::Unit::TestCase
+
+  class TestFrame < Wx::Frame
+    def initialize
+      super(nil, -1, '')
+      evt_paint { on_paint }
+    end
+
+    def on_paint
+      paint {}
+      close
+    end
+  end
+
+  class TestApp < Wx::App
+    def on_init
+      TestFrame.new.show
+    end
+
+    def on_exit
+      raise RuntimeError, 'on_exit exception'
+    end
+  end
+
+  def test_self_closing_frame
+    assert_raise_kind_of(RuntimeError) { TestApp.run }
+  end
+
+end

data/tests/test_app_init_exception.rb

@@ -0,0 +1,20 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require 'test/unit'
+require 'wx'
+
+class AppInitExitExceptions < Test::Unit::TestCase
+
+  class TestApp < Wx::App
+    def on_init
+      raise RuntimeError, 'on_init exception'
+    end
+  end
+
+  def test_on_init_exception
+    assert_raise_kind_of(RuntimeError) { TestApp.run }
+  end
+
+end

data/tests/test_book_controls.rb

@@ -0,0 +1,29 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './lib/wxframe_runner'
+
+class BookCtrlTests < WxRuby::Test::GUITests
+
+  def setup
+    super
+    @book = Wx::Choicebook.new(frame_win, name: 'ChoiceBook')
+  end
+
+  def cleanup
+    @book.destroy
+    super
+    GC.start
+  end
+
+  attr_reader :book
+
+  def test_control_sizer
+    btn = Wx::Button.new(book, Wx::ID_ANY, 'First')
+    # issue #199 : returning the control sizer should not cause it to be owned by Ruby
+    #              because that would cause double deletes
+    book.get_control_sizer.add(btn, Wx::SizerFlags.new.expand.border(Wx::ALL))
+  end
+
+end

data/tests/test_exceptions.rb

@@ -0,0 +1,41 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './lib/wxframe_runner'
+
+class DirectorExceptionTests < WxRuby::Test::GUITests
+
+  class InvalidOutputSizer < Wx::BoxSizer
+
+    def calc_min
+      Wx::Point.new(1,1) # expects Wx::Size
+    end
+
+  end
+
+  def test_invalid_output
+    szr = InvalidOutputSizer.new(Wx::Orientation::VERTICAL)
+    szr.add(Wx::Button.new(frame_win, name: 'button'), Wx::Direction::TOP)
+    frame_win.sizer = szr
+    assert_raise_kind_of(TypeError) { frame_win.layout }
+    frame_win.sizer = nil
+  end
+
+  class ExceptionSizer < Wx::BoxSizer
+
+    def calc_min
+      raise RuntimeError, 'AnyThing'
+    end
+
+  end
+
+  def test_exception_in_overload
+    szr = ExceptionSizer.new(Wx::Orientation::VERTICAL)
+    szr.add(Wx::Button.new(frame_win, name: 'button'), Wx::Direction::TOP)
+    frame_win.sizer = szr
+    assert_raise_kind_of(RuntimeError) { frame_win.layout }
+    frame_win.sizer = nil
+  end
+
+end

data/tests/test_list_ctrl.rb

@@ -4,7 +4,7 @@
 
 require_relative './lib/wxframe_runner'
 
-class ButtonTests < WxRuby::Test::GUITests
+class ListCtrlTests < WxRuby::Test::GUITests
 
   def setup
     super

data/tests/test_media_ctrl.rb

@@ -0,0 +1,38 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './lib/wxframe_runner'
+
+# test seems to deadlock for WXGTK
+if Wx.has_feature?(:USE_MEDIACTRL)
+
+require 'uri'
+
+class MediaCtrlTests < WxRuby::Test::GUITests
+
+  def setup
+    super
+    @media = Wx::MediaCtrl.new(frame_win)
+  end
+
+  def cleanup
+    @media.destroy
+    super
+  end
+
+  attr_reader :media
+
+  def test_uri
+    # just checking if Ruby URI is properly mapped
+    # it doesn't seem the mediactrl returns a very consistent result whether the resource is not a media file
+    # or if it is a non-existing file so only check whether it is a boolean return.
+    uri = URI("file://#{File.join(__dir__, 'media/beep_lo.wav')}")
+    assert_boolean(media.load(uri))
+    uri = URI("file://#{File.join(__dir__, 'art/test_art/image/wxruby.png')}")
+    assert_boolean(media.load(uri))
+  end
+
+end
+
+end