wxruby 1.9.4-i386-mswin32 → 1.9.5-i386-mswin32

data/README

@@ -17,7 +17,7 @@ wxruby version 2.0.
   Currently the following are fully supported:
 
   Windows NT/2000/XP/Vista (i686)
-  OS X 10.3+ (i686 and PowerPc)
+  OS X 10.4+ (i686 and PowerPc)
   Linux (i686 + AMD-64)
 
   It is unlikely that support for old Windows OS's (3.1, 95, 98, ME)
@@ -72,7 +72,7 @@ wxruby version 2.0.
 	 - Vastly improved support for OS X
 	 - Looks much better under Linux because it uses GTK+2
 	 - Simpler and more permissive license 
-	 - Wraps wxWidgets 2.8.3 instead of the older 2.4 series
+	 - Wraps wxWidgets 2.8.7 instead of the older 2.4 series
 	 
 - Is wxruby2 ready for "production" use?
 
@@ -135,7 +135,7 @@ wxruby version 2.0.
   the bug list, handle publicity, or do other necessary chores.
   
   Wrapping wx is a big project that requires a wide variety of skills. As of 
-  August 2006, the wxRuby project has about 30,000 lines of code, including 
+  February 2008, the wxRuby project has over 100,000 lines of code, including 
   ruby, C++, and SWIG scripts. If we weren't using SWIG it would be far bigger.
 
 
@@ -153,7 +153,12 @@ recommend installing the gem rather than building from source.
 REQUIREMENTS TO CREATE AND RUN WXRUBY APPS:
 
 - Ruby 1.8
-- MS Windows NT/2000/XP/Vista, Mac OS X 10.3+, or Linux with GTK+ 2, 
+- MS Windows NT/2000/XP/Vista, Mac OS X 10.4+, or Linux with GTK+ 2, 
+
+- On Windows, gdiplus.pll and msvcp71.dll. These are available on most
+  systems, but can be downloaded and installed for free from the
+  internet
+- On Linux, libgstreamer. This can be installed from most package sources
 
 SAMPLES:
 
@@ -212,19 +217,12 @@ API DIFFERENCES FROM WXWIDGETS:
 - log_message and log_status take a single string parameter, 
   rather than a format string followed by additional values 
   to be inserted. Use Ruby's sprintf if required.
-- ScreenDC extends DC on all platforms, unlike in C++ wx. 
-  This means that you cannot override any virtual methods that were 
-  defined in PaintDC or WindowDC in a ruby subclass of ScreenDC.
-  [Need to verify if this is still true]
-- BusyCursor can be used in a Ruby block to ensure the original cursor 
-  is always restored.
 
 ----------------------COMPILING WXRUBY--------------------------
 REQUIREMENTS TO COMPILE/BUILD WXRUBY ITSELF
 
 - rake 
-- SWIG, version 1.3.31. SWIG 1.3.29 or later may work; earlier version 
-  definitely won't, nor will later versions such as 1.3.33
+- SWIG, version 1.3.32 or later. Earlier versions will not work correctly.
 - wxWidgets 2.8.x SDK. See further information on the wxruby website for
   recommended compile-time options for wxWidgets.
 

data/lib/wx/classes/dc.rb

