wxruby3 1.6.0 → 1.7.0

data/samples/calendar/calendar.rb

@@ -23,6 +23,7 @@ module CalendarTest
   Calendar_Cal_Year = 204
   Calendar_Cal_SeqMonth = 205
   Calendar_Cal_SurroundWeeks = 206
+  Calendar_Cal_Generic = 207
 
   Calendar_DatePicker_AskDate = 300
   Calendar_DatePicker_ShowCentury = 301
@@ -75,6 +76,51 @@ module CalendarTest
     end
   end
 
+  class MyGenericCalendar < GenericCalendarCtrl
+    attr_reader :date
+
+    def initialize(parent, display_frame, initial_date, calendar_flags)
+      super( parent,
+             :date  => initial_date,
+             :style => calendar_flags | Wx::RAISED_BORDER)
+
+      @display = display_frame
+      @date = initial_date
+      @weekday_names = %w|Sun Mon Tue Wed Thu Fri Sat|
+
+      evt_calendar self, :on_calendar
+      evt_calendar_sel_changed self, :on_calendar_change
+      evt_calendar_weekday_clicked self, :on_calendar_weekday_click
+      evt_right_down :on_hit_test
+    end
+
+    def on_calendar(event)
+      @display.date = event.date
+    end
+
+    def on_calendar_change(event)
+      @date = event.date
+      Wx.log_status("Selected date: #{@date.strftime('%A %d %B %Y')}")
+    end
+
+    def on_calendar_weekday_click(event)
+      wday = event.week_day
+      Wx.log_status("Clicked on #{@weekday_names[wday]}")
+    end
+
+    def on_hit_test(event)
+      hit = hit_test(event.position)
+      case hit
+      when Time, DateTime
+        Wx.log_status("Hit-test: date #{hit}")
+      when Fixnum
+        Wx.log_status("Hit-test: weekday header #{hit}")
+      when NilClass
+        Wx.log_status("Hit-test: Nothing")
+      end
+    end
+  end
+
   class MyFrame < Frame
     def initialize(title)
       super(nil, -1, title)
@@ -102,12 +148,18 @@ module CalendarTest
       evt_menu Calendar_Cal_Month, :on_cal_allow_month
       evt_menu Calendar_Cal_Year, :on_cal_allow_year  if Wx::PLATFORM == 'WXOSX'
 
+      evt_menu Calendar_Cal_Generic, :on_cal_use_generic
+
       evt_menu Calendar_Cal_SeqMonth, :on_cal_seq_month
       evt_menu Calendar_Cal_SurroundWeeks, :on_cal_show_surrounding_weeks
 
       evt_update_ui Calendar_Cal_Year, :on_allow_year_update
     end
 
+    protected def calendar_klass
+      get_menu_bar.is_checked(Calendar_Cal_Generic) ? MyGenericCalendar : MyCalendar
+    end
+
     def add_menu_bar
       # create a menu bar
       menu_file = Wx::Menu.new
@@ -142,6 +194,10 @@ module CalendarTest
       menu_cal.append(Calendar_Cal_Year, "&Year can be changed\tCtrl-Y",
                       "Allow changing the year in the calendar",
                       Wx::ITEM_CHECK) if Wx::PLATFORM == 'WXOSX'
+      menu_cal.append_separator
+      menu_cal.append(Calendar_Cal_Generic, "Use generic control",
+                      "Use Generic Calendar control",
+                      Wx::ITEM_CHECK)
 
       menu_date = Wx::Menu.new
       menu_date.append_check_item(Calendar_DatePicker_ShowCentury, "Al&ways show century")
@@ -216,6 +272,13 @@ module CalendarTest
       @calendar.enable_year_change(allow)
     end
 
