wxruby3 0.9.0.pre.beta.9 → 0.9.0.pre.beta.11

data/samples/dialogs/dialogs.rb

@@ -36,6 +36,7 @@ DIALOGS_STYLED_BUSYINFO = 25
 DIALOGS_FIND = 26
 DIALOGS_REPLACE = 27
 DIALOGS_PREFS = 28
+DIALOGS_PREFS_TOOLBOOK = 29
 
 class MyTipProvider < TipProvider
   TIPS = [
@@ -147,16 +148,18 @@ end
 # PropertySheetDialog is specialised for doing preferences dialogs; it
 # contains a BookCtrl of some sort
 class MyPrefsDialog < Wx::PropertySheetDialog
-  def initialize(parent)
+  def initialize(parent, pref_type)
     # Using Book type other than Notebook needs two-step construction
     super()
-    self.sheet_style = Wx::PROPSHEET_BUTTONTOOLBOOK
-    self.sheet_outer_border = 1
-    self.sheet_inner_border = 2
-    img_list = Wx::ImageList.new(32, 32)
-    img_list << std_bitmap(Wx::ART_NORMAL_FILE)
-    img_list << std_bitmap(Wx::ART_CDROM)
-    img_list << std_bitmap(Wx::ART_REPORT_VIEW)
+    if pref_type == DIALOGS_PREFS_TOOLBOOK
+      self.sheet_style = Wx::PROPSHEET_BUTTONTOOLBOOK
+      self.sheet_outer_border = 1
+      self.sheet_inner_border = 2
+      img_list = Wx::ImageList.new(32, 32)
+      img_list << std_bitmap(Wx::ART_NORMAL_FILE)
+      img_list << std_bitmap(Wx::ART_CDROM)
+      img_list << std_bitmap(Wx::ART_REPORT_VIEW)
+    end
 
     create(parent, -1, "Preferences")
     create_buttons(Wx::ID_OK|Wx::ID_CANCEL)
@@ -247,40 +250,41 @@ class MyFrame < Frame
     @index = -1
     @index_2 = -1
 
-    @max = 10
+    @max = 100
 
     create_status_bar()
 
-    evt_menu(DIALOGS_CHOOSE_COLOUR) {|event| on_choose_colour(event) }
-    evt_menu(DIALOGS_CHOOSE_FONT) {|event| on_choose_font(event) }
-    evt_menu(DIALOGS_LOG_DIALOG) {|event| on_log_dialog(event) }
-    evt_menu(DIALOGS_MESSAGE_BOX) {|event| on_message_box(event) }
-    evt_menu(DIALOGS_TEXT_ENTRY) {|event| on_text_entry(event) }
-    evt_menu(DIALOGS_PASSWORD_ENTRY) {|event| on_password_entry(event) }
-    evt_menu(DIALOGS_NUM_ENTRY) {|event| on_numeric_entry(event) }
-    evt_menu(DIALOGS_SINGLE_CHOICE) {|event| on_single_choice(event) }
-    evt_menu(DIALOGS_MULTI_CHOICE) {|event| on_multi_choice(event) }
-    evt_menu(DIALOGS_FILE_OPEN) {|event| on_file_open(event) }
-    evt_menu(DIALOGS_FILE_OPEN2) {|event| on_file_open2(event) }
-    evt_menu(DIALOGS_FILES_OPEN) {|event| on_files_open(event) }
-    evt_menu(DIALOGS_FILE_SAVE) {|event| on_file_save(event) }
-    evt_menu(DIALOGS_DIR_CHOOSE) {|event| on_dir_choose(event) }
-    evt_menu(DIALOGS_MODAL) {|event| on_modal_dlg(event) }
-    evt_menu(DIALOGS_MODELESS) {|event| on_modeless_dlg(event) }
-    evt_menu(DIALOGS_TIP) {|event| on_show_tip(event) }
-    evt_menu(DIALOGS_CUSTOM_TIP) {|event| on_show_custom_tip(event) }
-    evt_menu(DIALOGS_PROGRESS) {|event| on_show_progress(event) }
-    evt_menu(DIALOGS_BUSYINFO) {|event| on_show_busy_info(event) }
-    evt_menu(DIALOGS_STYLED_BUSYINFO) {|event| on_show_styled_busy_info(event) }
-    evt_menu(DIALOGS_PREFS) {|event| on_show_prefs(event) }
-    evt_menu(DIALOGS_FIND) {|event| on_show_find_dialog(event) }
-    evt_menu(DIALOGS_REPLACE) {|event| on_show_replace_dialog(event) }
-    evt_find(-1) {|event| on_find_dialog(event) }
-    evt_find_next(-1) {|event| on_find_dialog(event) }
-    evt_find_replace(-1) {|event| on_find_dialog(event) }
-    evt_find_replace_all(-1) {|event| on_find_dialog(event) }
-    evt_find_close(-1) {|event| on_find_dialog(event) }
-    evt_menu(ID_EXIT) {|event| on_exit(event) }
+    evt_menu(DIALOGS_CHOOSE_COLOUR, :on_choose_colour)
+    evt_menu(DIALOGS_CHOOSE_FONT, :on_choose_font)
+    evt_menu(DIALOGS_LOG_DIALOG, :on_log_dialog)
+    evt_menu(DIALOGS_MESSAGE_BOX, :on_message_box)
+    evt_menu(DIALOGS_TEXT_ENTRY, :on_text_entry)
+    evt_menu(DIALOGS_PASSWORD_ENTRY, :on_password_entry)
+    evt_menu(DIALOGS_NUM_ENTRY, :on_numeric_entry)
+    evt_menu(DIALOGS_SINGLE_CHOICE, :on_single_choice)
+    evt_menu(DIALOGS_MULTI_CHOICE, :on_multi_choice)
+    evt_menu(DIALOGS_FILE_OPEN, :on_file_open)
+    evt_menu(DIALOGS_FILE_OPEN2, :on_file_open2)
+    evt_menu(DIALOGS_FILES_OPEN, :on_files_open)
+    evt_menu(DIALOGS_FILE_SAVE, :on_file_save)
+    evt_menu(DIALOGS_DIR_CHOOSE, :on_dir_choose)
+    evt_menu(DIALOGS_MODAL, :on_modal_dlg)
+    evt_menu(DIALOGS_MODELESS, :on_modeless_dlg)
+    evt_menu(DIALOGS_TIP, :on_show_tip)
+    evt_menu(DIALOGS_CUSTOM_TIP, :on_show_custom_tip)
+    evt_menu(DIALOGS_PROGRESS, :on_show_progress)
+    evt_menu(DIALOGS_BUSYINFO, :on_show_busy_info)
+    evt_menu(DIALOGS_STYLED_BUSYINFO, :on_show_styled_busy_info)
+    evt_menu(DIALOGS_PREFS, :on_show_prefs)
+    evt_menu(DIALOGS_PREFS_TOOLBOOK,:on_show_prefs)
+    evt_menu(DIALOGS_FIND, :on_show_find_dialog)
+    evt_menu(DIALOGS_REPLACE, :on_show_replace_dialog)
+    evt_find(-1, :on_find_dialog)
+    evt_find_next(-1, :on_find_dialog)
+    evt_find_replace(-1, :on_find_dialog)
+    evt_find_replace_all(-1, :on_find_dialog)
+    evt_find_close(-1, :on_find_dialog)
+    evt_menu(ID_EXIT, :on_exit)
 
   end
 
@@ -614,26 +618,37 @@ class MyFrame < Frame
 
 
   def on_show_prefs(event)
-    MyPrefsDialog(self)
+    MyPrefsDialog(self, event.id)
   end
 
   def on_show_progress(event)
     cont = false
     Wx::ProgressDialog("Progress dialog example",
-                       "An informative message",
+                       "An informative message\n"+"#{' '*100}\n\n\n\n",
                        @max, # range
                        self, # parent
-                       PD_CAN_ABORT | PD_APP_MODAL |
+                       PD_CAN_ABORT | PD_CAN_SKIP | PD_APP_MODAL |
                          PD_ELAPSED_TIME | PD_ESTIMATED_TIME |
                          PD_REMAINING_TIME) do |dialog|
       cont = true
-      (@max+1).times do |i|
-        if i == @max
-          cont = dialog.update(i, "That's all, folks!")
-        elsif i == @max / 2
-          cont = dialog.update(i, "Only half of it left (very long message)!")
-        else
+      i = 0
+      while i <= @max
+        if i == 0
           cont = dialog.update(i)
+        elsif i == @max
+          cont = dialog.update(i, "That's all, folks!\n\nNothing more to see here any more.")
+        elsif i <= (@max / 2)
+          cont = dialog.pulse("Testing indeterminate mode\n" +
+                              "\n" +
+                              "This mode allows you to show to the user\n" +
+                              "that something is going on even if you don't know\n" +
+                              "when exactly will you finish.")
+        else
+          cont = dialog.update(i, "Now in standard determinate mode\n" +
+                                  "\n" +
+                                  "This is the standard usage mode in which you\n" +
+                                  "update the dialog after performing each new step of work.\n" +
+                                  "It requires knowing the total number of steps in advance.")
         end
 
         if !cont
@@ -644,8 +659,12 @@ class MyFrame < Frame
             break
           end
           dialog.resume
+        elsif cont == :skipped
+          i += (@max / 4)
+          i = @max-1 if i >= @max
         end
-        sleep(1)
+        sleep(i == 0 ? 1 : 0.15)
+        i += 1
       end
     end
 
@@ -831,7 +850,8 @@ class MyApp < App
     file_menu.append(DIALOGS_PROGRESS, "Pro&gress dialog\tCtrl-G")
     file_menu.append(DIALOGS_BUSYINFO, "&Busy info dialog\tCtrl-B")
     file_menu.append(DIALOGS_STYLED_BUSYINFO, "Styled BusyInfo dialog")
-    file_menu.append(DIALOGS_PREFS, "Propert&y sheet dialog\tCtrl-Y")
+    file_menu.append(DIALOGS_PREFS, "Standard propert&y sheet dialog\tCtrl-Y")
+    file_menu.append(DIALOGS_PREFS_TOOLBOOK, "&Toolbook property sheet dialog\tShift-Ctrl-Y")
     file_menu.append(DIALOGS_FIND, "&Find dialog\tCtrl-F", "", ITEM_CHECK)
     file_menu.append(DIALOGS_REPLACE, "Find and &replace dialog\tShift-Ctrl-F", "", ITEM_CHECK)
 

data/samples/drawing/maths_images.rb

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

data/samples/sampler/ext.rb

@@ -38,12 +38,12 @@ end
 # otherwise samples using 'include Wx' (or other modules) will fail on referencing
 # a (module) method unscoped from one of these included modules
 module ::Kernel
-  def method_missing(name, *args)
+  def method_missing(name, *args, &block)
     if self.class.name.start_with?('WxRuby::Sample::SampleLoader_') && (scope = self.class.name.split('::')).size > 3
       top_mod = Object.const_get(scope[0,3].join('::'))
-      return top_mod.__send__(name, *args) if top_mod.respond_to?(name)
+      return top_mod.__send__(name, *args, &block) if top_mod.respond_to?(name)
       top_mod.included_modules.each do |imod|
-        return imod.__send__(name, *args) if imod.respond_to?(name)
+        return imod.__send__(name, *args, &block) if imod.respond_to?(name)
       end
     end
     super

data/samples/sampler/stc_editor.rb

@@ -117,21 +117,21 @@ module WxRuby
       style_set_foreground(Wx::STC::STC_STYLE_DEFAULT, Wx::BLACK);
       style_set_background(Wx::STC::STC_STYLE_DEFAULT, Wx::WHITE);
       style_clear_all
-      style_set_foreground(Wx::STC::STC_STYLE_LINENUMBER, Wx::Colour.new('SlateGray'))
+      style_set_foreground(Wx::STC::STC_STYLE_LINENUMBER, Wx::Colour.new('Dark Grey'))
       style_set_background(Wx::STC::STC_STYLE_LINENUMBER, Wx::WHITE);
       style_set_foreground(Wx::STC::STC_STYLE_INDENTGUIDE, Wx::LIGHT_GREY);
-      set_whitespace_background(false, Wx::Colour.new('DarkSlateGray'))
-      style_set_foreground(SCE_RB_COMMENTLINE, Wx::Colour.new('DARKGREEN'))
+      set_whitespace_background(false, Wx::Colour.new('Dark Slate Grey'))
+      style_set_foreground(SCE_RB_COMMENTLINE, Wx::Colour.new('Dark Green'))
       style_set_bold(SCE_RB_COMMENTLINE, true)
       style_set_foreground(SCE_RB_WORD, Wx::BLACK)
       style_set_bold(SCE_RB_WORD, true)
-      style_set_foreground(SCE_RB_OPERATOR, Wx::Colour.new('Teal'))
+      style_set_foreground(SCE_RB_OPERATOR, Wx::Colour.new('Dark Olive Green'))
       style_set_bold(SCE_RB_OPERATOR, true)
-      style_set_foreground(SCE_RB_POD, Wx::Colour.new('GREY'))
+      style_set_foreground(SCE_RB_POD, Wx::Colour.new('Grey'))
       style_set_foreground(SCE_RB_NUMBER, Wx::BLUE)
       style_set_foreground(SCE_RB_STRING, c_maroon)
       style_set_foreground(SCE_RB_CHARACTER, Wx::RED)
-      style_set_foreground(SCE_RB_SYMBOL, Wx::Colour.new('DARKBLUE'))
+      style_set_foreground(SCE_RB_SYMBOL, Wx::Colour.new('Navy'))
       style_set_bold(SCE_RB_SYMBOL, true)
       if Wx::WXWIDGETS_VERSION >= '3.3.0'
         style_set_foreground(SCE_RB_HERE_DELIM, Wx::BLACK)
@@ -145,8 +145,8 @@ module WxRuby
         style_set_foreground(SCE_RB_STRING_QR, c_maroon)
         style_set_foreground(SCE_RB_STRING_QW, c_maroon)
       end
-      bg = Wx::Colour.new('LightGray')
-      fg = Wx::Colour.new('DarkCyan')
+      bg = Wx::Colour.new('Light Grey')
+      fg = Wx::Colour.new('Cadet Blue')
       set_fold_margin_colour(true, bg)
       set_fold_margin_hi_colour(true, bg)
       marker_set_foreground(Wx::STC::STC_MARKNUM_FOLDER, fg)
@@ -156,8 +156,8 @@ module WxRuby
     end
 
     def dark_theme
-      bg = Wx::Colour.new('DarkSlateGray')
-      c_str = Wx::Colour.new('LimeGreen')
+      bg = Wx::Colour.new('Dark Slate Grey')
+      c_str = Wx::Colour.new('Lime Green')
       style_set_background(Wx::STC::STC_STYLE_DEFAULT, bg)
       style_set_foreground(Wx::STC::STC_STYLE_DEFAULT, Wx::WHITE)
       style_clear_all
@@ -166,28 +166,28 @@ module WxRuby
       style_set_foreground(Wx::STC::STC_STYLE_INDENTGUIDE, bg);
       set_whitespace_background(true, bg)
       style_set_eol_filled(SCE_RB_DEFAULT, true)
-      style_set_foreground(SCE_RB_COMMENTLINE, Wx::Colour.new('Silver'))
+      style_set_foreground(SCE_RB_COMMENTLINE, Wx::Colour.new('Light Grey'))
       style_set_background(SCE_RB_COMMENTLINE, bg)
       style_set_bold(SCE_RB_COMMENTLINE, true)
-      style_set_foreground(SCE_RB_WORD, Wx::Colour.new('Chocolate'))
+      style_set_foreground(SCE_RB_WORD, Wx::Colour.new('Coral'))
       style_set_background(SCE_RB_WORD, bg)
       style_set_bold(SCE_RB_WORD, true)
-      style_set_foreground(SCE_RB_OPERATOR, Wx::Colour.new('LightCyan'))
+      style_set_foreground(SCE_RB_OPERATOR, Wx::Colour.new('Light Grey'))
       style_set_background(SCE_RB_OPERATOR, bg)
       style_set_bold(SCE_RB_OPERATOR, true)
-      style_set_foreground(SCE_RB_POD, Wx::Colour.new('Gray'))
+      style_set_foreground(SCE_RB_POD, Wx::Colour.new('Grey'))
       style_set_background(SCE_RB_POD, bg)
-      style_set_foreground(SCE_RB_NUMBER, Wx::Colour.new('DeepSkyBlue'))
+      style_set_foreground(SCE_RB_NUMBER, Wx::Colour.new('Cyan'))
       style_set_background(SCE_RB_NUMBER, bg)
       style_set_foreground(SCE_RB_STRING, c_str)
       style_set_background(SCE_RB_STRING, bg)
-      style_set_foreground(SCE_RB_CHARACTER, Wx::Colour.new('YellowGreen'))
+      style_set_foreground(SCE_RB_CHARACTER, Wx::Colour.new('Yellow Green'))
       style_set_background(SCE_RB_CHARACTER, bg)
       style_set_foreground(SCE_RB_SYMBOL, Wx::Colour.new('Gold'))
       style_set_background(SCE_RB_SYMBOL, bg)
       style_set_bold(SCE_RB_SYMBOL, true)
       if Wx::WXWIDGETS_VERSION >= '3.3.0'
-        style_set_foreground(SCE_RB_HERE_DELIM, Wx::Colour.new('Chocolate'))
+        style_set_foreground(SCE_RB_HERE_DELIM, Wx::Colour.new('Coral'))
         style_set_bold(SCE_RB_HERE_DELIM, true)
         style_set_foreground(SCE_RB_HERE_Q, c_str)
         style_set_foreground(SCE_RB_HERE_QQ, c_str)
@@ -198,8 +198,8 @@ module WxRuby
         style_set_foreground(SCE_RB_STRING_QR, c_str)
         style_set_foreground(SCE_RB_STRING_QW, c_str)
       end
-      bg = Wx::Colour.new('CadetBlue')
-      fg = Wx::Colour.new('Chocolate')
+      bg = Wx::Colour.new('Cadet Blue')
+      fg = Wx::Colour.new('Coral')
       set_fold_margin_colour(true, bg)
       set_fold_margin_hi_colour(true, bg)
       marker_set_foreground(Wx::STC::STC_MARKNUM_FOLDER, fg)

data/samples/sampler/txt_editor.rb

@@ -35,9 +35,9 @@ module WxRuby
     end
 
     def dark_theme
-      self.background_colour = Wx::Colour.new('DarkSlateGray')
+      self.background_colour = Wx::Colour.new('Dark Slate Grey')
       self.foreground_colour = Wx::WHITE
-      self.set_default_style(txtatt = Wx::TextAttr.new(Wx::WHITE, Wx::Colour.new('DarkSlateGray'), self.font))
+      self.set_default_style(txtatt = Wx::TextAttr.new(Wx::WHITE, Wx::Colour.new('Dark Slate Grey'), self.font))
       self.set_style(0, self.get_last_position, txtatt)
     end
 

data/samples/treectrl/treectrl.rb

@@ -262,39 +262,41 @@ class MyTreeCtrl < Wx::TreeCtrl
   end
 
   def create_buttons_image_list(size)
-    if size < 0
-      self.buttons_image_list = nil
-      return
-    end
-
-    # Make an image list containing small icons
-    images = Wx::ImageList.new(size, size, true)
+    unless Wx::PLATFORM == 'WXMSW'
+      if size < 0
+        self.buttons_image_list = nil
+        return
+      end
 
-    # should correspond to TreeCtrlIcon_xxx enum
-    Wx::BusyCursor.busy do
-      icons = if @alternate_images
-                [Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon3.xpm'), Wx::BITMAP_TYPE_XPM),
-                 Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon3.xpm'), Wx::BITMAP_TYPE_XPM),
-                 Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon5.xpm'), Wx::BITMAP_TYPE_XPM),
-                 Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon5.xpm'), Wx::BITMAP_TYPE_XPM)
-                ]
-              else
-                icon_size = Wx::Size.new(@image_size, @image_size)
-                ic1 = Wx::ArtProvider::get_icon(Wx::ART_FOLDER, Wx::ART_LIST, icon_size)
-                ic2 = Wx::ArtProvider::get_icon(Wx::ART_FOLDER_OPEN, Wx::ART_LIST, icon_size)
-                [ic1, ic1, ic2, ic2]
-              end
+      # Make an image list containing small icons
+      images = Wx::ImageList.new(size, size, true)
 
-      icons.each do |ic|
-        if ic.width == size
-          images.add(ic)
-        else
-          resized = ic.convert_to_image.rescale(size, size)
-          images.add(Wx::Bitmap.new(resized))
+      # should correspond to TreeCtrlIcon_xxx enum
+      Wx::BusyCursor.busy do
+        icons = if @alternate_images
+                  [Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon3.xpm'), Wx::BITMAP_TYPE_XPM),
+                   Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon3.xpm'), Wx::BITMAP_TYPE_XPM),
+                   Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon5.xpm'), Wx::BITMAP_TYPE_XPM),
+                   Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon5.xpm'), Wx::BITMAP_TYPE_XPM)
+                  ]
+                else
+                  icon_size = Wx::Size.new(@image_size, @image_size)
+                  ic1 = Wx::ArtProvider::get_icon(Wx::ART_FOLDER, Wx::ART_LIST, icon_size)
+                  ic2 = Wx::ArtProvider::get_icon(Wx::ART_FOLDER_OPEN, Wx::ART_LIST, icon_size)
+                  [ic1, ic1, ic2, ic2]
+                end
+
+        icons.each do |ic|
+          if ic.width == size
+            images.add(ic)
+          else
+            resized = ic.convert_to_image.rescale(size, size)
+            images.add(Wx::Bitmap.new(resized))
+          end
         end
-      end
 
-      self.buttons_image_list = images
+        self.buttons_image_list = images
+      end
     end
   end
 
@@ -1454,7 +1456,7 @@ class MyFrame < Wx::Frame
   end
 
   def on_toggle_buttons(event)
-    unless Wx.has_feature?(:WXMSW)
+    unless Wx::PLATFORM == 'WXMSW'
       if Wx::THE_APP.show_buttons
         @treectrl.create_buttons_image_list(-1)
         Wx::get_app.show_buttons = false

data/tests/lib/wxapp_runner.rb

@@ -0,0 +1,64 @@
+
+require 'test/unit'
+require 'test/unit/ui/console/testrunner'
+require 'wx'
+
+module Wx::SF
+
+  module Test
+
+    class App < Wx::App
+      def initialize(test_runner, start_mtd)
+        super()
+        @test_runner = test_runner
+        @start_mtd = start_mtd
+      end
+
+      def on_init
+        @result = @start_mtd.bind(@test_runner).call
+        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 Runner < BaseRunner
+
+      org_start_mtd = instance_method :start
+      define_method :start do
+        (app = Wx::SF::Test::App.new(self, org_start_mtd)).run
+        app.result
+      end
+
+    end
+
+  end
+
+end
+
+module Test
+  module Unit
+    AutoRunner.register_runner(:wxapp) do |auto_runner|
+      Wx::SF::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
+  end
+end

data/tests/test_basic.rb

@@ -13,8 +13,3 @@ class BasicTests < Test::Unit::TestCase
   end
 
 end
-
-if $0 == __FILE__
-  require 'test/unit/ui/console/testrunner'
-  Test::Unit::UI::Console::TestRunner.run(BasicTests)
-end