wxruby3 0.9.0 → 0.9.1

data/ext/wxruby3/swig/custom/typemaps/swigtypemaps.swg

@@ -0,0 +1,173 @@
+/* -----------------------------------------------------------------------------
+ * swigtypemaps.swg
+ *
+ * Unified Typemap Library frontend
+ *
+ * Customized for wxRuby3.
+ * Copyright (c) 2023 M.J.N. Corino, The Netherlands
+ *
+ * This software is released under the MIT license.
+ * ----------------------------------------------------------------------------- */
+
+/*
+  This file provides the frontend to the Unified Typemap Library.
+
+  When using this library in a SWIG target language, you need to
+  define a minimum set of fragments, specialize a couple of macros,
+  and then include this file.
+
+  Typically you will create a 'mytypemaps.swg' file in each target
+  language, where you will have the following sections:
+
+    === mytypemaps.swg ===
+
+    //  Fragment section 
+    %include <typemaps/fragments.swg>
+    <include target language fragments>
+
+    // Unified typemap section 
+    <specialized the typemap library macros>
+    %include <typemaps/swigtypemaps.swg>
+
+    // Local typemap section 
+    <add/replace extra target language typemaps>
+
+    === mytypemaps.swg ===
+
+  While we add more docs, please take a look at the following cases
+  to see how you specialized the unified typemap library for a new
+  target language:
+
+      Lib/python/pytypemaps.swg
+      Lib/tcl/tcltypemaps.swg
+      Lib/ruby/rubytypemaps.swg
+      Lib/perl5/perltypemaps.swg
+    
+*/
+
+#define SWIGUTL SWIGUTL
+
+/* -----------------------------------------------------------------------------
+ *   Language specialization section. 
+ *
+ *   Tune these macros for each language as needed.
+ * ----------------------------------------------------------------------------- */
+
+/*
+  The SWIG target language object must be provided.
+  For example in python you define:
+
+    #define SWIG_Object PyObject *
+*/
+
+#if !defined(SWIG_Object) 
+#error "SWIG_Object must be defined as the SWIG target language object"
+#endif
+
+/*==== flags for new/convert methods ====*/
+
+
+#ifndef %convertptr_flags
+%define %convertptr_flags  0 %enddef
+#endif
+
+#ifndef %newpointer_flags
+%define %newpointer_flags  0 %enddef
+#endif
+
+#ifndef %newinstance_flags
+%define %newinstance_flags 0 %enddef
+#endif
+
+/*==== set output ====*/
+
+#ifndef %set_output
+/* simple set output operation */
+#define %set_output(obj)                  $result = obj
+#endif
+
+/*==== set variable output  ====*/
+
+#ifndef %set_varoutput
+/* simple set varoutput operation */
+#define %set_varoutput(obj)               $result = obj
+#endif
+
+/*==== append output ====*/
+
+#ifndef %append_output
+#if defined(SWIG_AppendOutput)
+/* simple append operation */
+#define %append_output(obj)               $result = SWIG_AppendOutput($result,obj) 
+#else
+#error "Language must define SWIG_AppendOutput or %append_output"
+#endif
+#endif
+
+/*==== set constant ====*/
+
+#ifndef %set_constant
+#if defined(SWIG_SetConstant)
+/* simple set constant operation */
+#define %set_constant(name,value)         SWIG_SetConstant(name,value)
+#else
+#error "Language must define SWIG_SetConstant or %set_constant"
+#endif
+#endif
+
+/*==== raise an exception ====*/
+
+#ifndef %raise
+#if defined(SWIG_Raise)
+/* simple raise operation */
+#define %raise(obj, type, desc)           SWIG_Raise(obj, type, desc); SWIG_fail
+#else
+#error "Language must define SWIG_Raise or %raise"
+#endif
+#endif
+
+/*==== director output exception ====*/
+
+/* wxRuby : make sure to pass the object and method that caused the failure */
+#if defined(SWIG_DIRECTOR_TYPEMAPS)
+#ifndef SWIG_DirOutFail
+#define SWIG_DirOutFail(self, method, code, msg)        Swig::DirectorTypeMismatchException::raise(self, method, SWIG_ErrorType(code), msg)
+#endif
+#endif
+
+
+/* -----------------------------------------------------------------------------
+ *  Language independent definitions
+ * ----------------------------------------------------------------------------- */
+
+#define %error_block(Block...)                 %block(Block)
+#define %default_code(code)                    SWIG_ArgError(code)  
+#define %argument_fail(code, type, name, argn) SWIG_exception_fail(%default_code(code), %argfail_fmt(type, name, argn))
+#define %argument_nullref(type, name, argn)    SWIG_exception_fail(SWIG_ValueError, %argnullref_fmt(type, name, argn))
+#define %variable_fail(code, type, name)       SWIG_exception_fail(%default_code(code), %varfail_fmt(type, name))
+#define %variable_nullref(type, name)          SWIG_exception_fail(SWIG_ValueError, %varnullref_fmt(type, name))
+#define %releasenotowned_fail(code, type, name, argn) SWIG_exception_fail(%default_code(code), %releasenotownedfail_fmt(type, name, argn))
+
+/* wxRuby : make sure to pass the object and method that caused the failure */
+#if defined(SWIG_DIRECTOR_TYPEMAPS)
+#define %dirout_fail(code, type)          SWIG_DirOutFail(swig_get_self(), "$symname", %default_code(code), %outfail_fmt(type))
+#define %dirout_nullref(type)             SWIG_DirOutFail(swig_get_self(), "$symname", SWIG_ValueError, %outnullref_fmt(type))
+#endif
+
+/* -----------------------------------------------------------------------------
+ *  All the typemaps
+ * ----------------------------------------------------------------------------- */
+
+
+%include <typemaps/fragments.swg>
+%include <typemaps/exception.swg>
+%include <typemaps/swigtype.swg>
+%include <typemaps/void.swg>
+%include <typemaps/swigobject.swg>
+%include <typemaps/valtypes.swg>
+%include <typemaps/ptrtypes.swg>
+%include <typemaps/inoutlist.swg>
+%include <typemaps/primtypes.swg>
+%include <typemaps/string.swg>
+%include <typemaps/misctypes.swg>
+%include <typemaps/enumint.swg>

