wxruby 1.9.0-powerpc-darwin8.10.0 → 1.9.2-powerpc-darwin8.10.0

data/lib/wx/classes/styledtextctrl.rb

@@ -0,0 +1,92 @@
+# Functionality here must be loaded first to add custom events
+require 'wx/classes/evthandler'
+
+# These event type constants will only be available and meaningful if
+# Wx::StyledTextCtrl has been compiled into the library. If so, they
+# need the below definitions for mapping, otherwise all the rest should
+# be skipped
+if defined?(Wx::StyledTextCtrl)
+  EventType = Wx::EvtHandler::EventType
+
+  STC_EVENT_TYPES = [ 
+    EventType['evt_stc_calltip_click', 1,
+              Wx::EVT_STC_CALLTIP_CLICK, 
+              Wx::StyledTextEvent],
+    EventType['evt_stc_change', 1,
+              Wx::EVT_STC_CHANGE, 
+              Wx::StyledTextEvent],
+    EventType['evt_stc_charadded', 1,
+              Wx::EVT_STC_CHARADDED, 
+              Wx::StyledTextEvent],
+    EventType['evt_stc_doubleclick', 1,
+              Wx::EVT_STC_DOUBLECLICK, 
+              Wx::StyledTextEvent],
+    EventType['evt_stc_do_drop', 1,
+              Wx::EVT_STC_DO_DROP,
+              Wx::StyledTextEvent],
+    EventType['evt_stc_drag_over', 1,
+              Wx::EVT_STC_DRAG_OVER,
+              Wx::StyledTextEvent],
+    EventType['evt_stc_dwellend', 1,
+              Wx::EVT_STC_DWELLEND,
+              Wx::StyledTextEvent],
+    EventType['evt_stc_dwellstart', 1,
+              Wx::EVT_STC_DWELLSTART,
+              Wx::StyledTextEvent],
+    EventType['evt_stc_hotspot_click', 1,
+              Wx::EVT_STC_HOTSPOT_CLICK,
+              Wx::StyledTextEvent],
+    EventType['evt_stc_hotspot_dclick', 1,
+              Wx::EVT_STC_HOTSPOT_DCLICK,
+              Wx::StyledTextEvent],
+    EventType['evt_stc_key', 1,
+              Wx::EVT_STC_KEY,
+              Wx::StyledTextEvent],
+    EventType['evt_stc_macrorecord', 1,
+              Wx::EVT_STC_MACRORECORD, 
+              Wx::StyledTextEvent],
+    EventType['evt_stc_marginclick', 1,
+              Wx::EVT_STC_MARGINCLICK, 
+              Wx::StyledTextEvent],
+    EventType['evt_stc_modified', 1,
+              Wx::EVT_STC_MODIFIED, 
+              Wx::StyledTextEvent],
+    EventType['evt_stc_needshown', 1,
+              Wx::EVT_STC_NEEDSHOWN, 
+              Wx::StyledTextEvent],
+    EventType['evt_stc_painted', 1,
+              Wx::EVT_STC_PAINTED, 
+              Wx::StyledTextEvent],
+    EventType['evt_stc_romodifyattempt', 1,
+              Wx::EVT_STC_ROMODIFYATTEMPT, 
+              Wx::StyledTextEvent],
+    EventType['evt_stc_savepointleft', 1,
+              Wx::EVT_STC_SAVEPOINTLEFT, 
+              Wx::StyledTextEvent],
+    EventType['evt_stc_savepointreached', 1,
+              Wx::EVT_STC_SAVEPOINTREACHED, 
+              Wx::StyledTextEvent],
+    EventType['evt_stc_start_drag', 1,
+              Wx::EVT_STC_START_DRAG, 
+              Wx::StyledTextEvent],
+    EventType['evt_stc_styleneeded', 1,
+              Wx::EVT_STC_STYLENEEDED, 
+              Wx::StyledTextEvent],
+    EventType['evt_stc_updateui', 1,
+              Wx::EVT_STC_UPDATEUI, 
+              Wx::StyledTextEvent],
+    EventType['evt_stc_uridropped', 1,
+              Wx::EVT_STC_URIDROPPED, 
+              Wx::StyledTextEvent],
+    EventType['evt_stc_userlistselection', 1,
+              Wx::EVT_STC_USERLISTSELECTION, 
+              Wx::StyledTextEvent],
+    EventType['evt_stc_zoom', 1,
+              Wx::EVT_STC_ZOOM, 
+              Wx::StyledTextEvent]
+    ]
+
+  STC_EVENT_TYPES.each do | ev_type | 
+    Wx::EvtHandler.register_event_type(ev_type)
+  end
+end