+    def on_cal_use_generic(_event)
+      calendar = calendar_klass.new(@panel, self, Wx::DEFAULT_DATE_TIME, @calendar_flags)
+      @sizer.replace(@calendar, calendar)
+      @calendar.destroy
+      @calendar = calendar
+    end
+
     def on_cal_seq_month(event)
       allow = get_menu_bar.is_checked(event.get_id)
       toggle_cal_style(allow, Wx::CAL_SEQUENTIAL_MONTH_SELECTION)
@@ -271,7 +334,7 @@ module CalendarTest
       else
         style &= ~flag
       end
-      @calendar = MyCalendar.new(@panel, self, date, style)
+      @calendar = calendar_klass.new(@panel, self, date, style)
       @sizer.add(@calendar, 0, Wx::ALIGN_CENTRE|Wx::ALL, 5)
       @panel.layout
     end

data/samples/dialogs/dialogs.rb

@@ -42,6 +42,8 @@ module Dialogs
   DIALOGS_REPLACE = 27
   DIALOGS_PREFS = 28
   DIALOGS_PREFS_TOOLBOOK = 29
+  DIALOGS_SHOW_TIP = 30
+  DIALOGS_RICHTIP_DIALOG = 31
 
   class MyTipProvider < Wx::TipProvider
     TIPS = [
@@ -251,6 +253,8 @@ module Dialogs
 
       @find_data = Wx::FindReplaceData.new
 
+      @tipRef = nil
+
       @ext_def = ""
       @index = -1
       @index_2 = -1
@@ -289,6 +293,9 @@ module Dialogs
       evt_find_replace(-1, :on_find_dialog)
       evt_find_replace_all(-1, :on_find_dialog)
       evt_find_close(-1, :on_find_dialog)
+      evt_menu(DIALOGS_SHOW_TIP, :on_show_tip_window)
+      evt_menu(DIALOGS_RICHTIP_DIALOG, :on_show_rich_tip)
+      evt_update_ui(DIALOGS_SHOW_TIP, :on_update_show_tip_ui)
       evt_menu(Wx::ID_EXIT, :on_exit)
 
     end
@@ -613,6 +620,169 @@ module Dialogs
 
     end
 
+    class RichTipDialog < Wx::Dialog
+
+      Icon_None = 0
+      Icon_Info = 1
+      Icon_Warning = 2
+      Icon_Error = 3
+      Icon_Custom = 4
+      Icon_Max = 5
+
+      Bg_Default = 0
+      Bg_Solid = 0
+      Bg_Gradient = 0
+      Bg_Max = 0
+
+      Timeout_None = 0
+      Timeout_Default = 1
+      Timeout_3sec = 2
+      Timeout_Max = 3
+
+      def initialize(parent)
+        super(parent, Wx::ID_ANY, "wxRichToolTip Test",
+              Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE,
+              Wx::DEFAULT_DIALOG_STYLE | Wx::RESIZE_BORDER)
+        # Create the controls.
+        @textTitle = Wx::TextCtrl.new(self, Wx::ID_ANY, "Tooltip title")
+        @textBody = Wx::TextCtrl.new(self, Wx::ID_ANY, "Main tooltip text\n" \
+                                                    "possibly on several\n" \
+                                                    "lines.",
+                                     Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE,
+                                     Wx::TE_MULTILINE)
+        btnShowText = Wx::Button.new(self, Wx::ID_ANY, "Show for &text")
+        btnShowBtn = Wx::Button.new(self, Wx::ID_ANY, "Show for &button")
+
+        icon_names = %w[&None &Information &Warning &Error &Custom]
+        @icons = Wx::RadioBox.new(self, Wx::ID_ANY, "&Icon choice:",
+                                  Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE,
+                                  icon_names,
+                                  1, Wx::RA_SPECIFY_ROWS)
+        @icons.set_selection(Icon_Info)
+
+        tip_kinds = [ "&None", "Top left", "Top", "Top right",
+            "Bottom left", "Bottom", "Bottom right", "&Auto" ]
+        @tipKinds = Wx::RadioBox.new(self, Wx::ID_ANY, "Tip &kind:",
+                                     Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE,
+                                     tip_kinds,
+                                      4, Wx::RA_SPECIFY_COLS)
+        @tipKinds.set_selection(Wx::TipKind_Auto)
+
+        bg_styles = %w[&Default &Solid &Gradient]
+        @bgStyles = Wx::RadioBox.new(self, Wx::ID_ANY, "Background style:",
+                                     Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE,
+                                     bg_styles,
+                                     1, Wx::RA_SPECIFY_ROWS)
+
+        timeout_nms = [ "&None", "&Default (no delay)", "&3 seconds" ]
+        @timeouts = Wx::RadioBox.new(self, Wx::ID_ANY, "Timeout:",
+                                     Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE,
+                                     timeout_nms,
+                                     1, Wx::RA_SPECIFY_ROWS)
+        @timeouts.set_selection(Timeout_Default)
+        @timeDelay = Wx::CheckBox.new(self, Wx::ID_ANY, "Delay show" )
+
+        # Lay them out.
+        @textBody.set_min_size([300, 200])
+  
+        sizer = Wx::VBoxSizer.new
+        sizer.add(@textTitle, Wx::SizerFlags.new.expand.border)
+        sizer.add(@textBody, Wx::SizerFlags.new(1).expand.border)
+        sizer.add(@icons, Wx::SizerFlags.new.expand.border)
+        sizer.add(@tipKinds, Wx::SizerFlags.new.centre.border)
+        sizer.add(@bgStyles, Wx::SizerFlags.new.centre.border)
+        sizer.add(@timeouts, Wx::SizerFlags.new.centre.border)
+        sizer.add(@timeDelay, Wx::SizerFlags.new.centre.border)
+        sizerBtns = Wx::HBoxSizer.new
+        sizerBtns.add(btnShowText, Wx::SizerFlags.new.border(Wx::RIGHT))
+        sizerBtns.add(btnShowBtn, Wx::SizerFlags.new.border(Wx::LEFT))
+        sizer.add(sizerBtns, Wx::SizerFlags.new.centre.border)
+        sizer.add(create_std_dialog_button_sizer(Wx::OK),
+                  Wx::SizerFlags.new.expand.border)
+        set_sizer_and_fit(sizer)
+  
+  
+        # And connect the event handlers.
+        evt_button(btnShowText, :on_show_tip_for_text)
+        evt_button(btnShowBtn, :on_show_tip_for_btn)
+      end
+
+    private
+
+      def on_show_tip_for_text(_event)
+        do_show_tip(@textTitle)
+      end
+
+      def on_show_tip_for_btn(_event)
+        do_show_tip(find_window_by_id(Wx::ID_OK))
+      end
+
+      def do_show_tip(win)
+        tip = Wx::RichToolTip.new(@textTitle.value, @textBody.value)
+        iconSel = @icons.get_selection
+        if iconSel == Icon_Custom
+          tip.set_icon(Wx.Icon(:tip, art_path: __dir__))
+        else # Use a standard icon.
+            stdIcons =[
+              Wx::ICON_NONE,
+              Wx::ICON_INFORMATION,
+              Wx::ICON_WARNING,
+              Wx::ICON_ERROR
+            ]
+
+            tip.set_icon(stdIcons[iconSel])
+        end
+
+        case @bgStyles.get_selection
+        when Bg_Solid
+          tip.set_background_colour(Wx::LIGHT_GREY)
+        when Bg_Gradient
+          tip.set_background_colour(Wx::WHITE, Wx::Colour.new(0xe4, 0xe5, 0xf0))
+        else
+          #
+        end
+
+        delay = @timeDelay.is_checked ? 500 : 0
+
+        case @timeouts.get_selection
+        when Timeout_None
+          # Don't call SetTimeout unnecessarily
+          # or msw will show generic impl
+          tip.set_timeout(0, delay) if delay > 0
+        when Timeout_3sec
+          tip.set_timeout(3000, delay)
+        else
+          #
+        end
+
+        tip.set_tip_kind(Wx::TipKind.new(@tipKinds.get_selection))
+
+        tip.show_for(win)
+      end
+
+    end
+
+    def on_show_rich_tip(_event)
+      MyFrame.RichTipDialog(self)
+    end
+
+    def on_show_tip_window(_event)
+      if @tipRef&.ok?
+        @tipRef.tip_window.close
+      else
+        @tipRef = Wx::TipWindow::new_tip(
+          self,
+          "This is just some text to be shown in the tip " \
+          "window, broken into multiple lines, each less " \
+          "than 60 logical pixels wide.",
+          from_dip(60))
+      end
+    end
+
+    def on_update_show_tip_ui(event)
+      event.check(!!@tipRef&.ok?)
+    end
+
     def on_exit(_event)
       close(true)
     end
@@ -832,6 +1002,8 @@ module Dialogs
       file_menu.append_separator
       file_menu.append(DIALOGS_TIP,  "&Tip of the day\tCtrl-T")
       file_menu.append(DIALOGS_CUSTOM_TIP,  "Custom tip of the day")
+      file_menu.append_check_item(DIALOGS_SHOW_TIP,  "Show &tip window\tShift-Ctrl-H")
+      file_menu.append(DIALOGS_RICHTIP_DIALOG, "Rich &tooltip dialog...\tCtrl-H")
       file_menu.append_separator
       file_menu.append(DIALOGS_FILE_OPEN,  "&Open file\tCtrl-O")
       file_menu.append(DIALOGS_FILE_OPEN2,  "&Second open file\tCtrl-2")

data/samples/dialogs/tip.xpm

@@ -0,0 +1,157 @@
+/* XPM */
+static const char *const tip_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 119 2",
+"   c #141414",
+".  c #1B1B1B",
+"X  c #1F2527",
+"o  c #242525",
+"O  c #242728",
+"+  c #262A2B",
+"@  c #2B2B2B",
+"#  c #2A2E30",
+"$  c #2C3233",
+"%  c #2C3639",
+"&  c #2F3A3D",
+"*  c #313131",
+"=  c #303C3F",
+"-  c #2D3E42",
+";  c #323F42",
+":  c #33454A",
+">  c #34494F",
+",  c #324A50",
+"<  c #3B4E52",
+"1  c #2F5058",
+"2  c #325157",
+"3  c #3D545A",
+"4  c #3A5A62",
+"5  c #34606A",
+"6  c #3F616A",
+"7  c #464646",
+"8  c #4B4B4B",
+"9  c #41585E",
+"0  c gray33",
+"q  c #5D5D5D",
+"w  c #425B62",
+"e  c #456067",
+"r  c #46646B",
+"t  c #456972",
+"y  c #4B6972",
+"u  c #416F7A",
+"i  c #646464",
+"p  c gray42",
+"a  c #696F71",
+"s  c #767676",
+"d  c #787777",
+"f  c gray49",
+"g  c #3E7582",
+"h  c #3E7D8A",
+"j  c #417A86",
+"k  c #417F8E",
+"l  c #3E8494",
+"z  c #418595",
+"x  c #4D8995",
+"c  c #468D9E",
+"v  c #6B848A",
+"b  c #4795A7",
+"n  c #4F92A1",
+"m  c #4D9AAA",
+"M  c #5695A4",
+"N  c #55A2B3",
+"B  c #5FAABA",
+"V  c #7BA6AF",
+"C  c #4FAFC5",
+"Z  c #5DB7CA",
+"A  c #52BAD1",
+"S  c #58BDD4",
+"D  c #62C2D5",
+"F  c #64C3DA",
+"G  c #73C8DA",
+"H  c #7ECBDD",
+"J  c #868686",
+"K  c gray55",
+"L  c #9FA0A0",
+"P  c #98A8AB",
+"I  c #ADADAC",
+"U  c #AAB1B2",
+"Y  c #A8B9BD",
+"T  c gray70",
+"R  c #90C3CF",
+"E  c #87C8D7",
+"W  c #82CADA",
+"Q  c #91C8D4",
+"!  c #93CFDC",
+"~  c #98CEDB",
+"^  c #93D1DF",
+"/  c #9AD1DC",
+"(  c #A4CCD7",
+")  c #A3CFDA",
+"_  c #A1D0DB",
+"`  c #ACD1DA",
+"'  c #B2D6DE",
+"]  c #BCD7DD",
+"[  c #89D2E2",
+"{  c #9BD5E1",
+"}  c #A9DEE9",
+"|  c #BFE1E7",
+" . c #BDE3EB",
+".. c #C5C5C5",
+"X. c #CACACA",
+"o. c #C2D5D9",
+"O. c #C2D8DD",
+"+. c #CCD9DD",
+"@. c #D4DBDD",
+"#. c #DBDDDE",
+"$. c #E0DFDF",
+"%. c #CCDDE1",
+"&. c #D2DFE1",
+"*. c #CCE5EB",
+"=. c #D6E2E4",
+"-. c #DCE3E5",
+";. c #D4E6E9",
+":. c #DBE6E8",
+">. c #E2E4E4",
+",. c #E6E9E9",
+"<. c #ECECEC",
+"1. c #F1EFEF",
+"2. c #E1EDF0",
+"3. c #E9EFF0",
+"4. c #EEF3F3",
+"5. c #F5F5F4",
+"6. c #F8F7F7",
+"7. c #FBFBFA",
+"8. c None",
+/* pixels */
+"8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.8.8.8.o o o o @ @ o o o o 8.8.8.8.8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.o o @ * * q q f J i q 7 * @ o o 8.8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.o O @ 7 K X.7.7.7.7.7.7.7.7.>.I i * @ o 8.8.8.8.8.8.",
+"8.8.8.8.8.o @ 8 T 6.7.7.7.7.7.7.7.7.7.7.7.7.7.#.s @ o o 8.8.8.8.",
+"8.8.8.o O * K 5.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7...8 O o 8.8.8.",
+"8.8.o O * I 7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.>.0 O o 8.8.",
+"8.8.o @ I 7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.<.7 O 8.8.",
+"8.o @ d 7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.X.@ o 8.",
+"8.O @ $.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.6.a O 8.",
+"o @ p 6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.Y @ o ",
+"o @ L 6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.*.$ o ",
+"o O U 6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.5. .; o ",
+"O $ P 5.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.4.} % o ",
+"o < v 3.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.2.W O o ",
+"o w < *.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.| x # o ",
+"8.$ < V :.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.;.[ , ;   ",
+"8.o y : ( -.<.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.<.=.{ j 3 o 8.",
+"8.8.+ w 4 ` =.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.%.^ m > % . 8.",
+"8.8.o & 3 2 Q O.-.<.<.<.<.<.<.<.<.<.<.<.<.<.,.=.' H z : : . 8.8.",
+"8.8.8.o % w - M / ] &.-.,.,.<.<.<.<.<.<.<.>.O.! Z 5 < ; . 8.8.8.",
+"8.8.8.8.o O e : 1 n W ~ ` ] O.%.%.+.@.>.,.+.! z : w @ . 8.8.8.8.",
+"8.8.8.8.8.8.o % r 3 > 5 h N B G G R o.#.>.` D : ; .   8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.o + : w y w 3 3 - X ` @.%.W l w . 8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.8.8.. o o o o O + - ( +._ S 6 O   8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.o 4 ( ) F g = . 8.8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.O u E F z < . 8.8.8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.o 3 C A k > . 8.8.8.8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.9 c b t + . 8.8.8.8.8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.: % o .   8.8.8.8.8.8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.. 8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.",
+"8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8."
+};

