wxruby 1.9.3-i386-mswin32 → 1.9.4-i386-mswin32

data/samples/dialogs/tips.txt

@@ -1,18 +1,18 @@
-Startup tips are documented in the "Startup tips overview" section of wxWindows documentation.
-These tips are being read from the tips.txt text file in this directory. Each line of the file contains a single tip.
-If you close and open this tips dialog, you will notice that the tip numbers start at the point you were at when you closed the dialog last time. This allows easy cycling through the entire list of tips, instead of always showing the initial tips over and over.
-Often you will want to save to the application's wxConfig, the last tip that the user saw, as well as whether they want to see tips on startup.
-Comments in the tips file have a # as the first character. Comments are automatically skipped over. See the tips.txt file in this directory for the example.
-# This line is a comment since it started with a #, and is skipped.
-Blank lines in the tip file are also automatically skipped over. Lines with only spaces are also considered empty.
-The next line in this tip file is empty, so it will be automatically skipped.
-
-The next line in this tip file is just empty spaces, so it is considered empty too, and is also automatically skipped.
-  
-You can easily add translations to your startup tips via the usual gettext methods by wrapping a string in a gettext macro, which is _(""). See next tip for example.
-_("This tip is marked as a translatable string by wrapping it inside the usual gettext macro, so it can be collected by gettext and added to a translation catalog. Your application can then use this catalog and serve out a translated version of the tip.")
-Translatable strings must strictly begin with _(", not _( " or wxGetTranslation(" or something else.
-If you are using gettext translatable strings, don't forget to escape to replace any " characters within the tip with a \" instead
-_("This is a translatable tip with the quoted words \"Escape me\" properly escaped.")
-If you have very specialized needs, you can derive your own wxTipProvider and use that instead.
-If you want to modify the tip content at runtime for purposes other than translation (for example, variable expansion), one easy option is to use a custom tip provider derived from wxFileTipProvider. Your custom tip provider would contain a single virtual function to override: PreprocessTip().
+Startup tips are documented in the "Startup tips overview" section of wxWindows documentation.
+These tips are being read from the tips.txt text file in this directory. Each line of the file contains a single tip.
+If you close and open this tips dialog, you will notice that the tip numbers start at the point you were at when you closed the dialog last time. This allows easy cycling through the entire list of tips, instead of always showing the initial tips over and over.
+Often you will want to save to the application's wxConfig, the last tip that the user saw, as well as whether they want to see tips on startup.
+Comments in the tips file have a # as the first character. Comments are automatically skipped over. See the tips.txt file in this directory for the example.
+# This line is a comment since it started with a #, and is skipped.
+Blank lines in the tip file are also automatically skipped over. Lines with only spaces are also considered empty.
+The next line in this tip file is empty, so it will be automatically skipped.
+
+The next line in this tip file is just empty spaces, so it is considered empty too, and is also automatically skipped.
+  
+You can easily add translations to your startup tips via the usual gettext methods by wrapping a string in a gettext macro, which is _(""). See next tip for example.
+_("This tip is marked as a translatable string by wrapping it inside the usual gettext macro, so it can be collected by gettext and added to a translation catalog. Your application can then use this catalog and serve out a translated version of the tip.")
+Translatable strings must strictly begin with _(", not _( " or wxGetTranslation(" or something else.
+If you are using gettext translatable strings, don't forget to escape to replace any " characters within the tip with a \" instead
+_("This is a translatable tip with the quoted words \"Escape me\" properly escaped.")
+If you have very specialized needs, you can derive your own wxTipProvider and use that instead.
+If you want to modify the tip content at runtime for purposes other than translation (for example, variable expansion), one easy option is to use a custom tip provider derived from wxFileTipProvider. Your custom tip provider would contain a single virtual function to override: PreprocessTip().

data/samples/drawing/graphics_drawing.rb

@@ -198,27 +198,31 @@ end
 class GraphicsFrame < Wx::Frame
   def initialize()
     super(nil,:title=>"Graphics Context example",:size=>[500,400])
-    hbox = Wx::BoxSizer.new(Wx::VERTICAL)
     @win = GraphicsWindow.new(self)
-    hbox.add(@win,1,Wx::EXPAND|Wx::ALL)
-    grid = Wx::GridSizer.new(2,2)
-    cb_rect = Wx::CheckBox.new(self,:label=>"Draw Rectangles")
-    cb_corner = Wx::CheckBox.new(self,:label=>"Draw Corners")
-    create_status_bar()
-    get_status_bar.set_status_text("FPS: 0")
-    grid.add(cb_rect)
-    grid.add(cb_corner)
-    @win.rect = cb_rect
-    @win.corner = cb_corner
-    hbox.add(grid)
-    set_sizer(hbox)
-    @timer = Wx::Timer.new(self,2000)
-    evt_timer(2000, :fps_display)
-    @timer.start(1000)
+
+    create_status_bar(3)
+    status_bar.set_status_text("Frames per sec: 0", 0)
+    @win.rect = Wx::CheckBox.new(status_bar,:label=>"Draw Rectangles")
+    @win.corner = Wx::CheckBox.new(status_bar,:label=>"Draw Corners")
+    
+    Wx::Timer.every(1000) { fps_display }
+    evt_size :on_size
   end
-  
+
+
+  # Place the two control checkboxes within the StatusBar
+  def on_size
+    rect = status_bar.field_rect(1)
+    @win.rect.move [ rect.x + 2, rect.y + 2]
+    @win.rect.size = [ rect.width - 4, rect.height - 4 ]
+
+    rect = status_bar.field_rect(2)
+    @win.corner.move [ rect.x + 2, rect.y + 2]
+    @win.corner.size = [ rect.width - 4, rect.height - 4 ]
+  end
+
   def fps_display()
-    get_status_bar.set_status_text("FPS: #{@win.fps}")
+    get_status_bar.set_status_text("Frames per sec: #{@win.fps}", 0)
     @win.fps = 0
   end
 end

data/samples/drawing/images.rb

@@ -1,48 +1,48 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2006 Kevin B. Smith
-# Freely reusable code: see SAMPLES-LICENSE.TXT for details
-
-begin
-  require 'wx'
-rescue LoadError => no_wx_err
-  begin
-    require 'rubygems'
-    require 'wx'
-  rescue LoadError
-    raise no_wx_err
-  end
-end
-
-# This sample demonstrates how to draw an image from a file onto a
-# window. This one uses a small PNG file, but other formats such as JPEG
-# are supported - see documentation for more details.
-
-class MyFrame < Wx::Frame
-  def initialize(title)
-    super(nil, -1, title)
-    evt_paint { on_paint }
-    
-    img_file = File.join( File.dirname(__FILE__), 'paperclip.png')
-    # first load the image into an Image object
-    image = Wx::Image.new(img_file)
-    # then create a Bitmap suitable for drawing
-    @bitmap = Wx::Bitmap.new(image)
-  end
-
-  def on_paint
-    paint do | dc |
-      dc.clear
-      dc.draw_bitmap(@bitmap, 0, 0, false)
-    end
-  end
-end
-
-class ImagesApp < Wx::App
-  def on_init
-    frame = MyFrame.new("Simple Image Demo")
-	frame.show
-  end
-end
-
-a = ImagesApp.new
-a.main_loop()
+#!/usr/bin/env ruby
+# wxRuby2 Sample Code. Copyright (c) 2004-2006 Kevin B. Smith
+# Freely reusable code: see SAMPLES-LICENSE.TXT for details
+
+begin
+  require 'wx'
+rescue LoadError => no_wx_err
+  begin
+    require 'rubygems'
+    require 'wx'
+  rescue LoadError
+    raise no_wx_err
+  end
+end
+
+# This sample demonstrates how to draw an image from a file onto a
+# window. This one uses a small PNG file, but other formats such as JPEG
+# are supported - see documentation for more details.
+
+class MyFrame < Wx::Frame
+  def initialize(title)
+    super(nil, -1, title)
+    evt_paint { on_paint }
+    
+    img_file = File.join( File.dirname(__FILE__), 'paperclip.png')
+    # first load the image into an Image object
+    image = Wx::Image.new(img_file)
+    # then create a Bitmap suitable for drawing
+    @bitmap = Wx::Bitmap.new(image)
+  end
+
+  def on_paint
+    paint do | dc |
+      dc.clear
+      dc.draw_bitmap(@bitmap, 0, 0, false)
+    end
+  end
+end
+
+class ImagesApp < Wx::App
+  def on_init
+    frame = MyFrame.new("Simple Image Demo")
+	frame.show
+  end
+end
+
+a = ImagesApp.new
+a.main_loop()

data/samples/etc/activation.rb

@@ -1,108 +1,108 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2006 Kevin B. Smith
-# Freely reusable code: see SAMPLES-LICENSE.TXT for details
-
-begin
-  require 'wx'
-rescue LoadError => no_wx_err
-  begin
-    require 'rubygems'
-    require 'wx'
-  rescue LoadError
-    raise no_wx_err
-  end
-end
-
-# This sample demonstrates the use of Activate Events. These are
-# generated when a frame becomes active or inactive. This is typically
-# indicated by a frame's titlebar changing colour, and a widget within
-# the frame gainin focus. An event is also generated when a whole wxRuby
-# app starts or stops being the current focussed desktop application.
-
-class MinimalFrame < Wx::Frame
-  def initialize(title, pos, size, style = Wx::DEFAULT_FRAME_STYLE)
-    super(nil, -1, title, pos, size, style)
-
-
-    menuFile = Wx::Menu.new()
-    helpMenu = Wx::Menu.new()
-    helpMenu.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
-    menuFile.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
-    menuBar = Wx::MenuBar.new()
-    menuBar.append(menuFile, "&File")
-    menuBar.append(helpMenu, "&Help")
-    set_menu_bar(menuBar)
-
-    create_status_bar(2)
-    set_status_text("Welcome to wxRuby!")
-
-    evt_menu(Wx::ID_EXIT) { on_quit }
-    evt_menu(Wx::ID_ABOUT) { on_about }
-
-    evt_activate { | e | on_activate(e) }
-    evt_iconize  { | e | on_iconize(e) }
-  end
-
-
-  def on_iconize(event)
-    if event.iconized
-      puts "Frame '#{get_title}' was iconized"
-    else
-      puts "Frame '#{get_title}' was restored"
-    end
-  end
-
-  def on_activate(event)
-    if event.get_active
-      puts "Frame '#{get_title}' became activated"
-      set_status_text 'Active'
-    else
-      puts "Frame '#{get_title}' became deactivated"
-      set_status_text 'Inactive'
-    end
-    event.skip # important
-  end
-
-  def on_quit
-    Wx::get_app.close_all
-  end
-
-  def on_about
-    msg =  sprintf("This is the About dialog of the activate sample.\n" \
-                    "Welcome to wxRuby, version %s", Wx::WXRUBY_VERSION)
-    Wx::message_box(msg, "About Activate", Wx::OK|Wx::ICON_INFORMATION, self)
-  end
-end
-
-class RbApp < Wx::App
-  def on_init
-    @frame_1 = MinimalFrame.new("Tall window",
-                                Wx::Point.new(50, 50), 
-                                Wx::Size.new(150, 240))
-    @frame_2 = MinimalFrame.new("Wide window",
-                                Wx::Point.new(100, 100), 
-                                Wx::Size.new(300, 180))
-    evt_activate_app { | e | on_activate_app(e) }
-    @frame_1.show()
-    @frame_2.show()
-
-  end
-
-  def on_activate_app(event)
-    if event.get_active
-      puts "The app became active"
-    else
-      puts "The app became inactive"
-    end
-    event.skip # important
-  end
-
-  def close_all
-    @frame_1.close(true)
-    @frame_2.close(true)
-  end
-end
-
-app = RbApp.new
-app.main_loop()
-
+#!/usr/bin/env ruby
+# wxRuby2 Sample Code. Copyright (c) 2004-2006 Kevin B. Smith
+# Freely reusable code: see SAMPLES-LICENSE.TXT for details
+
+begin
+  require 'wx'
+rescue LoadError => no_wx_err
+  begin
+    require 'rubygems'
+    require 'wx'
+  rescue LoadError
+    raise no_wx_err
+  end
+end
+
+# This sample demonstrates the use of Activate Events. These are
+# generated when a frame becomes active or inactive. This is typically
+# indicated by a frame's titlebar changing colour, and a widget within
+# the frame gainin focus. An event is also generated when a whole wxRuby
+# app starts or stops being the current focussed desktop application.
+
+class MinimalFrame < Wx::Frame
+  def initialize(title, pos, size, style = Wx::DEFAULT_FRAME_STYLE)
+    super(nil, -1, title, pos, size, style)
+
+
+    menuFile = Wx::Menu.new()
+    helpMenu = Wx::Menu.new()
+    helpMenu.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
+    menuFile.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
+    menuBar = Wx::MenuBar.new()
+    menuBar.append(menuFile, "&File")
+    menuBar.append(helpMenu, "&Help")
+    set_menu_bar(menuBar)
+
+    create_status_bar(2)
+    set_status_text("Welcome to wxRuby!")
+
+    evt_menu(Wx::ID_EXIT) { on_quit }
+    evt_menu(Wx::ID_ABOUT) { on_about }
+
+    evt_activate { | e | on_activate(e) }
+    evt_iconize  { | e | on_iconize(e) }
+  end
+
+
+  def on_iconize(event)
+    if event.iconized
+      puts "Frame '#{get_title}' was iconized"
+    else
+      puts "Frame '#{get_title}' was restored"
+    end
+  end
+
+  def on_activate(event)
+    if event.get_active
+      puts "Frame '#{get_title}' became activated"
+      set_status_text 'Active'
+    else
+      puts "Frame '#{get_title}' became deactivated"
+      set_status_text 'Inactive'
+    end
+    event.skip # important
+  end
+
+  def on_quit
+    Wx::get_app.close_all
+  end
+
+  def on_about
+    msg =  sprintf("This is the About dialog of the activate sample.\n" \
+                    "Welcome to wxRuby, version %s", Wx::WXRUBY_VERSION)
+    Wx::message_box(msg, "About Activate", Wx::OK|Wx::ICON_INFORMATION, self)
+  end
+end
+
+class RbApp < Wx::App
+  def on_init
+    @frame_1 = MinimalFrame.new("Tall window",
+                                Wx::Point.new(50, 50), 
+                                Wx::Size.new(150, 240))
+    @frame_2 = MinimalFrame.new("Wide window",
+                                Wx::Point.new(100, 100), 
+                                Wx::Size.new(300, 180))
+    evt_activate_app { | e | on_activate_app(e) }
+    @frame_1.show()
+    @frame_2.show()
+
+  end
+
+  def on_activate_app(event)
+    if event.get_active
+      puts "The app became active"
+    else
+      puts "The app became inactive"
+    end
+    event.skip # important
+  end
+
+  def close_all
+    @frame_1.close(true)
+    @frame_2.close(true)
+  end
+end
+
+app = RbApp.new
+app.main_loop()
+

data/samples/etc/choice.rb

@@ -1,72 +1,72 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2006 Kevin B. Smith
-# Freely reusable code: see SAMPLES-LICENSE.TXT for details
-
-begin
-  require 'wx'
-rescue LoadError => no_wx_err
-  begin
-    require 'rubygems'
-    require 'wx'
-  rescue LoadError
-    raise no_wx_err
-  end
-end
-include Wx
-
-ID_CHOICE = 1000
-
-class ChoiceDlg < Dialog
-  def initialize
-    super(nil, -1, "ChoiceDialog", DEFAULT_POSITION, Size.new(185, 185))
-
-    list = [ "ABS", "Airbag", "Air conditioning" ]
-
-    @m_pChoice = Choice.new(self, ID_CHOICE, DEFAULT_POSITION, DEFAULT_SIZE, list)
-    @m_pChoice.append("Automatic gear", 100)
-
-	@m_pLabel = StaticText.new(self, -1, "default")
-    dlgSizer = BoxSizer.new(HORIZONTAL)
-    choiceSizer = BoxSizer.new(VERTICAL)
-    choiceSizer.add(@m_pChoice, 1, GROW)
-	choiceSizer.add(@m_pLabel)
-    dlgSizer.add(choiceSizer, 1, GROW)
-    set_sizer(dlgSizer)
-    set_auto_layout(TRUE)
-    layout()
-
-    evt_choice(ID_CHOICE) {|event| onChoice(event) }
-    evt_close {onClose}
-  end
-
-  def onChoice(event)
-  	chose = event.get_selection
-	data = event.get_client_data
-    # NOTE: uninitialized client data will be false, not nil
-	if(!data)
-		data = 0
-	end
-	data += 1
-	@m_pLabel.set_label(data.to_s)
-
-	@m_pChoice.set_selection(chose)
-	@m_pChoice.set_client_data(chose, data)
-  end
-
-  def onClose
-     destroy()
-  end
-end
-
-
-class RbApp < App
-  def on_init
-    dlg = ChoiceDlg.new
-    set_top_window(dlg)
-    dlg.show(TRUE)
-  end
-
-end
-
-a = RbApp.new
-a.main_loop()
+#!/usr/bin/env ruby
+# wxRuby2 Sample Code. Copyright (c) 2004-2006 Kevin B. Smith
+# Freely reusable code: see SAMPLES-LICENSE.TXT for details
+
+begin
+  require 'wx'
+rescue LoadError => no_wx_err
+  begin
+    require 'rubygems'
+    require 'wx'
+  rescue LoadError
+    raise no_wx_err
+  end
+end
+include Wx
+
+ID_CHOICE = 1000
+
+class ChoiceDlg < Dialog
+  def initialize
+    super(nil, -1, "ChoiceDialog", DEFAULT_POSITION, Size.new(185, 185))
+
+    list = [ "ABS", "Airbag", "Air conditioning" ]
+
+    @m_pChoice = Choice.new(self, ID_CHOICE, DEFAULT_POSITION, DEFAULT_SIZE, list)
+    @m_pChoice.append("Automatic gear", 100)
+
+	@m_pLabel = StaticText.new(self, -1, "default")
+    dlgSizer = BoxSizer.new(HORIZONTAL)
+    choiceSizer = BoxSizer.new(VERTICAL)
+    choiceSizer.add(@m_pChoice, 1, GROW)
+	choiceSizer.add(@m_pLabel)
+    dlgSizer.add(choiceSizer, 1, GROW)
+    set_sizer(dlgSizer)
+    set_auto_layout(TRUE)
+    layout()
+
+    evt_choice(ID_CHOICE) {|event| onChoice(event) }
+    evt_close {onClose}
+  end
+
+  def onChoice(event)
+  	chose = event.get_selection
+	data = event.get_client_data
+    # NOTE: uninitialized client data will be false, not nil
+	if(!data)
+		data = 0
+	end
+	data += 1
+	@m_pLabel.set_label(data.to_s)
+
+	@m_pChoice.set_selection(chose)
+	@m_pChoice.set_client_data(chose, data)
+  end
+
+  def onClose
+     destroy()
+  end
+end
+
+
+class RbApp < App
+  def on_init
+    dlg = ChoiceDlg.new
+    set_top_window(dlg)
+    dlg.show(TRUE)
+  end
+
+end
+
+a = RbApp.new
+a.main_loop()