wxruby 1.9.1-i386-mswin32 → 1.9.2-i386-mswin32

data/lib/wx/classes/treectrl.rb

@@ -0,0 +1,18 @@
+# Hierarchical control with items
+class Wx::TreeCtrl
+  # Make these ruby enumerables so find, find_all, map etc are available
+  include Enumerable
+  # Iterate over all items
+  alias :each :traverse
+
+  # Return the children of +parent+ as an array of TreeItemIDs.
+  def get_children(parent)
+    kids = [ get_first_child(parent) ]
+    return [] if kids[0].zero?
+
+    while kid = get_next_sibling(kids.last) and not kid.zero?
+      kids << kid
+    end
+    kids
+  end
+end

data/lib/wx/classes/window.rb

@@ -1,11 +1,17 @@
 # Copyright 2004-2007 by Kevin Smith
 # released under the MIT-style wxruby2 license
 
+# The base class for all things displayed on screen
 class Wx::Window
-  # Create a wx-specific name for get_id, to prevent confusion with
-  # ruby's (deprecated) Object#id
+
+  # Ruby's Object#id is deprecated and will be removed in 1.9; therefore
+  # for classes inheriting from Wx::Window, the id method returns the
+  # wxRuby Window id
+  alias :id :get_id
+  # In case a more explicit option is preferred.
   alias :wx_id :get_id
 
+
   # Recursively searches all windows below +self+ and returns the first
   # window which has the id +an_id+. This corresponds to the find_window
   # method method in WxWidgets when called with an integer.
@@ -31,10 +37,11 @@ class Wx::Window
   # paint event is being handled just before running the event
   # handler. This ensures that any call to Window#paint within the
   # handler will supply a Wx::PaintDC (see swig/Window.i).
-  def evt_paint(&block)
+  def evt_paint(meth = nil, &block)
+    paint_proc = acquire_handler(meth, block)
     wrapped_block = proc do | event |
       instance_variable_set("@__painting__", true)
-      block.call(event)
+      paint_proc.call(event)
       remove_instance_variable("@__painting__")
     end
     __old_evt_paint(&wrapped_block)

data/lib/wx/keyword_ctors.rb

@@ -101,6 +101,7 @@ module Wx
         :size      => Wx::DEFAULT_SIZE,
         :pos       => Wx::DEFAULT_POSITION,
         :style     => 0,
+        :title     => '',
         :validator => Wx::DEFAULT_VALIDATOR,
         :choices   => [] # for Choice, ComboBox etc
       }
@@ -113,12 +114,6 @@ module Wx
       def param_spec
         @param_spec ||= []
       end
-
-      attr_writer :param_flags
-      def param_flags
-        @param_flags ||= {}
-      end
-
       
       # Adds a list of named parameters *params* to the parameter
       # specification for this Wx class's constructor. Each parameter
@@ -183,13 +178,6 @@ module Wx
             return
           end
 
-          # Allow classes to ignore :id argument in positional args
-          unless self.class < Wx::Dialog
-            if not mixed_args[0].kind_of?(Fixnum)
-              mixed_args.unshift(-1) 
-            end
-          end
-
           real_args = [ parent ] + self.class.args_as_list(*mixed_args)
           begin
             pre_wx_kwctor_init(*real_args)
@@ -210,8 +198,6 @@ module Wx
       def klass.inherited(sub_klass)
         sub_klass.instance_variable_set(:@param_spec, 
                                         instance_variable_get(:@param_spec) )
-        sub_klass.instance_variable_set(:@param_flags, 
-                                        instance_variable_get(:@param_flags) )
       end
     end
   end

data/lib/wx/keyword_defs.rb

@@ -4,7 +4,18 @@
 # widgets, windows and frames. It's for use with *Keyword Constructors*
 # and is no use on its own - except if you are looking for a bug or want
 # to add a  missing class.
