wxruby 1.9.5-universal-darwin-9 → 1.9.6-universal-darwin-9

data/samples/mdi/mdi.rb

@@ -1,17 +1,12 @@
 #!/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'
+
 
 # MDI sample for wxRuby
 # slapped together quickly by Kevin Smith

data/samples/media/mediactrl.rb

@@ -1,17 +1,11 @@
 #!/usr/bin/env ruby
-# wxRuby2 Sample Code. Ported from wxPython by Albin Holmgren
+# 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'
 
 # This sample demonstrates the use of Wx::MediaCtrl, which can be used
 # to playback sounds or movies using a platform-native player.

data/samples/minimal/minimal.rb

@@ -1,17 +1,11 @@
 #!/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' 
-    load 'wx'
-  rescue
-    raise no_wx_err
-  end
+  require 'rubygems' 
+rescue LoadError
 end
+require 'wx'
 
 # This sample shows a fairly minimal Wx::App using a Frame, with a
 # MenuBar and StatusBar but no controls. For the absolute minimum app,
@@ -24,32 +18,33 @@ class MinimalFrame < Wx::Frame
     # The main application frame has no parent (nil)
     super(nil, :title => title, :size => [ 400, 300 ])
 
-    icon_file = File.join( File.dirname(__FILE__), "mondrian.png")
     # PNG can be used on all platforms, but icon type must be specified
-    # to work on Windows; OS X doesn't have "Frame" icons.
+    # to work on Windows. Note that OS X doesn't have "Frame" icons. 
+    icon_file = File.join( File.dirname(__FILE__), "mondrian.png")
     self.icon = Wx::Icon.new(icon_file, Wx::BITMAP_TYPE_PNG)
 
     menu_bar = Wx::MenuBar.new
     # The "file" menu
     menu_file = Wx::Menu.new
+    # Using Wx::ID_EXIT standard id means the menu item will be given
+    # the right label for the platform and language, and placed in the
+    # correct platform-specific menu - eg on OS X, in the Application's menu
     menu_file.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
     menu_bar.append(menu_file, "&File")
 
     # The "help" menu
     menu_help = Wx::Menu.new
-    # Using Wx::ID_ABOUT default id means the menu item will be placed
-    # in the correct platform-specific place - eg on OS X
     menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
     menu_bar.append(menu_help, "&Help")
 
     # Assign the menubar to this frame
     self.menu_bar = menu_bar
 
-    # Create a status bar
+    # Create a status bar at the bottom of the frame
     create_status_bar(2)
     self.status_text = "Welcome to wxRuby!"
 
-    # Set it up to handle menu events using the relevant methods
+    # Set it up to handle menu events using the relevant methods. 
     evt_menu Wx::ID_EXIT, :on_quit
     evt_menu Wx::ID_ABOUT, :on_about
   end
@@ -60,17 +55,14 @@ class MinimalFrame < Wx::Frame
     close()
   end
 
-  # show an 'About' dialog
+  # show an 'About' dialog - WxRuby's about_box function will show a
+  # platform-native 'About' dialog, but you could also use an ordinary
+  # Wx::MessageDialog here.
   def on_about
-    msg =  sprintf("This is the About dialog of the minimal sample.\n" \
-                   "Welcome to wxRuby, version %s", Wx::WXRUBY_VERSION)
-
-    # create a simple message dialog with OK button
-    about_dlg = Wx::MessageDialog.new( self, msg, 'About Minimal',
-                                       Wx::OK|Wx::ICON_INFORMATION )
-    # Display the dialog on top of and blocking other windows, until
-    # dismissed by clicking the 'OK' button
-    about_dlg.show_modal
+    Wx::about_box(:name => self.title,
+                   :version     => Wx::WXRUBY_VERSION,
+                   :description => "This is the minimal sample",
+                   :developers  => ['The wxRuby Development Team'] )
   end
 end
 

data/samples/minimal/nothing.rb

@@ -1,17 +1,12 @@
 #!/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'
+
 
 # This is the minimum code to start a WxRuby app - create a Frame, and
 # show it.

data/samples/opengl/cube.rb

