wxruby 1.9.1-i686-linux → 1.9.2-i686-linux

data/lib/wx/version.rb

@@ -1,3 +1,3 @@
 module Wx
-  WXRUBY_VERSION    = '1.9.1'
+  WXRUBY_VERSION    = '1.9.2'
 end

data/samples/bigdemo/wxScrolledWindow.rbw

@@ -139,6 +139,8 @@ class MyCanvas < Wx::ScrolledWindow
         if event.left_is_down() and !@drawing
             set_focus()
             set_XY(event)
+            @event_x_old =  event.get_x # added this to save the current absolute...
+            @event_y_old = event.get_y  # ... mouse position
             @curLine = []
             capture_mouse()
             @drawing = true
@@ -167,11 +169,14 @@ class MyCanvas < Wx::ScrolledWindow
 
           paint do | dc |
             dc.set_pen(Wx::Pen.new("MEDIUM FOREST GREEN", 4, Wx::SOLID))
-            coords = [@x, @y] + convert_event_coords(event)
-            @curLine.push(coords)
+            save_coords = [@x, @y] + convert_event_coords(event)             # translate the absolute coords to save them in the array
+            coords = [@event_x_old, @event_y_old, event.get_x, event.get_y]  # the absolute coords to use for the first draw
+            @curLine.push(save_coords)                                       # use the translated coords here
             coords.flatten!()
-            dc.draw_line(coords[0], coords[1], coords[2], coords[3])
+            dc.draw_line(coords[0], coords[1], coords[2], coords[3])         # and the absolute coords here
             set_XY(event)
+            @event_x_old = event.get_x                                       # saving the new ...
+            @event_y_old = event.get_y                                       # ... absolute coords
           end
         end
     end

data/samples/calendar/calendar.rb

@@ -232,7 +232,7 @@ class MyFrame < Frame
         end
       @calendar = MyCalendar.new(@panel, self, date, style)
       @sizer.add(@calendar, 0, Wx::ALIGN_CENTRE|Wx::ALL, 5)
-      layout
+      @panel.layout
     end
 
     def highlight_special(on)

data/samples/caret/caret.rb

@@ -15,8 +15,6 @@ end
 include Wx
 
 # menu items
-Caret_Quit = ID_EXIT
-Caret_About = ID_ABOUT
 Caret_set_blink_time = 3
 Caret_Move = 4
 
@@ -27,26 +25,22 @@ Caret_Text = 1000
 # MyCanvas is a canvas on which you can type
 class MyCanvas < ScrolledWindow
   def initialize(parent)
-    super(parent, -1,
-          DEFAULT_POSITION, DEFAULT_SIZE,
-          SUNKEN_BORDER )
+    super(parent, :style => SUNKEN_BORDER)
 
-    set_background_colour(WHITE)
+    self.background_colour = WHITE
 
     @font = Font.new(12, FONTFAMILY_TELETYPE,
                      FONTSTYLE_NORMAL, FONTWEIGHT_NORMAL)
 
-    @x_caret = @y_caret =
-      @x_chars = @y_chars = 0
-
+    @x_caret = @y_caret = @x_chars = @y_chars = 0
     @x_margin = @y_margin = 5
     @text = nil
 
     create_caret
 
-    evt_paint {on_paint}
-    evt_size {|event| on_size(event)}
-    evt_char {|event| on_char(event)}
+    evt_paint :on_paint
+    evt_size :on_size
+    evt_char :on_char
   end
 
   def [](x,y)
@@ -108,14 +102,14 @@ class MyCanvas < ScrolledWindow
 
   def create_caret
     paint do | dc |
-      dc.set_font(@font)
-      @height_char = dc.get_char_height
-      @width_char = dc.get_char_width
+      dc.font = @font
+      @height_char = dc.char_height
+      @width_char = dc.char_width
 
-      caret = Caret.new(self, Size.new(@width_char, @height_char))
-      set_caret(caret)
+      my_caret = Caret.new(self, Size.new(@width_char, @height_char))
+      self.caret = my_caret
 
-      caret.move(Point.new(@x_margin, @y_margin))
+      caret.move [ @x_margin, @y_margin ]
       caret.show
     end
   end
@@ -130,13 +124,13 @@ class MyCanvas < ScrolledWindow
   def do_move_caret
     log_status("Caret is at (%d, %d)", @x_caret, @y_caret)
 