-
+#
+# For each class, the parameters *must* be declared in the order that
+# they are supplied to wxRuby. A parameter is specified by a symbol
+# name, and, optionally, a default argument which will of whatever type
+# the wxRuby core library accepts. Because hashes are unordered in Ruby
+# 1.8, if a default argument is specified, this must be the last in a
+# list of parameters.
+# 
+# Some common parameters to constructors such as size, position, title,
+# id and so forth always have a standard default argumnet, which is
+# defined in keyword_ctors. In these cases, it is not necessary to
+# supply the default argument in the definition.
 module Wx
   @defined_kw_classes = {}
 
@@ -27,18 +38,13 @@ module Wx
       return nil
     end
     klass.module_eval { include Wx::KeywordConstructor }
-    # automatically add :id as the first argument, unless this is a
-    # Dialog subclass - which don't require this argument
-    unless klass < Wx::Dialog
-      klass.wx_ctor_params :id
-    end
     klass.instance_eval(&block)
   end
 end
 
 # Window : base class for all widgets and frames
 Wx::define_keyword_ctors('Window') do
-   wx_ctor_params :pos, :size, :style
+   wx_ctor_params :id, :pos, :size, :style
    wx_ctor_params :name => 'window'
 end
 
@@ -49,30 +55,26 @@ end
 
 # Normal frame
 Wx::define_keyword_ctors('Frame') do
-  wx_ctor_params :title => ''
-  wx_ctor_params :pos, :size, :style => Wx::DEFAULT_FRAME_STYLE
+  wx_ctor_params :id, :title, :pos, :size, :style => Wx::DEFAULT_FRAME_STYLE
   wx_ctor_params :name => 'frame'
 end
 
 # MDI child frame
 Wx::define_keyword_ctors('MDIChildFrame') do
-  wx_ctor_params :title => ''
-  wx_ctor_params :pos, :size, :style => Wx::DEFAULT_FRAME_STYLE
+  wx_ctor_params :id, :title, :pos, :size, :style => Wx::DEFAULT_FRAME_STYLE
   wx_ctor_params :name => 'frame'
 end
 
 # MDI parent frame
 Wx::define_keyword_ctors('MDIParentFrame') do
-  wx_ctor_params :title => ''
-  wx_ctor_params :pos, :size
+  wx_ctor_params :id, :title, :pos, :size
   wx_ctor_params :style => Wx::DEFAULT_FRAME_STYLE|Wx::VSCROLL|Wx::HSCROLL
   wx_ctor_params :name => 'frame'
 end
 
 # wxMiniFrame 	A frame with a small title bar
 Wx::define_keyword_ctors('MiniFrame') do
-  wx_ctor_params :title => ''
-  wx_ctor_params :pos, :size
+  wx_ctor_params :id, :title, :pos, :size
   wx_ctor_params :style =>  Wx::DEFAULT_FRAME_STYLE
   wx_ctor_params :name => 'frame'
 end
@@ -95,9 +97,8 @@ end
 
 # wxWizard 	A wizard dialog
 Wx::define_keyword_ctors('Wizard') do
-  wx_ctor_params :title => ''
-  wx_ctor_params :bitmap => Wx::NULL_BITMAP
-  wx_ctor_params :pos, :size
+  wx_ctor_params :id, :title, :bitmap => Wx::NULL_BITMAP
+  wx_ctor_params :pos # NB - no size argument for this class
   wx_ctor_params :style => Wx::DEFAULT_DIALOG_STYLE
 end
 
@@ -106,58 +107,58 @@ end
 
 # A window whose colour changes according to current user settings
 Wx::define_keyword_ctors('Panel') do
-  wx_ctor_params :pos, :size, :style => Wx::TAB_TRAVERSAL
+  wx_ctor_params :id, :pos, :size, :style => Wx::TAB_TRAVERSAL
   wx_ctor_params :name => 'panel'
 end
 
 # wxScrolledWindow 	Window with automatically managed scrollbars
 Wx::define_keyword_ctors('ScrolledWindow') do