@@ -0,0 +1,57 @@
+# Class for drawing primitives and bitmaps on various outputs (screen, paper)
+class Wx::DC
+ # Several methods accept an array of Wx::Point objects. In line with
+  # the rest of the wxRuby API, allow these points to be specified as
+  # simple two-element arrays [x, y]. 
+  def __convert_point_array(arr)
+    if arr.all? { | x | x.kind_of?(Wx::Point) }
+      return arr
+    end
+    arr.map do | x |
+      case x
+      when Wx::Point
+        x
+      when Array
+        if x.length != 2
+          msg = "Wrong number of elements in point array item, should be two"
+          err = ArgumentError.new(msg)
+          err.set_backtrace(caller[2..-1])
+          Kernel.raise(err)
+        end
+        Wx::Point.new(x[0], x[1])
+      else
+        msg = "Wrong type of item #{x.inspect} in point array"
+        err = ArgumentError.new(msg)
+        err.set_backtrace(caller[2..-1])
+        Kernel.raise(err)
+      end
+    end
+  end
+  private :__convert_point_array
+
+  wx_draw_lines = self.instance_method(:draw_lines)
+  define_method(:draw_lines) do | *args |
+    args[0] = __convert_point_array(args[0])
+    wx_draw_lines.bind(self).call(*args)
+  end
+
+  wx_draw_polygon = self.instance_method(:draw_polygon)
+  define_method(:draw_polygon) do | *args |
+    args[0] = __convert_point_array(args[0])
+    wx_draw_polygon.bind(self).call(*args)
+  end
+
+  wx_draw_poly_polygon = self.instance_method(:draw_poly_polygon)
+  define_method(:draw_poly_polygon) do | *args |
+    args[0].map! do | arr |
+      __convert_point_array(arr)
+    end
+    wx_draw_poly_polygon.bind(self).call(*args)
+  end
+
+  wx_draw_spline = self.instance_method(:draw_spline)
+  define_method(:draw_spline) do | *args |
+    args[0] = __convert_point_array(args[0])
+    wx_draw_spline.bind(self).call(*args)
+  end
+end

data/lib/wx/classes/evthandler.rb

@@ -816,6 +816,9 @@ class Wx::EvtHandler
     EventType['evt_tree_item_expanding', 1,
               Wx::EVT_COMMAND_TREE_ITEM_EXPANDING, 
               Wx::TreeEvent],
+    EventType['evt_tree_item_menu', 1,
+              Wx::EVT_COMMAND_TREE_ITEM_MENU, 
+              Wx::TreeEvent],
     EventType['evt_tree_item_middle_click', 1,
               Wx::EVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, 
               Wx::TreeEvent],

data/lib/wx/classes/gauge.rb

@@ -0,0 +1,12 @@
+# Gauge : presents a progress bar
+#
+# On the C++ side, the actual class name of wxGauge under Windows is
+# wxGauge95. So when a Gauge is loaded from XRC, and we try to wrap the
+# object in a ruby class by calling obj->ClassInfo()->ClassName(), it
+# seeks for a ruby class (Wx::Gauge95) that doesn't exist (see
+# swig/shared/get_ruby_object.i). 
+#
+# To fix this, make Wx::Gauge95 an alias.
+if Wx::PLATFORM == 'WXMSW'
+  Wx::Gauge95 = Wx::Gauge
+end

data/lib/wx/classes/rect.rb

@@ -1,5 +1,10 @@
+# Class representing a rectangular shape
 class Wx::Rect
+  # Nicely readable inspect output for Rect
   def to_s
     "#<Wx::Rect: (#{get_left}, #{get_top}) (#{get_right}, #{get_bottom})>"    
   end
+  
+  # More ruby-ish names
+  alias :contains? :contains
 end

data/lib/wx/classes/window.rb

@@ -46,4 +46,37 @@ class Wx::Window
     end
     __old_evt_paint(&wrapped_block)
   end
+
+  # Provides bufferd drawing facility to reduce flicker for complex
+  # drawing commands. Works similar to BufferedDC and BufferedPaintDC in
+  # the wxWidgets API, by doing drawing on an in-memory Bitmap, then
+  # copying the result in bulk to the screen. 
+  #
+  # The method may be passed an existing Wx::Bitmap as the +buffer+,
+  # otherwise one will be created. 
+  #
+  # Works like wxAutoBufferedDC in that additional buffering will only
+  # be done on platforms that do not already natively support buffering
+  # for the standard PaintDC / ClientDC - Windows, in particular.
+  def paint_buffered(buffer = nil)
+    # OS X and GTK do double-buffering natively
+    if self.double_buffered?
+      paint { | dc | yield dc }
+    else
+      # client_size is the window area available for drawing upon
+      c_size = client_size
+      # Create an in-memory buffer if none supplied
+      buffer ||= Wx::Bitmap.new(c_size.width, c_size.height)
+      buffer.draw do | mem_dc |
+        mem_dc.background = Wx::TRANSPARENT_BRUSH
+        mem_dc.clear
+        # Yield the bitmap for the user code to draw upon
+        yield mem_dc
+        paint do | dc | 
+          # Copy the buffer to the window
+          dc.blit(0, 0, c_size.width, c_size.height, mem_dc, 0, 0)
+        end
+      end
+    end
+  end
 end

