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

data/samples/etc/wizard.rb

@@ -1,79 +1,79 @@
-#!/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
-
-class MyFrame < Wx::Frame
-  def initialize(title, pos, size)
-    super(nil, :title => title, :position => pos, :size => size)
-
-    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")
-    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
-
-    w = Wx::Wizard.new(self, :title => 'The WxRuby Wizard')
-    p1 = Wx::WizardPageSimple.new(w)
-    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, :label => 'This is the second page')
-
-    p3 = Wx::WizardPageSimple.new(w, p2)
-    p2.set_next(p3)
-    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
-
-  def on_quit
-    close(true)
-  end
-
-  def on_about
-    msg =  sprintf("This is the About dialog of the wizard sample.\n" \
-                    "Welcome to %s", Wx::VERSION_STRING)
-    Wx::message_box(msg, "About Wizard", Wx::OK|Wx::ICON_INFORMATION, self)
-  end
-end
-
-class RbApp < Wx::App
-  def on_init
-    frame = MyFrame.new("Wizard wxRuby App",
-                        Wx::Point.new(50, 50), 
-                        Wx::Size.new(450, 340))
-    frame.show(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
+
+class MyFrame < Wx::Frame
+  def initialize(title, pos, size)
+    super(nil, :title => title, :position => pos, :size => size)
+
+    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")
+    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
+
+    w = Wx::Wizard.new(self, :title => 'The WxRuby Wizard')
+    p1 = Wx::WizardPageSimple.new(w)
+    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, :label => 'This is the second page')
+
+    p3 = Wx::WizardPageSimple.new(w, p2)
+    p2.set_next(p3)
+    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
+
+  def on_quit
+    close(true)
+  end
+
+  def on_about
+    msg =  sprintf("This is the About dialog of the wizard sample.\n" \
+                    "Welcome to %s", Wx::VERSION_STRING)
+    Wx::message_box(msg, "About Wizard", Wx::OK|Wx::ICON_INFORMATION, self)
+  end
+end
+
+class RbApp < Wx::App
+  def on_init
+    frame = MyFrame.new("Wizard wxRuby App",
+                        Wx::Point.new(50, 50), 
+                        Wx::Size.new(450, 340))
+    frame.show(true)
+
+  end
+end
+
+app = RbApp.new
+app.main_loop()
+

data/samples/html/html.rb

@@ -18,6 +18,12 @@ require 'uri'
 
 class MyHtmlWindow < Wx::HtmlWindow
   attr_reader :html_src
+  def initialize(*args)
+    super
+    evt_html_link_clicked self, :on_link_clicked
+    evt_html_cell_hover self, :on_hover
+  end
+
   def load_page_from_uri(uri)
     case uri
     when URI::HTTP
@@ -64,21 +70,19 @@ class MyHtmlWindow < Wx::HtmlWindow
   def set_page(html)
     super html
     @html_src = html
-    get_related_frame.addr_bar.set_value(@loaded_uri.to_s)
+    related_frame.addr_bar.value = @loaded_uri.to_s
   end
 
-  def on_link_clicked(link)
-    href = link.get_href
-    if href =~ /^#/
-        super(link)
-    end
+  def on_link_clicked(event)
+    href = event.link_info.href
+    return if href =~ /^#/
     link_uri = URI.parse(href)
     @loaded_uri = load_page_from_uri(link_uri)
   end
 
-  def on_cell_mouse_hover(cell, x, y)
-    if link = cell.get_link
-      related_frame.status_text = link.get_href, 1
+  def on_hover(event)
+    if link = event.cell.link
+      related_frame.set_status_text(link.href)
     else
       related_frame.status_text = ''
     end
@@ -114,7 +118,7 @@ class HtmlFrame < Wx::Frame
 
     @html_win = MyHtmlWindow.new(panel, -1)
     @html_win.set_related_frame(self, 'HTML Window: %s')
-    @html_win.set_related_status_bar(2)
+
     @html_win.set_page(DATA.read)
     sizer.add(@html_win, 1, Wx::ALL|Wx::GROW, 4)
     panel.set_sizer(sizer)

data/samples/listbook/listbook.rb