-  wx_ctor_params :pos, :size, :style => Wx::VSCROLL|Wx::HSCROLL
+  wx_ctor_params :id, :pos, :size, :style => Wx::VSCROLL|Wx::HSCROLL
   wx_ctor_params :name => 'scrolledWindow'
 end
 
 # wxGrid 	A grid (table) window
 Wx::define_keyword_ctors('Grid') do
-  wx_ctor_params :pos, :size, :style => Wx::WANTS_CHARS
+  wx_ctor_params :id, :pos, :size, :style => Wx::WANTS_CHARS
   wx_ctor_params :name => 'grid'
 end
 
 # Window which can be split vertically or horizontally
 Wx::define_keyword_ctors('SplitterWindow') do
-  wx_ctor_params :pos, :size, :style => Wx::SP_3D
+  wx_ctor_params :id, :pos, :size, :style => Wx::SP_3D
   wx_ctor_params :name => 'splitterWindow'
 end
 
 # Implements the status bar on a frame
 Wx::define_keyword_ctors('StatusBar') do
-  wx_ctor_params :style => Wx::ST_SIZEGRIP
+  wx_ctor_params :id, :style => Wx::ST_SIZEGRIP
   wx_ctor_params :name => 'statusBar'
 end
 
 # Toolbar class
 Wx::define_keyword_ctors('ToolBar') do
-  wx_ctor_params :pos, :size, :style => Wx::TB_HORIZONTAL|Wx::NO_BORDER
+  wx_ctor_params :id, :pos, :size, :style => Wx::TB_HORIZONTAL|Wx::NO_BORDER
   wx_ctor_params :name => 'toolBar' # not as documented in Wx 2.6.3
 end
 
 # Notebook class
 Wx::define_keyword_ctors('Notebook') do
-  wx_ctor_params :pos, :size, :style, :name => 'noteBook' 
+  wx_ctor_params :id, :pos, :size, :style, :name => 'noteBook' 
 end
 
 # Similar to notebook but using list control - undocumented
 Wx::define_keyword_ctors('Listbook') do
-  wx_ctor_params :pos, :size, :style, :name => 'listBook'
+  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 :pos, :size, :style, :name => 'choiceBook'
+  wx_ctor_params :id, :pos, :size, :style, :name => 'choiceBook'
 end
 
 # wxSashWindow:	Window with four optional sashes that can be dragged
 Wx::define_keyword_ctors('SashWindow') do
-  wx_ctor_params :pos, :size
+  wx_ctor_params :id, :pos, :size
   wx_ctor_params :style =>  Wx::CLIP_CHILDREN|Wx::SW_3D
   wx_ctor_params :name => 'sashWindow'
 end
@@ -165,7 +166,7 @@ end
 # wxSashLayoutWindow: Window that can be involved in an IDE-like layout
 # arrangement
 Wx::define_keyword_ctors('SashLayoutWindow') do
-  wx_ctor_params :pos, :size
+  wx_ctor_params :id, :pos, :size
   wx_ctor_params :style =>  Wx::CLIP_CHILDREN|Wx::SW_3D
   wx_ctor_params :name => 'layoutWindow'
 end
@@ -179,13 +180,15 @@ end
 
 # wxWizardPageSimple: A page in wizard dialog.
 Wx::define_keyword_ctors('WizardPageSimple') do
-  wx_ctor_params :prev,  :next, :bitmap => Wx::NULL_BITMAP
+  wx_ctor_params :prev => nil
+  wx_ctor_params :next => nil
+  wx_ctor_params :bitmap => Wx::NULL_BITMAP
 end
 
 ### DIALOGS
 # wxDialog 	Base class for common dialogs
 Wx::define_keyword_ctors('Dialog') do
-  wx_ctor_params :title => ''
+  wx_ctor_params :id, :title => ''
   wx_ctor_params :pos, :size, :style => Wx::DEFAULT_DIALOG_STYLE
   wx_ctor_params :name => 'dialogBox'
 end
@@ -263,52 +266,52 @@ end
 
 # Push button control, displaying text
 Wx::define_keyword_ctors('Button') do
