wxruby 1.9.3-x86-linux → 1.9.4-x86-linux

data/lib/wx/classes/evthandler.rb

@@ -417,6 +417,15 @@ class Wx::EvtHandler
     EventType['evt_help_range', 2,
               Wx::EVT_HELP, 
               Wx::Event],
+    EventType['evt_html_cell_clicked', 1,
+              Wx::EVT_COMMAND_HTML_CELL_CLICKED, 
+              Wx::HtmlCellEvent],
+    EventType['evt_html_cell_hover', 1,
+              Wx::EVT_COMMAND_HTML_CELL_HOVER, 
+              Wx::HtmlCellEvent],
+    EventType['evt_html_link_clicked', 1,
+              Wx::EVT_COMMAND_HTML_LINK_CLICKED, 
+              Wx::HtmlLinkEvent],
     EventType['evt_hyperlink', 1,
               Wx::EVT_COMMAND_HYPERLINK, 
               Wx::HyperlinkEvent],

data/lib/wx/classes/timer.rb

@@ -1,5 +1,30 @@
 # Class allowing periodic or timed events to be fired
 class Wx::Timer
+  # Convenience method to trigger a one-off action after +interval+
+  # milliseconds have passed. The action is specified by the passed
+  # block. The Timer is owned by the global App object, and is returned
+  # by the method.
+  def self.after(interval, &block)
+    timer = new(Wx::THE_APP, Wx::ID_ANY)
+    Wx::THE_APP.evt_timer(timer.get_id, block)
+    timer.start(interval, true)
+    timer
+  end
+
+  # Convenience method to trigger a repeating action every +interval+
+  # milliseconds. The action is specified by the passed block. The Timer
+  # is owned by the global App object, and is returned by the method.
+  def self.every(interval, &block)
+    timer = new(Wx::THE_APP, Wx::ID_ANY)
+    Wx::THE_APP.evt_timer(timer.get_id, block)
+    timer.start(interval)
+    timer
+  end
+
+  # In common with other classes, make the id method refer to the
+  # wxWidgets id, not ruby's deprecated name for object_id
+  alias :id :get_id
+
   # This class can be linked to an owner - an instance of a class
   # derived from EvtHandler which will receive Timer events. However,
   # event if a Wx::Timer is attached to a Wx::Window, it is (unlike most

data/lib/wx/version.rb

@@ -1,3 +1,3 @@
 module Wx
-  WXRUBY_VERSION    = '1.9.3'
+  WXRUBY_VERSION    = '1.9.4'
 end

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/etc/threaded.rb

@@ -65,14 +65,11 @@ 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)
+    # Create a global application timer that passes control to other
+    # ruby threads. The timer will 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.
+    Wx::Timer.every(25) { Thread.pass }
     prog = ProgressFrame.new
     prog.show
   end

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)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: wxruby
 version: !ruby/object:Gem::Version 
-  version: 1.9.3
+  version: 1.9.4
 platform: x86-linux
 authors: 
 - wxRuby development team
-autorequire: wx
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-01-15 00:00:00 +00:00
+date: 2008-01-16 00:00:00 +00:00
 default_executable: 
 dependencies: []