data/lib/wx/version.rb

@@ -1,3 +1,3 @@
 module Wx
-  WXRUBY_VERSION    = '1.9.4'
+  WXRUBY_VERSION    = '1.9.5'
 end

data/samples/bigdemo/bigdemo.rb

@@ -22,8 +22,6 @@ rescue LoadError => no_wx_err
   end
 end
 
-MENU_EXIT = 100
-TREE_ID = 101
 
 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!"
 
@@ -249,8 +247,8 @@ class WxRubyDemo < Wx::Frame
         
         @mainmenu = Wx::MenuBar.new
         menu = Wx::Menu.new
-        menu.append(MENU_EXIT, "E&xit\tALT-X", "Get the heck outta here!")
-        evt_menu(MENU_EXIT) {exit}
+        menu.append(Wx::ID_EXIT, "E&xit\tALT-X", "Get the heck outta here!")
+        evt_menu(Wx::ID_EXIT) {exit}
         @mainmenu.append(menu, "&File")
         
         # Make a Demo menu - thanks to Kevin Smith for figuring the submenus out!
@@ -289,7 +287,7 @@ class WxRubyDemo < Wx::Frame
         @finddata = Wx::FindReplaceData.new()
         
         @treeMap = {}
-        @tree = Wx::TreeCtrl.new(splitter, TREE_ID, Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, Wx::TR_DEFAULT_STYLE)#, Wx::TR_HAS_BUTTONS | Wx::TR_HAS_VARIABLE_ROW_HEIGHT)
+        @tree = Wx::TreeCtrl.new(splitter)
         root = @tree.add_root("wxRuby Overview")
         firstChild = nil
         
@@ -304,11 +302,11 @@ class WxRubyDemo < Wx::Frame
         @tree.expand(root)
         @tree.expand(firstChild)
         
-        evt_tree_item_expanded(TREE_ID) {|event| on_item_expanded(event)}
-        evt_tree_item_collapsed(TREE_ID) {|event| on_item_collapsed(event)}
-        evt_tree_sel_changed(TREE_ID) {|event| on_tree_sel_changed(event)}
-        evt_tree_item_activated(TREE_ID) {|event| on_tree_sel_changed(event)}
-        @tree.evt_left_down   {|event| on_tree_left_down(event)}
+        evt_tree_item_expanded   @tree, :on_item_expanded
+        evt_tree_item_collapsed  @tree, :on_item_collapsed
+        evt_tree_sel_changed     @tree, :on_tree_sel_changed
+        evt_tree_item_activated  @tree, :on_tree_sel_changed
+        @tree.evt_left_down method(:on_tree_left_down)
         
         
         

data/samples/bigdemo/wxDialog.rbw

@@ -12,77 +12,61 @@ rescue LoadError => no_wx_err
 end
 
 class TestDialog < Wx::Dialog