-  wx_ctor_params :label => ''
+  wx_ctor_params :id, :label => ''
   wx_ctor_params :pos, :size, :style
   wx_ctor_params :validator, :name => 'button'
 end
 
 # Push button control, displaying a bitmap
 Wx::define_keyword_ctors('BitmapButton') do
-  wx_ctor_params :bitmap, :pos, :size, :style => Wx::BU_AUTODRAW
+  wx_ctor_params :id, :bitmap, :pos, :size, :style => Wx::BU_AUTODRAW
   wx_ctor_params :validator, :name => 'button'
 end
 
 # A button which stays pressed when clicked by user.
 Wx::define_keyword_ctors('ToggleButton') do
-  wx_ctor_params :label, :pos, :size, :style
+  wx_ctor_params :id, :label, :pos, :size, :style
   wx_ctor_params :validator, :name => 'checkBox'
 end
 
 # Control showing an entire calendar month
 Wx::define_keyword_ctors('CalendarCtrl') do
-  wx_ctor_params :date => Time.now()
+  wx_ctor_params :id, :date => Time.now()
   wx_ctor_params :pos, :size, :style => Wx::CAL_SHOW_HOLIDAYS
   wx_ctor_params :name => 'calendar'
 end
 
 # 	Checkbox control
 Wx::define_keyword_ctors('CheckBox') do
-  wx_ctor_params :label => ''
+  wx_ctor_params :id, :label => ''
   wx_ctor_params :pos, :size, :style
   wx_ctor_params :validator, :name => 'checkBox'
 end
 
 # A listbox with a checkbox to the left of each item
 Wx::define_keyword_ctors('CheckListBox') do 	
-  wx_ctor_params :pos, :size, :choices, :style
+  wx_ctor_params :id, :pos, :size, :choices, :style
   wx_ctor_params :validator, :name => 'listBox'
 end
 
 # wxChoice 	Choice control (a combobox without the editable area)
 Wx::define_keyword_ctors('Choice') do
-  wx_ctor_params :pos, :size, :choices, :style
+  wx_ctor_params :id, :pos, :size, :choices, :style
   wx_ctor_params :validator, :name => 'choice'
 end
 
 # wxComboBox 	A choice with an editable area
 Wx::define_keyword_ctors('ComboBox') do
-  wx_ctor_params :value => ''
+  wx_ctor_params :id, :value => ''
   wx_ctor_params :pos, :size, :choices => []
   wx_ctor_params :style 
   wx_ctor_params :validator, :name => 'comboBox'
@@ -316,7 +319,7 @@ end
 
 # wxBitmapComboBox 	A choice with an editable area
 Wx::define_keyword_ctors('BitmapComboBox') do
-  wx_ctor_params :value => ''
+  wx_ctor_params :id, :value => ''
   wx_ctor_params :pos, :size, :choices => []
   wx_ctor_params :style 
   wx_ctor_params :validator, :name => 'comboBox'
@@ -327,14 +330,14 @@ end
 # wxGauge 	A control to represent a varying quantity, such as time
 # remaining
 Wx::define_keyword_ctors('Gauge') do
-  wx_ctor_params :range, :pos, :size, :style => Wx::GA_HORIZONTAL
+  wx_ctor_params :id, :range, :pos, :size, :style => Wx::GA_HORIZONTAL
   wx_ctor_params :validator, :name => 'gauge'
 end
 
 # wxGenericDirCtrl 	A control for displaying a directory tree
 Wx::define_keyword_ctors('GenericDirCtrl') do
   # TODO :dir => Wx::DIR_DIALOG_DEFAULT_FOLDER_STR
-  wx_ctor_params :dir => '' 
+  wx_ctor_params :id, :dir => '' 
   wx_ctor_params :pos, :size, 
                  :style => Wx::DIRCTRL_3D_INTERNAL|Wx::SUNKEN_BORDER
   wx_ctor_params :filter => ''
@@ -346,14 +349,14 @@ end
 # wxHtmlListBox 	A listbox showing HTML content
 # wxListBox 	A list of strings for single or multiple selection
 Wx::define_keyword_ctors('ListBox') do
