wxruby 1.9.1-i686-linux → 1.9.2-i686-linux

data/lib/wx/classes/evthandler.rb

@@ -42,6 +42,7 @@ class Wx::EvtHandler
 
   # Given the Integer constant Wx::EVT_XXX, returns the convenience
   # handler method name associated with that type of event.
+
   def self.event_name_for_type(name)
     EVENT_NAME_TYPE_MAP.index(name)
   end
@@ -63,33 +64,85 @@ class Wx::EvtHandler
   end
 
   # Registers the event type +ev_type+, which should be an instance of
-  # the Struct class +Wx::EvtHandler::EventType+. 
+  # the Struct class +Wx::EvtHandler::EventType+. This sets up the
+  # mapping of events of that type (identified by integer id) to the
+  # appropriate ruby event class, and defines a convenience evt_xxx
+  # instance method in the class EvtHandler.
   def self.register_event_type(ev_type)
+    # set up the event type mapping
     EVENT_TYPE_CLASS_MAP[ev_type.const] = ev_type.evt_class
     EVENT_NAME_TYPE_MAP[ev_type.name.intern] = ev_type.const
 
     unless ev_type.arity and ev_type.name
       return 
     end
+
+    # set up the evt_xxx method
     case ev_type.arity
     when 0 # events without an id
       class_eval %Q| 
