wxruby 1.9.0-i386-mswin32 → 1.9.1-i386-mswin32

data/lib/wx/version.rb

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

data/samples/SAMPLES-LICENSE.TXT

@@ -1,18 +1,18 @@
-wxRuby2 Sample Code
-Copyright (c) 2004-2006 Kevin B. Smith
-
-Permission is hereby granted, free of charge, to any person obtaining 
-a copy of this software, to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of any portion of 
-this Software, and to permit persons to whom the Software is furnished
-to do so. This copyright notice need not be retained in any derived
-work.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+wxRuby2 Sample Code
+Copyright (c) 2004-2006 Kevin B. Smith
+
+Permission is hereby granted, free of charge, to any person obtaining 
+a copy of this software, to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of any portion of 
+this Software, and to permit persons to whom the Software is furnished
+to do so. This copyright notice need not be retained in any derived
+work.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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/About.rbw

@@ -1,39 +1,39 @@
-module About
-
-class MyAboutBox < Wx::Dialog
-    def initialize(parent)
-        super(parent, -1, "About the WxRuby Demo.")
-        sizer = Wx::BoxSizer.new(Wx::HORIZONTAL)
-        set_size(Wx::Size.new(510,310))
-        headerFont = Wx::Font.new(36, Wx::SWISS, Wx::NORMAL, Wx::NORMAL)
-        bodyFont = Wx::Font.new(12, Wx::SWISS, Wx::NORMAL, Wx::NORMAL)
-        title = Wx::StaticText.new(self, -1, "WxRuby Demo!", Wx::Point.new(20, 20))
-        title.set_font(headerFont)
-        
-        rVersion = Wx::StaticText.new(self, -1, "Running on Ruby version " + VERSION + " on " + RUBY_PLATFORM, Wx::Point.new(20,100))
-        rVersion.set_font(bodyFont)
-        rVersion.set_foreground_colour(Wx::RED)
-        
-        wxVersion = Wx::StaticText.new(self, -1, Wx::VERSION_STRING, Wx::Point.new(20,120))
-        wxVersion.set_font(bodyFont)
-        wxVersion.set_foreground_colour(Wx::BLUE)
-        
-        str = "Welcome to the WxRuby Demo!  This demo has been ported from the \nwxPython demo created by ROBIN DUNN (http://www.wxpython.org).\nGo ahead and click on each demo via the tree or the demo menu.\nLook at the source code - it is an excellent way to learn WxRuby!\n\nPorted by Robert Paul Carlin"
-        body = Wx::StaticText.new(self, -1, str, Wx::Point.new(20, 160))
-        body.set_font(bodyFont)
-        
-        self.centre_on_parent(Wx::BOTH)
-        
-        
-    end
-    
-    
-end
-
-end
-
-if __FILE__ == $0
-  run_solo_lib = File.join( File.dirname(__FILE__), 'run.rb')
-  load run_solo_lib
-  run File.basename($0)
-end
+module About
+
+class MyAboutBox < Wx::Dialog
+    def initialize(parent)
+        super(parent, -1, "About the WxRuby Demo.")
+        sizer = Wx::BoxSizer.new(Wx::HORIZONTAL)
+        set_size(Wx::Size.new(510,310))
+        headerFont = Wx::Font.new(36, Wx::SWISS, Wx::NORMAL, Wx::NORMAL)
+        bodyFont = Wx::Font.new(12, Wx::SWISS, Wx::NORMAL, Wx::NORMAL)
+        title = Wx::StaticText.new(self, -1, "WxRuby Demo!", Wx::Point.new(20, 20))
+        title.set_font(headerFont)
+        
+        rVersion = Wx::StaticText.new(self, -1, "Running on Ruby version " + VERSION + " on " + RUBY_PLATFORM, Wx::Point.new(20,100))
+        rVersion.set_font(bodyFont)
+        rVersion.set_foreground_colour(Wx::RED)
+        
+        wxVersion = Wx::StaticText.new(self, -1, Wx::VERSION_STRING, Wx::Point.new(20,120))
+        wxVersion.set_font(bodyFont)
+        wxVersion.set_foreground_colour(Wx::BLUE)
+        
+        str = "Welcome to the WxRuby Demo!  This demo has been ported from the \nwxPython demo created by ROBIN DUNN (http://www.wxpython.org).\nGo ahead and click on each demo via the tree or the demo menu.\nLook at the source code - it is an excellent way to learn WxRuby!\n\nPorted by Robert Paul Carlin"
+        body = Wx::StaticText.new(self, -1, str, Wx::Point.new(20, 160))
+        body.set_font(bodyFont)
+        
+        self.centre_on_parent(Wx::BOTH)
+        
+        
+    end
+    
+    
+end
+
+end
+
+if __FILE__ == $0
+  run_solo_lib = File.join( File.dirname(__FILE__), 'run.rb')
+  load run_solo_lib
+  run File.basename($0)
+end

data/samples/bigdemo/ColorPanel.rbw