data/samples/drawing/maths_images.rb

@@ -227,7 +227,7 @@ class MathsPanel < Panel
 
   # Display a dialog to save the image to a file
   def on_save
-    SaveImageDialog(parent) do |dlg|
+    MathImages::SaveImageDialog(parent) do |dlg|
       if dlg.show_modal == Wx::ID_OK
         if dlg.image_type == Wx::BITMAP_TYPE_PNG
           # test writing to IO

data/samples/event/event.rb

@@ -175,7 +175,7 @@ module Event
 
       Wx::MessageDialog(self, msg, 'About Event Handling',
                         Wx::OK | Wx::ICON_INFORMATION) do |about_dlg|
-        about_dlg.ok_label = Wx::ButtonLabel.new('Close')
+        about_dlg.ok_label = 'Close'
         about_dlg.show_modal
       end
     end

data/samples/printing/printing2.rb

@@ -172,7 +172,7 @@ module Printing2
       msg = <<~__STR
         Print framework sample application
   
-        Using wxRuby #{Wx::version()}
+        Using wxRuby #{Wx::WXRUBY_VERSION}
       __STR
 
       Wx::message_box(msg,'About')

data/samples/sampler.rb

@@ -79,14 +79,32 @@ module WxRuby
       evt_menu(ID::TB_CLOSE) { @frame.close }
     end
 
