wxruby3 1.6.1 → 1.7.0

data/rakelib/lib/generate/doc/rich_tool_tip.yaml

@@ -0,0 +1,26 @@
+---
+:wxRichToolTip:
+  :detail:
+    :pre:
+      :para:
+        - :pattern: !ruby/regexp /The images below show some examples.*/
+          :replace: |
+
+      :programlisting:
+        - :pattern: !ruby/regexp /.*/
+          :replace: |
+            
+            ```ruby
+              password = Wx::TextCtrl.new(..., style: Wx::TE_PASSWORD)
+              # ...
+              tip = Wx::RichToolTip.new("Caps Lock is on",
+                                        "You might have made an error in your password\n" +
+                                        "entry because Caps Lock is turned on.\n" +
+                                        "\n" +
+                                        "Press Caps Lock key to turn it off.")
+               tip.set_icon(Wx::ICON_WARNING)
+               tip.show_for(password)
+            ```
+    :post:
+      - :pattern: !ruby/regexp /<div class='appearance'>.*</table></div>/m
+        :subst: ''

data/rakelib/lib/generate/doc.rb

@@ -49,7 +49,7 @@ module WXRuby3
           end
           table = { 'Wx' => {}}
           handle_module(Wx, table['Wx'])
-          STDOUT.puts JSON.dump(table)
+          File.open(ARGV[0], 'w+') { |f| f << JSON.dump(table) }
         __SCRIPT
         STDERR.puts "* executing constants collection script:\n#{script}" if Director.trace?
         begin
@@ -57,22 +57,27 @@ module WXRuby3
           ftmp_name = tmpfile.path.dup
           tmpfile << script
           tmpfile.close(false)
-          result = if Director.trace?
-                     Config.instance.run(ftmp_name, capture: :out, verbose: false)
-                   else
-                     Config.instance.run(ftmp_name, capture: :no_err, verbose: false)
-                   end
+          tmpconsts = Tempfile.new('constants')
+          fconsts_name = tmpconsts.path.dup
+          tmpconsts.close(false)
+          if Director.trace?
+            Config.instance.run(ftmp_name, fconsts_name, capture: :out, verbose: false)
+          else
+            Config.instance.run(ftmp_name, fconsts_name, capture: :no_err, verbose: false)
+          end
+          result = File.read(fconsts_name)
           STDERR.puts "* got constants collection output:\n#{result}" if Director.trace?
           begin
             db = JSON.load(result)
           rescue Exception
-            File.open('constants_raw.json', "w") { |f| f << result } if Director.verbose?
+            # File.open('constants_raw.json', "w") { |f| f << result } if Director.verbose?
             ::Kernel.raise RuntimeError, "Exception loading constants collection result: #{$!.message.slice(0, 512)}", cause: nil
           end
           File.open('constants.json', "w") { |f| f << JSON.pretty_generate(db) } if Director.verbose?
           return db
         ensure
           File.unlink(ftmp_name)
+          File.unlink(fconsts_name)
         end
       end
 

data/rakelib/lib/generate/interface.rb

@@ -262,6 +262,16 @@ module WXRuby3
             fout.puts extension
             fout.puts '};'
           end
+          item.innerclasses.each do |inner|
+            if inner.protection == 'public' && !inner.ignored && !inner.deprecated
+              extension = extend_code("#{class_name(item)}::#{class_name(inner)}")
+              unless extension.empty?
+                fout.puts "\n%extend #{class_name(item)}::#{class_name(inner)} {"
+                fout.puts extension
+                fout.puts '};'
+              end
+            end
+          end
         end
       end
     end
@@ -523,7 +533,12 @@ module WXRuby3
       typedefs = def_items.select {|item| Extractor::TypedefDef === item && !item.ignored }
       typedefs.each do |item|
         fout.puts
-        fout.puts "#{item.definition};"
+        # work around problems with older doxygen and wxw < 3.3
+        if item.definition.start_with?('typedef')
+          fout.puts "#{item.definition};"
+        else # with older doxygen 'definition' is often not complete statement so we form it here
+          fout.puts "typedef #{item.type} #{item.name};"
+        end
       end
       fout.puts '' unless typedefs.empty?
     end

data/rakelib/lib/specs/interfaces.rb

@@ -32,6 +32,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxApp')
     Director.Spec(pkg, 'wxAppTraits')
     Director.Spec(pkg, 'wxConfigBase')
+    Director.Spec(pkg, 'wxDisplay')
     Director.Spec(pkg, 'wxDC')
     Director.Spec(pkg, 'wxWindowDC', director: Director::DerivedDC)
     Director.Spec(pkg, 'wxClientDC', director: Director::DerivedDC)