data/ext/wxruby3/swig/wx.i

@@ -35,11 +35,31 @@ WX_DECLARE_HASH_MAP(VALUE,
 					RbClassToSwigTypeHash);
 RbClassToSwigTypeHash Global_Type_Map;
 
+// Mapping of wxWidgets class names to Ruby classes
+WX_DECLARE_STRING_HASH_MAP(VALUE,
+                           WxClassnameToRbClassHash);
+WxClassnameToRbClassHash Global_Class_Map;
+
+// Record wxRuby class for a wxw class name
+WXRUBY_EXPORT void wxRuby_SetRbClassForWxName(const wxString& wx_name, VALUE cls)
+{
+  Global_Class_Map[wx_name] = cls;
+}
+
+// Retrieve wxRuby class for a wxw class name
+WXRUBY_EXPORT VALUE wxRuby_GetRbClassForWxName(const wxString& wx_name)
+{
+  return Global_Class_Map[wx_name];
+}
+
 // Record swig_type_info for a wxRuby class; called in class
 // initialisation
 WXRUBY_EXPORT void wxRuby_SetSwigTypeForClass(VALUE cls, swig_type_info* ty)
 {
   Global_Type_Map[cls] = ty;
+  const char* swig_type_name = ty->name;
+  // skip '_p_' prefix and register class
+  wxRuby_SetRbClassForWxName(wxString(swig_type_name+3), cls);
 }
 
 // Retrieve swig_type_info for a ruby class - needed by functions which
@@ -141,41 +161,41 @@ WXRUBY_EXPORT VALUE wxRuby_WrapWxObjectInRuby(wxObject *wx_obj)
 
   // Get the wx class and the ruby class we are converting into
   wxString class_name( wx_obj->GetClassInfo()->GetClassName() );
