wxruby 1.9.9-x86-mingw32 → 1.9.10-x86-mingw32

data/lib/wx/classes/listctrl.rb

@@ -7,6 +7,18 @@ class Wx::ListCtrl
     0.upto(item_count - 1) { | i | yield i }
   end
 
+  # Returns an Array containing the indexes of the currently selected
+  # items 
+  def get_selections
+    selections = []
+    item = get_next_item(-1, Wx::LIST_NEXT_BELOW, Wx::LIST_STATE_SELECTED)
+    while item >= 0
+      selections << item
+      item = get_next_item(item, Wx::LIST_NEXT_BELOW, Wx::LIST_STATE_SELECTED) 
+    end
+    selections
+  end
+
   # Stub version for LC_VIRTUAL controls that does nothing; may be
   # overridden in subclasses.
   def on_get_item_attr(i)

data/lib/wx/classes/point.rb

@@ -4,6 +4,14 @@ class Wx::Point
     "#<Wx::Point: (#{x}, #{y})>"
   end
 
+  # Correct comparison for Points - same if same x and y
+  def ==(other)
+    unless other.kind_of?(Wx::Point)
+      Kernel.raise TypeError, "Cannot compare Point to #{other}"
+    end
+    x == other.x and y == other.y
+  end
+
   # Return a new Wx::Point with the x and y parameters both divided by
   # parameter +div+, which should be a Numeric
   def /(div)

data/lib/wx/classes/rect.rb

@@ -4,7 +4,16 @@ class Wx::Rect
   def to_s
     "#<Wx::Rect: (#{get_left}, #{get_top}) (#{get_right}, #{get_bottom})>"    
   end
-  
+
+  # Correct comparison for Wx::Rect, are the same if have the same
+  # position and the same size
+  def ==(other)
+    unless other.kind_of?(Wx::Rect)
+      Kernel.raise TypeError, "Cannot compare Rect to #{other}"
+    end
+    get_left == other.get_left and get_top == other.get_top and
+      get_right = other.get_right and get_bottom == other.get_bottom
+  end
   # More ruby-ish names
   alias :contains? :contains
 end

data/lib/wx/classes/richtextctrl.rb

@@ -38,4 +38,26 @@ class Wx::RichTextCtrl
       Kernel.raise RuntimeError, "Could not retrieve style at position #{pos}"
     end
   end
+
+  # Fix to accept a single +pos+ argument and return a Wx::Rect
+  wx_car_pos_for_index = self.instance_method(:get_caret_position_for_index)
+  define_method(:get_caret_position_for_index) do | pos |
+    rect = Wx::Rect.new
+    if wx_car_pos_for_index.bind(self).call(pos, rect)
+      return rect
+    else
+      Kernel.raise RuntimeError, "Could not rect for position #{pos}"
+    end
+  end
+
+  # Fix to return a pair of col, row values
+  wx_pos_to_xy = self.instance_method(:position_to_xy)
+  define_method(:position_to_xy) do | pos |
+    success, x, y = wx_pos_to_xy.bind(self).call(pos)
+    if success
+      return x, y
+    else
+      Kernel.raise RuntimeError, "Could not convert position #{pos} to x, y"
+    end
+  end
 end

data/lib/wx/classes/size.rb

@@ -1,8 +1,17 @@
 class Wx::Size
+  # More informative output for inspect etc
   def to_s
     "#<Wx::Size: (#{get_width}, #{get_height})>"
   end
 
+  # Compare with another size
+  def ==(other)
+    unless other.kind_of?(Wx::Size)
+      Kernel.raise TypeError, "Cannot compare Size to #{other}"
+    end
+    get_x == other.get_x and get_y == other.get_y
+  end
+
   # Return a new Wx::Size with the width and height values both divided
   # by parameter +div+, which should be a Numeric
   def /(div)

data/lib/wx/classes/sizer.rb

@@ -11,12 +11,27 @@ class Wx::Sizer
   def add_item(item, *mixed_args)
     args = Wx::args_as_list(ADD_ITEM_PARAMS, *mixed_args)
 
-    # Call add to append if default position
+    full_args = []
+
+    # extract the width and the height in the case of a spacer
+    # defined as an array
+    if item.kind_of?(Array)
+      Kernel.raise ArgumentError,
+        "Invalid Sizer specification : [width, height] expected" if item.size != 2
+      full_args << item[0] << item[1]
+    else
+      full_args << item
+    end
+
+    # update the full arguments list with the optional arguments (except index)
     idx = args.shift