-  wx_ctor_params :pos, :size, :choices => []
+  wx_ctor_params :id, :pos, :size, :choices => []
   wx_ctor_params :style
   wx_ctor_params :validator, :name => 'listBox'
 end
 
 # wxListCtrl 	A control for displaying lists of strings and/or icons, plus a multicolumn report view
 Wx::define_keyword_ctors('ListCtrl') do
-  wx_ctor_params :pos, :size, :style => Wx::LC_ICON
+  wx_ctor_params :id, :pos, :size, :style => Wx::LC_ICON
   wx_ctor_params :validator, :name => 'listCtrl'
 end
 
@@ -361,13 +364,13 @@ end
 
 # wxTreeCtrl 	Tree (hierarchy) control
 Wx::define_keyword_ctors('TreeCtrl') do
-  wx_ctor_params :pos, :size, :style => Wx::TR_HAS_BUTTONS
+  wx_ctor_params :id, :pos, :size, :style => Wx::TR_HAS_BUTTONS
   wx_ctor_params :validator, :name => 'treeCtrl'
 end
 
 # wxSpinCtrl 	A spin control - i.e. spin button and text control
 Wx::define_keyword_ctors('SpinCtrl') do
-  wx_ctor_params :value => ''
+  wx_ctor_params :id, :value => ''
   wx_ctor_params :pos, :size, :style => Wx::SP_ARROW_KEYS
   wx_ctor_params :min => 0
   wx_ctor_params :max => 100
@@ -377,27 +380,27 @@ end
 
 # One or more lines of non-editable text
 Wx::define_keyword_ctors('StaticText') do
-  wx_ctor_params :label, :pos, :size, :style, :name => 'staticText'
+  wx_ctor_params :id, :label, :pos, :size, :style, :name => 'staticText'
 end
 
 Wx::define_keyword_ctors('StaticBox') do
-  wx_ctor_params :label, :pos, :size, :style, :name => 'staticBox'
+  wx_ctor_params :id, :label, :pos, :size, :style, :name => 'staticBox'
 end
 
 Wx::define_keyword_ctors('StaticLine') do
-  wx_ctor_params :pos, :size, :style => Wx::LI_HORIZONTAL
+  wx_ctor_params :id, :pos, :size, :style => Wx::LI_HORIZONTAL
   wx_ctor_params :name => 'staticBox'
 end
 
 # wxStaticBitmap 	A control to display a bitmap
 Wx::define_keyword_ctors('StaticBitmap') do
-  wx_ctor_params :label, :pos, :size, :style
+  wx_ctor_params :id, :label, :pos, :size, :style
 end
 
 
 # wxRadioBox 	A group of radio buttons
 Wx::define_keyword_ctors('RadioBox') do
-  wx_ctor_params :label => ''
+  wx_ctor_params :id, :label => ''
   wx_ctor_params :pos, :size, :choices => []
   wx_ctor_params :major_dimension => 0
   wx_ctor_params :style => Wx::RA_SPECIFY_COLS
@@ -406,14 +409,14 @@ end
 
 # wxRadioButton: A round button used with others in a mutually exclusive way
 Wx::define_keyword_ctors('RadioButton') do
-  wx_ctor_params :label => ''
+  wx_ctor_params :id, :label => ''
   wx_ctor_params :pos, :size, :style => 0
   wx_ctor_params :validator, :name => 'radioButton'
 end
 
 # wxSlider 	A slider that can be dragged by the user
 Wx::define_keyword_ctors('Slider') do
-  wx_ctor_params :value => 0
+  wx_ctor_params :id, :value => 0
   wx_ctor_params :min_value, :max_value
   wx_ctor_params :pos, :size, :style => Wx::SL_HORIZONTAL
   wx_ctor_params :validator, :name => 'slider'
@@ -421,7 +424,7 @@ end
 
 # wxSpinButton - Has two small up and down (or left and right) arrow buttons
 Wx::define_keyword_ctors('SpinButton') do
