wxruby3 0.9.0.pre.rc.2-x64-mingw-ucrt → 0.9.0-x64-mingw-ucrt

data/lib/wx/wxruby/cmd/sampler.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # wxruby sampler command handler
-# Copyright (c) M.J.N. Corino, The Netherlands
 #--------------------------------------------------------------------
 
 require 'fileutils'

data/lib/wx/wxruby/cmd/test.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # wxruby unit test command handler
-# Copyright (c) M.J.N. Corino, The Netherlands
 #--------------------------------------------------------------------
 
 require 'fileutils'

data/lib/wx.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx all-in-one loader for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 WX_GLOBAL_CONSTANTS=true unless defined? WX_GLOBAL_CONSTANTS
 

data/rakelib/install.rb

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

data/rakelib/lib/config/cygwin.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 buildtools configuration
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 raise "Cygwin platform is unsupported as yet."

data/rakelib/lib/config/linux.rb

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

data/rakelib/lib/config/macosx.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 buildtools configuration
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './unixish'
@@ -85,7 +88,7 @@ module WXRuby3
           private
 
           def wx_configure
-            bash('./configure --disable-sys-libs --without-liblzma --prefix=`pwd`/install --disable-tests --without-subdirs --disable-debug_info')
+            bash('./configure --disable-optimise --disable-sys-libs --without-liblzma --prefix=`pwd`/install --disable-tests --without-subdirs --disable-debug_info CFLAGS="-Wno-unused-but-set-variable"')
           end
 
           def wx_make

data/rakelib/lib/config/mingw.rb

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

data/rakelib/lib/config/netbsd.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 buildtools configuration
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 raise "NETBSD platform is unsupported as yet."

data/rakelib/lib/config/unixish.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 buildtools configuration
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'set'
@@ -155,17 +158,17 @@ module WXRuby3
           @wx_version  = wx_config('--version')
           @wx_port = case wx_config('--selected-config')
                      when /\Agtk/
-                       :wxGTK
+                       :wxgtk
                      when /\Aqt/
-                       :wxQT
+                       :wxqt
                      when /\Ax11/
-                       :wxX11
+                       :wxx11
                      when /\Amotif/
-                       :wxMOTIF
+                       :wxmotif
                      when /\Amsw/
-                       :wxMSW
+                       :wxmsw
                      when /\Aosx/
-                       :wxOSX
+                       :wxosx
                      else
                        nil
                      end

data/rakelib/lib/config.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 buildtools configuration
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'rbconfig'
@@ -189,14 +192,16 @@ module WXRuby3
     private :bash
 
     def test(*tests, **options)
+      errors = 0
       tests = Dir.glob(File.join(Config.instance.test_dir, '*.rb')) if tests.empty?
       tests.each do |test|
         unless File.exist?(test)
           test = File.join(Config.instance.test_dir, test)
           test = Dir.glob(test+'.rb').shift || test unless File.exist?(test)
         end
-        Rake.sh(Config.instance.exec_env, *make_ruby_cmd(test))
+        Rake.sh(Config.instance.exec_env, *make_ruby_cmd(test)) { |ok,status| errors += 1 unless ok }
       end
+      fail "ERRORS: ##{errors} test scripts failed." if errors>0
     end
 
     def irb(**options)

data/rakelib/lib/ext/enum_chain.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 extensions for Enumerator::Chain
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 unless ::Enumerator.const_defined?(:Chain)

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/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'

data/samples/controls/controls.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'
@@ -178,8 +183,6 @@ end
 
 class MyPanel < Panel
 
-  #    delete Log::set_active_target(@m_logTargetOld)
-  #    delete @m_notebook.GetImageList()
   attr_reader   :m_text,:m_logTargetOld
 
   def initialize(frame,x,y,w,h)
@@ -276,10 +279,10 @@ class MyPanel < Panel
     @m_notebook.add_page(panel, "Choice", false, Image_Choice)
 
     panel = Panel.new(@m_notebook)