+    full_args.concat(args)
+
+    # Call add to append if default position
     if idx == -1
-      add(item, *args)
+      add(*full_args)
     else
-      insert(idx, item, *args)
+      insert(idx, *full_args)
     end
   end
 end

data/lib/wx/classes/toolbar.rb

@@ -5,21 +5,19 @@ class Wx::ToolBar
   ADD_ITEM_PARAMS = [ Wx::Parameter[ :position, -1 ], 
                       Wx::Parameter[ :id, -1 ],
                       Wx::Parameter[ :label, "" ], 
-                      Wx::Parameter[ :bitmap, Wx::NULL_BITMAP ],
                       Wx::Parameter[ :bitmap2, Wx::NULL_BITMAP ],
                       Wx::Parameter[ :kind, Wx::ITEM_NORMAL ], 
                       Wx::Parameter[ :short_help, "" ], 
                       Wx::Parameter[ :long_help, "" ], 
                       Wx::Parameter[ :client_data, nil ] ]
   
-  def add_item(*mixed_args)
+  def add_item(bitmap, *mixed_args)
     args = Wx::args_as_list(ADD_ITEM_PARAMS, *mixed_args)
-    if args[3] == Wx::NULL_BITMAP
-      Kernel.raise ArgumentError, "Main button bitmap may not be NULL"
-    end
 
-    # Call add_tool to append if default position
     pos = args.shift
+    args.insert(2, bitmap)
+
+    # Call add_tool to append if default position
     if pos == -1
       add_tool(*args)
     else

data/lib/wx/classes/vboxsizer.rb

@@ -0,0 +1,6 @@
+# Just a shortcut version for creating a vertical box sizer
+class Wx::VBoxSizer < Wx::BoxSizer
+  def initialize
+    super(Wx::VERTICAL)
+  end
+end

data/lib/wx/classes/window.rb

@@ -11,6 +11,13 @@ class Wx::Window
   # In case a more explicit option is preferred.
   alias :wx_id :get_id
 
+  # The name of Wx::Window#raise conflicts with Ruby's core Kernel#raise
+  # method. This can cause unexpected errors when undecorated #raise is
+  # used inside a Window method. For wxRuby 2.0 it's too late to remove
+  # Window#raise completely, but for now, offer alternatives to
+  # raise/lower that could replace them in future versions.
+  alias :bring_to_front :raise
+  alias :send_to_back :lower
 
   # Recursively searches all windows below +self+ and returns the first
   # window which has the id +an_id+. This corresponds to the find_window

data/lib/wx/classes/xmlresource.rb

@@ -34,4 +34,21 @@ class Wx::XmlResource
     end
     fname
   end
+
+  # Returns a Wx::Wizard object from the element named +name+ in the
+  # loaded XRC file. The Wizard will have the parent +parent+.
+  # 
+  # This method is not available in wxWidgets, but is here for
+  # completeness and also to document how to use load_object (see
+  # below).
+  def load_wizard(parent, name)
+    wiz = Wx::Wizard.new()
+    load_wizard_subclass(wiz, parent, name)
+    wiz
+  end
+
+  # Completes the loading of a incomplete instance of Wx::Wizard.
+  def load_wizard_subclass(wizard, parent, name)
+    load_object(wizard, parent, name, "wxWizard")
+  end
 end

data/lib/wx/helpers.rb

@@ -8,7 +8,6 @@ module Wx
   # structs containing the keyword name and default value for each
   # possible argument. +mixed_args+ is an array which may optionally end
   # with a set of named arguments
-
   def self.args_as_list(param_spec, *mixed_args)
     # get keyword arguments from mixed args if supplied, else empty
     kwa = mixed_args.last.kind_of?(Hash) ? mixed_args.pop : {}
@@ -27,4 +26,20 @@ module Wx
     Kernel.raise ArgumentError, 
                  "Bad arg composition of #{mixed_args.inspect}"
   end