@@ -1,19 +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'
- require 'gl'
- require 'glu'
-rescue LoadError => e
- begin
-   require 'rubygems'
-   require 'wx'
-   require 'gl'
-   require 'glu'
- rescue
-   raise e
- end
+  require 'rubygems' 
+rescue LoadError
 end
+require 'wx'
+require 'gl'
+require 'glu'
 
 include Gl
 include Glu
@@ -120,4 +114,4 @@ Wx::App.run do
  self.app_name = 'GLCanvas Cube'
  frame = CubeFrame.new("OpenGL Canvas wxRuby App")
  frame.show
-end
+end

data/samples/printing/printing.rb

@@ -1,185 +1,11 @@
 #!/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
-
-require 'wx'
-
-WXPRINT_QUIT           = Wx::ID_EXIT
-WXPRINT_PRINT          = Wx::ID_PRINT
-WXPRINT_PAGE_SETUP     = Wx::ID_PRINT_SETUP
-WXPRINT_PREVIEW        = Wx::ID_PREVIEW
-
-WXPRINT_PRINT_PS       = 105
-WXPRINT_PAGE_SETUP_PS  = 107
-WXPRINT_PREVIEW_PS     = 108
-
-WXPRINT_ABOUT          = Wx::ID_ABOUT
-
-WXPRINT_ANGLEUP        = 110
-WXPRINT_ANGLEDOWN      = 111
-
-class MyFrame < Wx::Frame
-
-  attr_accessor :canvas
-
-  def initialize(parent,title,pos,size)
-    super(parent,-1,title,pos,size)
-    @canvas = nil
-    @bitmap = Wx::Bitmap.new
-    @angle = 30 
-    
-    # map events
-    evt_menu(WXPRINT_QUIT) {|e| on_exit(e)}
-    evt_menu(WXPRINT_PRINT) {|e| on_print(e)}
-    evt_menu(WXPRINT_PREVIEW) {|e| on_print_preview(e)}
-    evt_menu(WXPRINT_PAGE_SETUP) {|e| on_page_setup(e)}
-    evt_menu(WXPRINT_ABOUT) {|e| on_print_about(e)}  
-    evt_menu(WXPRINT_ANGLEUP) {|e| on_angle_up(e)}
-    evt_menu(WXPRINT_ANGLEDOWN) {|e| on_angle_down(e)}
-  end
-
-  def draw(dc)
-    dc.set_background(Wx::WHITE_BRUSH)
-    dc.clear()
-    dc.set_font(Wx::get_app.test_font)
-
-    dc.set_background_mode(Wx::TRANSPARENT)
-
-    dc.set_brush(Wx::CYAN_BRUSH)
-    dc.set_pen(Wx::RED_PEN)
-
-    dc.draw_rounded_rectangle(0, 20, 200, 80, 20)
-
-    dc.draw_text( "Rectangle 200 by 80", 40, 40)
-
-    dc.set_pen( Wx::Pen.new(Wx::BLACK,0,Wx::DOT_DASH) )
-    dc.draw_ellipse(50, 140, 100, 50)
-    dc.set_pen(Wx::RED_PEN)
-
-    dc.draw_text( "Test message: this is in 10 point text", 10, 180)
-
-    test = "Hebrew    שלום -- Japanese (日本語)"
-    dc.draw_text( test, 10, 200 )
-
-    points = []
-    points << Wx::Point.new(0,0)
-    points << Wx::Point.new(20,0)
-    points << Wx::Point.new(20,20)
-    points << Wx::Point.new(10,20)
-    points << Wx::Point.new(10,-20)
-    
-    dc.draw_polygon( points, 20, 250, Wx::ODDEVEN_RULE )
-    dc.draw_polygon( points, 50, 250, Wx::WINDING_RULE )
-
-    dc.draw_elliptic_arc( 80, 250, 60, 30, 0.0, 270.0 )
-
-    points[0].x = 150
-    points[0].y = 250
-    points[1].x = 180
-    points[1].y = 250
-    points[2].x = 180
-    points[2].y = 220
-    points[3].x = 200
-    points[3].y = 220
-    points.pop
-    dc.draw_spline( points )
-
-    dc.draw_arc( 20,10, 10,10, 25,40 )
-
-    str = ""
-    i = 0
-    str = "---- Text at angle #{i} ----"
-    dc.draw_rotated_text( str, 100, 300, i )
-
-    i = @angle;
-    str = "---- Text at angle #{i} ----"
-    dc.draw_rotated_text( str, 100, 300, i )
-
-    dc.set_pen(Wx::BLACK_PEN)
-    dc.draw_line(0, 0, 200, 200)
-    dc.draw_line(200, 0, 0, 200)
-
-    # Load icon
-    if Wx::PLATFORM == "WXMSW"
-      icon_file = File.join(File.dirname(__FILE__), 'mondrian.ico')
-      my_icon = Wx::Icon.new(icon_file, Wx::BITMAP_TYPE_ICO)
-    else
-      icon_file = File.join(File.dirname(__FILE__), 'mondrian.xpm')
-      my_icon = Wx::Icon.new(icon_file, Wx::BITMAP_TYPE_XPM)
-    end
-
-    dc.draw_icon( my_icon, 100, 100)
-
-    if @bitmap.is_ok
-      dc.draw_bitmap( @bitmap, 10, 10 )
-    end
-  end
-  
-  def on_angle_up(event)
-    @angle += 5
-    canvas.refresh 
-  end
-  
-  def on_angle_down(event)
-    @angle -= 5
-    canvas.refresh
-  end
-
-  def on_size(event)
-    super(event)
-  end
-  
-  def on_print(event)
-    print_dialog_data = Wx::PrintDialogData.new(Wx::get_app.print_data)
-
-    printer = Wx::Printer.new(print_dialog_data)
-    printout = MyPrintout.new("My printout")
-    if (!printer.print(self, printout, true))
-        if (Wx::Printer.get_last_error == Wx::PRINTER_ERROR)
-            Wx::message_box("There was a problem printing.\nPerhaps your current printer is not set correctly?", "Printing", Wx::OK)
-        else
-            Wx::message_box("You canceled printing", "Printing", Wx::OK)
-        end
-    else
-        Wx::get_app.print_data = printer.get_print_dialog_data.get_print_data
-    end   
-  end  
-  
-  def on_print_preview(event)
-    # Pass two printout objects: for preview, and possible printing.
-    print_dialog_data = Wx::PrintDialogData.new(Wx::get_app.print_data)
-    preview = Wx::PrintPreview.new(MyPrintout.new, MyPrintout.new, print_dialog_data)
-    if not preview.is_ok
-        #delete preview;
-        Wx::message_box("There was a problem previewing.\nPerhaps your current printer is not set correctly?", "Previewing", Wx::OK)
-        return
-    end
-
-    prev_frame = Wx::PreviewFrame.new(preview, self, "Demo Print Preview", Wx::Point.new(100, 100), Wx::Size.new(600, 650))
-    prev_frame.centre(Wx::BOTH)
-    prev_frame.init
-    prev_frame.show
-  end
-  
-  def on_page_setup(event)
-    Wx::get_app.page_setup_data = Wx::PageSetupDialogData.new(Wx::get_app.print_data)
-    page_setup_dialog = Wx::PageSetupDialog.new(self, Wx::get_app.page_setup_data)
-    page_setup_dialog.show_modal
-
-    Wx::get_app.print_data = page_setup_dialog.get_page_setup_data.get_print_data
-    Wx::get_app.page_setup_data = Wx::PageSetupDialogData.new(Wx::get_app.print_data)
-  end
-
-  def on_exit(event)
-    close(true)
-  end
-  
-  def on_print_about(event)
-    Wx::message_box("wxWidgets printing demo\nAuthor: Julian Smart\nAdapted to wxRuby by Sean Long",
-        "About wxRuby printing demo", Wx::OK|Wx::CENTRE)
-  end
- 
+begin
+  require 'rubygems' 
+rescue LoadError
 end