-    get_caret.move_xy(@x_margin + @x_caret * @width_char,
-                        @y_margin + @y_caret * @height_char)
+    caret.move_xy( @x_margin + @x_caret * @width_char,
+                   @y_margin + @y_caret * @height_char)
   end
 
   def on_size(event)
-    @x_chars = (event.get_size.x - 2*@x_margin) / @width_char
-    @y_chars = (event.get_size.y - 2*@y_margin) / @height_char
+    @x_chars = (event.size.x - 2 * @x_margin) / @width_char
+    @y_chars = (event.size.y - 2 * @y_margin) / @height_char
     if @x_chars <= 0
       @x_chars = 1
     end
@@ -152,17 +146,15 @@ class MyCanvas < ScrolledWindow
 
     @text = " " * @x_chars * @y_chars
 
-    frame = get_parent
-    if frame && frame.get_status_bar
+    if parent && parent.status_bar
       msg = sprintf("Panel size is (%d, %d)", @x_chars, @y_chars)
-      frame.set_status_text(msg, 1)
-      frame.refresh
+      parent.set_status_text(msg, 1)
+      parent.refresh
     end
     event.skip
   end
 
   def on_paint
-    caret = get_caret
     if caret
       caret.hide
     end
@@ -180,7 +172,6 @@ class MyCanvas < ScrolledWindow
     if caret
       caret.show
     end
-
   end
 
   def on_char(event)
@@ -212,15 +203,14 @@ class MyCanvas < ScrolledWindow
     end
     do_move_caret
   end
-
 end
 
 class MyFrame < Frame
-  def initialize(title,pos,size)
+  def initialize(title, pos, size)
     super(nil, -1, title, pos, size)
     # set the frame icon
     icon_file = File.join(File.dirname(__FILE__), 'mondrian.xpm')
-    set_icon(Icon.new(icon_file, BITMAP_TYPE_XPM))
+    self.icon = Icon.new(icon_file, BITMAP_TYPE_XPM)
 
     # create a menu bar
     menu_file = Menu.new
@@ -228,16 +218,16 @@ class MyFrame < Frame
     menu_file.append(Caret_set_blink_time, "&Blink time...\tCtrl-B")
     menu_file.append(Caret_Move, "&Move caret\tCtrl-C")
     menu_file.append_separator
-    menu_file.append(Caret_About, "&About...\tCtrl-A", "Show about dialog")
+    menu_file.append(Wx::ID_ABOUT, "&About...\tCtrl-A", "Show about dialog")
     menu_file.append_separator
-    menu_file.append(Caret_Quit, "E&xit\tAlt-X", "Quit self program")
+    menu_file.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit self program")
 
     # now append the freshly created menu to the menu bar...
     menu_bar = MenuBar.new
     menu_bar.append(menu_file, "&File")
 
     # ... and attach self menu bar to the frame
-    set_menu_bar(menu_bar)
+    self.menu_bar = menu_bar
 
     @canvas = MyCanvas.new(self)
 
@@ -247,12 +237,12 @@ class MyFrame < Frame
 
     # create a status bar just for fun (by default with 1 pane only)
     create_status_bar(2)
-    set_status_text("Welcome to Windows!")
+    self.status_text = "Welcome to Windows!"
 
-    evt_menu(Caret_Quit) {on_quit}
-    evt_menu(Caret_About) {on_about}
-    evt_menu(Caret_set_blink_time) {on_set_blink_time}
-    evt_menu(Caret_Move) {on_caret_move}
+    evt_menu Wx::ID_EXIT, :on_quit
+    evt_menu Wx::ID_ABOUT, :on_about
+    evt_menu Caret_set_blink_time, :on_set_blink_time
+    evt_menu Caret_Move, :on_caret_move
   end
   
   def on_quit

data/samples/etc/threaded.rb

