wx_sugar 0.1.16 → 0.1.17

data/lib/wx_sugar/all.rb

@@ -1,5 +1,5 @@
-%w[ accessors delayed_constructors event_connector 
-    keyword_constructors layout menu wx_classes ].each do | ext_feature |
+%w[ delayed_constructors event_connector 
+    layout menu wx_classes ].each do | ext_feature |
   require 'wx_sugar/' + ext_feature    
 end 
 

data/lib/wx_sugar/version.rb

@@ -1,3 +1,3 @@
 module WxSugar
-  VERSION = '0.1.16'
+  VERSION = '0.1.17'
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: wx_sugar
 version: !ruby/object:Gem::Version 
-  version: 0.1.16
-date: 2007-08-24 00:00:00 +01:00
+  version: 0.1.17
+date: 2007-09-11 00:00:00 +01:00
 summary: Syntax extensions for WxRuby.
 require_paths: 
 - lib
@@ -35,20 +35,16 @@ files:
 - lib/wx_sugar/layout.rb
 - lib/wx_sugar/delayed_constructors.rb
 - lib/wx_sugar/class_definitions.rb
-- lib/wx_sugar/keyword_classes.rb
 - lib/wx_sugar/enumerable_controls.rb
 - lib/wx_sugar/menu.rb
-- lib/wx_sugar/accessors.rb
 - lib/wx_sugar/all.rb
 - lib/wx_sugar/itemdata.rb
 - lib/wx_sugar/event_connector.rb
 - lib/wx_sugar/wx_classes.rb
-- lib/wx_sugar/keyword_constructors.rb
 - lib/wx_sugar/version.rb
 - lib/wx_sugar/wx_classes/listctrl.rb
 - lib/wx_sugar/wx_classes/colour.rb
 - lib/wx_sugar/wx_classes/position.rb
-- lib/wx_sugar/wx_classes/treectrl.rb
 - lib/wx_sugar/wx_classes/window.rb
 - lib/wx_sugar/wx_classes/size.rb
 - lib/wx_sugar/wx_classes/control_with_items.rb

data/lib/wx_sugar/accessors.rb

@@ -1,66 +0,0 @@
-# = WxSugar - Accessors
-#
-# The default WxRuby interface has lots and lots of methods like
-#
-#  * get_position()
-#  * set_size(a_size)
-#  * is_checked()
-# 
-# and so on. Methods that retrieve set, or query attributes of an object
-# are more normally in Ruby called simply by the attribute name:
-#
-#  * position()
-#  * size = a_size
-#  * checked?
-#
-# This extension creates an alias for every WxRuby instance method that
-# begins with +get_+, +set_+ or +is_+. Note that if you are calling a
-# 'setter' method on self, you must explicitly send the message to self:
-# 
-#  # set's self size to be 100px by 100px
-#  self.size = Wx::Size.new(100, 100)
-#  # only sets the value of a local variable 'size'
-#  size = Wx::Size.new
-
-require 'wx_sugar/class_definitions.rb'
-
-module NiceRubyMethodNames
-  def self.included(klass)
-    klass.class_eval do 
-      instance_methods.grep(/^([gs]et|is)_(\w+)/) do | meth |
-        prefix, basename = $1, $2
-        case prefix
-        when 'get' : alias_method(basename, meth)
-        when 'set' : alias_method("#{basename}=", meth)
-        when 'is'  : alias_method("#{basename}?", meth)
-        end
-      end
-    end
-  end
-end
-
-module MethMissingNiceRubyNames
-  def method_missing(sym, *args)
-    case sym.to_s
-    when /^(.*)\=$/
-      meth = "set_#{$1}"
-    when /^(.*)\?$/
-      meth = "is_#{$1}"
-    else
-      meth = "get_#{sym}"
-    end
-    if respond_to?(meth)
-      send(meth, *args)
-    else
-      e = NoMethodError.new("undefined method '#{sym}' for #{self.inspect}")
-      e.set_backtrace(caller)
-      Kernel.raise e
-    end
-  end
-end
-
-
-WxSugar::ALL_CLASSES.each do | klass |
-  # klass.class_eval { include NiceRubyMethodNames }
-  klass.class_eval { include MethMissingNiceRubyNames }
-end