+require 'wx'
 
 class MyCanvas < Wx::ScrolledWindow
   #attr_accessor :frame

data/samples/text/scintilla.rb

@@ -1,17 +1,12 @@
 #!/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
 
 

data/samples/text/textctrl.rb

@@ -1,17 +1,11 @@
 #!/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 InformativeTextCtrl < Wx::TextCtrl
   NEWLINE_CORRECTION_FACTOR = 0
@@ -19,8 +13,8 @@ class InformativeTextCtrl < Wx::TextCtrl
   # These text controls are multiline, and may have rich (coloured,
   # styled) text in them
   STYLE = Wx::TE_MULTILINE|Wx::TE_RICH|Wx::TE_RICH2
-  def initialize(parent, text)
-    super(parent, -1, text, Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, STYLE)
+  def initialize(parent, text = '')
+    super(parent, :value => text, :style => STYLE)
   end
 
   # more ruby-ish
@@ -45,29 +39,28 @@ end
 class LogTextCtrl < Wx::TextCtrl
   STYLE = Wx::TE_READONLY|Wx::TE_MULTILINE
   def initialize(parent)
-    super(parent, -1, '', Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, STYLE)
+    super(parent, :style => STYLE)
   end
 end
 
 class TextCtrlFrame < Wx::Frame
-  def initialize(title, pos, size)
-    super(nil, -1, title, pos, size)
+  def initialize(*args)
+    super(nil, *args)
 