@@ -0,0 +1,81 @@
+#!/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 simple sample demonstrates how to use Ruby 1.8's lightweight
+# (green) threads to execute non-GUI code in parallel with a wxRuby
+# GUI. This strategy is useful in a number of situations:
+# 
+# * To keep the GUI responsive whilst computationally intensive
+#   operations are carried out in the background
+# * To keep the GUI responsive while waiting for networking operations
+#   to complete 
+# 
+# The basic problem is that, as with other Ruby GUI toolkits, non-GUI
+# threads will not, by default, get allocated time to run while Ruby is
+# busy in Wx code - the main wxRuby event loop. Strategies to deal with
+# this include using non-blocking IO, and, more generically, using
+# wxRuby's Timer class to explicitly allocate time for non-GUI threads
+# to run. The latter technique is shown here.
+
+# This frame shows a set of progress bars which monitor progress of
+# long-running tasks. In this example, this long-running task is
+# emulated by simply sleep-ing for random periods, but could equally be
+# downloading from a socket or parsing a file.
+class ProgressFrame < Wx::Frame
+  STEPS = 20
+  def initialize
+    super(nil, :title => 'Threading demo')
+    @gauges = []
+    panel = Wx::Panel.new(self)
+    sizer = Wx::BoxSizer.new(Wx::VERTICAL)
+    # show ten gauges
+    10.times do 
+      gauge = Wx::Gauge.new(panel, :range => STEPS)
+      # For each gauge, start a new thread in which the task runs
+      Thread.new do 
+        # The long-running task
+        STEPS.times do | i |
+          sleep rand(100) / 50.0
+          # Update the main GUI
+          gauge.value = i + 1
+        end
+      end
+      @gauges << gauge
+      sizer.add(gauge, 0, Wx::GROW|Wx::ALL, 2)
+    end
+    panel.sizer = sizer
+    sizer.fit(panel)
+  end
+end
+
+# This app class creates a frame, and, importantly, a timer to allow
+class GaugeApp < Wx::App
+  # Get a guaranteed-unique id
+  THREAD_TIMER_ID = Wx::ID_HIGHEST + 1
+  def on_init
+    # Create a global application timer 
+    t = Wx::Timer.new(self, THREAD_TIMER_ID)
+    # When the timer "ticks", switch control to other ruby threads
+    evt_timer(THREAD_TIMER_ID) { Thread.pass }
+    # Start the timer to run every 1/40 second (25ms); higher values
+    # will make the other threads run more often, but will eventually
+    # degrade the responsiveness of the GUI.
+    t.start(25)
+    prog = ProgressFrame.new
+    prog.show
+  end
+end
+
+GaugeApp.new.main_loop

data/samples/etc/wizard.rb

@@ -14,42 +14,41 @@ rescue LoadError => no_wx_err
 end
 
 class MyFrame < Wx::Frame
-  def initialize(title, pos, size, style = Wx::DEFAULT_FRAME_STYLE)
-    super(nil, -1, title, pos, size, style)
+  def initialize(title, pos, size)
+    super(nil, :title => title, :position => pos, :size => size)
 
-
-    menuFile = Wx::Menu.new()
-    helpMenu = Wx::Menu.new()
+    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 = 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!")
-    s = Wx::StaticText.new(self, -1, 'The Wizard has completed')
+    self.menu_bar = menuBar
 
+    create_status_bar(1)
+    self.status_text = "Welcome to wxRuby!"
+    s = Wx::StaticText.new(self, :label => 'The Wizard has completed')
+    evt_menu Wx::ID_EXIT, :on_quit
+    evt_menu Wx::ID_ABOUT, :on_about
 
-    evt_menu(Wx::ID_EXIT) { on_quit }
-    evt_menu(Wx::ID_ABOUT) { on_about }
-    w = Wx::Wizard.new(self, -1, 'The WxRuby Wizard')
+    w = Wx::Wizard.new(self, :title => 'The WxRuby Wizard')
     p1 = Wx::WizardPageSimple.new(w)
-    s = Wx::StaticText.new(p1, -1, 'This is the first page')
+    s = Wx::StaticText.new(p1, :label => 'This is the first page')
+
     p2 = Wx::WizardPageSimple.new(w, p1)
     p1.set_next(p2)
-    s = Wx::StaticText.new(p2, -1, 'This is the second page')
+    s = Wx::StaticText.new(p2, :label => 'This is the second page')
+
     p3 = Wx::WizardPageSimple.new(w, p2)
     p2.set_next(p3)
-    s = Wx::StaticText.new(p3, -1, 'This is the final page')
-
-    evt_wizard_page_changed(w.get_id) { p "page changed" }
-    evt_wizard_page_changing(w.get_id) { p "page changing" }
-    evt_wizard_help(w.get_id) { p "wizard help" }
-    evt_wizard_cancel(w.get_id) { p "wizard cancelled" }
-    evt_wizard_finished(w.get_id) { p "wizard finished" }
+    s = Wx::StaticText.new(p3, :label => 'This is the final page')
 