-    StaticBox.new( panel, -1, "&Box around combobox",
-                   Point.new(5, 5), Size.new(150, 100))
-    @m_combo = MyComboBox.new( panel, ID_COMBO, "This",
-                               Point.new(20,25), Size.new(120, -1),
+    box = StaticBox.new( panel, -1, "&Box around combobox",
+                         Point.new(5, 5), Size.new(150, 100))
+    @m_combo = MyComboBox.new( box, ID_COMBO, "This",
+                               Point.new(15,20), Size.new(120, -1),
                                choices,TE_PROCESS_ENTER)
     # CB_READONLY | PROCESS_ENTER)
 
@@ -317,42 +320,43 @@ class MyPanel < Panel
     @m_notebook.add_page(panel, "RadioBox", false, Image_Radio)
 
     panel = Panel.new(@m_notebook)
-    StaticBox.new( panel, -1, "&Gauge and Slider", Point.new(10,10), Size.new(222,130) )
-    @m_gauge = Gauge.new( panel, -1, 200, Point.new(18,50), Size.new(155, 30), GA_HORIZONTAL|NO_BORDER )
+    box = StaticBox.new( panel, -1, "&Gauge and Slider", Point.new(10,10), Size.new(240,170) )
+    @m_gauge = Gauge.new( box, -1, 200, Point.new(10,30), Size.new(155, 30), GA_HORIZONTAL|NO_BORDER )
     @m_gauge.set_background_colour(GREEN)
     @m_gauge.set_foreground_colour(RED)
-    @m_gaugeVert = Gauge.new( panel, -1, 100,
-                              Point.new(195,35), Size.new(30, 90),
+    @m_gaugeVert = Gauge.new( box, -1, 100,
+                              Point.new(185,25), Size.new(30, 90),
                               GA_VERTICAL | GA_SMOOTH | NO_BORDER )
-    @m_slider = Slider.new( panel, ID_SLIDER, 0, 0, 200, Point.new(18,90), Size.new(155,-1),
+    @m_slider = Slider.new( box, ID_SLIDER, 0, 0, 200, Point.new(10,70), Size.new(155,-1),
                             SL_AUTOTICKS | SL_LABELS )
-    @m_slider.set_tick_freq(40)
+    @m_slider.set_tick_freq(40) unless Wx::PLATFORM == 'WXOSX'
     @m_slider.set_tool_tip("This is a sliding slider")
 
-    StaticBox.new( panel, -1, "&Explanation",
-                   Point.new(230,10), Size.new(270,130),
-                   ALIGN_CENTER )
+    box = StaticBox.new(panel, -1, "&Explanation",
+                        Point.new(250,10), Size.new(310,170),
+                        ALIGN_CENTER )
 
-    StaticText.new( panel, -1,
+    StaticText.new( box, -1,
                     "In order see the gauge (aka progress bar)\n"+
                     "control do something you have to drag the\n"+
                     "handle of the slider to the right.\n"+
                     "\n"+
                     "This is also supposed to demonstrate how\n"+
                     "to use static controls.\n",
-                    Point.new(250,25),
-                    Size.new(240, 110))
+                    Point.new(10,10),
+                    DEFAULT_SIZE)
+                    #Size.new(240, 110))
     initialSpinValue = -5
     s = initialSpinValue.to_s
-    @m_spintext = TextCtrl.new( panel, -1, s, Point.new(20,160), Size.new(80,-1) )
-    @m_spinbutton = SpinButton.new( panel, ID_SPIN, Point.new(103,160), Size.new(80, -1) )
+    @m_spintext = TextCtrl.new( panel, -1, s, Point.new(20,195), Size.new(80,-1) )
+    @m_spinbutton = SpinButton.new( panel, ID_SPIN, Point.new(103,195), Size.new(80, @m_spintext.size.height) )
     @m_spinbutton.set_range(-40,30)
     @m_spinbutton.set_value(initialSpinValue)
 
     @m_btnProgress = Button.new( panel, ID_BTNPROGRESS, "&Show progress dialog",
-                                 Point.new(300, 160) )
+                                 Point.new(300, 195) )
 
-    @m_spinctrl = SpinCtrl.new( panel, ID_SPINCTRL, "", Point.new(200, 160), Size.new(80, -1) )
+    @m_spinctrl = SpinCtrl.new( panel, ID_SPINCTRL, "", Point.new(200, 195), Size.new(95, @m_spintext.size.height) )
     @m_spinctrl.set_range(10,30)
     @m_spinctrl.set_value(15)
 
@@ -609,26 +613,6 @@ class MyPanel < Panel
     @m_text.append_text( "ListBox control selection string is: '" )
     @m_text.append_text( listbox.get_string_selection() )
     @m_text.append_text( "'\n" )
-
-    # NOTE: get_client_data and set_client_data have been removed from wxRuby 0.4
-    # because they could cause crashes
-    #        obj = event.get_client_data()
-    #        @m_text.append_text( "ListBox event client data string is: '" )
-    #        if obj
-    #            @m_text.append_text( obj )
-    #        else
-    #            @m_text.append_text( "none" )
-    #        end
-
-    #        @m_text.append_text( "'\n" )
-    #        @m_text.append_text( "ListBox control client data string is: '" )
-    #        obj = listbox.get_client_data(listbox.get_selection())
-    #        if obj
-    #            @m_text.append_text( obj )
-    #        else
-    #            @m_text.append_text( "none" )
-    #        end
-    #        @m_text.append_text( "'\n" )
   end
 
   def onListBoxDoubleClick(event)
@@ -652,12 +636,6 @@ class MyPanel < Panel
       @m_lbSelectThis.enable( event.get_int() == 0 )
       @m_lbSelectNum.enable( event.get_int() == 0 )
       @m_listboxSorted.enable( event.get_int() == 0 )
-      #w = Window::find_window_by_id(ID_CHANGE_COLOUR)
-      #if(w)
-      #    w.enable( event.get_int() == 0 )
-      #else
-      #    puts("Window ID_CHANGE_COLOR not found")
-      #end
     when ID_LISTBOX_SEL_NUM
       @m_listbox.set_selection( 2 )
       @m_listboxSorted.set_selection( 2 )
@@ -699,28 +677,6 @@ class MyPanel < Panel
     @m_text.append_text( "Choice control selection string is: '" )
     @m_text.append_text( choice.get_string_selection() )
     @m_text.append_text( "'\n" )
-
-    # NOTE: get_client_data and set_client_data have been removed from wxRuby 0.4
-    # because they could cause crashes
-    #        obj = event.get_client_data()
-    #        @m_text.append_text( "Choice event client data string is: '" )
-
-    #        if obj
-    #           @m_text.append_text( obj )
-    #        else
-    #           @m_text.append_text( "none" )
-    #        end
-
-    #        @m_text.append_text( "'\n" )
-    #        @m_text.append_text( "Choice control client data string is: '" )
-
-    #        obj = choice.get_client_data(choice.get_selection())
-    #        if obj
-    #           @m_text.append_text( obj )
-    #        else
-    #           @m_text.append_text( "none" )
-    #        end
-    #        @m_text.append_text( "'\n" )
   end
 
   def onChoiceButtons(event)
@@ -910,7 +866,7 @@ class MyPanel < Panel
     end
 
     cont = false
-    ProgressDialog("Progress dialog example",
+    Wx.ProgressDialog("Progress dialog example",
                    "An informative message",
                    max, # range
                    self, # parent
@@ -967,7 +923,7 @@ end
 
 class MyFrame < Frame
   def initialize(title,x,y)
-    super(nil, -1, title, Point.new(x, y), Size.new(500, 430))
+    super(nil, -1, title, Point.new(x, y), Size.new(600, 500))
 
     @s_delay = 5000
     @s_enabled = true
@@ -1093,9 +1049,9 @@ class MyFrame < Frame
     focus = Window::find_focus()
     if focus && (focus != @s_windowFocus)
       @s_windowFocus = focus
-      msg = sprintf( "Focus: %s, HWND = %08x",
+      msg = sprintf( "Focus: %s @ %d",
                        @s_windowFocus.wx_class,
-                       @s_windowFocus.get_handle )
+                       @s_windowFocus.object_id )
       set_status_text(msg)
     end
   end

data/samples/controls/get_item_sample.rb

@@ -1,7 +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
+
 # Written by Nobuaki Arima
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/controls/htlbox.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'
@@ -175,7 +181,7 @@ class MyFrame < Wx::Frame
     # create the child controls
     create_box
     text = Wx::TextCtrl.new(self, Wx::ID_ANY, "", style: Wx::TE_MULTILINE)
-    Wx::Log.set_active_target(Wx::LogTextCtrl.new(text))
+    old_log_tgt = Wx::Log.set_active_target(Wx::LogTextCtrl.new(text))
 
     # and lay them out
     sizer = Wx::HBoxSizer.new
@@ -187,6 +193,7 @@ class MyFrame < Wx::Frame
     evt_menu ID::HtmlLbox_CustomBox,  :on_simple_or_custom_box
     evt_menu ID::HtmlLbox_SimpleBox,  :on_simple_or_custom_box
     evt_menu ID::HtmlLbox_Quit,  :on_quit
+    evt_close { Wx::Log.set_active_target(old_log_tgt); destroy }
 
     evt_menu ID::HtmlLbox_SetMargins, :on_set_margins
     evt_menu ID::HtmlLbox_DrawSeparator, :on_draw_separator

data/samples/dialogs/dialogs.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'
@@ -432,7 +437,7 @@ class MyFrame < Frame
                            "This is a small sample\n" +
                              "A single-choice convenience dialog",
                            "Please select a value",
-                           choices, nil, OK | CANCEL) do |dialog|
+                           choices, OK | CANCEL) do |dialog|
       dialog.set_selection(2)
 
       if dialog.show_modal == ID_OK

data/samples/dialogs/wizard.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/dragdrop/dragdrop.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'