-    def initialize(parent, id, title)
-        super(parent, id, title)
-        sizer = Wx::BoxSizer.new(Wx::VERTICAL)
-        
-        label = Wx::StaticText.new(self, -1, "This is a wxDialog")
-        #label.set_help_text("This is the help text for the label")
-        sizer.add(label, 0, Wx::ALIGN_CENTER | Wx::ALL, 5)
-        
-        box = Wx::BoxSizer.new(Wx::HORIZONTAL)
-        
-        label = Wx::StaticText.new(self, -1, "Field #1")
-        #label.set_help_text("This is the help text for the label")
-        box.add(label, 0, Wx::ALIGN_CENTER | Wx::ALL, 5)
-        
-        text = Wx::TextCtrl.new(self, -1, "", 
-                                Wx::DEFAULT_POSITION, Wx::Size.new(80,-1))
-        #text.set_help_text("Here's some help text for field #1")
-        box.add(text, 1, Wx::ALIGN_CENTER | Wx::ALL, 5)
-        
-        sizer.add(box, 0, Wx::GROW | Wx::ALIGN_CENTER_VERTICAL | Wx::ALL, 5)
-        
-        box = Wx::BoxSizer.new(Wx::HORIZONTAL)
-        
-        label = Wx::StaticText.new(self, -1, "Field #2")
-        #label.set_help_text("This is the help text for the label")
-        box.add(label, 0, Wx::ALIGN_CENTER | Wx::ALL, 5)
-        
-        text = Wx::TextCtrl.new(self, -1, "", Wx::DEFAULT_POSITION, Wx::Size.new(80,-1))
-        #text.set_help_text("Here's some help text for field #2")
-        box.add(text, 1, Wx::ALIGN_CENTER | Wx::ALL, 5)
-        
-        sizer.add(box, 0, Wx::GROW | Wx::ALIGN_CENTER_VERTICAL | Wx::ALL, 5)
-        
-        line = Wx::StaticLine.new(self, -1, Wx::DEFAULT_POSITION, 
-                                  Wx::Size.new(20,-1), Wx::LI_HORIZONTAL)
-        sizer.add(line, 0, Wx::ALIGN_BOTTOM | Wx::GROW , 5)
-        
-        # The StdDialogButtonSizer arranges the contained buttons with
-        # platform-standard spacing, ordering and labelling.
-        button_sizer = Wx::StdDialogButtonSizer.new()
-        btn = Wx::Button.new(self, Wx::ID_OK, 'OK')
-        btn.set_default()
-        #btn.set_help_text("The Ok button completes the dialog")
-        button_sizer.add_button(btn)
-        
-        btn = Wx::Button.new(self, Wx::ID_CANCEL, 'Cancel')
-        #btn.set_help_text("The Cancel button cancels the dialog. (Duh!)")
-        button_sizer.add_button(btn)
-        button_sizer.realize
-        sizer.add(button_sizer, 0, Wx::ALIGN_CENTER_VERTICAL|Wx::ALL, 5)
-        
-        set_sizer(sizer)
-        sizer.fit(self)
-    end
+  def initialize(parent, id, title)
+    super(parent, id, title)
+    sizer = Wx::BoxSizer.new(Wx::VERTICAL)
+    label = Wx::StaticText.new(self, :label => "This is a wxDialog")
+    #label.set_help_text("This is the help text for the label")
+    sizer.add(label, 0, Wx::ALIGN_CENTER | Wx::ALL, 5)
+    
+    box = Wx::BoxSizer.new(Wx::HORIZONTAL)
+    
+    label = Wx::StaticText.new(self, :label => "Field #1")
+    #label.set_help_text("This is the help text for the label")
+    box.add(label, 0, Wx::ALIGN_CENTER|Wx::ALL, 5)
+    
+    text = Wx::TextCtrl.new(self, :value => "", :size => [80,-1])
+    #text.set_help_text("Here's some help text for field #1")
+    box.add(text, 1, Wx::ALIGN_CENTER|Wx::ALL, 5)
+    sizer.add(box, 0, Wx::GROW|Wx::ALIGN_CENTER_VERTICAL|Wx::ALL, 5)
+    
+    box = Wx::BoxSizer.new(Wx::HORIZONTAL)
+    
+    label = Wx::StaticText.new(self, :label => "Field #2")
+    #label.set_help_text("This is the help text for the label")
+    box.add(label, 0, Wx::ALIGN_CENTER|Wx::ALL, 5)
+    
+    text = Wx::TextCtrl.new(self, :value => "", :size => [80,-1])
+    #text.set_help_text("Here's some help text for field #2")
+    box.add(text, 1, Wx::ALIGN_CENTER|Wx::ALL, 5)
+    sizer.add(box, 0, Wx::GROW|Wx::ALIGN_CENTER_VERTICAL|Wx::ALL, 5)
+    
+    # This convenience method creates a sizer containing the chosen
+    # buttons (in this case, OK and Cancel). The buttons will be given
+    # the correct layout and labels for the platform.
+    button_sizer = create_button_sizer(Wx::OK|Wx::CANCEL)
+    sizer.add(button_sizer, 0, Wx::ALIGN_CENTER_VERTICAL|Wx::ALL, 5)
+    self.sizer = sizer
+    sizer.fit(self)
+  end
 end
 
 module Demo