@@ -1,25 +1,25 @@
-#!/usr/bin/env ruby
-
-begin
-  require 'wx'
-rescue LoadError => no_wx_err
-  begin
-    require 'rubygems'
-    require 'wx'
-  rescue LoadError
-    raise no_wx_err
-  end
-end
-
-class ColoredPanel < Wx::Window
-    def initialize(parent, color)
-        super(parent, -1, Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, Wx::SIMPLE_BORDER)
-        set_background_colour(color)
-    end
-end
-
-if __FILE__ == $0
-  run_solo_lib = File.join( File.dirname(__FILE__), 'run.rb')
-  load run_solo_lib
-  run File.basename($0)
-end
+#!/usr/bin/env ruby
+
+begin
+  require 'wx'
+rescue LoadError => no_wx_err
+  begin
+    require 'rubygems'
+    require 'wx'
+  rescue LoadError
+    raise no_wx_err
+  end
+end
+
+class ColoredPanel < Wx::Window
+    def initialize(parent, color)
+        super(parent, -1, Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, Wx::SIMPLE_BORDER)
+        set_background_colour(color)
+    end
+end
+
+if __FILE__ == $0
+  run_solo_lib = File.join( File.dirname(__FILE__), 'run.rb')
+  load run_solo_lib
+  run File.basename($0)
+end

data/samples/bigdemo/GridSimple.rbw

@@ -1,80 +1,80 @@
-#!/usr/bin/env ruby
-
-begin
-  require 'wx'
-rescue LoadError => no_wx_err
-  begin
-    require 'rubygems'
-    require 'wx'
-  rescue LoadError
-    raise no_wx_err
-  end
-end
-
-class SimpleGrid < Wx::Grid
-    
-    def initialize(parent, log)
-        super(parent, -1)
-        @log = log
-        @moveTo = nil
-        
-        evt_idle {|event| on_idle(event)}
-        
-        create_grid(25,25)      
-        
-        # simple cell formatting
-        set_col_size(3,200)
-        set_row_size(4,45)
-        set_cell_value(0,0,"First cell")
-        set_cell_value(1,1,"Another cell")
-        set_cell_value(2,2,"Yet another cell")
-        set_cell_value(3,3,"This cell is read-only")
-        set_cell_font(0,0, Wx::Font.new(12, Wx::ROMAN, Wx::ITALIC, Wx::NORMAL))
-        set_cell_text_colour(1,1,Wx::RED)
-        set_cell_background_colour(2,2,Wx::CYAN)
-        set_read_only(3,3,true)
-        
-        set_col_label_value(0, "Custom")
-        set_col_label_value(1, "column")
-        set_col_label_value(2, "labels")
-        
-        set_col_label_alignment(Wx::ALIGN_LEFT, Wx::ALIGN_BOTTOM)
-        
-        # overflow cells
-        set_cell_value(9,1, "This default cell will overflow into neighboring cells, but not if you turn overflow off.")
-        #set_cell_size(11, 1, 3, 3)
-        set_cell_alignment(11, 1, Wx::ALIGN_CENTRE, Wx::ALIGN_CENTRE)
-        set_cell_value(11, 1, "This cell is set to span 3 rows and 3 columns")
-        
-        # evt_grid_cell_left_click {|event| on_cell_left_click(event)}
-    end
-    
-    def on_cell_left_click(event)
-        @log.write_text("on_cell_left_click: (%d,%d)" % [evt.get_row(), evt.get_col()])
-        evt.skip()
-    end
-    
-    def on_idle(event)
-        if @moveTo != nil
-            set_grid_cursor(@moveTo[0], @moveTo[1])
-            @moveTo = nil
-        end
-        event.skip()
-    end
-end
-
-module GridDemo
-    class TestFrame < Wx::Frame
-        def initialize(parent, log)
-            super(parent, -1, "Simple Grid Demo", Wx::DEFAULT_POSITION, Wx::Size.new(640,480))
-            grid = SimpleGrid.new(self, log)
-        end
-    end
-end
-
-
-if __FILE__ == $0
-  run_solo_lib = File.join( File.dirname(__FILE__), 'run.rb')
-  load run_solo_lib
-  run File.basename($0)
-end
+#!/usr/bin/env ruby
+
+begin
+  require 'wx'
+rescue LoadError => no_wx_err
+  begin
+    require 'rubygems'
+    require 'wx'
+  rescue LoadError
+    raise no_wx_err
+  end
+end
+
+class SimpleGrid < Wx::Grid
+    
+    def initialize(parent, log)
+        super(parent, -1)
+        @log = log
+        @moveTo = nil
+        
+        evt_idle {|event| on_idle(event)}
+        
+        create_grid(25,25)      
+        
+        # simple cell formatting
+        set_col_size(3,200)
+        set_row_size(4,45)
+        set_cell_value(0,0,"First cell")
+        set_cell_value(1,1,"Another cell")
+        set_cell_value(2,2,"Yet another cell")
+        set_cell_value(3,3,"This cell is read-only")
+        set_cell_font(0,0, Wx::Font.new(12, Wx::ROMAN, Wx::ITALIC, Wx::NORMAL))
+        set_cell_text_colour(1,1,Wx::RED)
+        set_cell_background_colour(2,2,Wx::CYAN)
+        set_read_only(3,3,true)
+        
+        set_col_label_value(0, "Custom")
+        set_col_label_value(1, "column")
+        set_col_label_value(2, "labels")
+        
+        set_col_label_alignment(Wx::ALIGN_LEFT, Wx::ALIGN_BOTTOM)
+        
+        # overflow cells
+        set_cell_value(9,1, "This default cell will overflow into neighboring cells, but not if you turn overflow off.")
+        #set_cell_size(11, 1, 3, 3)
+        set_cell_alignment(11, 1, Wx::ALIGN_CENTRE, Wx::ALIGN_CENTRE)
+        set_cell_value(11, 1, "This cell is set to span 3 rows and 3 columns")
+        
+        # evt_grid_cell_left_click {|event| on_cell_left_click(event)}
+    end
+    
+    def on_cell_left_click(event)
+        @log.write_text("on_cell_left_click: (%d,%d)" % [evt.get_row(), evt.get_col()])
+        evt.skip()
+    end
+    
+    def on_idle(event)
+        if @moveTo != nil
+            set_grid_cursor(@moveTo[0], @moveTo[1])
+            @moveTo = nil
+        end
+        event.skip()
+    end
+end
+
+module GridDemo
+    class TestFrame < Wx::Frame
+        def initialize(parent, log)
+            super(parent, -1, "Simple Grid Demo", Wx::DEFAULT_POSITION, Wx::Size.new(640,480))
+            grid = SimpleGrid.new(self, log)
+        end
+    end
+end
+
+
+if __FILE__ == $0
+  run_solo_lib = File.join( File.dirname(__FILE__), 'run.rb')
+  load run_solo_lib
+  run File.basename($0)
+end