-    panel = Wx::Panel.new(self, -1)
+    panel = Wx::Panel.new(self)
     sizer = Wx::BoxSizer.new(Wx::VERTICAL)
 
-    @textctrl = InformativeTextCtrl.new(panel, '')
+    @textctrl = InformativeTextCtrl.new(panel)
     populate_textctrl()
     sizer.add(@textctrl, 2, Wx::GROW|Wx::ALL, 2)
 
-    button = Wx::Button.new(panel, -1, 'Get Info')
+    button = Wx::Button.new(panel, :label => 'Get Info')
     sizer.add(button, 0, Wx::ADJUST_MINSIZE|Wx::ALL, 2 )
-    evt_button(button.get_id) { | e | on_click(e) }
+    evt_button button, :on_click
 
     @log = LogTextCtrl.new(panel)
     sizer.add(@log, 1, Wx::GROW|Wx::ALL, 2)
-
-    panel.set_sizer( sizer )
+    panel.sizer = sizer
   end
 
   def populate_textctrl()
@@ -86,39 +79,35 @@ class TextCtrlFrame < Wx::Frame
     menu_file = Wx::Menu.new()
     menu_file.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
     menu_bar.append(menu_file, "&File")
-    evt_menu(Wx::ID_EXIT) { on_quit() }
+    evt_menu Wx::ID_EXIT, :on_quit
 
     menu_help = Wx::Menu.new()
     menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
-    evt_menu(Wx::ID_ABOUT) { on_about() }
+    evt_menu Wx::ID_ABOUT, :on_about
     menu_bar.append(menu_help, "&Help")
 
-    set_menu_bar(menu_bar)
+    self.menu_bar = menu_bar
   end
 
-  def on_click(e)
-    @log.set_value( @textctrl.report() )
+  def on_click
+    @log.value = @textctrl.report
   end
 
-  def on_quit()
-    close(TRUE)
+  def on_quit
+    close
   end
 
-  def on_about()
+  def on_about
     msg =  sprintf("This is the About dialog of the textctrl sample.\n" \
                     "Welcome to %s", Wx::VERSION_STRING)
     message_box(msg, "About Minimal", Wx::OK|Wx::ICON_INFORMATION, self)
   end
 end
 
-class RbApp < Wx::App
-  def on_init()
-    frame = TextCtrlFrame.new("TextCtrl demonstration",
-                              Wx::Point.new(50, 50),
-                              Wx::Size.new(450, 340) )
-
-    frame.show(true)
-  end
+Wx::App.run do
+  frame = TextCtrlFrame.new( :title => "TextCtrl demonstration",
+                             :pos => [ 50, 50 ],
+                             :size => [ 450, 340 ] )
+  frame.show
 end
 
-RbApp.new().main_loop()