wxruby3 0.9.0.pre.rc.3 → 0.9.1

data/samples/text/scintilla.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/text/textctrl.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'
@@ -45,6 +50,9 @@ class TextCtrlFrame < Wx::Frame
     sizer = Wx::BoxSizer.new(Wx::VERTICAL)
 
     @textctrl = InformativeTextCtrl.new(panel)
+    if Wx.has_feature?(:USE_SPELLCHECK)
+      @textctrl.enable_proof_check(Wx::TextProofOptions.default)
+    end
     populate_textctrl
     sizer.add(@textctrl, 2, Wx::GROW|Wx::ALL, 2)
 
@@ -55,6 +63,8 @@ class TextCtrlFrame < Wx::Frame
     @log = LogTextCtrl.new(panel)
     sizer.add(@log, 1, Wx::GROW|Wx::ALL, 2)
     panel.sizer = sizer
+
+    construct_menus
   end
 
   def populate_textctrl
@@ -86,6 +96,13 @@ class TextCtrlFrame < Wx::Frame
 
   def on_click
     @log.value = @textctrl.report
+    if Wx.has_feature?(:USE_SPELLCHECK)
+      if @textctrl.get_proof_check_options.is_spell_check_enabled
+        @textctrl.enable_proof_check(Wx::TextProofOptions.disable)
+      else
+        @textctrl.enable_proof_check(Wx::TextProofOptions.default)
+      end
+    end
   end
 
   def on_quit
@@ -95,7 +112,7 @@ class TextCtrlFrame < Wx::Frame
   def on_about
     msg =  sprintf("This is the About dialog of the textctrl sample.\n" \
                     "Welcome to %s", Wx::WXWIDGETS_VERSION)
-    message_box(msg, "About Minimal", Wx::OK|Wx::ICON_INFORMATION, self)
+    Wx.message_box(msg, "About Minimal", Wx::OK|Wx::ICON_INFORMATION, self)
   end
 end
 

data/samples/text/unicode.rb

@@ -1,8 +1,13 @@
-#!/usr/bin/env ruby
+# 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
+
 # encoding: UTF-8
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 
@@ -225,7 +230,7 @@ module UnicodeSample
   def self.activate
     frame = IConvFrame.new("Unicode demonstration - ",
                            Wx::Point.new(50, 50),
-                           Wx::Size.new(450, 450) )
+                           Wx::Size.new(450, 600) )
 
     frame.show(true)
     frame

data/samples/treectrl/treectrl.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'
@@ -1079,7 +1084,7 @@ class MyFrame < Wx::Frame
 
     # set our text control as the log target
     logWindow = Wx::LogTextCtrl.new(@textctrl)
-    Wx::Log::set_active_target(logWindow)
+    @old_log_tgt = Wx::Log::set_active_target(logWindow)
 
     # @splitter.split_horizontally(@treectrl, @textctrl, 500)
 
@@ -1677,7 +1682,7 @@ class MyFrame < Wx::Frame
   end
 
   def on_close(event)
-    Wx::Log::active_target = nil
+    Wx::Log::active_target = @old_log_tgt
     destroy
   end
 

data/samples/xrc/custom_xrc_sample.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/xrc/xrc_sample.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/tests/lib/item_container_tests.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 module ItemContainerTests
 

data/tests/lib/text_entry_tests.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 module TextEntryTests
 

data/tests/lib/wxapp_runner.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 require 'test/unit'
 require 'test/unit/ui/console/testrunner'

data/tests/lib/wxframe_runner.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 require_relative './wxapp_runner'
 
@@ -69,7 +72,18 @@ module WxRuby
 
     class GUITests < ::Test::Unit::TestCase
 
-      def test_frame
+      setup
+      def base_setup
+        10.times { Wx.get_app.yield }
+      end
+
+      cleanup
+      def base_cleanup
+        10.times { Wx.get_app.yield }
+        GC.start
+      end
+
+      def frame_win
         Wx.get_app.frame
       end
 
@@ -83,14 +97,14 @@ module WxRuby
           @count +=1
         end
 
-        def wait_event(msec)
+        def wait_event(msec, reset=true)
           start = Time.now
           msec /= 1000.0
           while (Time.now - start) < msec
             Wx.get_app.yield
             if @count > 0
               raise StandardError.new("Too many events. Expected a single one.") unless @count == 1
-              @count = 0
+              @count = 0 if reset
               return true
             end
             sleep(50.0/1000.0)
@@ -99,6 +113,65 @@ module WxRuby
         end
       end
 