+
+  # Given an integer constant +int_const+, returns an array Wx constant
+  # names which have this value. If a string +prefix+ is supplied, find
+  # only constants whose names begin with this prefix. For example,
+  # passing "EVT" would return only constants with a name like
+  # Wx::EVT_XXX
+  # 
+  # This is primarily useful for debugging, when an unknown constant is
+  # returned, eg as an event type id.
+  def self.find_const(sought, prefix = "")
+    consts = constants.grep(/\A#{prefix}/)
+    consts.find_all do | c | 
+      c_val = const_get(c)
+      c_val.instance_of?(Fixnum) and c_val == sought
+    end
+  end
 end

data/lib/wx/keyword_ctors.rb

@@ -122,8 +122,9 @@ module Wx
       # API constructor
       def wx_ctor_params(*params)
         self.param_spec += params.map do | param |
-          param.kind_of?(Hash) ? Parameter[*param.to_a.flatten] : 
-            Parameter[param, STANDARD_DEFAULTS[param] ]
+          param.kind_of?(Hash) ? 
+            Parameter[ param.keys.first, param.values.first ] : 
+            Parameter[ param, STANDARD_DEFAULTS[param] ]
         end
       end
 

data/lib/wx/keyword_defs.rb

@@ -156,19 +156,29 @@ Wx::define_keyword_ctors('ToolBarTool') do
   wx_ctor_params :long_help => ''
 end
 
+# Similar to notebook but using choice control
+Wx::define_keyword_ctors('Choicebook') do
+  wx_ctor_params :id, :pos, :size, :style, :name => 'choiceBook'
+end
+
 # Notebook class
 Wx::define_keyword_ctors('Notebook') do
   wx_ctor_params :id, :pos, :size, :style, :name => 'noteBook' 
 end
 
-# Similar to notebook but using list control - undocumented
+# Similar to notebook but using list control
 Wx::define_keyword_ctors('Listbook') do
   wx_ctor_params :id, :pos, :size, :style, :name => 'listBook'
 end
 
-# Similar to notebook but using choice control
-Wx::define_keyword_ctors('Choicebook') do
-  wx_ctor_params :id, :pos, :size, :style, :name => 'choiceBook'
+# Similar to notebook but using toolbar
+Wx::define_keyword_ctors('Toolbook') do
+  wx_ctor_params :id, :pos, :size, :style, :name => 'toolBook'
+end
+
+# Similar to notebook but using tree control
+Wx::define_keyword_ctors('Treebook') do
+  wx_ctor_params :id, :pos, :size, :style, :name => 'treeBook'
 end
 
 # wxSashWindow:	Window with four optional sashes that can be dragged
@@ -268,7 +278,6 @@ Wx::define_keyword_ctors('PrintDialog') do
   wx_ctor_params :data
 end
 
-
 # Simple message box dialog
 Wx::define_keyword_ctors('MessageDialog') do
   wx_ctor_params :message => ''
@@ -277,6 +286,13 @@ Wx::define_keyword_ctors('MessageDialog') do
   wx_ctor_params :pos
 end
 
+# Property editing dialog
+Wx::define_keyword_ctors('PropertySheetDialog') do
+  wx_ctor_params :id, :title
+  wx_ctor_params :pos, :size, :style => Wx::DEFAULT_DIALOG_STYLE
+  wx_ctor_params :name => 'propertySheetDialog'
+end
+
 ### CONTROLS
 
 # Push button control, displaying text
@@ -517,6 +533,11 @@ Wx::define_keyword_ctors('HtmlListBox') do
   wx_ctor_params :id, :pos, :size, :style, :name => 'HtmlListBoxNameStr'
 end
 
+Wx::define_keyword_ctors('DatePickerCtrl') do
+  wx_ctor_params :id, :dt => Time.now
+  wx_ctor_params :pos, :size, :style, :validator, :name => 'dateCtrl'
+end
+
 Wx::define_keyword_ctors('RichTextCtrl') do
   wx_ctor_params :id, :value => ''
   wx_ctor_params :pos, :size, :style => Wx::TE_MULTILINE
@@ -531,6 +552,7 @@ Wx::define_keyword_ctors('RichTextStyleListCtrl') do
   wx_ctor_params :id, :pos, :size, :style
 end
 
+
 # FIXME - SymbolPickerDialog is hard to because the parent argument is
 # in a strange place.
 

data/lib/wx/version.rb

@@ -1,3 +1,3 @@
 module Wx
-  WXRUBY_VERSION    = '1.9.9'
+  WXRUBY_VERSION    = '1.9.10'
 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/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 " + RUBY_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,23 +1,23 @@
-#!/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 'rubygems' 
-rescue LoadError
-end
-require 'wx'
-
-
-
-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
+# 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'
+
+
+
+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