@@ -1,181 +1,181 @@
-#!/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
-
-#
-# 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')
-    
-    # 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
-    evt_menu(FILE_ABOUT) do
-      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
-
-    # Variables not in tabs
-    @listbook    = xrcid_to_window('ID_LISTBOOK')
-    @text_output = xrcid_to_window('ID_ORDER_TEXTCTRL')
-    
-    # Variables for widgets in Pizza tab
-    @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 << xrcid_to_window("ID_PIZZA_TOPPING_#{i+1}_CHOICE")
-    end
-
-    # fill in toppings
-    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)
-      index += 1
-    end
-    
-    # Events for pizza tab
-    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"
-      order_string << @pizza_cheese.get_string_selection + " and" + "\n"
-      @pizza_toppings.each { |obj| order_string << obj.get_string_selection + "\n" }
-
-      @text_output.set_value(order_string)
-    end
-    
-
-    # Variables for widgets in Drink tab
-    @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|
-      #get selections and add to order
-      order_string = @text_output.get_value
-      if order_string != "" then order_string << "\n" end
-      
-      order_string << "One #{@drink_size.get_string_selection} #{@drink_type.get_string_selection }.\n"      
-
-      @text_output.set_value(order_string)
-    end    
-    
-    # Variables for widgets in Ice Cream tab
-    @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 << 
-        xrcid_to_window("ID_ICE_CREAM_TOPPING_#{i+1}_CHOICE")
-    end    
-
-    toppings = ['','m&m\'s','chocolate chips','fudge','nuts','cherry','whip cream'] 
-    toppings.each do |top_name|
-      @ice_cream_toppings.each do |top_obj|
-        top_obj.append(top_name)
-      end      
-    end    
-    @ice_cream_toppings.each { |obj| obj.set_selection(0) } 
-    
-    # Events for ice cream tab
-    evt_button(Wx::xrcid('ID_ICE_CREAM_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 #{@ice_cream_size.get_string_selection} #{@ice_cream_type.get_string_selection} ice cream:\n"      
-      @ice_cream_toppings.each { |obj| order_string << obj.get_string_selection + "\n" }
-
-      @text_output.set_value(order_string)
-    end       
-    
-    evt_listbook_page_changed(Wx::xrcid('ID_LISTBOOK')) do |event|
-      tab_number = event.get_selection
-      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
-
-  # 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
-
-#
-# Application class.
-#
-class XrcApp < Wx::App
-
-  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' )
-
-    $xml.load(xrc_file)	
-
-
-    # Show the main frame.
-    $main = SimpleFrame.new(self)
-    $main.show(true)
-    
-  end
-end
-
-
-XrcApp.new().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
+
+#
+# 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')
+    
+    # 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
+    evt_menu(FILE_ABOUT) do
+      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
+
+    # Variables not in tabs
+    @listbook    = xrcid_to_window('ID_LISTBOOK')
+    @text_output = xrcid_to_window('ID_ORDER_TEXTCTRL')
+    
+    # Variables for widgets in Pizza tab
+    @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 << xrcid_to_window("ID_PIZZA_TOPPING_#{i+1}_CHOICE")
+    end
+
+    # fill in toppings
+    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)
+      index += 1
+    end
+    
+    # Events for pizza tab
+    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"
+      order_string << @pizza_cheese.get_string_selection + " and" + "\n"
+      @pizza_toppings.each { |obj| order_string << obj.get_string_selection + "\n" }
+
+      @text_output.set_value(order_string)
+    end
+    
+
+    # Variables for widgets in Drink tab
+    @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|
+      #get selections and add to order
+      order_string = @text_output.get_value
+      if order_string != "" then order_string << "\n" end
+      
+      order_string << "One #{@drink_size.get_string_selection} #{@drink_type.get_string_selection }.\n"      
+
+      @text_output.set_value(order_string)
+    end    
+    
+    # Variables for widgets in Ice Cream tab
+    @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 << 
+        xrcid_to_window("ID_ICE_CREAM_TOPPING_#{i+1}_CHOICE")
+    end    
+
+    toppings = ['','m&m\'s','chocolate chips','fudge','nuts','cherry','whip cream'] 
+    toppings.each do |top_name|
+      @ice_cream_toppings.each do |top_obj|
+        top_obj.append(top_name)
+      end      
+    end    
+    @ice_cream_toppings.each { |obj| obj.set_selection(0) } 
+    
+    # Events for ice cream tab
+    evt_button(Wx::xrcid('ID_ICE_CREAM_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 #{@ice_cream_size.get_string_selection} #{@ice_cream_type.get_string_selection} ice cream:\n"      
+      @ice_cream_toppings.each { |obj| order_string << obj.get_string_selection + "\n" }
+
+      @text_output.set_value(order_string)
+    end       
+    
+    evt_listbook_page_changed(Wx::xrcid('ID_LISTBOOK')) do |event|
+      tab_number = event.get_selection
+      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
+
+  # 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
+
+#
+# Application class.
+#
+class XrcApp < Wx::App
+
+  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' )
+
+    $xml.load(xrc_file)	
+
+
+    # Show the main frame.
+    $main = SimpleFrame.new(self)
+    $main.show(true)
+    
+  end
+end
+
+
+XrcApp.new().main_loop()