+      class UISimulator < Wx::UIActionSimulator
+
+        def mouse_move(*args)
+          super
+          Wx::get_app.yield
+        end
+
+        def mouse_down(button = Wx::MouseButton::MOUSE_BTN_LEFT)
+          super
+          Wx::get_app.yield
+        end
+
+        def mouse_up(button = Wx::MouseButton::MOUSE_BTN_LEFT)
+          super
+          Wx::get_app.yield
+        end
+
+        def mouse_click(button = Wx::MouseButton::MOUSE_BTN_LEFT)
+          super
+          Wx::get_app.yield
+        end
+
+        def mouse_dbl_click(button = Wx::MouseButton::MOUSE_BTN_LEFT)
+          super
+          Wx::get_app.yield
+        end
+
+        def mouse_drag_drop(x1, y1, x2, y2, button = Wx::MouseButton::MOUSE_BTN_LEFT)
+          super
+          Wx::get_app.yield
+        end
+
+        def key_down(keycode, modifiers = Wx::KeyModifier::MOD_NONE)
+          super
+          Wx::get_app.yield
+        end
+
+        def key_up(keycode, modifiers = Wx::KeyModifier::MOD_NONE)
+          super
+          Wx::get_app.yield
+        end
+
+        def char(keycode, modifiers = Wx::KeyModifier::MOD_NONE)
+          super
+          Wx::get_app.yield
+        end
+
+        def select(text)
+          super
+          Wx::get_app.yield
+        end
+
+        def text(text)
+          super
+          Wx::get_app.yield
+        end
+
+      end
+
       def self.has_ui_simulator?
         Wx.has_feature?(:USE_UIACTIONSIMULATOR) && (Wx::PLATFORM != 'WXOSX' || Wx::WXWIDGETS_VERSION >= '3.3')
       end
@@ -107,6 +180,11 @@ module WxRuby
         GUITests.has_ui_simulator?
       end
 
+      def get_ui_simulator
+        raise 'Wx::UIActionSimulator is NOT supported on this platform!' unless has_ui_simulator?
+        @ui_sim ||= UISimulator.new
+      end
+
       def count_events(win, evt, id1=Wx::ID_ANY, id2=nil)
         return 0 unless block_given?
         evt_count = EventCounter.new

data/tests/test_app_event_filter.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 require_relative './lib/wxapp_runner'
 

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_app_traits.rb

@@ -0,0 +1,33 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './lib/wxapp_runner'
+
+class AppTraitsTests < Test::Unit::TestCase
+
+  def test_traits
+    traits = Wx.get_app.get_traits
+    assert_not_nil(traits)
+    assert_kind_of(Wx::AppTraits, traits)
+    port_id, ver_major, ver_minor, ver_micro = traits.get_toolkit_version
+    port = case port_id
+           when Wx::PortId::PORT_GTK; 'WXGTK'
+           when Wx::PortId::PORT_MAC; 'WXOSX'
+           when Wx::PortId::PORT_MSW; 'WXMSW'
+           else
+             nil
+           end
+    assert_equal(Wx::PLATFORM, port)
+    assert_true(Wx::PlatformInfo.instance.check_toolkit_version(ver_major, ver_minor, ver_micro))
+
+    std_paths = traits.get_standard_paths
+    assert_not_nil(std_paths)
+    assert_kind_of(Wx::StandardPaths, std_paths)
+    assert_not_empty(std_paths.config_dir)
+    assert_not_empty(std_paths.data_dir)
+    assert_not_empty(std_paths.documents_dir)
+    assert_not_empty(std_paths.app_documents_dir)
+  end
+
+end

data/tests/test_art.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 require_relative './lib/wxapp_runner'
 
@@ -43,6 +46,19 @@ class TestArt < Test::Unit::TestCase
     end
   end
 
+  def test_bitmap_bundle
+    bmps = []
+    bmps << Wx.Bitmap(:wxruby)
+    bmps << Wx.Bitmap('wxruby-64x64')
+    bmps << Wx.Bitmap('wxruby-128x128')
+    bmps << Wx.Bitmap('wxruby-256x256')
+    bundle = assert_nothing_raised { Wx::BitmapBundle.from_bitmaps(bmps) }
+    assert_instance_of(Wx::BitmapBundle, bundle)
+    assert_true(bundle.ok?)
+    assert_equal(Wx::Size.new(32,32), bundle.default_size)
+    assert_instance_of(Wx::Bitmap, bundle.get_bitmap([256,256]))
+  end
+
   if Wx::PLATFORM == 'WXMSW'
 
   def test_cursors
@@ -95,6 +111,12 @@ class TestArt < Test::Unit::TestCase
     assert_equal('sample', File.basename(art, '.*'))
     img = Wx::Image.new(art)
     assert { img.ok? }
+    img = Wx.Image(:sample, art_section: 'my_art')
+    assert { img.ok? }
+    bmp = Wx.Bitmap(:sample, art_section: 'my_art')
+    assert { bmp.ok? }
+    icon = Wx.Icon(:sample, art_section: 'my_art')
+    assert { icon.ok? }
   end
 
 end