@@ -122,6 +123,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxCursor')
     Director.Spec(pkg, 'wxRadioButton', director: Director::Window, requirements: %w[USE_RADIOBTN])
     Director.Spec(pkg, 'wxToolTip', requirements: %w[USE_TOOLTIPS])
+    Director.Spec(pkg, 'wxRichToolTip', requirements: %w[USE_RICHTOOLTIP])
     Director.Spec(pkg, 'wxLog', requirements: %w[USE_LOG])
     Director.Spec(pkg, 'wxToolBar', requirements: %w[USE_TOOLBAR])
     Director.Spec(pkg, 'wxImage', requirements: %w[USE_IMAGE])
@@ -211,7 +213,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxDragDrop', requirements: %w[USE_DRAG_AND_DROP])
     Director.Spec(pkg, 'wxContextHelpButton', requirements: %w[USE_HELP])
     Director.Spec(pkg, 'wxHelpProvider', requirements: %w[USE_HELP])
-    Director.Spec(pkg, 'wxTipWindow', requirements: %w[USE_HELP])
+    Director.Spec(pkg, 'wxTipWindow', requirements: %w[USE_TIPWINDOW])
     Director.Spec(pkg, 'wxHelpController', requirements: %w[USE_HELP])
     Director.Spec(pkg, 'wxExtHelpController', director: Director::HelpController, requirements: %w[USE_HELP])
     Director.Spec(pkg, 'wxTaskBarIconEvent', director: Director::Event, requirements: %w[USE_TASKBARICON])

data/rakelib/lib/swig_runner.rb

@@ -24,8 +24,12 @@ module WXRuby3
       include Util::StringUtil
 
       def swig_major
+        swig_version.first
+      end
+
+      def swig_version
         check_swig unless swig_state
-        (@swig_version || '').split('.').first.to_i
+        @swig_version
       end
 
       private
@@ -38,32 +42,28 @@ module WXRuby3
         !!@swig_state
       end
 
-      def swig_version
-        check_swig unless swig_state
-        @swig_version
-      end
-
       def check_swig
         begin
-          @swig_version = `#{WXRuby3::Config.get_config('swig')} -version`[/\d+\.\d+\.\d+/]
+          swig_version_ = `#{WXRuby3::Config.get_config('swig')} -version`[/\d+\.\d+\.\d+/]
         rescue Exception
           $stderr.puts "ERROR: Could not run SWIG (#{WXRuby3::Config.get_config('swig')})"
           exit(1)
         end
 
         # Very old versions put --version on $stderr, not $stdout
-        unless @swig_version
+        unless swig_version_
           $stderr.puts "Could not get version info from SWIG; " +
                         "is a very old version installed?.\n"
           exit(1)
         end
 
-        if @swig_version < SWIG_MINIMUM_VERSION
-          $stderr.puts "SWIG version #{@swig_version} is installed, " +
+        if swig_version_ < SWIG_MINIMUM_VERSION
+          $stderr.puts "SWIG version #{swig_version_} is installed, " +
                         "minimum version required is #{SWIG_MINIMUM_VERSION}.\n"
           exit(1)
         end
 
+        @swig_version = swig_version_.split('.').map(&:to_i)
         @swig_state = true
       end
 

data/rakelib/lib/typemap/aui_tabctrl.rb

@@ -0,0 +1,46 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 Common typemap definitions
+###
+
+require_relative '../core/mapping'
+
+module WXRuby3
+
+  module Typemap
+
+    # These typemaps are used by AUI classes to convert wxAuiTabCtrl pointers
+    # into lightweight wrapper objects
+    module AuiTabCtrl
+
+      include Typemap::Module
+
+      define do
+
+        map 'wxAuiTabCtrl*' => 'Wx::AUI::AuiTabCtrl' do
+
+          add_header_code <<~__CODE
+            // implemented in TreeEvent.cpp
+            extern VALUE _wxRuby_Wrap_wxAuiTabCtrl(wxAuiTabCtrl* wxATC);
+            extern wxAuiTabCtrl* _wxRuby_Unwrap_wxAuiTabCtrl(VALUE rbATC);
+            extern bool _wxRuby_Is_wxAuiTabCtrl(VALUE rbATC);
+            __CODE
+
+          map_in temp: 'wxAuiTabCtrl *tmpATC', code: <<~__CODE
+            if ($input != Qnil) tmpATC = _wxRuby_Unwrap_wxAuiTabCtrl($input);
+            $1 = tmpATC;
+            __CODE
+
+          map_out code: '$result = _wxRuby_Wrap_wxAuiTabCtrl($1);'
+        end
+
+      end # define
+
+    end # AuiTabCtrl
+
+  end # Typemap
+
+end # WXRuby3

data/rakelib/lib/typemap/common.rb