-    def Demo.run(frame, nb, log)
-        win = TestDialog.new(nil, -1, "This is a wxDialog")
-        win.center_on_screen(Wx::BOTH)
-        val = win.show_modal()
-        if val == Wx::ID_OK
-            log.write_text("You pressed OK")
-        else
-            log.write_text("You pressed Cancel")
-        end
-    end
-    
-    def Demo.overview
-        return "Welcome to the wxRuby Dialog Demo!"
+  def Demo.run(frame, nb, log)
+    win = TestDialog.new(frame, -1, "This is a wxDialog")
+    win.center_on_screen(Wx::BOTH)
+    # Show the dialog and await the user's response
+    val = win.show_modal()
+    if val == Wx::ID_OK
+      log.write_text("You pressed OK")
+    else
+      log.write_text("You pressed Cancel")
     end
+  end
+  
+  def Demo.overview
+    return "Welcome to the wxRuby Dialog Demo!"
+  end
 end
 
 if __FILE__ == $0

data/samples/drawing/images.rb

@@ -17,32 +17,26 @@ end
 # window. This one uses a small PNG file, but other formats such as JPEG
 # are supported - see documentation for more details.
 
-class MyFrame < Wx::Frame
-  def initialize(title)
-    super(nil, -1, title)
-    evt_paint { on_paint }
-    
+class ImageFrame < Wx::Frame
+  def initialize
+    super(nil, :title => 'Simple image demo')
+
+    # Load a PNG bitmap from a file for drawing
     img_file = File.join( File.dirname(__FILE__), 'paperclip.png')
-    # first load the image into an Image object
-    image = Wx::Image.new(img_file)
-    # then create a Bitmap suitable for drawing
-    @bitmap = Wx::Bitmap.new(image)
+    @bitmap = Wx::Bitmap.new(img_file, Wx::BITMAP_TYPE_PNG)
+
+    # Set up the drawing to be done when the frame needs re-painting
+    evt_paint :on_paint
   end
 
   def on_paint
     paint do | dc |
-      dc.clear
       dc.draw_bitmap(@bitmap, 0, 0, false)
     end
   end
 end
 
-class ImagesApp < Wx::App
-  def on_init
-    frame = MyFrame.new("Simple Image Demo")
-	frame.show
-  end
+Wx::App.run do
+  ImageFrame.new.show
 end
 
-a = ImagesApp.new
-a.main_loop()

data/samples/treectrl/treectrl.rb

@@ -89,7 +89,7 @@ class MyTreeCtrl < Wx::TreeCtrl
     evt_tree_item_expanding self, :on_item_expanding
     evt_tree_item_collapsed self, :on_item_collapsed
     evt_tree_item_collapsing self, :on_item_collapsing
-    evt_tree_item_right_click self, :on_item_right_click
+    evt_tree_item_menu self, :on_item_menu
     evt_tree_sel_changed self, :on_sel_changed
     evt_tree_sel_changing self, :on_sel_changing
     evt_tree_key_down self, :on_tree_key_down
@@ -644,7 +644,7 @@ class MyTreeCtrl < Wx::TreeCtrl
     Wx::log_message("OnItemActivated")
   end
 
-  def on_item_right_click(event)
+  def on_item_menu(event)
     show_popup_menu(event.item, event.point)
   end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: wxruby
 version: !ruby/object:Gem::Version 
-  version: 1.9.4
-date: 2008-01-16 00:00:00 -08:00
+  version: 1.9.5
+date: 2008-03-10 00:00:00 -07:00
 summary: Ruby interface to the wxWidgets GUI library
 require_paths: 
 - lib
@@ -49,9 +49,11 @@ files:
 - lib/wx/classes/combobox.rb
 - lib/wx/classes/commandevent.rb
 - lib/wx/classes/controlwithitems.rb
+- lib/wx/classes/dc.rb
 - lib/wx/classes/event.rb
 - lib/wx/classes/evthandler.rb
 - lib/wx/classes/font.rb
+- lib/wx/classes/gauge.rb
 - lib/wx/classes/grid.rb
 - lib/wx/classes/helpcontroller.rb
 - lib/wx/classes/htmlhelpcontroller.rb