data/samples/bigdemo/MDIDemo.rbw

@@ -1,59 +1,59 @@
-#!/usr/bin/env ruby
-
-begin
-  require 'wx'
-rescue LoadError => no_wx_err
-  begin
-    require 'rubygems'
-    require 'wx'
-  rescue LoadError
-    raise no_wx_err
-  end
-end
-
-module Demo
-
-class MyParentFrame < Wx::MDIParentFrame
-    def initialize
-        super(nil, -1, "MDI Parent", Wx::DEFAULT_POSITION, 
-              Wx::Size.new(600,400))
-        
-        @win_count = 0
-        menu = Wx::Menu.new
-        menu.append(5000, "&New Window")
-        menu.append_separator
-        menu.append(5001, "E&xit")
-        
-        menubar = Wx::MenuBar.new()
-        menubar.append(menu, "&File")
-        set_menu_bar(menubar)
-        
-        create_status_bar
-        
-        evt_menu(5000) {|event| on_new_window(event)}
-        evt_menu(5001) {|event| on_exit(event)}
-        scrollwin_demo_file = File.join(File.dirname(__FILE__), 
-                                        "wxScrolledWindow.rbw")
-        load scrollwin_demo_file
-    end
-    
-    def on_exit(event)
-        close()
-    end
-    
-    def on_new_window(event)
-        @win_count += 1
-        win = Wx::MDIChildFrame.new(self, -1, "Child Window: #{@win_count}")
-        canvas = MyCanvas.new(win)
-        win.show
-    end
-end
-    
-end
-
-
-if __FILE__ == $0
-  run_solo_lib = File.join( File.dirname(__FILE__), 'run.rb')
-  load run_solo_lib
-  run File.basename($0)
-end
+#!/usr/bin/env ruby
+
+begin
+  require 'wx'
+rescue LoadError => no_wx_err
+  begin
+    require 'rubygems'
+    require 'wx'
+  rescue LoadError
+    raise no_wx_err
+  end
+end
+
+module Demo
+
+class MyParentFrame < Wx::MDIParentFrame
+    def initialize
+        super(nil, -1, "MDI Parent", Wx::DEFAULT_POSITION, 
+              Wx::Size.new(600,400))
+        
+        @win_count = 0
+        menu = Wx::Menu.new
+        menu.append(5000, "&New Window")
+        menu.append_separator
+        menu.append(5001, "E&xit")
+        
+        menubar = Wx::MenuBar.new()
+        menubar.append(menu, "&File")
+        set_menu_bar(menubar)
+        
+        create_status_bar
+        
+        evt_menu(5000) {|event| on_new_window(event)}
+        evt_menu(5001) {|event| on_exit(event)}
+        scrollwin_demo_file = File.join(File.dirname(__FILE__), 
+                                        "wxScrolledWindow.rbw")
+        load scrollwin_demo_file
+    end
+    
+    def on_exit(event)
+        close()
+    end
+    
+    def on_new_window(event)
+        @win_count += 1
+        win = Wx::MDIChildFrame.new(self, -1, "Child Window: #{@win_count}")
+        canvas = MyCanvas.new(win)
+        win.show
+    end
+end
+    
+end
+
+
+if __FILE__ == $0
+  run_solo_lib = File.join( File.dirname(__FILE__), 'run.rb')
+  load run_solo_lib
+  run File.basename($0)
+end