@@ -565,7 +565,7 @@ module WXRuby3
         map 'wxUpdateUIEvent &' => 'Wx::UpdateUIEvent' do
           map_directorin code: <<~__CODE
             #ifdef __WXRB_DEBUG__
-            $input = wxRuby_WrapWxEventInRuby(this, static_cast<wxEvent*> (&$1));
+            $input = wxRuby_WrapWxEventInRuby(const_cast<void*>((const void*)this), static_cast<wxEvent*> (&$1));
             #else
             $input = wxRuby_WrapWxEventInRuby(static_cast<wxEvent*> (&$1));
             #endif
@@ -577,7 +577,7 @@ module WXRuby3
         map 'wxCommandEvent &' => 'Wx::CommandEvent' do
           map_directorin code: <<~__CODE
             #ifdef __WXRB_DEBUG__
-            $input = wxRuby_WrapWxEventInRuby(this, static_cast<wxEvent*> (&$1));
+            $input = wxRuby_WrapWxEventInRuby(const_cast<void*>((const void*)this), static_cast<wxEvent*> (&$1));
             #else
             $input = wxRuby_WrapWxEventInRuby(static_cast<wxEvent*> (&$1));
             #endif
@@ -598,7 +598,7 @@ module WXRuby3
         map 'wxKeyEvent &' => 'Wx::KeyEvent' do
           map_directorin code: <<~__CODE
             #ifdef __WXRB_DEBUG__
-            $input = wxRuby_WrapWxEventInRuby(this, static_cast<wxEvent*> (&$1));
+            $input = wxRuby_WrapWxEventInRuby(const_cast<void*>((const void*)this), static_cast<wxEvent*> (&$1));
             #else
             $input = wxRuby_WrapWxEventInRuby(static_cast<wxEvent*> (&$1));
             #endif

data/rakelib/lib/typemap/print_page_range.rb

@@ -54,17 +54,45 @@ module WXRuby3
 
           map 'std::vector<wxPrintPageRange> &' => 'Array<Wx::PRT::PrintPageRange>' do
 
-            map_in temp: 'std::vector<wxPrintPageRange> tmp_vector', code: '$1 = &tmp_vector;'
+            map_in temp: 'std::vector<wxPrintPageRange> tmp', code: <<~__CODE
+                if (TYPE($input) == T_ARRAY)
+                {
+                  $1 = &tmp;
+                  for (int i = 0; i < RARRAY_LEN($input); i++)
+                  {
+                    void *ptr;
+                    VALUE r_range = rb_ary_entry($input, i);
+                    int res = SWIG_ConvertPtr(r_range, &ptr, SWIGTYPE_p_wxPrintPageRange, 0);
+                    if (!SWIG_IsOK(res) || !ptr) {
+                      rb_raise(rb_eTypeError, "Expected Array of Wx::PRT::PrintPageRange for 1");
+                    }
+                    wxPrintPageRange *range = reinterpret_cast< wxPrintPageRange * >(ptr);
+                    $1->push_back(*range);
+                  }
+                }
+                else {
+                  rb_raise(rb_eArgError, "Expected Array of Wx::PRT::PrintPageRange for 1");
+                }      
+                __CODE
 
             map_argout code: <<~__CODE
+                VALUE rb_ranges = rb_ary_new();
                 for (const wxPrintPageRange& range : *$1)
                 {
-                  VALUE r_range = SWIG_NewPointerObj(new wxPrintPageRange(range), SWIGTYPE_p_wxPrintPageRange, SWIG_POINTER_OWN);
-                  rb_ary_push($input, r_range);
+                  VALUE rb_range = SWIG_NewPointerObj(new wxPrintPageRange(range), SWIGTYPE_p_wxPrintPageRange, SWIG_POINTER_OWN);
+                  rb_ary_push(rb_ranges, rb_range);
                 }
+                $result = SWIG_AppendOutput($result, rb_ranges);
                 __CODE
 
-            map_directorin code: '$input = rb_ary_new();'
+            map_directorin code: <<~__CODE
+                $input = rb_ary_new();
+                for (const wxPrintPageRange& range : $1)
+                {
+                  VALUE rb_range = SWIG_NewPointerObj(new wxPrintPageRange(range), SWIGTYPE_p_wxPrintPageRange, SWIG_POINTER_OWN);
+                  rb_ary_push($input, rb_range);
+                }
+                __CODE
 
             map_directorargout code: <<~__CODE
                 for (int i = 0; i < RARRAY_LEN($result); i++)
@@ -83,10 +111,6 @@ module WXRuby3
 
           end
         end
-        # Doc only mapping def
-        map 'std::vector<wxPrintPageRange> &' => 'Array<Wx::PRT::PrintPageRange>', swig: false do
-          map_in
-        end
 
       end
 

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")