+    evt_wizard_page_changed(w) { p "page changed" }
+    evt_wizard_page_changing(w) { p "page changing" }
+    evt_wizard_help(w) { p "wizard help" }
+    evt_wizard_cancel(w) { p "wizard cancelled" }
+    evt_wizard_finished(w) { p "wizard finished" }
 
     w.run_wizard(p1)
   end
@@ -70,7 +69,6 @@ class RbApp < Wx::App
     frame = MyFrame.new("Wizard wxRuby App",
                         Wx::Point.new(50, 50), 
                         Wx::Size.new(450, 340))
-
     frame.show(true)
 
   end

data/samples/html/html.rb

@@ -78,9 +78,9 @@ class MyHtmlWindow < Wx::HtmlWindow
 
   def on_cell_mouse_hover(cell, x, y)
     if link = cell.get_link
-      get_related_frame.set_status_text(link.get_href)
+      related_frame.status_text = link.get_href, 1
     else
-      get_related_frame.set_status_text('')
+      related_frame.status_text = ''
     end
   end
 end
@@ -95,8 +95,8 @@ class HtmlFrame < Wx::Frame
     super(nil, -1, title, pos, size, style)
     setup_menus
     setup_panel
-    create_status_bar(2)
-    set_status_text("Welcome to wxRuby!")
+    create_status_bar
+    self.status_text = "Welcome to wxRuby!"
   end
 
   def setup_panel
@@ -127,6 +127,7 @@ class HtmlFrame < Wx::Frame
     # in the correct platform-specific place
     menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
     menu_file.append(Wx::ID_OPEN, "&Open File...\tCtrl-O", "Open File")