data/lib/wx/classes/textctrl.rb

@@ -0,0 +1,14 @@
+class Wx::TextCtrl
+  # Fix position_to_xy so it returns a two-element array - the internal
+  # version returns a three-element array with a Boolean that doesn't
+  # really make sense in Ruby
+  wx_position_to_xy = instance_method(:position_to_xy)
+  define_method(:position_to_xy) do | pos |
+    retval, x, y = wx_position_to_xy.bind(self).call(pos)
+    if retval
+      return [x, y]
+    else
+      return nil
+    end
+  end
+end

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,7 +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
+
+  # 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.
@@ -27,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

@@ -0,0 +1,205 @@
+# = WxRuby Extensions - Keyword Constructors
+# 
+# The *Keyword Constructors* extension allows the use of Ruby hash-style
+# keyword arguments in constructors of common WxWidgets Windows, Frame,
+# Dialog and Control classes.
+# 
+# == Introduction
+#
+# Building a GUI in WxWidgets involves lots of calls to +new+, but
+# these methods often have long parameter lists. Often the default
+# values for many of these parameters are correct. For example, if
+# you're using a sizer-based layout, you usually don't want to specify a
+# size for widgets, but you still have to type
+#  
+#  Wx::TreeCtrl.new( parent, -1, Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, 
+#                    Wx::NO_BUTTONS )
+#  
+# just to create a standard TreeCtrl with the 'no buttons' style. If you
+# want to specify the 'NO BUTTONS' style, you can't avoid all the typing
+# of DEFAULT_POSITION etc.
+#
+# == Basic Keyword Constructors
+# 
+# With keyword_constructors, you could write the above as
+# 
+#  TreeCtrl.new(parent, :style => Wx::NO_BUTTONS)
+# 
+# And it will assume you want the default id (-1), and the default size
+# and position. If you want to specify an explicit size, you can do so:
+#
+#  TreeCtrl.new(parent, :size => Wx::Size.new(100, 300))
+# 
+# For brevity, this module also allows you to specify positions and
+# sizes using a a two-element array:
+#  
+#  TreeCtrl.new(parent, :size => [100, 300])
+#
+# Similarly with position:
+#
+#  TreeCtrl.new(parent, :pos => Wx::Point.new(5, 25))
+#
+#  TreeCtrl.new(parent, :pos => [5, 25])
+#
+# You can have multiple keyword arguments:
+#
+#  TreeCtrl.new(parent, :pos => [5, 25], :size => [100, 300] )
+#
+# == No ID required
+# 
+# As with position and size, you usually don't want to deal with
+# assigning unique ids to every widget and frame you create - it's a C++
+# hangover that often seems clunky in Ruby. The *Event Connectors*
+# extension allows you to set up event handling without having to use
+# ids, and if no :id argument is supplied to a constructor, the default
+# (-1) will be passed.
+#
+# There are occasions when a specific ID does need to be used - for
+# example, to tell WxWidgets that a button is a 'stock' item, so that it
+# can be displayed using platform-standard text and icon. To do this,
+# simply pass an :id argument to the constructor - here, the system's
+# standard 'preview' button
+#
+#  Wx::Button.new(parent, :id => Wx::ID_PREVIEW) 
+#
+# == Class-specific arguments
+# 
+# The arguments :size, :pos and :style are common to many WxWidgets
+# window classes. The +new+ methods of these classes also have
+# parameters that are specific to those classes; for example, the text
+# label on a button, or the initial value of a text control.
+# 
+#  Wx::Button.new(parent, :label => 'press me')
+#  Wx::TextCtrl.new(parent, :value => 'type some text here')
+#
+# The keyword names of these arguments can be found by looking at the
+# WxRuby documentation, in the relevant class's +new+ method. You can
+# also get a string description of the class's +new+ method parameters
+# within Ruby by doing:
+# 
+#  puts Wx::TextCtrl.describe_constructor()
+# 
+# This will print a list of the argument names expected by the class's
+# +new+ method, and the correct type for them.
+#
+# == Mixing positional and keyword arguments
+#
+# To support existing code, and to avoid forcing the use of more verbose
+# keyword-style arguments where they're not desired, you can mix
+# positional and keyword arguments, omitting or including +id+s as
+# desired.
+#
+#  Wx::Button.new(parent, 'press me', :style => Wx::BU_RIGHT)
+
+module Wx
+  module KeywordConstructor
+    module ClassMethods
+
+      # Common Wx constructor argument keywords, with their default values.
+      STANDARD_DEFAULTS = {
+        :id        => -1,
+        :size      => Wx::DEFAULT_SIZE,
+        :pos       => Wx::DEFAULT_POSITION,
+        :style     => 0,
+        :title     => '',
+        :validator => Wx::DEFAULT_VALIDATOR,
+        :choices   => [] # for Choice, ComboBox etc
+      }
+
+      
+      # A named parameter in a Wx constructor parameter list
+      Parameter = Struct.new( :name, :default )
+
+      attr_writer :param_spec
+      def param_spec
+        @param_spec ||= []
+      end
+      
+      # Adds a list of named parameters *params* to the parameter
+      # specification for this Wx class's constructor. Each parameter
+      # should be specified as a either a common known symbol, such as
+      # +:size+ or +:pos:+ or +:style:+ (corresponding to the common
+      # constructor arguments in WxWidgets API), or a single-key with the
+      # key the name of the argument, and the value a default value.
+      # 
+      # Parameters should be specified in the order they occur in the 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] ]
+        end
+      end
+
+      def args_as_list(*mixed_args)
+        # get keyword arguments from mixed args if supplied, else empty
+        kwa = mixed_args.last.kind_of?(Hash) ? mixed_args.pop : {}
+        out_args = []
+        param_spec.zip(mixed_args) do | param, arg |
+          if arg # use the supplied list arg 
+            out_args << arg
+          elsif kwa.key?(param.name) # use the keyword arg
+            out_args << kwa[param.name]
+          else # use the default argument
+            out_args << param.default
+          end
+        end
+        out_args
+      rescue
+        Kernel.raise ArgumentError, 
+                     "Bad arg composition of #{mixed_args.inspect}"
+      end
+
+      def args_as_hash(*mixed_args)
+        kwa = mixed_args.last.kind_of?(Hash) ? mixed_args.pop : {}
+        param_spec.zip(mixed_args) do | param, arg |
+          kwa[param.name] = arg if arg
+        end
+        kwa 
+      end
+      
+      def describe_constructor()
+        param_spec.inject("") do | desc, param |
+          desc << "#{param.name} (#{param.default.class.name})\n"
+        end
+      end
+    end
+
+    def self.included(klass)
+      klass.extend ClassMethods
+      klass.module_eval do
+
+        alias :pre_wx_kwctor_init :initialize
+
+        def initialize(parent = :default_ctor, *mixed_args)
+          # allow zero-args ctor for use with XRC
+          if parent == :default_ctor
+            pre_wx_kwctor_init()
+            return
+          end
+
+          real_args = [ parent ] + self.class.args_as_list(*mixed_args)
+          begin
+            pre_wx_kwctor_init(*real_args)
+          rescue
+            msg = "Error initializing #{self.inspect} \n" +
+                  "Sent parameters: #{real_args.inspect}\n" +
+                   "Correct parameters are:\n" + 
+                   self.class.describe_constructor()
+            Kernel.raise ArgumentError, msg
+          end
+          
+          yield self if block_given?
+        end
+      end
+      
+      # Any class inheriting from a class including this module must have
+      # its own copy of the param_spec
+      def klass.inherited(sub_klass)
+        sub_klass.instance_variable_set(:@param_spec, 
+                                        instance_variable_get(:@param_spec) )
+      end
+    end
+  end
+end
+