data/tests/test_art_provider.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 require_relative './lib/wxapp_runner'
 

data/tests/test_aui.rb

@@ -0,0 +1,65 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './lib/wxframe_runner'
+
+class Issue141Test  < WxRuby::Test::GUITests
+
+  class AUIFrame < Wx::Frame
+    def initialize(parent, id=Wx::ID_ANY, title="Ruby Test Dialog",
+                   pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE,
+                   style=Wx::DEFAULT_DIALOG_STYLE)
+
+      super(parent, id, title, pos, size, style)
+
+      dlg_sizer = Wx::BoxSizer.new(Wx::VERTICAL)
+
+      box_sizer_2 = Wx::BoxSizer.new(Wx::HORIZONTAL)
+
+      @notebook = Wx::AUI::AuiNotebook.new(self, Wx::ID_ANY,
+                                           Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, Wx::AUI_NB_TOP|
+                                             Wx::AUI_NB_TAB_SPLIT|Wx::AUI_NB_TAB_MOVE|Wx::AUI_NB_SCROLL_BUTTONS|
+                                             Wx::AUI_NB_CLOSE_ON_ACTIVE_TAB|Wx::AUI_NB_MIDDLE_CLICK_CLOSE)
+      box_sizer_2.add(@notebook, Wx::SizerFlags.new.border(Wx::ALL))
+
+      page = Wx::Panel.new(@notebook, Wx::ID_ANY, Wx::DEFAULT_POSITION,
+                           Wx::DEFAULT_SIZE, Wx::TAB_TRAVERSAL)
+      @notebook.add_page(page, "page #1")
+      page.set_background_colour(Wx::SystemSettings.get_colour(
+        Wx::SYS_COLOUR_BTNFACE))
+
+      page_sizer = Wx::BoxSizer.new(Wx::VERTICAL)
+
+      box_sizer = Wx::BoxSizer.new(Wx::HORIZONTAL)
+
+      @static_text = Wx::StaticText.new(page, Wx::ID_ANY,
+                                        "What hath Ruby wrought?")
+      box_sizer.add(@static_text, Wx::SizerFlags.new.border(Wx::ALL))
+
+      page_sizer.add(box_sizer, Wx::SizerFlags.new.border(Wx::ALL))
+      page.set_sizer_and_fit(page_sizer)
+
+      dlg_sizer.add(box_sizer_2, Wx::SizerFlags.new.border(Wx::ALL))
+
+      set_sizer_and_fit(dlg_sizer)
+      centre(Wx::BOTH)
+    end
+  end
+
+  def setup
+    super
+  end
+
+  def test_aui_frame
+    GC.start
+    aui_frame = AUIFrame.new(frame_win)
+    aui_frame.show
+    GC.start
+    aui_frame.destroy
+    Wx.get_app.yield
+    # in case of regressions this should segfault
+    GC.start
+  end
+
+end

data/tests/test_basic.rb

@@ -1,10 +1,14 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 require 'test/unit'
 require 'wx'
 
 class BasicTests < Test::Unit::TestCase
 
   def test_versions
-    assert_equal(Wx::WXRUBY_VERSION, "#{Wx::WXRUBY_MAJOR}.#{Wx::WXRUBY_MINOR}.#{Wx::WXRUBY_RELEASE}-#{Wx::WXRUBY_RELEASE_TYPE}")
+    assert_equal(Wx::WXRUBY_VERSION, "#{Wx::WXRUBY_MAJOR}.#{Wx::WXRUBY_MINOR}.#{Wx::WXRUBY_RELEASE}#{Wx::WXRUBY_RELEASE_TYPE.empty? ? '' : '-'+Wx::WXRUBY_RELEASE_TYPE}")
     assert_equal(Wx::WXWIDGETS_VERSION, "#{Wx::WXWIDGETS_MAJOR_VERSION}.#{Wx::WXWIDGETS_MINOR_VERSION}.#{Wx::WXWIDGETS_RELEASE_NUMBER}")
   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_box_sizer.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 require_relative './lib/wxframe_runner'
 
@@ -5,14 +8,14 @@ class BoxSizerTests < WxRuby::Test::GUITests
 
   def setup
     super
-    @win = Wx::Window.new(test_frame, Wx::ID_ANY)
+    @win = Wx::Window.new(frame_win, Wx::ID_ANY)
     @sizer = Wx::HBoxSizer.new
     @win.set_client_size(127, 35)
     @win.sizer = @sizer
   end
 
   def cleanup
-    test_frame.destroy_children
+    frame_win.destroy_children
     @win = nil
     @sizer = nil
     super

data/tests/test_clipboard.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 require_relative './lib/wxapp_runner'