-        def #{ev_type.name}(&block)
-          connect(Wx::ID_ANY, Wx::ID_ANY, #{ev_type.const}, &block)
+        def #{ev_type.name}(meth = nil, &block)
+          handler = acquire_handler(meth, block)
+          connect(Wx::ID_ANY, Wx::ID_ANY, #{ev_type.const}, &handler)
         end |
     when 1 # events with an id
       class_eval %Q|
-        def #{ev_type.name}(id, &block)
-          connect(id, Wx::ID_ANY, #{ev_type.const}, &block)
+        def #{ev_type.name}(id, meth = nil, &block)
+          handler = acquire_handler(meth, block)
+          id  = acquire_id(id)
+          connect(id, Wx::ID_ANY, #{ev_type.const}, &handler)
         end |
     when 2 # events with id range
       class_eval %Q|
-        def #{ev_type.name}(first_id, last_id, &block)
-          connect(first_id, last_id, #{ev_type.const}, &block)
+        def #{ev_type.name}(first_id, last_id, meth = nil, &block)
+          handler  = acquire_handler(meth, block)
+          first_id = acquire_id(first_id)
+          last_id  = acquire_id(last_id)
+          connect( first_id, last_id, #{ev_type.const}, &handler)
         end |
     end
   end
 
+  # Not for external use; determines whether to use a block or call a
+  # method in self to handle an event, passed to connect. Makes evt_xxx
+  # liberal about what it accepts - aside from a block, it can be a
+  # method name (as Symbol or String), a (bound) method object, or a
+  # Proc object
+  def acquire_handler(meth, block)
+    if block and not meth
+      return block
+    elsif meth and not block
+      h_meth = case meth
+        when Symbol, String : self.method(meth)
+        when Proc : meth
+        when Method : meth.to_proc
+      end
+      if h_meth.arity == 1
+        return lambda { | evt | h_meth.call(evt) }
+      else
+        return lambda { h_meth.call }
+      end
+    else
+      Kernel.raise ArgumentError,
+                  "Specify event handler with a method, name, proc OR block"
+                  caller
+    end
+  end
+
+  # Not for external use; acquires an id either from an explicit Fixnum
+  # parameter or by calling the wx_id method of a passed Window.
+  def acquire_id(window_or_id)
+    case window_or_id
+    when Fixnum : window_or_id
+    when Wx::Window, Wx::MenuItem : window_or_id.wx_id
+    else Kernel.raise ArgumentError, 
+                     "Must specify Wx::Window event source or its Wx id, " +
+                     "not '#{window_or_id.inspect}'",
+                      caller
+    end
+  end
+  private :acquire_id, :acquire_handler
+
   # Definitions for all event types that are part by core wxRuby. Events
   # that are mapped to class Wx::Event are TODO as they are not
   # currently wrapped by the correct class. All StyledTextCtrl
@@ -195,6 +248,9 @@ class Wx::EvtHandler
     EventType['evt_close', 0,
               Wx::EVT_CLOSE_WINDOW, 
               Wx::CloseEvent],
+    EventType['evt_collapsiblepane_changed', 1,
+              Wx::EVT_COMMAND_COLLPANE_CHANGED, 
+              Wx::CollapsiblePaneEvent],
     EventType['evt_combobox', 1,
               Wx::EVT_COMMAND_COMBOBOX_SELECTED, 
               Wx::CommandEvent],

data/lib/wx/classes/listctrl.rb

@@ -0,0 +1,9 @@
+# Multi-item control with numerous possible view styles
+class Wx::ListCtrl
+  # Make these ruby enumerables so find, find_all, map are available 
+  include Enumerable
+  # Passes each valid item index into the passed block
+  def each
+    0.upto(item_count - 1) { | i | yield i }
+  end
+end

data/lib/wx/classes/menu.rb

@@ -0,0 +1,62 @@
+# A single labelled list within a drop-down menu, or a popup menu
+class Wx::Menu
+
+  # In the standard WxWidgets API, the methods append, prepend, insert
+  # (and their variants) require a constant integer id as the identifier
+  # of the menu item. This is then used in event handling. 
+  #
+  # In WxRuby the use of explicit ids can be avoided in most cases,
+  # being a most unruby-ish practice. So, by analogy with the general
+  # use of Wx::Window classes and event handlers, where the id is
+  # implicit in the constructor, and the window can be passed direct to
+  # the event handler setup method, the below sets up a similar facility
+  # for adding items to Wx::Menu.
+  #
+  # For all these methods, the only required argument is the string name
+  # of the menu item; a system-default id will be supplied if no
+  # explicit one is given. The return value of these methods in all
+  # cases is a Wx::MenuItem object, which can be passed directly as the
+  # first argument to an evt_menu handler.
+  def self.methods_with_optional_ids(*meth_names)
+    class_eval do 
+      meth_names.each do | meth |
+        old_meth = instance_method(meth)
+        define_method(meth) do | *args |
+          case args.first
+            when Fixnum : old_meth.bind(self).call(*args)
+            when String : old_meth.bind(self).call(Wx::ID_ANY, *args)
+            when Wx::MenuItem : old_meth.bind(self).call(args.first)
+          end
+        end
+      end
+    end
+  end
+
+  # Create the optional-id methods
+  methods_with_optional_ids :append, :prepend,
+                            :append_check_item, :prepend_check_item, 
+                            :append_radio_item, :prepend_radio_item
+
+  # This is much the same as above, except for insert and variants,
+  # which take an additional first argument, the position at which to
+  # insert the new item.
+  def self.methods_with_optional_ids_and_pos(*meth_names)
+    class_eval do 
+      meth_names.each do | meth |
+        old_meth = instance_method(meth)
+        define_method(meth) do | pos, *args |
+          case args.first
+            when Fixnum : old_meth.bind(self).call(pos, *args)
+            when String : old_meth.bind(self).call(pos, Wx::ID_ANY, *args)
+            when Wx::MenuItem : old_meth.bind(self).call(pos, args.first)
+          end
+        end
+      end
+    end
+  end
+
+  # Create the optional-id methods
+  methods_with_optional_ids_and_pos :insert,
+                                    :insert_check_item,
+                                    :insert_radio_item
+end

data/lib/wx/classes/menuitem.rb

@@ -0,0 +1,7 @@
+# An individual item within a frame or popup menu
+class Wx::MenuItem
+  # Get the Wx id, not Ruby's deprecated Object#id
+  alias :id :get_id
+  # In case a more explicit option is preferred.
+  alias :wx_id :get_id
+end

data/lib/wx/classes/paintdc.rb

@@ -4,7 +4,7 @@ class Wx::PaintDC
   # always be used via Window#paint, which takes a block receiving the
   # DC. This ensures that the DC is cleaned up at the correct time,
   # preventing serious errors on some platforms.
-  def initialize(*args)
+  define_method(:initialize) do | *args |
     Kernel.raise RuntimeError,
                  "Do not instantiate PaintDC directly; use Window#paint",
                  caller[1..-1]

data/lib/wx/classes/timer.rb

@@ -34,7 +34,7 @@ class Wx::Timer
     @@__unowned_timers__ ||= []
 
     # remove from list of previous owner
-    if @__owner__
+    if defined?(@__owner__) and @__owner__
       @__owner__.instance_eval { @__owned_timers__.delete(this_timer) }
     end
 
@@ -51,7 +51,7 @@ class Wx::Timer
 
     # Then add to list of new owner, setting destructor hook if required    
     new_owner.instance_eval do
-      if not @__owned_timers__
+      if not defined?(@__owned_timers__)
         @__owned_timers__ = []
         unless self.kind_of?(Wx::App) # Don't set up hook on App
           evt_window_destroy do | evt |

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
+