-    def create_popup_menu
-      # Called by the base class when it needs to popup the menu
-      #  (the default evt_right_down event).  Create and return
-      #  the menu to display.
-      menu = Wx::Menu.new
-      menu.append(ID::TB_RESTORE, "Restore wxRuby Sampler")
-      menu.append(ID::TB_CLOSE, "Close wxRuby Sampler")
-      return menu
+    if ::Wx::WXWIDGETS_VERSION >= '3.1.5'
+
+      def get_popup_menu
+        # Called by the base class when it needs to popup the menu
+        #  (the default evt_right_down event).  Create once and return
+        #  the menu to display.
+        unless @popup_menu
+          @popup_menu = Wx::Menu.new
+          @popup_menu.append(ID::TB_RESTORE, "Restore wxRuby Sampler")
+          @popup_menu.append(ID::TB_CLOSE, "Close wxRuby Sampler")
+        end
+        @popup_menu
+      end
+
+    else
+
+      def create_popup_menu
+        # Called by the base class when it needs to popup the menu
+        #  (the default evt_right_down event).  Create and return
+        #  the menu to display.
+        menu = Wx::Menu.new
+        menu.append(ID::TB_RESTORE, "Restore wxRuby Sampler")
+        menu.append(ID::TB_CLOSE, "Close wxRuby Sampler")
+        menu
+      end
+
     end
 
     def make_icon(imgname)

