wxruby 1.9.5-i386-mswin32 → 1.9.7-i386-mswin32

data/samples/bigdemo/ColorPanel.rbw

@@ -1,15 +1,13 @@
 #!/usr/bin/env ruby
-
+# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# 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
+  require 'rubygems' 
+rescue LoadError
 end
+require 'wx'
+
+
 
 class ColoredPanel < Wx::Window
     def initialize(parent, color)

data/samples/bigdemo/GridSimple.rbw

@@ -1,15 +1,13 @@
 #!/usr/bin/env ruby
-
+# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# 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
+  require 'rubygems' 
+rescue LoadError
 end
+require 'wx'
+
+
 
 class SimpleGrid < Wx::Grid
     

data/samples/bigdemo/MDIDemo.rbw

@@ -1,15 +1,13 @@
 #!/usr/bin/env ruby
-
+# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# 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
+  require 'rubygems' 
+rescue LoadError
 end
+require 'wx'
+
+
 
 module Demo
 

data/samples/bigdemo/PopupMenu.rbw

@@ -1,15 +1,13 @@
 #!/usr/bin/env ruby
-
+# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# 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
+  require 'rubygems' 
+rescue LoadError
 end
+require 'wx'
+
+
 
 TEXT = "Right-click on the panel (or Ctrl-click on the Mac) to show a popup\nmenu.  Then look at the code for this sample.  Notice how the\nPopupMenu method is similar to the ShowModal method of a wxDialog in\nthat it doesn't return until the popup menu has been dismissed.  The\nevent handlers for the popup menu items can either be attached to the\nmenu itself, or to the window that invokes PopupMenu."
 

data/samples/bigdemo/ShapedWindow.rbw

@@ -1,17 +1,13 @@
 #!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2006 Kevin B. Smith
+# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
 # 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
+  require 'rubygems' 
+rescue LoadError
 end
+require 'wx'
+
+
 include Wx
 
 BUTTON_CLOSE = 1003

data/samples/bigdemo/Sizers.rbw

@@ -1,15 +1,13 @@
 #!/usr/bin/env ruby
-
+# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# 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
+  require 'rubygems' 
+rescue LoadError
 end
+require 'wx'
+
+
 
 def make_simple_box1(win)
     box = Wx::BoxSizer.new(Wx::HORIZONTAL)

data/samples/bigdemo/bigdemo.rb

@@ -1,7 +1,15 @@
 #!/usr/bin/env ruby
-# Demo created by Robert Carlin, 
-#  based on the wxPython demo by Robin Dunn
-#  Modified a bit by Kevin Smith and Roy Sutton
+# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Freely reusable code: see SAMPLES-LICENSE.TXT for details
+begin
+  require 'rubygems' 
+rescue LoadError
+end
+require 'wx'
+
+# Demo created by Robert Carlin, based on the wxPython demo by Robin Dunn
+# Modified by Kevin Smith, Roy Sutton, Alex Fenton
+
 
 #  TODO:
 #    Finish Scintilla integration
@@ -11,18 +19,6 @@
 #    Finish 'rubification' of source
 #    Fix non-scintilla code viewer
 
