wxruby 1.9.0-powerpc-darwin8.10.0 → 1.9.2-powerpc-darwin8.10.0

data/lib/wx/version.rb

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

data/samples/aui/aui.rb

@@ -564,7 +564,8 @@ class AuiFrame < Wx::Frame
     evt_update_ui(ID_VerticalGradient) { | e | on_update_ui(e) } 
     evt_update_ui(ID_HorizontalGradient) { | e | on_update_ui(e) } 
     evt_menu_range( ID_FirstPerspective, 
-                    ID_FirstPerspective + @perspectives.length) { | e | }
+                    ID_FirstPerspective + 
+                    @perspectives.length) { | e | on_restore_perspective(e) }
     evt_aui_pane_close { | e | on_pane_close(e) }
     evt_auinotebook_page_close(Wx::ID_ANY) { | e | on_notebook_page_close(e) }
   end
@@ -800,7 +801,7 @@ class AuiFrame < Wx::Frame
   def setup_perspectives
     perspective_all = @mgr.save_perspective
 
-    @mgr.get_all_panes.each do | pane | 
+    @mgr.each_pane do | pane | 
       pane.hide unless pane.is_toolbar
     end 
 
@@ -935,7 +936,7 @@ class AuiFrame < Wx::Frame
     end
 
 
-    @mgr.get_all_panes.each do | pane | 
+    @mgr.each_pane do | pane | 
       maybe_nb = pane.get_window
       next unless maybe_nb.kind_of?(Wx::AuiNotebook)
       if e_id == ID_NotebookArtGloss
@@ -1023,8 +1024,8 @@ class AuiFrame < Wx::Frame
   def on_create_perspective
     msg = "Enter a name for the new perspective:"
     dlg = Wx::TextEntryDialog.new(self, msg, "Wx::AUI Test")
-    dlg.set_value("Perspective %d" % @perspectives.length + 1)
-    return unless dlg.show_modal != Wx::ID_OK
+    dlg.set_value("Perspective %d" % [ @perspectives.length + 1 ] )
+    return unless dlg.show_modal == Wx::ID_OK
     if @perspectives.length.zero?
       @perspectives_menu.append_separator
     end

data/samples/bigdemo/wxListCtrl_virtual.rbw

@@ -60,33 +60,33 @@ class TestVirtualList < Wx::ListCtrl
         @log.write_text("on_item_deselected: %s" % event.get_index())
     end
     
-     #---------------------------------------------------
-    # These methods are callbacks for implementing the
-    # "virtualness" of the list...  Normally you would
-    # determine the text, attributes and/or image based
-    # on values from some external data source, but for
-    # this demo we'll just calculate them
-    
+    # These three following methods are callbacks for implementing the
+    # "virtualness" of the list; they *must* be defined by any ListCtrl
+    # object with the style LC_VIRTUAL.
+
+    # Normally you would determine the text, attributes and/or image
+    # based on values from some external data source, but for this demo
+    # we'll just calculate them based on order. 
     def on_get_item_text(item, col)
-        return "Item %d, column %d" % [item,col]
+      return "Item %d, column %d" % [item,col]
     end
     
-    def on_get_item_image(item)
-        if item % 3 == 0
-            return @idx1
-        else
-            return -1
-        end
+    def on_get_item_column_image(item, col)
+      if item % 4 == 0
+        return @idx1
+      else
+        return -1
+      end
     end
     
     def on_get_item_attr(item)
-        if item % 3 == 1
-            return @attr1
-        elsif item % 3 == 2
-            return @attr2
-        else 
-            return nil
-        end
+      if item % 3 == 1
+        return @attr1
+      elsif item % 3 == 2
+        return @attr2
+      else 
+        return nil
+      end
     end
 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