+    menu_file.append(Wx::ID_HIGHEST + 1, "&Open URL...\tCtrl-U", "Open URL")
     menu_file.append(Wx::ID_PRINT, "&Print...\tCtrl-P", "Print")
 
     menu_file.append(Wx::ID_PREVIEW, "&Preview...\tCtrl-Shift-P", 
@@ -137,13 +138,14 @@ class HtmlFrame < Wx::Frame
     menu_bar.append(menu_file, "&File")
     menu_bar.append(menu_help, "&Help")
     # Assign the menus to this frame
-    set_menu_bar(menu_bar)
+    self.menu_bar = menu_bar
     # handle menu events
-    evt_menu(Wx::ID_OPEN) { on_open_file }
-    evt_menu(Wx::ID_PRINT) { on_print }
-    evt_menu(Wx::ID_PREVIEW) { on_preview }
-    evt_menu(Wx::ID_EXIT) { on_quit }
-    evt_menu(Wx::ID_ABOUT) { on_about }
+    evt_menu Wx::ID_OPEN, :on_open_file
+    evt_menu Wx::ID_HIGHEST + 1, :on_open_url
+    evt_menu Wx::ID_PRINT, :on_print
+    evt_menu Wx::ID_PREVIEW, :on_preview
+    evt_menu Wx::ID_EXIT, :on_quit
+    evt_menu Wx::ID_ABOUT, :on_about
   end
 
   # end the application
@@ -153,16 +155,27 @@ class HtmlFrame < Wx::Frame
 
   def on_open_file
     f_dlg = Wx::FileDialog.new(self, "Open an HTML file", "", "", 
-                                "HTML files (*.html;*.htm)|.html;.htm)", 
+                                "HTML files (*.html;*.htm)|*.html;*.htm)", 
                                 Wx::OPEN)
     if not f_dlg.show_modal == Wx::ID_OK
       return
     end
     html_file = f_dlg.get_path
-
+    if html_file.index("\\")
+      html_file = html_file.split("\\").join("/")
+    end
     @html_win.load_file(html_file)
   end
 
+  def on_open_url
+    url = Wx::get_text_from_user('Enter URL to open', 'Enter URL')
+    if not url.empty?
+      uri = URI.parse(url)
+      uri.path = '/' if uri.path.empty?
+      @html_win.load_page_from_uri(uri)
+    end
+  end
+
   # show an 'About' dialog
   def on_about
     msg =  sprintf("This is the About dialog of the HTML sample.\n" \

data/samples/listbook/listbook.rb

@@ -13,69 +13,66 @@ rescue LoadError => no_wx_err
   end
 end
 
-# This sample demonstrates the use of the listbook class.
-# NB: This sample doesn't currently work on Linux (21/08/2006)
-
-
-
 #
 # Basic Frame Class. This creates the dialog window
 #
 class SimpleFrame < Wx::Frame 
 
-	FILE_DIALOG, FILE_ABOUT, FILE_QUIT = [0,Wx::ID_ABOUT,Wx::ID_EXIT]
-	
-	def initialize(parent)
-      # To load a layout defined in XRC into a Ruby subclass of Frame,
-      # first call the empty constructor. All the details of size,
-      # title, position and so on are loaded from the XRC by the call to 
-      # load_frame_subclass. Using a non-empty constructor will cause
-      # errors on GTK.
-      super()
-      $xml.load_frame_subclass(self,nil,'ID_FRAME')
+  FILE_DIALOG, FILE_ABOUT, FILE_QUIT = [0,Wx::ID_ABOUT,Wx::ID_EXIT]
+  
+  def initialize(parent)
+    # To load a layout defined in XRC into a Ruby subclass of Frame,
+    # first call the empty constructor. All the details of size,
+    # title, position and so on are loaded from the XRC by the call to 
+    # load_frame_subclass. Using a non-empty constructor will cause
+    # errors on GTK.
+    super()
+    $xml.load_frame_subclass(self,nil,'ID_FRAME')
     
-		# Create a new menu
-		bar = Wx::MenuBar.new
-		menu = Wx::Menu.new
+    # Create a new menu
+    bar = Wx::MenuBar.new
+    menu = Wx::Menu.new
     menu.append(FILE_ABOUT,"About...")
     menu.append_separator
-		menu.append(FILE_QUIT,"Quit")
-		bar.append(menu,"File")
-		
-		set_menu_bar(bar)
-		
-		# Assign the menu events
+    menu.append(FILE_QUIT,"Quit")
+    bar.append(menu,"File")
+    
+    set_menu_bar(bar)
+    
+    # Assign the menu events
     evt_menu(FILE_ABOUT) do
-        Wx::message_box("wxRuby Listbook sample\nby Sean Long", "About Listbook", Wx::OK | Wx::ICON_INFORMATION, self)
+      Wx::message_box("wxRuby Listbook sample\nby Sean Long", "About Listbook", Wx::OK | Wx::ICON_INFORMATION, self)
     end    
-		evt_menu(FILE_QUIT) do
-			Wx::get_app.exit_main_loop()
-		end
-		evt_close() do
-			Wx::get_app.exit_main_loop()
-		end
+    evt_menu(FILE_QUIT) do
+      Wx::get_app.exit_main_loop()
+    end
+    evt_close() do
+      Wx::get_app.exit_main_loop()
+    end
 
     # Variables not in tabs
-    @listbook = Wx::Window.find_window_by_id(Wx::xrcid('ID_LISTBOOK'),self)
-    @text_output = Wx::Window.find_window_by_id(Wx::xrcid('ID_ORDER_TEXTCTRL'),self)
+    @listbook    = xrcid_to_window('ID_LISTBOOK')
+    @text_output = xrcid_to_window('ID_ORDER_TEXTCTRL')
     
     # Variables for widgets in Pizza tab
-    @pizza_size = Wx::Window.find_window_by_id(Wx::xrcid('ID_PIZZA_SIZE_CHOICE'),self)
-    @pizza_crust = Wx::Window.find_window_by_id(Wx::xrcid('ID_PIZZA_CRUST_CHOICE'),self)
-    @pizza_sauce = Wx::Window.find_window_by_id(Wx::xrcid('ID_PIZZA_SAUCE_CHOICE'),self)
-    @pizza_cheese = Wx::Window.find_window_by_id(Wx::xrcid('ID_PIZZA_CHEESE_CHOICE'),self)
+    @pizza_size   = xrcid_to_window('ID_PIZZA_SIZE_CHOICE')
+    @pizza_crust  = xrcid_to_window('ID_PIZZA_CRUST_CHOICE')
+    @pizza_sauce  = xrcid_to_window('ID_PIZZA_SAUCE_CHOICE')
+    @pizza_cheese = xrcid_to_window('ID_PIZZA_CHEESE_CHOICE')
     @pizza_toppings = []
     3.times do |i|
-      @pizza_toppings << Wx::Window.find_window_by_id(Wx::xrcid("ID_PIZZA_TOPPING_#{i+1}_CHOICE"),self)
+      @pizza_toppings << xrcid_to_window("ID_PIZZA_TOPPING_#{i+1}_CHOICE")
     end
 
     # fill in toppings
-    toppings = ['pepperoni','sausage','itallian sausage','olives','mushrooms','artichoke','extra cheese','']
+    toppings = ['pepperoni','sausage','italian sausage','olives',
+                'mushrooms','artichoke','extra cheese','']
     toppings.each do |top_name|
       @pizza_toppings.each do |top_obj|
         top_obj.append(top_name)
       end      
     end
+
     index = 0
     @pizza_toppings.each do |obj|
       obj.set_selection(index)
@@ -83,11 +80,10 @@ class SimpleFrame < Wx::Frame
     end
     
     # Events for pizza tab
-    evt_button(Wx::xrcid('ID_PIZZA_BUTTON')) do |event|
+    evt_button( Wx::xrcid('ID_PIZZA_BUTTON') ) do |event|
       #get selections and add to order
       order_string = @text_output.get_value
       if order_string != "" then order_string << "\n" end
-      
       order_string << "One #{@pizza_size.get_string_selection} pizza with:\n"      
       order_string << @pizza_crust.get_string_selection + " crust" + "\n"
       order_string << @pizza_sauce.get_string_selection + " sauce" +"\n"
@@ -99,8 +95,8 @@ class SimpleFrame < Wx::Frame
     
 
     # Variables for widgets in Drink tab
-    @drink_size = Wx::Window.find_window_by_id(Wx::xrcid('ID_DRINK_SIZE_CHOICE'),self)
-    @drink_type = Wx::Window.find_window_by_id(Wx::xrcid('ID_DRINK_TYPE_CHOICE'),self)
+    @drink_size = xrcid_to_window('ID_DRINK_SIZE_CHOICE')
+    @drink_type = xrcid_to_window('ID_DRINK_TYPE_CHOICE')
     
     # Events for drink tab
     evt_button(Wx::xrcid('ID_DRINK_BUTTON')) do |event|
@@ -114,11 +110,12 @@ class SimpleFrame < Wx::Frame
     end    
     
     # Variables for widgets in Ice Cream tab
-    @ice_cream_size = Wx::Window.find_window_by_id(Wx::xrcid('ID_ICE_CREAM_SIZE_CHOICE'),self)
-    @ice_cream_type = Wx::Window.find_window_by_id(Wx::xrcid('ID_ICE_CREAM_TYPE_CHOICE'),self)
+    @ice_cream_size = xrcid_to_window('ID_ICE_CREAM_SIZE_CHOICE')
+    @ice_cream_type = xrcid_to_window('ID_ICE_CREAM_TYPE_CHOICE')
     @ice_cream_toppings = []
     4.times do |i|
-      @ice_cream_toppings << Wx::Window.find_window_by_id(Wx::xrcid("ID_ICE_CREAM_TOPPING_#{i+1}_CHOICE"),self)
+      @ice_cream_toppings << 
+        xrcid_to_window("ID_ICE_CREAM_TOPPING_#{i+1}_CHOICE")
     end    
 
     toppings = ['','m&m\'s','chocolate chips','fudge','nuts','cherry','whip cream'] 
@@ -146,10 +143,15 @@ class SimpleFrame < Wx::Frame
       order_string = @text_output.get_value
       order_string << "moved to tab = #{@listbook.get_page_text(tab_number)} \n"
       @text_output.set_value(order_string)
-    end    
- 
+    end
+  end
+
+  # Converts a XRCID id - as used in wxWidget's XML format - into the
+  # correct ruby window
+  def xrcid_to_window(xrc_id) 
+    Wx::Window.find_window_by_id(Wx::xrcid(xrc_id), self)      
   end
-	
+
 end
 
 #
@@ -157,27 +159,23 @@ end
 #
 class XrcApp < Wx::App
 
-	def on_init
-		#
-		# Create a resource handler
-		#
-		$xml = Wx::XmlResource.get();
-		$xml.init_all_handlers();
+  def on_init
+    # Create a resource handler
+    $xml = Wx::XmlResource.get();
+    $xml.init_all_handlers();
 
-		# Load a resource file from the script's directory
-        xrc_file = File.join( File.dirname( __FILE__ ), 'listbook.xrc' )
+    # Load a resource file from the script's directory
+    xrc_file = File.join( File.dirname( __FILE__ ), 'listbook.xrc' )
 
-		$xml.load(xrc_file)	
+    $xml.load(xrc_file)	
 
-		#
-		# Show the main frame.
-		#
-		$main = SimpleFrame.new(self)
-		$main.show(true)
-    
-	end
 
+    # Show the main frame.
+    $main = SimpleFrame.new(self)
+    $main.show(true)
+    
+  end
 end
-		
-		
+
+
 XrcApp.new().main_loop()