data/samples/text/textctrl.rb

@@ -45,8 +45,8 @@ module TextCtrl
   end
 
   class TextCtrlFrame < Wx::Frame
-    def initialize(*args)
-      super(nil, *args)
+    def initialize(*args, **kwargs)
+      super(nil, *args, **kwargs)
 
       self.icon = Wx.Icon(:sample, Wx::BITMAP_TYPE_XPM, art_path: File.join(__dir__, '..'))
 

data/samples/treectrl/treectrl.rb

@@ -89,8 +89,8 @@ module TreeCtrl
     TreeCtrlIcon_FolderOpened = 0, 1, 2, 3, 4
 
   class MyTreeCtrl < Wx::TreeCtrl
-    def initialize(parent, *args)
-      super(parent, *args)
+    def initialize(parent, *args, **kwargs)
+      super(parent, *args, **kwargs)
 
       @alternate_images = false
       @alternate_states = false

data/tests/lib/leaked_process_event_exception_test.rb

@@ -4,7 +4,7 @@
 
 require_relative './wxapp_runner'
 
-class ProcessEventHandlingExceptionTests < Test::Unit::TestCase
+class ProcessEventHandlingExceptionTests < WxRuby::Test::Unit
 
   class TestEvent < Wx::Event
     EVT_TEST_EVENT = Wx::EvtHandler.register_class(self, nil, 'evt_test_event', 0)