data/lib/wx/keyword_defs.rb

@@ -0,0 +1,465 @@
+# = WxSugar - Keyword Constructors Classes
+# 
+# This extension defines the keyword parameters for +new+ methods for
+# 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 = {}
+
+  # accepts a string unadorned name of a WxWidgets class, and block, which 
+  # defines the constructor parameters and style flags for that class.
+  # If the named class exists in the available WxRuby, the block is run and 
+  # the class may use keyword constructors. If the class is not available, the
+  # block is ignored.
+  def self.define_keyword_ctors(klass_name, &block)
+    # check this class hasn't already been defined
+    if @defined_kw_classes[klass_name]
+      raise ArgumentError, "Keyword ctor for #{klass_name} already defined"
+    else
+      @defined_kw_classes[klass_name] = true
+    end
+
+    begin     
+      klass =  Wx::const_get(klass_name)
+    rescue NameError
+      return nil
+    end
+    klass.module_eval { include Wx::KeywordConstructor }
+    klass.instance_eval(&block)
+  end
+end
+
+# Window : base class for all widgets and frames
+Wx::define_keyword_ctors('Window') do
+   wx_ctor_params :id, :pos, :size, :style
+   wx_ctor_params :name => 'window'
+end
+
+
+### FRAMES
+
+# wxTopLevelWindow 	ABSTRACT: Any top level window, dialog or frame
+
+# Normal frame
+Wx::define_keyword_ctors('Frame') do
+  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 :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 :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 :id, :title, :pos, :size
+  wx_ctor_params :style =>  Wx::DEFAULT_FRAME_STYLE
+  wx_ctor_params :name => 'frame'
+end
+
+# wxSplashScreen 	Splash screen class
+# FIXME - this probably won't work at present because the 'parent' arg
+# comes in a funny place in this class's ctor
+# 
+# Wx::define_keyword_ctors('SplashScreen') do
+#   wx_ctor_params :bitmap => Wx::NULL_BITMAP
+#   wx_ctor_params :splashstyle, :milliseconds, :id => 1
+#   wx_ctor_params :parent => nil
+#   wx_ctor_params :title => ''
+#   wx_ctor_params :pos, :size
+#   wx_ctor_params :style => Wx::SIMPLE_BORDER|Wx::FRAME_NO_TASKBAR|Wx::STAY_ON_TOP
+# end
+
+# wxPropertySheetDialog 	Property sheet dialog
+# wxTipWindow 	Shows text in a small window
+
+# wxWizard 	A wizard dialog
+Wx::define_keyword_ctors('Wizard') do
+  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
+
+
+# MISCELLANEOUS WINDOWS
+
+# A window whose colour changes according to current user settings
+Wx::define_keyword_ctors('Panel') do
+  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 :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 :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 :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 :id, :style => Wx::ST_SIZEGRIP
+  wx_ctor_params :name => 'statusBar'
+end
+
+# Toolbar class
+Wx::define_keyword_ctors('ToolBar') do
+  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 :id, :pos, :size, :style, :name => 'noteBook' 
+end
+
+# Similar to notebook but using list control - undocumented
+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'
+end
+
+# wxSashWindow:	Window with four optional sashes that can be dragged
+Wx::define_keyword_ctors('SashWindow') do
+  wx_ctor_params :id, :pos, :size
+  wx_ctor_params :style =>  Wx::CLIP_CHILDREN|Wx::SW_3D
+  wx_ctor_params :name => 'sashWindow'
+end
+
+# wxSashLayoutWindow: Window that can be involved in an IDE-like layout
+# arrangement
+Wx::define_keyword_ctors('SashLayoutWindow') do
+  wx_ctor_params :id, :pos, :size
+  wx_ctor_params :style =>  Wx::CLIP_CHILDREN|Wx::SW_3D
+  wx_ctor_params :name => 'layoutWindow'
+end
+
+# wxVScrolledWindow: As wxScrolledWindow but supports lines of variable height
+
+# wxWizardPage: A base class for the page in wizard dialog.
+Wx::define_keyword_ctors('WizardPage') do
+  wx_ctor_params :bitmap => Wx::NULL_BITMAP
+end
+
+# wxWizardPageSimple: A page in wizard dialog.
+Wx::define_keyword_ctors('WizardPageSimple') do
+  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 :id, :title => ''
+  wx_ctor_params :pos, :size, :style => Wx::DEFAULT_DIALOG_STYLE
+  wx_ctor_params :name => 'dialogBox'
+end
+
+# wxColourDialog 	Colour chooser dialog
+Wx::define_keyword_ctors('ColourDialog') do
+  wx_ctor_params :colour_data => nil
+end
+
+# wxDirDialog 	Directory selector dialog
+Wx::define_keyword_ctors('DirDialog') do
+  wx_ctor_params :message => 'Choose a directory'
+  wx_ctor_params :default_path => ''
+  wx_ctor_params :style, :pos, :size, :name => 'wxDirCtrl'
+end
+
+# wxFileDialog 	File selector dialog
+Wx::define_keyword_ctors('FileDialog') do
+  wx_ctor_params :message => 'Choose a file'
+  wx_ctor_params :default_dir  => ''
+  wx_ctor_params :default_file => ''
+  wx_ctor_params :wildcard => '*.*'
+  wx_ctor_params :style, :pos
+end
+
+# wxFindReplaceDialog 	Text search/replace dialog
+Wx::define_keyword_ctors('FindReplaceDialog') do
+  wx_ctor_params :find_replace_data => Wx::FindReplaceData.new()
+  wx_ctor_params :title => 'findReplaceDialog'
+  wx_ctor_params :style
+end
+
+# wxMultiChoiceDialog 	Dialog to get one or more selections from a list
+# wxSingleChoiceDialog 	Dialog to get a single selection from a list and return the string
+
+# Dialog to get a single line of text from the user
+Wx::define_keyword_ctors('TextEntryDialog') do
+  wx_ctor_params :message => ''
+  wx_ctor_params :caption => 'Please enter text'
+  wx_ctor_params :default_value => ''
+  wx_ctor_params :style => Wx::OK|Wx::CANCEL|Wx::CENTRE
+  wx_ctor_params :pos
+end
+
+# wxPasswordEntryDialog 	Dialog to get a password from the user
+# Wx::define_keyword_ctors('PasswordEntryDialog') do
+#   wx_ctor_params :message => ''
+#   wx_ctor_params :caption => 'Enter password'
+#   wx_ctor_params :default_value => ''
+#   wx_ctor_params :style => Wx::OK|Wx::CANCEL|Wx::CENTRE
+#   wx_ctor_params :pos
+# end
+
+# wxFontDialog 	Font chooser dialog
+# wxPageSetupDialog 	Standard page setup dialog
+Wx::define_keyword_ctors('PageSetupDialog') do
+  wx_ctor_params :data
+end
+
+# wxPrintDialog 	Standard print dialog
+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 => ''
+  wx_ctor_params :caption => 'Message box'
+  wx_ctor_params :style => Wx::OK|Wx::CANCEL
+  wx_ctor_params :pos
+end
+
+### CONTROLS
+
+# Push button control, displaying text
+Wx::define_keyword_ctors('Button') do
+  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 :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 :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 :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 :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 :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 :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 :id, :value => ''
+  wx_ctor_params :pos, :size, :choices => []
+  wx_ctor_params :style 
+  wx_ctor_params :validator, :name => 'comboBox'
+end
+
+# wxBitmapComboBox 	A choice with an editable area
+Wx::define_keyword_ctors('BitmapComboBox') do
+  wx_ctor_params :id, :value => ''
+  wx_ctor_params :pos, :size, :choices => []
+  wx_ctor_params :style 
+  wx_ctor_params :validator, :name => 'comboBox'
+end
+
+# wxDatePickerCtrl 	Small date picker control
+
+# wxGauge 	A control to represent a varying quantity, such as time
+# remaining
+Wx::define_keyword_ctors('Gauge') do
+  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 :id, :dir => '' 
+  wx_ctor_params :pos, :size, 
+                 :style => Wx::DIRCTRL_3D_INTERNAL|Wx::SUNKEN_BORDER
+  wx_ctor_params :filter => ''
+  wx_ctor_params :default_filter => 0
+  wx_ctor_params :name => 'genericDirCtrl'
+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 :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 :id, :pos, :size, :style => Wx::LC_ICON
+  wx_ctor_params :validator, :name => 'listCtrl'
+end
+
+# wxListView 	A simpler interface (facade for wxListCtrl in report mode
+
+# wxTreeCtrl 	Tree (hierarchy) control
+Wx::define_keyword_ctors('TreeCtrl') do
+  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 :id, :value => ''
+  wx_ctor_params :pos, :size, :style => Wx::SP_ARROW_KEYS
+  wx_ctor_params :min => 0
+  wx_ctor_params :max => 100
+  wx_ctor_params :initial => 0
+  wx_ctor_params :name => 'spinCtrl'
+end
+
+# One or more lines of non-editable text
+Wx::define_keyword_ctors('StaticText') do
+  wx_ctor_params :id, :label, :pos, :size, :style, :name => 'staticText'
+end
+
+Wx::define_keyword_ctors('StaticBox') do
+  wx_ctor_params :id, :label, :pos, :size, :style, :name => 'staticBox'
+end
+
+Wx::define_keyword_ctors('StaticLine') do
+  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 :id, :label, :pos, :size, :style
+end
+
+
+# wxRadioBox 	A group of radio buttons
+Wx::define_keyword_ctors('RadioBox') do
+  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
+  wx_ctor_params :validator, :name => 'radioBox'
+end
+
+# wxRadioButton: A round button used with others in a mutually exclusive way
+Wx::define_keyword_ctors('RadioButton') do
+  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 :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'
+end
+
+# wxSpinButton - Has two small up and down (or left and right) arrow buttons
+Wx::define_keyword_ctors('SpinButton') do
+   wx_ctor_params :id, :pos, :size, :style => Wx::SP_HORIZONTAL
+   wx_ctor_params :name => 'spinButton'
+end
+
+# wxVListBox 	A listbox supporting variable height rows
+
+# wxTextCtrl 	Single or multiline text editing control
+Wx::define_keyword_ctors('TextCtrl') do
+  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 :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 :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 :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
+