-begin
-  require 'wx'
-rescue LoadError => no_wx_err
-  begin
-    require 'rubygems'
-    require 'wx'
-  rescue LoadError
-    raise no_wx_err
-  end
-end
-
-
 OVR_TEXT = "This is the WxRuby Demo.  It was ported from the wxPython Demo, created by Robin Dunn.  Many thanks to him for all his hard work - this demo is what it is because of him.  Click on any of the items in the tree control to start the demo.  Don't forget to check out the Demo Code tab - you can see the source code for each demo!\nHope you like it!"
 
 $tree_list = [
@@ -311,10 +307,9 @@ class WxRubyDemo < Wx::Frame
         
         
         # Create a Notebook
-        @nb = Wx::Notebook.new(splitter2, -1, Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, Wx::CLIP_CHILDREN)
+        @nb = Wx::Notebook.new(splitter2, :style => Wx::CLIP_CHILDREN)
         
-        @ovr = Wx::TextCtrl.new(@nb, -1, OVR_TEXT, Wx::DEFAULT_POSITION, 
-                                Wx::Size.new(400,400), 
+        @ovr = Wx::TextCtrl.new(@nb, :value => OVR_TEXT, :style =>
                                 Wx::TE_MULTILINE|Wx::TE_READONLY|
                                 Wx::TE_RICH|Wx::TE_NOHIDESEL)
         @nb.add_page(@ovr, "Overview")
@@ -326,10 +321,10 @@ class WxRubyDemo < Wx::Frame
           # FIXME: Should use DemoCodeViewer, but when we do (on Windows) it
           #         puts all text on one line!  Can remove instance_eval
           #         once that's resolved
-          @txt = Wx::TextCtrl.new(@nb, -1, OVR_TEXT, Wx::DEFAULT_POSITION, 
-                                  Wx::Size.new(400,400), 
-                                  Wx::TE_MULTILINE|Wx::TE_READONLY|
-                                  Wx::HSCROLL|Wx::TE_RICH|Wx::TE_NOHIDESEL)
+          @txt = Wx::TextCtrl.new(@nb, :value => OVR_TEXT, :style =>
+                                   Wx::TE_MULTILINE|Wx::TE_READONLY|
+                                   Wx::HSCROLL|Wx::TE_RICH|Wx::TE_RICH2|
+                                   Wx::TE_NOHIDESEL)
           @txt.instance_eval { alias clear_all clear }
           @txt.set_max_length(0)
           @nb.add_page(@txt, "Demo Code")
@@ -349,8 +344,8 @@ class WxRubyDemo < Wx::Frame
         @log.set_max_length(0)
         Wx::Log::set_active_target(Wx::LogTextCtrl.new(@log))
         
-        splitter.split_vertically(@tree, splitter2, 190)
-        splitter2.split_horizontally(@nb, @log, 200)
+        splitter.split_vertically(@tree, splitter2, 220)
+        splitter2.split_horizontally(@nb, @log, 300)
 
         
         splitter.set_minimum_pane_size(20)        
@@ -390,7 +385,9 @@ class WxRubyDemo < Wx::Frame
     end
     
     def on_tree_sel_changed(event)
+
         item = event.get_item()
+
         if item.nonzero?
           itemText = @tree.get_item_text(item)
           run_demo(itemText)
@@ -403,7 +400,9 @@ class WxRubyDemo < Wx::Frame
         if item == @tree.get_selection()
             set_overview(@tree.get_item_text(item) + " Overview", @curOverview)
             Wx::log_message(@tree.get_item_text(item) + " Overview")
+
         end
+
         event.skip()
     end
     
@@ -543,7 +542,7 @@ class WxRubyDemo < Wx::Frame
                 @finddlg.set_focus()
                 return
             else
-                @finddlg.destroy()
+                @finddlg.hide()
             end
           end
           @txt.show_position(loc)

data/samples/bigdemo/demoTemplate.rbw

@@ -1,17 +1,13 @@
 #!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2006 Kevin B. Smith
+# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
 # 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
+  require 'rubygems' 
+rescue LoadError
 end
+require 'wx'
+
+
 
 class
     def initialize()

data/samples/bigdemo/run.rb

@@ -1,17 +1,13 @@
 #!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2006 Kevin B. Smith
+# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
 # 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
+  require 'rubygems' 
+rescue LoadError
 end
+require 'wx'
+
+
 
 class Log
   def write_text(txt)

data/samples/bigdemo/wxArtProvider.rbw

@@ -1,17 +1,13 @@
 #!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2006 Kevin B. Smith
+# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
 # 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
+  require 'rubygems' 
+rescue LoadError
 end
+require 'wx'
+
+
 
 ArtClients = [ "Wx::ART_TOOLBAR",
                "Wx::ART_MENU",

data/samples/bigdemo/wxBitmapButton.rbw

@@ -1,59 +1,60 @@
 #!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2006 Kevin B. Smith
+# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
 # 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
+  require 'rubygems' 
+rescue LoadError
 end
+require 'wx'
 
-class TestPanel < Wx::Panel
-    def initialize(parent, log)
-        super(parent, -1, Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, Wx::NO_FULL_REPAINT_ON_RESIZE)
-        @log = log
-        
-        bmp_file = File.join( File.dirname(__FILE__), 'icons', 'test2.bmp')
-        bmp = Wx::Bitmap.new(bmp_file, Wx::BITMAP_TYPE_BMP)
-        mask = Wx::Mask.new(bmp, Wx::BLUE)
 
-        bmp.set_mask(mask)
-        b = Wx::BitmapButton.new(self, 10, bmp, Wx::Point.new(20,20), Wx::Size.new(bmp.get_width + 10, bmp.get_height + 10))
-        evt_button(10) {|event| on_click(event)}
-        b.set_tool_tip('This is a bitmap button.')
-        
-        b = Wx::BitmapButton.new(self, 20, bmp, Wx::Point.new(20,120), Wx::Size.new(bmp.get_width + 10, bmp.get_height + 10), Wx::NO_BORDER)
-        evt_button(20) {|event| on_click(event)}
-        b.set_tool_tip("This is a Bitmap button with\nWx::NO_BORDER style.")
+require 'wx'
 
-        bmp_file = File.join( File.dirname(__FILE__), 'icons', 'smiles.bmp')
-        bmp = Wx::Bitmap.new(bmp_file, Wx::BITMAP_TYPE_BMP)
-        b.set_bitmap_selected(bmp)
 
-    end
+class TestPanel < Wx::Panel
+  def initialize(parent, log)
+    super(parent, :style => Wx::NO_FULL_REPAINT_ON_RESIZE)
+    @log = log
     
-    def on_click(event)
-        @log.write_text("Click! %d" % event.get_id())
-    end
+    bmp_file = File.join( File.dirname(__FILE__), 'icons', 'test2.bmp')
+    bmp = Wx::Bitmap.new(bmp_file, Wx::BITMAP_TYPE_BMP)
+    bmp.mask= Wx::Mask.new(bmp, Wx::BLUE)
 
+    b = Wx::BitmapButton.new( self, 
+                              :bitmap => bmp, 
+                              :pos    => [ 20, 20 ], 
+                              :size   => [ bmp.width + 10,bmp.height + 10] )
+    evt_button b, :on_click
+    b.tool_tip = 'This is a bitmap button.'
+    
+    b = Wx::BitmapButton.new( self,
+                              :bitmap => bmp, 
+                              :pos    => [ 20, 120 ], 
+                              :size   => [ bmp.width + 10,bmp.height + 10],
+                              :style  => Wx::NO_BORDER)
+    evt_button b, :on_click
+    b.tool_tip = "This is a Bitmap button with\nWx::NO_BORDER style."
 
+    bmp_file = File.join( File.dirname(__FILE__), 'icons', 'smiles.bmp')
+    bmp = Wx::Bitmap.new(bmp_file, Wx::BITMAP_TYPE_BMP)
+    b.bitmap_selected = bmp
+  end
+  
+  def on_click(event)
+    @log.write_text("Click! %d" % event.id)
+  end
 end
 
 module Demo
 
-    def Demo.run(frame, nb, log)
-        win = TestPanel.new(nb, log)
-        return win
-    end
-    
-    def Demo.overview
-        return "A BitmapButton control displays a bitmap. It can have a separate bitmap for each button state: normal, selected, disabled.\n\nThe bitmaps to be displayed should have a small number of colours, such as 16, to avoid palette problems.\n\nA bitmap can be derived from most image formats using the Wx::Image class."
-    end
+  def Demo.run(frame, nb, log)
+    win = TestPanel.new(nb, log)
+    return win
+  end
+  
+  def Demo.overview
+    return "A BitmapButton control displays a bitmap. It can have a separate bitmap for each button state: normal, selected, disabled.\n\nThe bitmaps to be displayed should have a small number of colours, such as 16, to avoid palette problems.\n\nA bitmap can be derived from most image formats using the Wx::Image class."
+  end
 
 end
 

data/samples/bigdemo/wxButton.rbw

@@ -1,15 +1,13 @@
 #!/usr/bin/env ruby
-
+# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# 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
+  require 'rubygems' 
+rescue LoadError
 end
+require 'wx'
+
+
 
 class TestPanel < Wx::Panel
     def initialize(parent, log)