data/tests/lib/leaked_queued_event_exception_test.rb

@@ -4,7 +4,7 @@
 
 require_relative './wxapp_runner'
 
-class QueuedEventHandlingExceptionTests < Test::Unit::TestCase
+class QueuedEventHandlingExceptionTests < WxRuby::Test::Unit
 
   class TestEvent < Wx::Event
     EVT_TEST_EVENT = Wx::EvtHandler.register_class(self, nil, 'evt_test_event', 0)

data/tests/lib/wxapp_runner.rb

@@ -2,8 +2,7 @@
 #
 # This software is released under the MIT license.
 
-require 'test/unit'
-require 'test/unit/ui/console/testrunner'
+require_relative './wxrb_test'
 require 'wx'
 
 module WxRuby
@@ -11,33 +10,42 @@ module WxRuby
   module Test
 
     class App < Wx::App
-      def initialize(test_runner, start_mtd)
+      def initialize(test_runner, start_mtd, *args, **kwargs)
         super()
         @test_runner = test_runner
         @start_mtd = start_mtd
+        @args = args
+        @kwargs = kwargs
+      end
+
+      protected def run_all_tests
+        @start_mtd.bind(@test_runner).call(*@args, **@kwargs)
       end
 
       def on_init
-        @result = @start_mtd.bind(@test_runner).call
+        @result = run_all_tests
         false
       end
 
       attr_reader :result
     end
 