data/lib/wx_sugar/keyword_classes.rb

@@ -1,443 +0,0 @@
-# = 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.
-
-module WxSugar
-  @defined_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_classes[klass_name]
-      raise ArgumentError, "Keyword ctor for #{klass_name} already defined"
-    else
-      @defined_classes[klass_name] = true
-    end
-
-    begin     
-      klass =  Wx::const_get(klass_name)
-    rescue NameError
-      return nil
-    end
-    klass.module_eval { include WxSugar::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
-WxSugar.define_keyword_ctors('Window') do
-   wx_ctor_params :pos, :size, :style
-   wx_ctor_params :name => 'window'
-end
-
-
-### FRAMES
-
-# wxTopLevelWindow 	ABSTRACT: Any top level window, dialog or frame
-
-# Normal frame
-WxSugar.define_keyword_ctors('Frame') do
-  wx_ctor_params :title => ''
-  wx_ctor_params :pos, :size, :style => Wx::DEFAULT_FRAME_STYLE
-  wx_ctor_params :name => 'frame'
-end
-
-# MDI child frame
-WxSugar.define_keyword_ctors('MDIChildFrame') do
-  wx_ctor_params :title => ''
-  wx_ctor_params :pos, :size, :style => Wx::DEFAULT_FRAME_STYLE
-  wx_ctor_params :name => 'frame'
-end
-
-# MDI parent frame
-WxSugar.define_keyword_ctors('MDIParentFrame') do
-  wx_ctor_params :title => ''
-  wx_ctor_params :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
-WxSugar.define_keyword_ctors('MiniFrame') do
-  wx_ctor_params :title => ''
-  wx_ctor_params :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
-# 
-# WxSugar.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
-WxSugar.define_keyword_ctors('Wizard') do
-  wx_ctor_params :title => ''
-  wx_ctor_params :bitmap => Wx::NULL_BITMAP
-  wx_ctor_params :pos, :size
-  wx_ctor_params :style => Wx::DEFAULT_DIALOG_STYLE
-end
-
-
-# MISCELLANEOUS WINDOWS
-
-# A window whose colour changes according to current user settings
-WxSugar.define_keyword_ctors('Panel') do
-  wx_ctor_params :pos, :size, :style => Wx::TAB_TRAVERSAL
-  wx_ctor_params :name => 'panel'
-end
-
-# wxScrolledWindow 	Window with automatically managed scrollbars
-WxSugar.define_keyword_ctors('ScrolledWindow') do
-  wx_ctor_params :pos, :size, :style => Wx::VSCROLL|Wx::HSCROLL
-  wx_ctor_params :name => 'scrolledWindow'
-  wx_ctor_flags  :h_scroll => Wx::HSCROLL, 
-                 :v_scroll => Wx::VSCROLL
-end
-
-# wxGrid 	A grid (table) window
-WxSugar.define_keyword_ctors('Grid') do
-  wx_ctor_params :pos, :size, :style => Wx::WANTS_CHARS
-  wx_ctor_params :name => 'grid'
-end
-
-# Window which can be split vertically or horizontally
-WxSugar.define_keyword_ctors('SplitterWindow') do
-  wx_ctor_params :pos, :size, :style => Wx::SP_3D
-  wx_ctor_params :name => 'splitterWindow'
-end
-
-# Implements the status bar on a frame
-WxSugar.define_keyword_ctors('StatusBar') do
-  wx_ctor_params :style => Wx::ST_SIZEGRIP
-  wx_ctor_params :name => 'statusBar'
-end
-
-# Toolbar class
-WxSugar.define_keyword_ctors('ToolBar') do
-  wx_ctor_params :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
-WxSugar.define_keyword_ctors('Notebook') do
-  wx_ctor_params :pos, :size, :style, :name => 'noteBook' 
-end
-
-# Similar to notebook but using list control - undocumented
-WxSugar.define_keyword_ctors('Listbook') do
-  wx_ctor_params :pos, :size, :style, :name => 'listBook'
-end
-
-# Similar to notebook but using choice control
-WxSugar.define_keyword_ctors('Choicebook') do
-  wx_ctor_params :pos, :size, :style, :name => 'choiceBook'
-end
-
-# wxSashWindow:	Window with four optional sashes that can be dragged
-WxSugar.define_keyword_ctors('SashWindow') do
-  wx_ctor_params :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
-WxSugar.define_keyword_ctors('SashLayoutWindow') do
-  wx_ctor_params :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.
-WxSugar.define_keyword_ctors('WizardPage') do
-  wx_ctor_params :bitmap => Wx::NULL_BITMAP
-end
-
-# wxWizardPageSimple: A page in wizard dialog.
-WxSugar.define_keyword_ctors('WizardPageSimple') do
-  wx_ctor_params :prev,  :next, :bitmap => Wx::NULL_BITMAP
-end
-
-### DIALOGS
-# wxDialog 	Base class for common dialogs
-WxSugar.define_keyword_ctors('Dialog') do
-  wx_ctor_params :title => ''
-  wx_ctor_params :pos, :size, :style => Wx::DEFAULT_DIALOG_STYLE
-  wx_ctor_params :name => 'dialogBox'
-end
-
-# wxColourDialog 	Colour chooser dialog
-WxSugar.define_keyword_ctors('ColourDialog') do
-  wx_ctor_params :colour_data => nil
-end
-
-# wxDirDialog 	Directory selector dialog
-WxSugar.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
-WxSugar.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
-WxSugar.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
-WxSugar.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
-# WxSugar.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
-WxSugar.define_keyword_ctors('PageSetupDialog') do
-  wx_ctor_params :data
-end
-
-# wxPrintDialog 	Standard print dialog
-WxSugar.define_keyword_ctors('PrintDialog') do
-  wx_ctor_params :data
-end
-
-
-# Simple message box dialog
-WxSugar.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
-WxSugar.define_keyword_ctors('Button') do
-  wx_ctor_params :label => ''
-  wx_ctor_params :pos, :size, :style
-  wx_ctor_params :validator, :name => 'button'
-end
-
-# Push button control, displaying a bitmap
-WxSugar.define_keyword_ctors('BitmapButton') do
-  wx_ctor_params :bitmap, :pos, :size, :style => Wx::BU_AUTODRAW
-  wx_ctor_params :validator, :name => 'button'
-end
-
-# A button which stays pressed when clicked by user.
-WxSugar.define_keyword_ctors('ToggleButton') do
-  wx_ctor_params :label, :pos, :size, :style
-  wx_ctor_params :validator, :name => 'checkBox'
-end
-
-# Control showing an entire calendar month
-WxSugar.define_keyword_ctors('CalendarCtrl') do
-  wx_ctor_params :date => Time.now()
-  wx_ctor_params :pos, :size, :style => Wx::CAL_SHOW_HOLIDAYS
-  wx_ctor_params :name => 'calendar'
-end
-
-# 	Checkbox control
-WxSugar.define_keyword_ctors('CheckBox') do
-  wx_ctor_params :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
-WxSugar.define_keyword_ctors('CheckListBox') do 	
-  wx_ctor_params :pos, :size, :choices, :style
-  wx_ctor_params :validator, :name => 'listBox'
-end
-
-# wxChoice 	Choice control (a combobox without the editable area)
-WxSugar.define_keyword_ctors('Choice') do
-  wx_ctor_params :pos, :size, :choices, :style
-  wx_ctor_params :validator, :name => 'choice'
-end
-
-# wxComboBox 	A choice with an editable area
-WxSugar.define_keyword_ctors('ComboBox') do
-  wx_ctor_params :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
-WxSugar.define_keyword_ctors('Gauge') do
-  wx_ctor_params :range, :pos, :size, :style => Wx::GA_HORIZONTAL
-  wx_ctor_params :validator, :name => 'gauge'
-end
-
-# wxGenericDirCtrl 	A control for displaying a directory tree
-WxSugar.define_keyword_ctors('GenericDirCtrl') do
-  # TODO :dir => Wx::DIR_DIALOG_DEFAULT_FOLDER_STR
-  wx_ctor_params :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
-WxSugar.define_keyword_ctors('ListBox') do
-  wx_ctor_params :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
-WxSugar.define_keyword_ctors('ListCtrl') do
-  wx_ctor_params :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
-WxSugar.define_keyword_ctors('TreeCtrl') do
-  wx_ctor_params :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
-WxSugar.define_keyword_ctors('SpinCtrl') do
-  wx_ctor_params :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
-WxSugar.define_keyword_ctors('StaticText') do
-  wx_ctor_params :label, :pos, :size, :style, :name => 'staticText'
-end
-
-WxSugar.define_keyword_ctors('StaticBox') do
-  wx_ctor_params :label, :pos, :size, :style, :name => 'staticBox'
-end
-
-WxSugar.define_keyword_ctors('StaticLine') do
-  wx_ctor_params :pos, :size, :style => Wx::LI_HORIZONTAL
-  wx_ctor_params :name => 'staticBox'
-end
-
-# wxStaticBitmap 	A control to display a bitmap
-WxSugar.define_keyword_ctors('StaticBitmap') do
-  wx_ctor_params :label, :pos, :size, :style
-end
-
-
-# wxRadioBox 	A group of radio buttons
-WxSugar.define_keyword_ctors('RadioBox') do
-  wx_ctor_params :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
-WxSugar.define_keyword_ctors('RadioButton') do
-  wx_ctor_params :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
-WxSugar.define_keyword_ctors('Slider') do
-  wx_ctor_params :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
-WxSugar.define_keyword_ctors('SpinButton') do
-   wx_ctor_params :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
-WxSugar.define_keyword_ctors('TextCtrl') do
-  wx_ctor_params :value => ''
-  wx_ctor_params :pos, :size, :style
-  wx_ctor_params :validator, :name => 'textCtrl'
-end
-
-# wxHtmlWindow - Control for displaying HTML
-WxSugar.define_keyword_ctors('HtmlWindow') do
-  wx_ctor_params :pos, :size, :style => Wx::HW_DEFAULT_STYLE
-  wx_ctor_params :name => 'htmlWindow'
-end
-
-# wxHyperTextCtrl - display a clickable URL
-WxSugar.define_keyword_ctors('HyperlinkCtrl') do
-  wx_ctor_params :label => ''
-  wx_ctor_params :url => ''
-  wx_ctor_params :pos, :size, :style => 0
-  wx_ctor_params :name => 'hyperlink'
-end

data/lib/wx_sugar/keyword_constructors.rb

@@ -1,267 +0,0 @@
-# = 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 WxSugar
-module KeywordConstructor
-  module ClassMethods
-    # Shorthand constructors
-    TYPEMAP = {
-      Wx::Size  => lambda { | x | Wx::Size === x ? x : Wx::Size.new(*x) },
-      Wx::Point => lambda { | x | Wx::Point === x ? x : Wx::Point.new(*x) }
-    }
-
-    # Common Wx constructor argument keywords, with their default values.
-    STANDARD_DEFAULTS = {
-      :id        => -1,
-      :size      => Wx::DEFAULT_SIZE,
-      :pos       => Wx::DEFAULT_POSITION,
-      :style     => 0,
-      :validator => Wx::DEFAULT_VALIDATOR,
-      :choices   => [] # for Choice, ComboBox etc
-    }
-
-    # Provide convenient convertors for Wx::Size and Wx::Point to be
-    # specified as simple ruby array. 
-    # 
-    # instead of
-    #  :size => Wx::Size.new(150, 225)
-    # just
-    #  :size => [ 150, 225 ]
-    def map_type(in_obj, default)
-      if TYPEMAP.include?(default.class)
-        in_obj = TYPEMAP[default.class].call(in_obj)
-      end
-      in_obj
-    end
-    
-    # A named parameter in a Wx constructor parameter list
-    Parameter = Struct.new( :name, :default )
-
-    attr_writer :param_spec
-    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
-    # 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
-
-    # Add a named style constructor flag.
-    def wx_ctor_flags(flags)
-      param_flags.update(flags)
-    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 << map_type(arg, param.default)
-        elsif kwa.key?(param.name) # use the keyword arg
-          out_args << map_type(kwa[param.name], param.default)
-        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
-    
-    # Look through a set of keyword arguments +in_flags+ and return a
-    # style parameter based on the known style flags applicable to this
-    # widget type.
-    # TODO - not currently used
-    def style_constant(kw_args)
-      # get the default flag for this style parameter
-      base_style = kw_args[:style] || 
-                   param_spec.find { | x | x.name == :style }.default
-      
-      # go through each of the known style flags for this widget
-      param_flags.each do | sym, const |
-        next unless kw_args.key?(sym)
-        # add or delete flag, depending on whether true or false
-        kw_args[sym] ? base_style |= const : base_style &= ~const
-      end
-      base_style
-    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, *mixed_args)
-        if parent and not parent.is_a?(Wx::Window)
-          Kernel.raise ArgumentError,
-                       "Parent must be a Wx::Window, not #{parent.inspect}"
-        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)
-        
-
-        # deal with style flags
-        # if mixed_args.last.kind_of?(Hash)
-          # flags = self.class.style_constant(mixed_args.last)
-          # style_param = self.class.param_spec.find { | param | param.name == :style }
-          # real_args[ self.class.param_spec.index(style_param) + 1 ] = flags
-        # end
-
-        begin
-          pre_wx_kwctor_init(*real_args)
-        rescue
-          Kernel.raise ArgumentError, "Error initializing #{self.inspect} \n" +
-                                      "Sent parameters: #{real_args.inspect}\n" +
-                                      "correct parameters are:\n" + 
-                                      self.class.describe_constructor()
-        end
-      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, 
-                                      self.instance_variable_get(:@param_spec) )
-      sub_klass.instance_variable_set(:@param_flags, 
-                                      self.instance_variable_get(:@param_flags) )
-    end
-  end
-end
-end
-
-require 'wx_sugar/keyword_classes'