-   wx_ctor_params :pos, :size, :style => Wx::SP_HORIZONTAL
+   wx_ctor_params :id, :pos, :size, :style => Wx::SP_HORIZONTAL
    wx_ctor_params :name => 'spinButton'
 end
 
@@ -429,27 +432,34 @@ end
 
 # wxTextCtrl 	Single or multiline text editing control
 Wx::define_keyword_ctors('TextCtrl') do
-  wx_ctor_params :value => ''
+  wx_ctor_params :id, :value => ''
   wx_ctor_params :pos, :size, :style
   wx_ctor_params :validator, :name => 'textCtrl'
 end
 
 # wxHtmlWindow - Control for displaying HTML
 Wx::define_keyword_ctors('HtmlWindow') do
-  wx_ctor_params :pos, :size, :style => Wx::HW_DEFAULT_STYLE
+  wx_ctor_params :id, :pos, :size, :style => Wx::HW_DEFAULT_STYLE
   wx_ctor_params :name => 'htmlWindow'
 end
 
 # wxHyperTextCtrl - display a clickable URL
 Wx::define_keyword_ctors('HyperlinkCtrl') do
-  wx_ctor_params :label => ''
+  wx_ctor_params :id, :label => ''
   wx_ctor_params :url => ''
   wx_ctor_params :pos, :size, :style => 0
   wx_ctor_params :name => 'hyperlink'
 end
 
 Wx::define_keyword_ctors('StyledTextCtrl') do
-  wx_ctor_params :pos, :size, :style => 0
+  wx_ctor_params :id, :pos, :size, :style => 0
   wx_ctor_params :name => 'styledTextCtrl'
 end
 
+
+Wx::define_keyword_ctors('CollapsiblePane') do
+  wx_ctor_params :id, :label => ''
+  wx_ctor_params :pos, :size, :style => 0
+  wx_ctor_params :validator, :name => 'collapsiblePane'
+end
+

data/lib/wx/version.rb

@@ -1,3 +1,3 @@
 module Wx
-  WXRUBY_VERSION    = '1.9.1'
+  WXRUBY_VERSION    = '1.9.2'
 end

data/samples/bigdemo/wxScrolledWindow.rbw

@@ -139,6 +139,8 @@ class MyCanvas < Wx::ScrolledWindow
         if event.left_is_down() and !@drawing
             set_focus()
             set_XY(event)
+            @event_x_old =  event.get_x # added this to save the current absolute...
+            @event_y_old = event.get_y  # ... mouse position
             @curLine = []
             capture_mouse()
             @drawing = true
@@ -167,11 +169,14 @@ class MyCanvas < Wx::ScrolledWindow
 
           paint do | dc |
             dc.set_pen(Wx::Pen.new("MEDIUM FOREST GREEN", 4, Wx::SOLID))
-            coords = [@x, @y] + convert_event_coords(event)
-            @curLine.push(coords)
+            save_coords = [@x, @y] + convert_event_coords(event)             # translate the absolute coords to save them in the array
+            coords = [@event_x_old, @event_y_old, event.get_x, event.get_y]  # the absolute coords to use for the first draw
+            @curLine.push(save_coords)                                       # use the translated coords here
             coords.flatten!()
-            dc.draw_line(coords[0], coords[1], coords[2], coords[3])
+            dc.draw_line(coords[0], coords[1], coords[2], coords[3])         # and the absolute coords here
             set_XY(event)
+            @event_x_old = event.get_x                                       # saving the new ...
+            @event_y_old = event.get_y                                       # ... absolute coords
           end
         end
     end

data/samples/calendar/calendar.rb

@@ -232,7 +232,7 @@ class MyFrame < Frame
         end
       @calendar = MyCalendar.new(@panel, self, date, style)
       @sizer.add(@calendar, 0, Wx::ALIGN_CENTRE|Wx::ALL, 5)
-      layout
+      @panel.layout
     end
 
     def highlight_special(on)