wxruby 1.9.6-x86-mingw32 → 1.9.8-x86-mingw32

data/samples/mdi/mdi.rb

@@ -7,60 +7,56 @@ rescue LoadError
 end
 require 'wx'
 
-
-# MDI sample for wxRuby
-# slapped together quickly by Kevin Smith
-
-ID_NEXT = 1
-ID_PREVIOUS = 2
-ID_CASCADE = 3
-ID_TILE = 4
-ID_CREATE = 5
-ID_CLOSE = 6
-ID_EXIT = 99
-
+# Simple MDI-based parent frame with menus to create, cycle through and
+# close child frames within in.
+#
+# NB: MDI is only properly implemented on Windows, and is simulated by
+# using a Notebook on Linux and OS X. Therefore its use is not
+# recommended for cross-platform applications. An alternative interface
+# strategy may be to use separate frames, or possibly the AUI classes.
 class MyFrame < Wx::MDIParentFrame
   def initialize(title)
-    super(nil, -1, title,Wx::DEFAULT_POSITION,Wx::Size.new(500,400))
+    super(nil, :title => title, :size => [ 500, 400 ] )
     
     @child_number = 0
     
     menuFile = Wx::Menu.new
-    menuFile.append(ID_EXIT, "E&xit\tAlt-X")
+    menuFile.append(Wx::ID_EXIT, "E&xit\tAlt-X")
+    evt_menu Wx::ID_EXIT, :close
+
     menuMDI = Wx::Menu.new
-    menuMDI.append(ID_NEXT, "&Next Child\tCtrl-F6")
-    menuMDI.append(ID_PREVIOUS, "&Previous Child")
-    menuMDI.append_separator()
-    menuMDI.append(ID_CASCADE, "&Cascade")
-    menuMDI.append(ID_TILE, "&Tile")
-    menuMDI.append_separator()
-    menuMDI.append(ID_CREATE, "&Add Child")
-    menuMDI.append(ID_CLOSE, "&Remove Child\tCtrl-F4")
+    menuMDI.append(Wx::ID_FORWARD, "&Next Child\tCtrl-F6")
+    evt_menu Wx::ID_FORWARD, :activate_next
+    menuMDI.append(Wx::ID_BACKWARD, "&Previous Child")
+    evt_menu Wx::ID_BACKWARD, :activate_previous
+    menuMDI.append_separator
+
+    mi_cascade = menuMDI.append("&Cascade")
+    evt_menu mi_cascade, :cascade
+    mi_tile    = menuMDI.append("&Tile")
+    evt_menu mi_tile, :tile
+    menuMDI.append_separator
+
+    menuMDI.append(Wx::ID_NEW, "&Add Child")
+    evt_menu Wx::ID_NEW, :create_child
+    menuMDI.append(Wx::ID_CLOSE, "&Remove Child\tCtrl-F4")
+    evt_menu Wx::ID_CLOSE, :on_close_child
+
     menuBar = Wx::MenuBar.new
     menuBar.append(menuFile, "&File")
     menuBar.append(menuMDI, "&Window")
-    set_menu_bar(menuBar)
-    
-    evt_menu(ID_EXIT) { close }
-    evt_menu(ID_NEXT) { activate_next }
-    evt_menu(ID_PREVIOUS) { activate_previous }
-    evt_menu(ID_CASCADE) { cascade }
-    evt_menu(ID_TILE) { tile }
-    evt_menu(ID_CREATE) { create_child }
-    evt_menu(ID_CLOSE) { on_close_child }
+
+    self.menu_bar = menuBar
     
     create_status_bar(2).set_status_widths([100, -1])
     set_status_text("Some features only work on MS Windows", 1)
 
-    create_child
-    create_child
-    create_child
+    3.times { create_child }
   end
   
   def on_close_child
-    active = get_active_child
-    if(active)
-        active.close
+    if active_child
+        active_child.close
     end
   end
   
@@ -71,12 +67,11 @@ class MyFrame < Wx::MDIParentFrame
   end
 end
 
-class NothingApp < Wx::App
+class MDIApp < Wx::App
   def on_init
     frame = MyFrame.new("MDI App")
 	frame.show
   end
 end
 
-a = NothingApp.new
-a.main_loop()
+MDIApp.new.main_loop

data/samples/media/mediactrl.rb

@@ -9,12 +9,13 @@ require 'wx'
 
 # This sample demonstrates the use of Wx::MediaCtrl, which can be used
 # to playback sounds or movies using a platform-native player.
-class MediaPanel<Wx::Panel
+class MediaPanel < Wx::Panel
   def initialize(parent)
     super(parent, :style => Wx::TAB_TRAVERSAL|Wx::CLIP_CHILDREN)
 
     # The actual media player control
-    @mc = Wx::MediaCtrl.new(self, :pos => [100,100], :size => [300,300])
+    @mc = Wx::MediaCtrl.new(self)
+
     evt_media_loaded @mc,:on_media_loaded
 
     # Some buttons to control playback
@@ -102,7 +103,6 @@ class MediaPanel<Wx::Panel
     if dlg.show_modal == Wx::ID_OK
       do_load_file(dlg.path)
     end
-    dlg.destroy
   end
 
   # Move the media to a position in the file, using the slider

data/samples/printing/printing.rb

@@ -7,6 +7,183 @@ rescue LoadError
 end
 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
+ 
+end
+
 class MyCanvas < Wx::ScrolledWindow
   #attr_accessor :frame