-    if defined? ::IntelliJ
-      require 'test/unit/ui/teamcity/testrunner'
-      BaseRunner = ::Test::Unit::UI::TeamCity::TestRunner
-    else
-      BaseRunner = ::Test::Unit::UI::Console::TestRunner
-    end
+    class Unit < Minitest::Test
 
-    class Runner < BaseRunner
+      def self.is_ci_build?
+        (ENV['GITHUB_ACTION'] || ENV['CI'])
+      end
+
+      def is_ci_build?
+        Unit.is_ci_build?
+      end
+
+      def self.uses_wayland?
+        Wx.has_feature?('HAVE_WAYLAND_CLIENT')
+      end
 
-      org_start_mtd = instance_method :start
-      define_method :start do
-        (app = WxRuby::Test::App.new(self, org_start_mtd)).run
-        app.result
+      def uses_wayland?
+        Unit.uses_wayland?
       end
 
     end
@@ -46,34 +54,16 @@ module WxRuby
 
 end
 
-module Test
-  module Unit
-    AutoRunner.register_runner(:wxapp) do |auto_runner|
-      WxRuby::Test::Runner
-    end
-    AutoRunner.default_runner = :wxapp
-    if defined? ::IntelliJ
-      class AutoRunner
-        alias :wx_initialize :initialize
-        private :wx_initialize
-
-        def initialize(*args)
-          wx_initialize(*args)
-          @runner = AutoRunner.default_runner
-        end
-      end
-    end
+module Minitest
 
-    class TestCase
-
-      def self.is_ci_build?
-        (ENV['GITHUB_ACTION'] || ENV['CI'])
-      end
-
-      def is_ci_build?
-        TestCase.is_ci_build?
-      end
+  RUN_ALL_METHOD = VERSION >= '6.0.0' ? :run_all_suites : :__run
 
+  class << self
+    org_run_all_suites_mtd = instance_method RUN_ALL_METHOD
+    define_method RUN_ALL_METHOD do |*args, **kwargs|
+      (app = WxRuby::Test::App.new(self, org_run_all_suites_mtd, *args, **kwargs)).run
+      app.result
     end
   end
+
 end