-  wxCharBuffer wx_classname = class_name.mb_str();
-  VALUE r_class_name = rb_intern(wx_classname.data () + 2);
-  VALUE r_class = Qnil;
-
-  if ( class_name.Len() > 2 )
-  {
-    // lookup the class in the main module and any package submodules loaded
-    if (rb_const_defined(mWxCore, r_class_name))
-      r_class = rb_const_get(mWxCore, r_class_name);
-    else
-    {
-      VALUE submod_ary = rb_ivar_get(mWxCore, rb_intern("@__pkgmods__"));
-      for (long n=0; n<RARRAY_LEN(submod_ary); ++n)
-      {
-        VALUE submod = rb_ary_entry(submod_ary, n);
-        if (rb_const_defined(submod, r_class_name))
-        {
-          r_class = rb_const_get(submod, r_class_name);
-          break;
-        }
-      }
-    }
-  }
+  VALUE r_class = wxRuby_GetRbClassForWxName(class_name);
 
   // Handle classes (currently) unknown in wxRuby.
   // (could cause problems because class-specific methods won't be accessible).
-  if ( r_class == Qnil )
+  if (r_class == 0 || NIL_P(r_class))
   {
-    // map unknown wxWindow derivatives as basic window
+    // map unknown wxWindow derivatives as a mapped base class
+    // this solves issues with explicitly defined wxRuby custom
+    // DECLARE_DYNAMIC_CLASS classes like WxRubyTreeCtrl
     if (wxIsKindOf(wx_obj, wxWindow))
     {
-      r_class = rb_const_get(mWxCore, window_id());
-      // issue warning if $VERBOSE is true
-      rb_warning("Cannot wrap exact window class as '%s' is not (yet) known in wxRuby; wrapping as base Window object.",
-                 (const char *)class_name.mb_str());
+      wxClassInfo* cls_info = wx_obj->GetClassInfo();
+      do
+      {
+        wxString base_name(wx_obj->GetClassInfo()->GetBaseClassName1());
+        r_class = wxRuby_GetRbClassForWxName(base_name);
+        if (r_class == 0 || NIL_P(r_class))
+        {
+          cls_info = wxClassInfo::FindClass(base_name);
+          if (!cls_info)
+          {
+            // map to basic Wx::Window
+            r_class = rb_const_get(mWxCore, window_id());
+            // issue warning if $VERBOSE is true
+            rb_warning("Cannot wrap exact window class as '%s' is not (yet) known in wxRuby; wrapping as base Wx::Window object.",
+                       (const char *)class_name.mb_str());
+          }
+        }
+        else
+        {
+          // issue warning if $VERBOSE is true
+          rb_warning("Cannot wrap exact window class as '%s' is not (yet) known in wxRuby; wrapping as %s object.",
+                     (const char *)class_name.mb_str(), rb_class2name(r_class));
+        }
+      } while (r_class == 0 || NIL_P(r_class));
     }
     else
     {
@@ -188,7 +208,7 @@ WXRUBY_EXPORT VALUE wxRuby_WrapWxObjectInRuby(wxObject *wx_obj)
   // Otherwise, retrieve the swig type info for this class and wrap it
   // in Ruby. wxRuby_GetSwigTypeForClass is defined in wx.i
   swig_type_info* swig_type = wxRuby_GetSwigTypeForClass(r_class);
-  VALUE r_obj = SWIG_NewPointerObj(wx_obj, swig_type, 1);
+  VALUE r_obj = SWIG_NewPointerObj(wx_obj, swig_type, 0);
   return r_obj;
 }
 

data/lib/wx/core/const.rb

@@ -0,0 +1,83 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+
+module Wx
+
+=begin
+  These constants are not documented in the wxWidgets interface headers
+  although they are referenced in various argument defaults which *are*
+  in the interface header declarations so.
+=end
+
+  DEFAULT_DATE_TIME_FORMAT = '%c'
+  DEFAULT_TIME_SPAN_FORMAT = '%H:%M:%S'
+
+  CHOICE_NAME_STR = 'choice'
+  COLOUR_PICKER_CTRL_NAME_STR = 'colourpicker'
+  COLOUR_PICKER_WIDGET_NAME_STR = 'colourpickerwidget'
+  HYPERLINK_CTRL_NAME_STR = 'hyperlink'
+  PANEL_NAME_STR = 'panel'
+  LIST_BOX_NAME_STR = 'listBox'
+  FRAME_NAME_STR = 'frame'
+  STATUS_LINE_NAME_STR = 'status_line'
+  STATIC_BITMAP_NAME_STR = 'staticBitmap'
+  WEB_VIEW_NAME_STR = 'wxWebView'
+  ANIMATION_CTRL_NAME_STR = 'animationctrl'
+  TOOL_BAR_NAME_STR = 'toolbar'
+  TEXT_CTRL_NAME_STR = 'text'
+  LIST_CTRL_NAME_STR = 'listCtrl'
+  FILE_PICKER_CTRL_NAME_STR = 'filepicker'
+  FILE_PICKER_WIDGET_NAME_STR = 'filepickerwidget'
+  DIR_PICKER_CTRL_NAME_STR = 'dirpicker'
+  DIR_PICKER_WIDGET_NAME_STR = 'dirpickerwidget'
+  FILE_CTRL_NAME_STR = 'wxfilectrl'
+  FILE_SELECTOR_PROMPT_STR = 'Select a file'
+  STATIC_BOX_NAME_STR = 'groupBox'
+  BUTTON_NAME_STR = 'button'
+  RADIO_BOX_NAME_STR = 'radioBox'
+  STATIC_LINE_NAME_STR = 'staticLine'
+  RADIO_BUTTON_NAME_STR = 'radioButton'
+  BITMAP_RADIO_BUTTON_NAME_STR = 'radioButton'
+  GAUGE_NAME_STR = 'gauge'
+  DATA_VIEW_CTRL_NAME_STR = 'dataviewCtrl'
+  FONT_PICKER_CTRL_NAME_STR = 'fontpicker'
+  FONT_PICKER_WIDGET_NAME_STR = 'fontpickerwidget'
+  REARRANGE_LIST_NAME_STR = 'wxRearrangeList'
+  REARRANGE_DIALOG_NAME_STR = 'wxRearrangeDlg'
+  NOTEBOOK_NAME_STR = 'notebook'
+  CONTROL_NAME_STR = 'control'
+  SCROLL_BAR_NAME_STR = 'scrollBar'
+  STATUS_BAR_NAME_STR = 'statusBar'
+  SLIDER_NAME_STR = 'slider'
+  HEADER_CTRL_NAME_STR = 'wxHeaderCtrl'
+  BITMAP_COMBO_BOX_NAME_STR = 'bitmapComboBox'
+  CHECK_BOX_NAME_STR = 'check'
+  FILE_DIALOG_NAME_STR = 'filedlg'
+  ADD_REMOVE_CTRL_NAME_STR = 'wxAddRemoveCtrl'
+  STATIC_TEXT_NAME_STR = 'staticText'
+  COMBO_BOX_NAME_STR = 'comboBox'
+  SEARCH_CTRL_NAME_STR = 'searchCtrl'
+  TREE_CTRL_NAME_STR = 'treeCtrl'
+  DIALOG_NAME_STR = 'dialog'
+  COLLAPSIBLE_HEADER_CTRL_NAME_STR = 'collapsibleHeader'
+  COLLAPSIBLE_PANE_NAME_STR = 'collapsiblePane'
+  BANNER_WINDOW_NAME_STR = 'bannerwindow'
+  GRID_NAME_STR = 'grid'
+  TREE_LIST_CTRL_NAME_STR = 'wxTreeListCtrl'
+  HTML_LIST_BOX_NAME_STR = 'htmlListBox'
+  SIMPLE_HTML_LIST_BOX_NAME_STR = 'simpleHtmlListBox'
+  EDITABLE_LIST_BOX_NAME_STR = 'editableListBox'
+  V_LIST_BOX_NAME_STR = 'wxVListBox'
+
+  if Wx::PLATFORM == 'WXMSW'
+    # wxMSW only
+    MSW_HEADER_CTRL_NAME_STR = 'wxMSWHeaderCtrl'
+  end
+
+  PROPERTY_GRID_MANAGER_NAME_STR = 'wxPropertyGridManager'
+  PROPERTY_GRID_NAME_STR = 'wxPropertyGrid'
+  STC_NAME_STR = 'stcwindow'
+
+end

data/lib/wx/doc/const.rb

@@ -11,74 +11,74 @@ module Wx
   These constants are not documented in the wxWidgets interface headers
   although they are referenced in various argument defaults which *are*
   in the interface header declarations so we do want them included the
-  wxRuby docs so the doc links work but we do not need them in the
-  wxRuby implementation since these are internal to the C++ wrappers.
+  wxRuby docs so the doc links work.
 =end
 
-  DefaultDateTimeFormat = '%c'
-  DefaultTimeSpanFormat = '%H:%M:%S'
+  DEFAULT_DATE_TIME_FORMAT = '%c'
+  DEFAULT_TIME_SPAN_FORMAT = '%H:%M:%S'
 
-  ChoiceNameStr = 'choice'
-  ColourPickerCtrlNameStr = 'colourpicker'
-  ColourPickerWidgetNameStr = 'colourpickerwidget'
-  HyperlinkCtrlNameStr = 'hyperlink'
-  PanelNameStr = 'panel'
-  ListBoxNameStr = 'listBox'
-  FrameNameStr = 'frame'
-  StatusLineNameStr = 'status_line'
-  StaticBitmapNameStr = 'staticBitmap'
-  WebViewNameStr = 'wxWebView'
-  AnimationCtrlNameStr = 'animationctrl'
-  ToolBarNameStr = 'toolbar'
-  TextCtrlNameStr = 'text'
-  ListCtrlNameStr = 'listCtrl'
-  FilePickerCtrlNameStr = 'filepicker'
-  FilePickerWidgetNameStr = 'filepickerwidget'
-  DirPickerCtrlNameStr = 'dirpicker'
-  DirPickerWidgetNameStr = 'dirpickerwidget'
-  FileCtrlNameStr = 'wxfilectrl'
-  StaticBoxNameStr = 'groupBox'
-  ButtonNameStr = 'button'
-  RadioBoxNameStr = 'radioBox'
-  StaticLineNameStr = 'staticLine'
-  RadioButtonNameStr = 'radioButton'
-  BitmapRadioButtonNameStr = 'radioButton'
-  GaugeNameStr = 'gauge'
-  DataViewCtrlNameStr = 'dataviewCtrl'
-  FontPickerCtrlNameStr = 'fontpicker'
-  FontPickerWidgetNameStr = 'fontpickerwidget'
-  RearrangeListNameStr = 'wxRearrangeList'
-  RearrangeDialogNameStr = 'wxRearrangeDlg'
-  NotebookNameStr = 'notebook'
-  ControlNameStr = 'control'
-  ScrollBarNameStr = 'scrollBar'
-  StatusBarNameStr = 'statusBar'
-  SliderNameStr = 'slider'
-  HeaderCtrlNameStr = 'wxHeaderCtrl'
-  BitmapComboBoxNameStr = 'bitmapComboBox'
-  CheckBoxNameStr = 'check'
-  FileDialogNameStr = 'filedlg'
-  AddRemoveCtrlNameStr = 'wxAddRemoveCtrl'
-  StaticTextNameStr = 'staticText'
-  ComboBoxNameStr = 'comboBox'
-  SearchCtrlNameStr = 'searchCtrl'
-  DirDialogNameStr = 'wxDirCtrl'
-  TreeCtrlNameStr = 'treeCtrl'
-  DialogNameStr = 'dialog'
-  CollapsibleHeaderCtrlNameStr = 'collapsibleHeader'
-  CollapsiblePaneNameStr = 'collapsiblePane'
-  BannerWindowNameStr = 'bannerwindow'
-  GridNameStr = 'grid'
-  TreeListCtrlNameStr = 'wxTreeListCtrl'
-  HtmlListBoxNameStr = 'htmlListBox'
-  SimpleHtmlListBoxNameStr = 'simpleHtmlListBox'
-  EditableListBoxNameStr = 'editableListBox'
-  VListBoxNameStr = 'wxVListBox'
-  CollapsiblePaneNameStr = 'collapsiblePane'
-  MSWHeaderCtrlNameStr = 'wxMSWHeaderCtrl'
-  PropertyGridManagerNameStr = 'wxPropertyGridManager'
-  PropertyGridNameStr = 'wxPropertyGrid'
-  STCNameStr = 'stcwindow'
-  STCNameStr = 'stcwindow'
+  CHOICE_NAME_STR = 'choice'
+  COLOUR_PICKER_CTRL_NAME_STR = 'colourpicker'
+  COLOUR_PICKER_WIDGET_NAME_STR = 'colourpickerwidget'
+  HYPERLINK_CTRL_NAME_STR = 'hyperlink'
+  PANEL_NAME_STR = 'panel'
+  LIST_BOX_NAME_STR = 'listBox'
+  FRAME_NAME_STR = 'frame'
+  STATUS_LINE_NAME_STR = 'status_line'
+  STATIC_BITMAP_NAME_STR = 'staticBitmap'
+  WEB_VIEW_NAME_STR = 'wxWebView'
+  ANIMATION_CTRL_NAME_STR = 'animationctrl'
+  TOOL_BAR_NAME_STR = 'toolbar'
+  TEXT_CTRL_NAME_STR = 'text'
+  LIST_CTRL_NAME_STR = 'listCtrl'
+  FILE_PICKER_CTRL_NAME_STR = 'filepicker'
+  FILE_PICKER_WIDGET_NAME_STR = 'filepickerwidget'
+  DIR_PICKER_CTRL_NAME_STR = 'dirpicker'
+  DIR_PICKER_WIDGET_NAME_STR = 'dirpickerwidget'
+  FILE_CTRL_NAME_STR = 'wxfilectrl'
+  FILE_SELECTOR_PROMPT_STR = 'Select a file'
+  STATIC_BOX_NAME_STR = 'groupBox'
+  BUTTON_NAME_STR = 'button'
+  RADIO_BOX_NAME_STR = 'radioBox'
+  STATIC_LINE_NAME_STR = 'staticLine'
+  RADIO_BUTTON_NAME_STR = 'radioButton'
+  BITMAP_RADIO_BUTTON_NAME_STR = 'radioButton'
+  GAUGE_NAME_STR = 'gauge'
+  DATA_VIEW_CTRL_NAME_STR = 'dataviewCtrl'
+  FONT_PICKER_CTRL_NAME_STR = 'fontpicker'
+  FONT_PICKER_WIDGET_NAME_STR = 'fontpickerwidget'
+  REARRANGE_LIST_NAME_STR = 'wxRearrangeList'
+  REARRANGE_DIALOG_NAME_STR = 'wxRearrangeDlg'
+  NOTEBOOK_NAME_STR = 'notebook'
+  CONTROL_NAME_STR = 'control'
+  SCROLL_BAR_NAME_STR = 'scrollBar'
+  STATUS_BAR_NAME_STR = 'statusBar'
+  SLIDER_NAME_STR = 'slider'
+  HEADER_CTRL_NAME_STR = 'wxHeaderCtrl'
+  BITMAP_COMBO_BOX_NAME_STR = 'bitmapComboBox'
+  CHECK_BOX_NAME_STR = 'check'
+  FILE_DIALOG_NAME_STR = 'filedlg'
+  ADD_REMOVE_CTRL_NAME_STR = 'wxAddRemoveCtrl'
+  STATIC_TEXT_NAME_STR = 'staticText'
+  COMBO_BOX_NAME_STR = 'comboBox'
+  SEARCH_CTRL_NAME_STR = 'searchCtrl'
+  TREE_CTRL_NAME_STR = 'treeCtrl'
+  DIALOG_NAME_STR = 'dialog'
+  COLLAPSIBLE_HEADER_CTRL_NAME_STR = 'collapsibleHeader'
+  COLLAPSIBLE_PANE_NAME_STR = 'collapsiblePane'
+  BANNER_WINDOW_NAME_STR = 'bannerwindow'
+  GRID_NAME_STR = 'grid'
+  TREE_LIST_CTRL_NAME_STR = 'wxTreeListCtrl'
+  HTML_LIST_BOX_NAME_STR = 'htmlListBox'
+  SIMPLE_HTML_LIST_BOX_NAME_STR = 'simpleHtmlListBox'
+  EDITABLE_LIST_BOX_NAME_STR = 'editableListBox'
+  V_LIST_BOX_NAME_STR = 'wxVListBox'
+
+  # wxMSW only
+  MSW_HEADER_CTRL_NAME_STR = 'wxMSWHeaderCtrl'
+
+  PROPERTY_GRID_MANAGER_NAME_STR = 'wxPropertyGridManager'
+  PROPERTY_GRID_NAME_STR = 'wxPropertyGrid'
+  STC_NAME_STR = 'stcwindow'
 
 end

data/lib/wx/doc/event.rb

@@ -27,10 +27,4 @@ module Wx
 
   end
 
-  # Find a window with the focus, that is also a descendant of the given window.
-  # This is used to determine the window to initially send commands to.
-  # @param [Wx::Window] ancestor
-  # @return [Wx::Window,nil] descendant window of ancestor with focus
-  def self.find_focus_descendant(ancestor) end
-
 end

data/lib/wx/doc/functions.rb

@@ -190,21 +190,21 @@ module Wx
   #   # else: cancelled by user
   # </code>
   # @return [String] selected file name
-  def file_selector(message, default_path='', default_filename='', default_extension='', wildcard='',
+  def self.file_selector(message, default_path='', default_filename='', default_extension='', wildcard='',
                     flags=0, parent=nil, x=Wx::DEFAULT_COORD, y=Wx::DEFAULT_COORD) end
 
   # An extended version of {Wx::file_selector}.
   # @return [String] selected file name
-  def file_selector_ex(message='Select a file', default_path='', default_filename='', indexDefaultExtension=nil,
+  def self.file_selector_ex(message='Select a file', default_path='', default_filename='', indexDefaultExtension=nil,
                        wildcard='*', flags=0, parent=nil, x=Wx::DEFAULT_COORD, y=Wx::DEFAULT_COORD) end
 
   # Shows a file dialog asking the user for a file name for saving a file.
   # @see Wx::file_selector, Wx::FileDialog
-  def load_file_selector(what,  extension, default_name='', parent=nil) end
+  def self.load_file_selector(what,  extension, default_name='', parent=nil) end
 
   # Shows a file dialog asking the user for a file name for opening a file.
   # @see Wx::file_selector, Wx::FileDialog
-  def save_file_selector(what, extension, default_name='', parent=nil) end
+  def self.save_file_selector(what, extension, default_name='', parent=nil) end
 
   # @!endgroup
 
@@ -213,14 +213,14 @@ module Wx
   # Returns true if the ID is in the list of recognized stock actions
   # @param [Integer] id ID to check
   # @return [true,false]
-  def is_stock_id(id) end
+  def self.is_stock_id(id) end
 
   # Returns true if the label is empty or label of a stock button with
   # given ID
   # @param [Integer] id ID to check
   # @param [String] label to check
   # @return [true,false]
-  def is_stock_label(id, label) end
+  def self.is_stock_label(id, label) end
 
   STOCK_NOFLAGS = 0
 
@@ -236,13 +236,13 @@ module Wx
   # @param [Integer] id	Given id of the wxMenuItem, wxButton, wxToolBar tool, etc.
   # @param [Integer] flags Combination of the elements of STOCK_xxx flags.
   # @return [String]
-  def get_stock_label(id, flags = Wx::STOCK_WITH_MNEMONIC) end
+  def self.get_stock_label(id, flags = Wx::STOCK_WITH_MNEMONIC) end
 
   # Returns the accelerator that should be used for given stock UI element
   # (e.g. "Ctrl+X" for Wx::ID_CUT)
   # @param [Integer] id stock UI element ID
   # @return [Wx::AcceleratorEntry]
-  def get_stock_accelerator(id) end
+  def self.get_stock_accelerator(id) end
 
   STOCK_MENU = 0
 
@@ -250,7 +250,7 @@ module Wx
   # @param [Integer] id stock UI element ID
   # @param [Integer] client context (currently only STOCK_MENU)
   # @return [String]
-  def get_stock_help_string(id, client = Wx::STOCK_MENU) end
+  def self.get_stock_help_string(id, client = Wx::STOCK_MENU) end
 
   # @!endgroup
 

data/lib/wx/doc/window.rb

@@ -48,4 +48,9 @@ class Wx::Window
   # @return [Wx::Window]
   def find_window_by_name(name) end
 
+  # Switches the current sizer with the given sizer and detaches and returns the 'old' sizer.
+  # @param [Wx::Sizer] new_sizer new sizer for window
+  # @return [Wx::Sizer] previous window sizer
+  def switch_sizer(new_sizer) end
+
 end

data/lib/wx/keyword_defs.rb

@@ -349,8 +349,6 @@ Wx::define_keyword_ctors(Wx::ComboCtrl) do
   wx_ctor_params :validator, :name => 'comboCtrl'
 end
 
-# wxDatePickerCtrl 	Small date picker control
-
 # wxGauge 	A control to represent a varying quantity, such as time
 # remaining
 Wx::define_keyword_ctors(Wx::Gauge) do
@@ -514,8 +512,50 @@ Wx::define_keyword_ctors(Wx::VListBox) do
   wx_ctor_params :id, :pos, :size, :style, :name => 'VListBoxNameStr'
 end
 
+# wxDatePickerCtrl 	Small date picker control
 Wx::define_keyword_ctors(Wx::DatePickerCtrl) do
-  wx_ctor_params :id, :dt, :pos, :size, :style, :validator, :name => 'dateCtrl'
+  wx_ctor_params :id, :dt, :pos, :size, :style => Wx::DP_DEFAULT|Wx::DP_SHOWCENTURY
+  wx_ctor_params :validator, :name => 'datePickerCtrl'
+end
+
+Wx::define_keyword_ctors(Wx::TimePickerCtrl) do
+  wx_ctor_params :id, :dt, :pos, :size, :style => Wx::TP_DEFAULT
+  wx_ctor_params :validator, :name => 'timePickerCtrl'
+end
+
+Wx::define_keyword_ctors(Wx::ColourPickerCtrl) do
+  wx_ctor_params :id, :colour => :BLACK
+  wx_ctor_params :pos, :size, :style => Wx::CLRP_DEFAULT_STYLE
+  wx_ctor_params :validator, :name => 'colourPickerCtrl'
+end
+
+Wx::define_keyword_ctors(Wx::FontPickerCtrl) do
+  wx_ctor_params :id, :font => Wx::NULL_FONT
+  wx_ctor_params :pos, :size, :style => Wx::FNTP_DEFAULT_STYLE
+  wx_ctor_params :validator, :name => 'fontPickerCtrl'
+end
+
+Wx::define_keyword_ctors(Wx::FilePickerCtrl) do
+  wx_ctor_params :id, :path => ''
+  wx_ctor_params :message => Wx::FILE_SELECTOR_PROMPT_STR
+  wx_ctor_params :wildcard => Wx::FILE_SELECTOR_DEFAULT_WILDCARD_STR
+  wx_ctor_params :pos, :size, :style => Wx::FLP_DEFAULT_STYLE
+  wx_ctor_params :validator, :name => 'filePickerCtrl'
+end
+
+Wx::define_keyword_ctors(Wx::DirPickerCtrl) do
+  wx_ctor_params :id, :path => ''
+  wx_ctor_params :message => Wx::DIR_SELECTOR_PROMPT_STR
+  wx_ctor_params :pos, :size, :style => Wx::DIRP_DEFAULT_STYLE
+  wx_ctor_params :validator, :name => 'dirPickerCtrl'
+end
+
+Wx::define_keyword_ctors(Wx::FileCtrl) do
+  wx_ctor_params :id, :defaultDirectory => ''
+  wx_ctor_params :defaultFilename => ''
+  wx_ctor_params :wildcard => Wx::FILE_SELECTOR_DEFAULT_WILDCARD_STR
+  wx_ctor_params :style => Wx::FC_DEFAULT_STYLE
+  wx_ctor_params :pos, :size, :name => 'fileCtrl'
 end
 
 Wx::define_keyword_ctors(Wx::ActivityIndicator) do
@@ -542,6 +582,3 @@ Wx::define_keyword_ctors(Wx::RearrangeCtrl) do
   wx_ctor_params :id, :pos, :size, :order, :items, :style
   wx_ctor_params :validator, :name => 'rearrangeCtrl'
 end
-
-# FIXME - SymbolPickerDialog is hard to because the parent argument is
-# in a strange place.

data/lib/wx/version.rb

@@ -3,5 +3,5 @@
 # This software is released under the MIT license.
 
 module Wx
-  WXRUBY_VERSION    = '0.9.0'
+  WXRUBY_VERSION    = '0.9.1'
 end