data/lib/wx_sugar/wx_classes/treectrl.rb

@@ -1,40 +0,0 @@
-class Wx::TreeCtrl
-  # Recurses over the tree item +start_item+ and its descendants,
-  # yielding each item in the tree in turn into the block. If
-  # +start_item+ is not specified, this method will recurse over every
-  # item within the tree, starting with the root item.
-  #
-  # In its simplest form, the method accepts a block with one parameter,
-  # which will be the TreeItemId of the item. This is an opaque integer
-  # value which uniquely identifies the tree item. It can be used as an
-  # argument to many other methods within TreeCtrl (for example,
-  # get_item_text).
-  #
-  # The block passed to +traverse+ may optionally receive two additional
-  # parameters, +text+ and +data+. If these are specified, they will be
-  # filled with the text label for the item and any ruby item data
-  # associated with the item, respectively.
-  def traverse(start_item = self.get_root_item, &block)
-    case block.arity
-    when 1
-      block.call(start_item)
-    when 2
-      block.call(start_item, 
-                 get_item_text(start_item))
-    when 3
-      block.call(start_item, 
-                 get_item_text(start_item), 
-                 get_item_data(start_item))
-    else
-      raise ArgumentError, "Invalid number of block parameters"
-    end
-
-    if item_has_children(start_item)
-      child, cookie = get_first_child(start_item)
-      while child.nonzero?
-        traverse(child, &block)
-        child = get_next_sibling(child)
-      end
-    end
-  end
-end