Version 0.4 of wxPython for MSW.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/wxPython/README.txt

@@ -10,7 +10,7 @@ extremly cool object oriented language.  It's easier than Perl and
 nearly as powerful.  It runs on more platforms than Java, and by some
 reports, is even faster than Java with a JIT compiler!
 
-So why would you wan to use wxPython over just C++ and wxWindows?
+So why would you want to use wxPython over just C++ and wxWindows?
 Personally I prefer using Python for everything.  I only use C++ when
 I absolutly have to eek more performance out of an algorithm, and even
 then I ususally code it as an extension module and leave the majority
@@ -41,6 +41,20 @@ application will cause problems.  However there is a plan to support
 this in the future.
 
 
+What's New in 0.4
+-----------------
+1. Worked on wxGTK compatibility.  It is partially working.  On a
+Solaris/Sparc box wxPython is working but only when it is statically
+linked with the Python interpreter.  When built as a dyamically loaded
+extension module, things acting weirdly and it soon seg-faults.  And on
+Linux ???????  (I don't know.  I can't get wxGTK to build right now.
+I'll have to look into that... :-)
+
+2. Added Toolbar, StatusBar and SplitterWindow classes.
+
+3. Varioius bug fixes, enhancements, etc.
+
+
 
 Build Instructions
 ------------------
@@ -65,8 +79,9 @@ PYTHONPATH, such as the site-packages directory on Unix systems.
 Win32
 -----
 
-1. Build wxWindows with USE_RESOURCE_LOADING_IN_MSW set to 1 in
+1. Build wxWindows with wxUSE_RESOURCE_LOADING_IN_MSW set to 1 in
-include/wx/msw/setup.h so icons can be loaded dynamically.
+include/wx/msw/setup.h so icons can be loaded dynamically.  While
+there, make sure wxUSE_OWNER_DRAWN is also set to 1.
 
 2. Change into the $(WXWIN)/utils/wxPython/src directory.
 

utils/wxPython/distrib/wxPython.rsp

@@ -0,0 +1,38 @@
+wxPython\*.pyd
+wxPython\*.pyc
+wxPython\*.pyo
+wxPython\*.py
+wxPython\*.txt
+
+wxPython\tests\*.py
+wxPython\tests\bitmaps
+
+
+wxPython\src\*.i
+wxPython\src\*.py
+wxPython\src\*.cpp
+wxPython\src\*.h
+wxPython\src\*.ico
+wxPython\src\*.def
+wxPython\src\*.rc
+wxPython\src\makefile.*
+wxPython\src\Makefile.pre.in
+wxPython\src\Setup.in
+
+wxPython\src\msw\*.cpp
+wxPython\src\msw\*.h
+wxPython\src\msw\*.py
+
+wxPython\src\gtk\*.cpp
+wxPython\src\gtk\*.h
+wxPython\src\gtk\*.py
+
+wxPython\src\motif\*.cpp
+wxPython\src\motif\*.h
+wxPython\src\motif\*.py
+
+wxPython\src\qt\*.cpp
+wxPython\src\qt\*.h
+wxPython\src\qt\*.py
+
+

utils/wxPython/distrib/zipit.bat

@@ -0,0 +1,8 @@
+
+@echo off
+
+cd %WXWIN%\utils
+
+zip -@ -r wxPython\wxPython-%1.zip < wxPython\distrib\wxPython.rsp
+
+cd -

utils/wxPython/src/Makefile.pre.in

@@ -333,6 +333,7 @@ PYMODULES = $(GENCODEDIR)/wxp.py       $(GENCODEDIR)/events.py    \
 	    $(GENCODEDIR)/gdi.py       $(GENCODEDIR)/mdi.py       \
 	    $(GENCODEDIR)/controls.py  $(GENCODEDIR)/controls2.py \
             $(GENCODEDIR)/windows2.py  $(GENCODEDIR)/cmndlgs.py   \
+            $(GENCODEDIR)/frames.py    $(GENCODEDIR)/stattool.py   \
 	    __init__.py
 
 
@@ -359,6 +360,8 @@ $(GENCODEDIR)/mdi.cpp       $(GENCODEDIR)/mdi.py       : mdi.i        my_typemap
 $(GENCODEDIR)/controls.cpp  $(GENCODEDIR)/controls.py  : controls.i   my_typemaps.i _defs.i
 $(GENCODEDIR)/controls2.cpp $(GENCODEDIR)/controls2.py : controls2.i  my_typemaps.i _defs.i
 $(GENCODEDIR)/cmndlgs.cpp   $(GENCODEDIR)/cmndlgs.py   : cmndlgs.i    my_typemaps.i _defs.i
+$(GENCODEDIR)/frames.cpp    $(GENCODEDIR)/frames.py    : frames.i     my_typemaps.i _defs.i
+$(GENCODEDIR)/stattool.cpp  $(GENCODEDIR)/stattool.py  : stattool.i   my_typemaps.i _defs.i
 
 $(GENCODEDIR)/helpers.cpp:
 	ln -s `pwd`/helpers.cpp $@

utils/wxPython/src/_defs.i

@@ -92,6 +92,8 @@ class wxSlider;
 class wxPyTimer;
 class wxIndividualLayoutConstraint;
 class wxLayoutConstraints;
+class wxToolBar;
+class wxStatusBar;
 
 //---------------------------------------------------------------------------
 
@@ -113,9 +115,6 @@ enum {
     wxMINOR_VERSION,
     wxRELEASE_NUMBER,
 
-#ifdef __WXMSW__
-    UNKNOWN,
-#endif
     NOT_FOUND,
 
     wxVSCROLL,
@@ -158,6 +157,7 @@ enum {
     wxTB_3DBUTTONS,
     wxTB_HORIZONTAL,
     wxTB_VERTICAL,
+    wxTB_FLAT,
     wxCOLOURED,
     wxFIXED_LENGTH,
     wxALIGN_LEFT,
@@ -486,6 +486,7 @@ enum _Virtual_keycodes {
 };
 
 typedef enum {
+ wxCURSOR_NONE = 0,
  wxCURSOR_ARROW =  1,
  wxCURSOR_BULLSEYE,
  wxCURSOR_CHAR,
@@ -511,13 +512,13 @@ typedef enum {
  wxCURSOR_WAIT,
  wxCURSOR_WATCH,
  wxCURSOR_BLANK
-//#ifdef __X__
+//  #ifndef __WXMSW__
 //    /* Not yet implemented for Windows */
 //    , wxCURSOR_CROSS_REVERSE,
 //    wxCURSOR_DOUBLE_ARROW,
 //    wxCURSOR_BASED_ARROW_UP,
 //    wxCURSOR_BASED_ARROW_DOWN
-//#endif
+//  #endif
 } _standard_cursors_t;
 
 
@@ -697,6 +698,9 @@ enum wxEventType {
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.5  1998/10/02 06:40:32  RD
+// Version 0.4 of wxPython for MSW.
+//
 // Revision 1.4  1998/08/18 19:48:11  RD
 // more wxGTK compatibility things.
 //

utils/wxPython/src/_extras.py

@@ -45,6 +45,15 @@ def _StdFrameCallbacks(win):
     _checkForCallback(win, "OnCloseWindow",        wxEVT_CLOSE_WINDOW)
 
 
+def _StdDialogCallbacks(win):
+    _StdWindowCallbacks(win)
+    _checkForCallback(win, "OnOk",     wxEVT_COMMAND_BUTTON_CLICKED,   wxID_OK)
+    _checkForCallback(win, "OnApply",  wxEVT_COMMAND_BUTTON_CLICKED,   wxID_APPLY)
+    _checkForCallback(win, "OnCancel", wxEVT_COMMAND_BUTTON_CLICKED,   wxID_CANCEL)
+    _checkForCallback(win, "OnCloseWindow", wxEVT_CLOSE_WINDOW)
+    _checkForCallback(win, "OnCharHook",    wxEVT_CHAR_HOOK)
+
+
 def _StdOnScrollCallback(win):
     try:    cb = getattr(win, "OnScroll")
     except: pass
@@ -339,336 +348,8 @@ def EVT_NOTEBOOK_PAGE_CHANGING(win, id, func):
 
 
 
+
 #----------------------------------------------------------------------
-#----------------------------------------------------------------------
-# We need to add to the shadow classes a bit to facilitate callbacks via
-# virtual functions.  These classes replace the shadows generated by SWIG.
-
-class wxWindow(wxWindowPtr):
-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxWindow,(arg0.this,arg1,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-
-class wxFrame(wxFramePtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxFrame,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdFrameCallbacks(self)
-
-
-if wxPlatform == '__WXMSW__':
-    class wxMiniFrame(wxMiniFramePtr):
-        def __init__(self,arg0,arg1,arg2,*args) :
-            argl = map(None,args)
-            try: argl[0] = argl[0].this
-            except: pass
-            try: argl[1] = argl[1].this
-            except: pass
-            args = tuple(argl)
-            self.this = apply(windowsc.new_wxMiniFrame,(arg0.this,arg1,arg2,)+args)
-            self.thisown = 1
-            _StdFrameCallbacks(self)
-
-
-class wxPanel(wxPanelPtr):
-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxPanel,(arg0.this,arg1,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-
-class wxDialog(wxDialogPtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxDialog,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-        _checkForCallback(self, "OnOk",     wxEVT_COMMAND_BUTTON_CLICKED,   wxID_OK)
-        _checkForCallback(self, "OnApply",  wxEVT_COMMAND_BUTTON_CLICKED,   wxID_APPLY)
-        _checkForCallback(self, "OnCancel", wxEVT_COMMAND_BUTTON_CLICKED,   wxID_CANCEL)
-        _checkForCallback(self, "OnCloseWindow", wxEVT_CLOSE_WINDOW)
-        _checkForCallback(self, "OnCharHook",    wxEVT_CHAR_HOOK)
-
-
-class wxScrolledWindow(wxScrolledWindowPtr):
-    def __init__(self,arg0,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxScrolledWindow,(arg0.this,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-        _StdOnScrollCallback(self)
-
-
-
-class wxMDIParentFrame(wxMDIParentFramePtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(mdic.new_wxMDIParentFrame,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdFrameCallbacks(self)
-
-
-class wxMDIChildFrame(wxMDIChildFramePtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(mdic.new_wxMDIChildFrame,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdFrameCallbacks(self)
-
-
-class wxMDIClientWindow(wxMDIClientWindowPtr):
-    def __init__(self,arg0,*args) :
-        self.this = apply(mdic.new_wxMDIClientWindow,(arg0.this,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-        _StdOnScrollCallback(self)
-
-
-
-class wxControl(wxControlPtr):
-    def __init__(self,this):
-        self.this = this
-        _StdWindowCallbacks(self)
-
-class wxButton(wxButtonPtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxButton,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxBitmapButton(wxBitmapButtonPtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxBitmapButton,(arg0.this,arg1,arg2.this,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxCheckBox(wxCheckBoxPtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxCheckBox,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-
-
-class wxChoice(wxChoicePtr):
-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxChoice,(arg0.this,arg1,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxComboBox(wxComboBoxPtr):
-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxComboBox,(arg0.this,arg1,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxGauge(wxGaugePtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxGauge,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxStaticBox(wxStaticBoxPtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxStaticBox,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxStaticText(wxStaticTextPtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxStaticText,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxListBox(wxListBoxPtr):
-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxListBox,(arg0.this,arg1,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxTextCtrl(wxTextCtrlPtr):
-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxTextCtrl,(arg0.this,arg1,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxScrollBar(wxScrollBarPtr):
-    def __init__(self,arg0,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxScrollBar,(arg0.this,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-if wxPlatform == '__WXMSW__':
-    class wxSpinButton(wxSpinButtonPtr):
-        def __init__(self,arg0,*args) :
-            argl = map(None,args)
-            try: argl[1] = argl[1].this
-            except: pass
-            try: argl[2] = argl[2].this
-            except: pass
-            args = tuple(argl)
-            self.this = apply(controlsc.new_wxSpinButton,(arg0.this,)+args)
-            self.thisown = 1
-            _StdWindowCallbacks(self)
-
-class wxStaticBitmap(wxStaticBitmapPtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxStaticBitmap,(arg0.this,arg1,arg2.this,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxRadioBox(wxRadioBoxPtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxRadioBox,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxRadioButton(wxRadioButtonPtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxRadioButton,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxSlider(wxSliderPtr):
-    def __init__(self,arg0,arg1,arg2,arg3,arg4,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxSlider,(arg0.this,arg1,arg2,arg3,arg4,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-
-
-
-
 
 class wxTimer(wxPyTimer):
     def __init__(self):
@@ -762,6 +443,9 @@ class wxApp(wxPyApp):
 #----------------------------------------------------------------------------
 #
 # $Log$
+# Revision 1.3  1998/10/02 06:40:33  RD
+# Version 0.4 of wxPython for MSW.
+#
 # Revision 1.2  1998/08/18 19:48:12  RD
 # more wxGTK compatibility things.
 #

utils/wxPython/src/cmndlgs.i

@@ -52,6 +52,8 @@ class wxColourDialog : public wxDialog {
 public:
     wxColourDialog(wxWindow* parent, wxColourData* data = NULL);
 
+    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+
 #ifdef __WXMSW__
     wxColourData& GetColourData();
 #else
@@ -72,6 +74,8 @@ public:
                 long style = 0,
                 const wxPoint& pos = wxPyDefaultPosition);
 
+    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+
     wxString GetPath();
     wxString GetMessage();
     long GetStyle();
@@ -93,6 +97,8 @@ public:
                  long style = 0,
                  const wxPoint& pos = wxPyDefaultPosition);
 
+    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+
     wxString GetDirectory();
     wxString GetFilename();
     int GetFilterIndex();
@@ -134,6 +140,8 @@ public:
         }
     }
 
+    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+
     int GetSelection();
     wxString GetStringSelection();
     void SetSelection(int sel);
@@ -152,6 +160,8 @@ public:
                       long style = wxOK | wxCANCEL | wxCENTRE,
                       const wxPoint& pos = wxPyDefaultPosition);
 
+    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+
     wxString GetValue();
     void SetValue(const wxString& value);
     int ShowModal();
@@ -184,6 +194,8 @@ class wxFontDialog : public wxDialog {
 public:
     wxFontDialog(wxWindow* parent, wxFontData* data = NULL);
 
+    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+
     wxFontData& GetFontData();
     int ShowModal();
 };
@@ -230,6 +242,8 @@ class wxPageSetupDialog : public wxDialog {
 public:
     wxPageSetupDialog(wxWindow* parent, wxPageSetupData* data = NULL);
 
+    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+
     wxPageSetupData& GetPageSetupData();
     int ShowModal();
 };
@@ -271,6 +285,8 @@ class wxPrintDialog : public wxDialog {
 public:
     wxPrintDialog(wxWindow* parent, wxPrintData* data = NULL);
 
+    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+
     wxPrintData& GetPrintData();
     wxDC* GetPrintDC();
     int ShowModal();
@@ -287,6 +303,8 @@ public:
                     long style = wxOK | wxCANCEL | wxCENTRE,
                     const wxPoint& pos = wxPyDefaultPosition);
 
+    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+
     int ShowModal();
 };
 
@@ -296,6 +314,9 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.4  1998/10/02 06:40:34  RD
+// Version 0.4 of wxPython for MSW.
+//
 // Revision 1.3  1998/08/18 19:48:13  RD
 // more wxGTK compatibility things.
 //

utils/wxPython/src/controls.i

@@ -18,6 +18,9 @@
 
 #ifdef __WXMSW__
 #include <wx/spinbutt.h>
+#if wxUSE_OWNER_DRAWN
+#include <wx/checklst.h>
+#endif
 #endif
 %}
 
@@ -33,6 +36,8 @@
 %import gdi.i
 %import events.i
 
+%pragma(python) code = "import wxp"
+
 //----------------------------------------------------------------------
 
 %{
@@ -58,6 +63,9 @@ public:
              long style = 0,
              const wxValidator& validator = wxPyDefaultValidator,
              char* name = "button");
+
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     void SetDefault();
 };
 
@@ -72,6 +80,8 @@ public:
                    const wxValidator& validator = wxPyDefaultValidator,
                    char* name = "button");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     wxBitmap& GetBitmapLabel();
 #ifdef __WXMSW__
     wxBitmap& GetBitmapDisabled();
@@ -96,6 +106,8 @@ public:
                const wxValidator& val = wxPyDefaultValidator,
                char* name = "checkBox");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     bool GetValue();
     void SetValue(const bool state);
 };
@@ -112,6 +124,8 @@ public:
              const wxValidator& validator = wxPyDefaultValidator,
              char* name = "choice");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     void Append(const wxString& item);
     void Clear();
     int FindString(const wxString& string);
@@ -137,6 +151,8 @@ public:
                const wxValidator& validator = wxPyDefaultValidator,
                char* name = "comboBox");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     void Append(const wxString& item);
     // TODO: void Append(const wxString& item, char* clientData);
     void Clear();
@@ -175,6 +191,8 @@ public:
             const wxValidator& validator = wxPyDefaultValidator,
             char* name = "gauge");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     int GetBezelFace();
     int GetRange();
     int GetShadowWidth();
@@ -207,6 +225,8 @@ public:
                  long style = 0,
                  char* name = "staticText");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     wxString GetLabel();
     void SetLabel(const wxString& label);
 };
@@ -223,6 +243,8 @@ public:
               const wxValidator& validator = wxPyDefaultValidator,
               char* name = "listBox");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     void Append(const wxString& item);
     // TODO:    void Append(const wxString& item, char* clientData);
     void Clear();
@@ -246,6 +268,29 @@ public:
 };
 
 
+//----------------------------------------------------------------------
+
+#ifdef __WXMSW__
+class wxCheckListBox : public wxListBox {
+public:
+    wxCheckListBox(wxWindow *parent, wxWindowID id,
+                   const wxPoint& pos = wxPyDefaultPosition,
+                   const wxSize& size = wxPyDefaultSize,
+                   int LCOUNT = 0,
+                   wxString* LIST = NULL,
+                   long style = 0,
+                   const wxValidator& validator = wxPyDefaultValidator,
+                   char* name = "listBox");
+
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
+    bool  IsChecked(int uiIndex);
+    void  Check(int uiIndex, bool bCheck = TRUE);
+
+    int GetItemHeight();
+};
+#endif
+
 //----------------------------------------------------------------------
 
 class wxTextCtrl : public wxControl {
@@ -257,6 +302,8 @@ public:
                const wxValidator& validator = wxPyDefaultValidator,
                char* name = "text");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     void Clear();
     void Copy();
     void Cut();
@@ -301,6 +348,8 @@ public:
                 const wxValidator& validator = wxPyDefaultValidator,
                 char* name = "scrollBar");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     int GetRange();
     int GetPageSize();
     int GetPosition();
@@ -341,6 +390,8 @@ public:
                    long style = 0,
                    char* name = "staticBitmap");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     wxBitmap& GetBitmap();
     void SetBitmap(const wxBitmap& bitmap);
 };
@@ -359,6 +410,8 @@ public:
                const wxValidator& validator = wxPyDefaultValidator,
                char* name = "radioBox");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     %name(EnableBox)void Enable(bool enable);
     void Enable(int n, bool enable);
     int FindString(const wxString& string);
@@ -388,6 +441,8 @@ public:
                   const wxValidator& validator = wxPyDefaultValidator,
                   char* name = "radioButton");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     bool GetValue();
     void SetValue(bool value);
 };
@@ -404,6 +459,8 @@ public:
              const wxValidator& validator = wxPyDefaultValidator,
              char* name = "slider");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     void ClearSel();
     void ClearTicks();
     int GetLineSize();
@@ -432,6 +489,9 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.4  1998/10/02 06:40:35  RD
+// Version 0.4 of wxPython for MSW.
+//
 // Revision 1.3  1998/08/18 19:48:14  RD
 // more wxGTK compatibility things.
 //

utils/wxPython/src/controls2.i

@@ -16,7 +16,9 @@
 #include "helpers.h"
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
+#if 0
 #include <wx/tabctrl.h>
+#endif
 %}
 
 //----------------------------------------------------------------------
@@ -32,6 +34,8 @@
 %import events.i
 %import controls.i
 
+%pragma(python) code = "import wxp"
+
 //----------------------------------------------------------------------
 
 %{
@@ -91,6 +95,8 @@ public:
                char* name = "listctrl");
 #endif
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     bool Arrange(int flag = wxLIST_ALIGN_DEFAULT);
     bool DeleteItem(long item);
     bool DeleteAllItems();
@@ -109,7 +115,7 @@ public:
     bool GetColumn(int col, wxListItem& item);
     int GetColumnWidth(int col);
     int GetCountPerPage();
-#ifdef __WXMSW
+#ifdef __WXMSW__
     wxTextCtrl* GetEditControl();
 #endif
     wxImageList* GetImageList(int which);
@@ -293,6 +299,8 @@ public:
             char* name = "wxTreeCtrl");
 #endif
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     bool DeleteAllItems();
 #ifdef __WXMSW__
     bool DeleteItem(long item);
@@ -372,6 +380,7 @@ public:
 
 //----------------------------------------------------------------------
 
+#ifdef SKIPTHIS
 #ifdef __WXMSW__
 class wxTabEvent : public wxCommandEvent {
 public:
@@ -387,6 +396,8 @@ public:
               long style = 0,
               char* name = "tabCtrl");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     bool DeleteAllItems();
     bool DeleteItem(int item);
     wxImageList* GetImageList();
@@ -418,6 +429,7 @@ public:
 
 };
 
+#endif
 #endif
 
 //----------------------------------------------------------------------
@@ -426,6 +438,9 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.4  1998/10/02 06:40:36  RD
+// Version 0.4 of wxPython for MSW.
+//
 // Revision 1.3  1998/08/18 19:48:15  RD
 // more wxGTK compatibility things.
 //

utils/wxPython/src/frames.i

@@ -0,0 +1,96 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        frames.i
+// Purpose:     SWIG definitions of various window classes
+//
+// Author:      Robin Dunn
+//
+// Created:     8/27/98
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 by Total Control Software
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+
+%module frames
+
+%{
+#include "helpers.h"
+
+#ifdef __WXMSW__
+#include <wx/minifram.h>
+#endif
+%}
+
+//----------------------------------------------------------------------
+
+%include typemaps.i
+%include my_typemaps.i
+
+// Import some definitions of other classes, etc.
+%import _defs.i
+%import misc.i
+%import gdi.i
+%import windows.i
+%import stattool.i
+
+%pragma(python) code = "import wxp"
+
+//----------------------------------------------------------------------
+
+class wxFrame : public wxWindow {
+public:
+    wxFrame(wxWindow* parent, const wxWindowID id, const wxString& title,
+            const wxPoint& pos = wxPyDefaultPosition,
+            const wxSize& size = wxPyDefaultSize,
+            long style = wxDEFAULT_FRAME_STYLE,
+            char* name = "frame");
+
+    %pragma(python) addtomethod = "__init__:wxp._StdFrameCallbacks(self)"
+
+    void Centre(int direction = wxBOTH);
+#ifdef __WXMSW__
+    void Command(int id);
+#endif
+    wxStatusBar* CreateStatusBar(int number = 1,
+                                 long style = wxST_SIZEGRIP,
+                                 wxWindowID id = -1,
+                                 char* name = "statusBar");
+    wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL,
+                             wxWindowID id = -1,
+                             char* name = "toolBar");
+
+    wxMenuBar* GetMenuBar();
+    wxStatusBar* GetStatusBar();
+    wxString GetTitle();
+    wxToolBar* GetToolBar();
+    void Iconize(bool iconize);
+    bool IsIconized();
+    void Maximize(bool maximize);
+#ifdef __WXMSW__
+    void SetAcceleratorTable(const wxAcceleratorTable& accel);
+#endif
+    void SetIcon(const wxIcon& icon);
+    void SetMenuBar(wxMenuBar* menuBar);
+    void SetStatusBar(wxStatusBar *statusBar);
+    void SetStatusText(const wxString& text, int number = 0);
+    void SetStatusWidths(int LCOUNT, int* LIST); // uses typemap
+    void SetTitle(const wxString& title);
+    void SetToolBar(wxToolBar* toolbar);
+
+};
+
+//---------------------------------------------------------------------------
+
+#ifdef __WXMSW__
+class wxMiniFrame : public wxFrame {
+public:
+    wxMiniFrame(wxWindow* parent, const wxWindowID id, const wxString& title,
+                const wxPoint& pos = wxPyDefaultPosition,
+                const wxSize& size = wxPyDefaultSize,
+                long style = wxDEFAULT_FRAME_STYLE,
+                char* name = "frame");
+
+    %pragma(python) addtomethod = "__init__:wxp._StdFrameCallbacks(self)"
+};
+#endif
+

utils/wxPython/src/gdi.i

@@ -56,6 +56,7 @@ public:
 
 %new wxBitmap* wxEmptyBitmap(int width, int height, int depth=-1);
 wxBitmap* wxNoRefBitmap(char* name, long flags);
+
 %{                              // Alternate 'constructor'
     wxBitmap* wxEmptyBitmap(int width, int height, int depth=-1) {
         return new wxBitmap(width, height, depth);
@@ -117,9 +118,9 @@ public:
     bool Ok();
 };
 
-%new wxCursor* wxStockCursor(int id);
+%name(wxStockCursor) %new wxCursor* wxPyStockCursor(int id);
 %{                              // Alternate 'constructor'
-    wxCursor* wxStockCursor(int id) {
+    wxCursor* wxPyStockCursor(int id) {
         return new wxCursor(id);
     }
 %}
@@ -484,6 +485,9 @@ extern wxColour wxNullColour;
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.4  1998/10/02 06:40:38  RD
+// Version 0.4 of wxPython for MSW.
+//
 // Revision 1.3  1998/08/18 19:48:16  RD
 // more wxGTK compatibility things.
 //

utils/wxPython/src/helpers.cpp

@@ -44,6 +44,7 @@ extern HINSTANCE wxhInstance;
 //----------------------------------------------------------------------
 // This gets run when the DLL is loaded.  We just need to save a handle.
 //----------------------------------------------------------------------
+
 BOOL WINAPI DllMain(
     HINSTANCE   hinstDLL,    // handle to DLL module
     DWORD       fdwReason,   // reason for calling function
@@ -123,7 +124,7 @@ void __wxPreStart()
         return;
 
 #ifdef __WXMSW__
-    wxApp::Initialize((WXHINSTANCE)wxhInstance);
+    wxApp::Initialize();
 #endif
 #ifdef __WXGTK__
     wxClassInfo::InitializeClasses();
@@ -256,7 +257,7 @@ PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args)
 static
 PyObject* wxPyConstructObject(void* ptr, char* className)
 {
-    char    buff[64];               // should be big enough...
+    char    buff[64];               // should always be big enough...
     char    swigptr[64];
 
     sprintf(buff, "_%s_p", className);
@@ -364,7 +365,6 @@ void wxPyTimer::Notify() {
 
 
 
-
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 // Some helper functions for typemaps in my_typemaps.i, so they won't be
@@ -651,7 +651,11 @@ wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.10  1998/10/02 06:40:39  RD
+// Version 0.4 of wxPython for MSW.
+//
 // Revision 1.9  1998/09/25 13:28:52  VZ
+//
 // USE_xxx constants renamed to wxUSE_xxx. This is an incompatible change, you
 // must recompile everything after upgrading!
 //

utils/wxPython/src/helpers.h

@@ -58,7 +58,6 @@ extern "C" char *SWIG_GetPtr(char *, void **, char *);
 // Non-const versions to keep SWIG happy.
 extern wxPoint  wxPyDefaultPosition;
 extern wxSize   wxPyDefaultSize;
-extern char*    wxPyPanelNameStr;
 extern wxString wxPyEmptyStr;
 
 //----------------------------------------------------------------------
@@ -103,6 +102,9 @@ private:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.5  1998/10/02 06:40:40  RD
+// Version 0.4 of wxPython for MSW.
+//
 // Revision 1.4  1998/08/27 21:59:09  RD
 // Some chicken-and-egg problems solved for wxPython on wxGTK
 //

utils/wxPython/src/makefile.nt

@@ -50,15 +50,19 @@ TARGET = wxpc
 
 OBJECTS = wxp.obj        helpers.obj    windows.obj    events.obj     \
 	  misc.obj       gdi.obj        mdi.obj        controls.obj   \
-	  controls2.obj  windows2.obj   cmndlgs.obj
+	  controls2.obj  windows2.obj   cmndlgs.obj    stattool.obj   \
+	  frames.obj
+
 
 PYMODULES = $(TARGETDIR)\wxp.py       $(TARGETDIR)\events.py    \
 	    $(TARGETDIR)\windows.py   $(TARGETDIR)\misc.py      \
 	    $(TARGETDIR)\gdi.py       $(TARGETDIR)\mdi.py       \
 	    $(TARGETDIR)\controls.py  $(TARGETDIR)\controls2.py \
             $(TARGETDIR)\windows2.py  $(TARGETDIR)\cmndlgs.py   \
+	    $(TARGETDIR)\stattool.py  $(TARGETDIR)\frames.py    \
 	    $(TARGETDIR)\__init__.py
 
+
 #----------------------------------------------------------------------
 
 !if "$(FINAL)" == "0"
@@ -179,6 +183,8 @@ $(GENCODEDIR)/mdi.cpp       $(GENCODEDIR)/mdi.py       : mdi.i        my_typemap
 $(GENCODEDIR)/controls.cpp  $(GENCODEDIR)/controls.py  : controls.i   my_typemaps.i _defs.i
 $(GENCODEDIR)/controls2.cpp $(GENCODEDIR)/controls2.py : controls2.i  my_typemaps.i _defs.i
 $(GENCODEDIR)/cmndlgs.cpp   $(GENCODEDIR)/cmndlgs.py   : cmndlgs.i    my_typemaps.i _defs.i
+$(GENCODEDIR)/stattool.cpp  $(GENCODEDIR)/stattool.py  : stattool.i   my_typemaps.i _defs.i
+$(GENCODEDIR)/frames.cpp    $(GENCODEDIR)/frames.py    : frames.i     my_typemaps.i _defs.i
 
 
 $(TARGETDIR)\wxp.py       : $(GENCODEDIR)\wxp.py
@@ -191,13 +197,19 @@ $(TARGETDIR)\mdi.py       : $(GENCODEDIR)\mdi.py
 $(TARGETDIR)\controls.py  : $(GENCODEDIR)\controls.py
 $(TARGETDIR)\controls2.py : $(GENCODEDIR)\controls2.py
 $(TARGETDIR)\cmndlgs.py   : $(GENCODEDIR)\cmndlgs.py
+$(TARGETDIR)\frames.py  : $(GENCODEDIR)\frames.py
+$(TARGETDIR)\stattool.py  : $(GENCODEDIR)\stattool.py
 $(TARGETDIR)\__init__.py  : __init__.py
 
 
 #------------------------------------------------------------------------
 #
 # $Log$
+# Revision 1.6  1998/10/02 06:40:41  RD
+# Version 0.4 of wxPython for MSW.
+#
 # Revision 1.5  1998/08/19 00:38:23  RD
+#
 # A few tweaks
 #
 # Revision 1.4  1998/08/18 21:55:10  RD

utils/wxPython/src/mdi.i

@@ -26,6 +26,9 @@
 %import _defs.i
 %import misc.i
 %import windows.i
+%import frames.i
+
+%pragma(python) code = "import wxp"
 
 //----------------------------------------------------------------------
 
@@ -39,6 +42,8 @@ public:
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                      const char* name = "frame");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdFrameCallbacks(self)"
+
     void ActivateNext();
     void ActivatePrevious();
     void ArrangeIcons();
@@ -69,6 +74,8 @@ public:
                     long style = wxDEFAULT_FRAME_STYLE,
                     const char* name = "frame");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdFrameCallbacks(self)"
+
     void Activate();
     void Maximize();
     void Restore();
@@ -85,12 +92,17 @@ public:
 class wxMDIClientWindow : public wxWindow {
 public:
     wxMDIClientWindow(wxMDIParentFrame* parent, long style = 0);
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:wxp._StdOnScrollCallbacks(self)"
 };
 
 //---------------------------------------------------------------------------
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.4  1998/10/02 06:40:41  RD
+// Version 0.4 of wxPython for MSW.
+//
 // Revision 1.3  1998/08/18 19:48:18  RD
 // more wxGTK compatibility things.
 //

utils/wxPython/src/msw/cmndlgs.cpp

@@ -1,5 +1,5 @@
 /*
- * FILE : msw\cmndlgs.cpp
+ * FILE : msw/cmndlgs.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
@@ -3627,7 +3627,6 @@ SWIGEXPORT(void,initcmndlgsc)() {
 	 SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
 	 SWIG_RegisterMapping("_wxPageSetupDialog","_class_wxPageSetupDialog",0);
 	 SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-	 SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
 	 SWIG_RegisterMapping("_uint","_unsigned_int",0);
 	 SWIG_RegisterMapping("_uint","_int",0);
 	 SWIG_RegisterMapping("_uint","_wxWindowID",0);
@@ -3752,7 +3751,6 @@ SWIGEXPORT(void,initcmndlgsc)() {
 	 SWIG_RegisterMapping("_short","_WXTYPE",0);
 	 SWIG_RegisterMapping("_short","_unsigned_short",0);
 	 SWIG_RegisterMapping("_short","_signed_short",0);
-	 SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0);
 	 SWIG_RegisterMapping("_wxWindowID","_EBool",0);
 	 SWIG_RegisterMapping("_wxWindowID","_uint",0);
 	 SWIG_RegisterMapping("_wxWindowID","_int",0);
@@ -3771,7 +3769,6 @@ SWIGEXPORT(void,initcmndlgsc)() {
 	 SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
 	 SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
 	 SWIG_RegisterMapping("_class_wxPageSetupDialog","_wxPageSetupDialog",0);
-	 SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0);
 	 SWIG_RegisterMapping("_wxFontDialog","_class_wxFontDialog",0);
 	 SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
 	 SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
@@ -3826,5 +3823,4 @@ SWIGEXPORT(void,initcmndlgsc)() {
 	 SWIG_RegisterMapping("_wxWindow","_class_wxColourDialog",SwigwxColourDialogTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_wxColourDialog",SwigwxColourDialogTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
-	 SWIG_RegisterMapping("_class_wxFrame","_wxFrame",0);
 }

utils/wxPython/src/msw/cmndlgs.py

@@ -65,6 +65,7 @@ class wxColourDialog(wxColourDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxColourDialog,(arg0.this,)+args)
         self.thisown = 1
+        wxp._StdDialogCallbacks(self)
 
 
 
@@ -101,6 +102,7 @@ class wxDirDialog(wxDirDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxDirDialog,(arg0.this,)+args)
         self.thisown = 1
+        wxp._StdDialogCallbacks(self)
 
 
 
@@ -164,6 +166,7 @@ class wxFileDialog(wxFileDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxFileDialog,(arg0.this,)+args)
         self.thisown = 1
+        wxp._StdDialogCallbacks(self)
 
 
 
@@ -194,6 +197,7 @@ class wxSingleChoiceDialog(wxSingleChoiceDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxSingleChoiceDialog,(arg0.this,arg1,arg2,arg3,)+args)
         self.thisown = 1
+        wxp._StdDialogCallbacks(self)
 
 
 
@@ -221,6 +225,7 @@ class wxTextEntryDialog(wxTextEntryDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxTextEntryDialog,(arg0.this,arg1,)+args)
         self.thisown = 1
+        wxp._StdDialogCallbacks(self)
 
 
 
@@ -307,6 +312,7 @@ class wxFontDialog(wxFontDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxFontDialog,(arg0.this,)+args)
         self.thisown = 1
+        wxp._StdDialogCallbacks(self)
 
 
 
@@ -437,6 +443,7 @@ class wxPageSetupDialog(wxPageSetupDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxPageSetupDialog,(arg0.this,)+args)
         self.thisown = 1
+        wxp._StdDialogCallbacks(self)
 
 
 
@@ -546,6 +553,7 @@ class wxPrintDialog(wxPrintDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxPrintDialog,(arg0.this,)+args)
         self.thisown = 1
+        wxp._StdDialogCallbacks(self)
 
 
 
@@ -567,6 +575,7 @@ class wxMessageDialog(wxMessageDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxMessageDialog,(arg0.this,arg1,)+args)
         self.thisown = 1
+        wxp._StdDialogCallbacks(self)
 
 
 

utils/wxPython/src/msw/controls.cpp

@@ -1,5 +1,5 @@
 /*
- * FILE : msw\controls.cpp
+ * FILE : msw/controls.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
@@ -58,6 +58,9 @@ extern PyObject *SWIG_newvarlink(void);
 
 #ifdef __WXMSW__
 #include <wx/spinbutt.h>
+#if wxUSE_OWNER_DRAWN
+#include <wx/checklst.h>
+#endif
 #endif
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
@@ -2748,6 +2751,172 @@ static PyObject *_wrap_wxListBox_SetStringSelection(PyObject *self, PyObject *ar
     return _resultobj;
 }
 
+static void *SwigwxCheckListBoxTowxListBox(void *ptr) {
+    wxCheckListBox *src;
+    wxListBox *dest;
+    src = (wxCheckListBox *) ptr;
+    dest = (wxListBox *) src;
+    return (void *) dest;
+}
+
+static void *SwigwxCheckListBoxTowxControl(void *ptr) {
+    wxCheckListBox *src;
+    wxControl *dest;
+    src = (wxCheckListBox *) ptr;
+    dest = (wxControl *) src;
+    return (void *) dest;
+}
+
+static void *SwigwxCheckListBoxTowxWindow(void *ptr) {
+    wxCheckListBox *src;
+    wxWindow *dest;
+    src = (wxCheckListBox *) ptr;
+    dest = (wxWindow *) src;
+    return (void *) dest;
+}
+
+static void *SwigwxCheckListBoxTowxEvtHandler(void *ptr) {
+    wxCheckListBox *src;
+    wxEvtHandler *dest;
+    src = (wxCheckListBox *) ptr;
+    dest = (wxEvtHandler *) src;
+    return (void *) dest;
+}
+
+#define new_wxCheckListBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8) (new wxCheckListBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8))
+static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxCheckListBox * _result;
+    wxWindow * _arg0;
+    wxWindowID  _arg1;
+    wxPoint * _arg2 = &wxPyDefaultPosition;
+    wxSize * _arg3 = &wxPyDefaultSize;
+    int  _arg4 = 0;
+    wxString * _arg5 = NULL;
+    long  _arg6 = 0;
+    wxValidator * _arg7 = &wxPyDefaultValidator;
+    char * _arg8 = "listBox";
+    char * _argc0 = 0;
+    char * _argc2 = 0;
+    char * _argc3 = 0;
+    PyObject * _obj5 = 0;
+    char * _argc7 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si|ssOlss:new_wxCheckListBox",&_argc0,&_arg1,&_argc2,&_argc3,&_obj5,&_arg6,&_argc7,&_arg8)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxCheckListBox. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc2) {
+        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxCheckListBox. Expected _wxPoint_p.");
+        return NULL;
+        }
+    }
+    if (_argc3) {
+        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxCheckListBox. Expected _wxSize_p.");
+        return NULL;
+        }
+    }
+    if (_obj5)
+{
+    _arg5 = wxString_LIST_helper(_obj5);
+    if (_arg5 == NULL) {
+        return NULL;
+    }
+}
+    if (_argc7) {
+        if (SWIG_GetPtr(_argc7,(void **) &_arg7,"_wxValidator_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 8 of new_wxCheckListBox. Expected _wxValidator_p.");
+        return NULL;
+        }
+    }
+{
+    _arg4 = PyList_Size(_obj5);
+}
+    _result = (wxCheckListBox *)new_wxCheckListBox(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7,_arg8);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxCheckListBox_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    delete [] _arg5;
+}
+    return _resultobj;
+}
+
+#define wxCheckListBox_IsChecked(_swigobj,_swigarg0)  (_swigobj->IsChecked(_swigarg0))
+static PyObject *_wrap_wxCheckListBox_IsChecked(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxCheckListBox * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxCheckListBox_IsChecked",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCheckListBox_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckListBox_IsChecked. Expected _wxCheckListBox_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxCheckListBox_IsChecked(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxCheckListBox_Check(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Check(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxCheckListBox_Check(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxCheckListBox * _arg0;
+    int  _arg1;
+    bool  _arg2 = (1);
+    char * _argc0 = 0;
+    int tempbool2;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si|i:wxCheckListBox_Check",&_argc0,&_arg1,&tempbool2)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCheckListBox_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckListBox_Check. Expected _wxCheckListBox_p.");
+        return NULL;
+        }
+    }
+    _arg2 = (bool ) tempbool2;
+    wxCheckListBox_Check(_arg0,_arg1,_arg2);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxCheckListBox_GetItemHeight(_swigobj)  (_swigobj->GetItemHeight())
+static PyObject *_wrap_wxCheckListBox_GetItemHeight(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxCheckListBox * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxCheckListBox_GetItemHeight",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCheckListBox_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckListBox_GetItemHeight. Expected _wxCheckListBox_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxCheckListBox_GetItemHeight(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
 static void *SwigwxTextCtrlTowxControl(void *ptr) {
     wxTextCtrl *src;
     wxControl *dest;
@@ -5178,6 +5347,10 @@ static PyMethodDef controlscMethods[] = {
 	 { "wxTextCtrl_Copy", _wrap_wxTextCtrl_Copy, 1 },
 	 { "wxTextCtrl_Clear", _wrap_wxTextCtrl_Clear, 1 },
 	 { "new_wxTextCtrl", _wrap_new_wxTextCtrl, 1 },
+	 { "wxCheckListBox_GetItemHeight", _wrap_wxCheckListBox_GetItemHeight, 1 },
+	 { "wxCheckListBox_Check", _wrap_wxCheckListBox_Check, 1 },
+	 { "wxCheckListBox_IsChecked", _wrap_wxCheckListBox_IsChecked, 1 },
+	 { "new_wxCheckListBox", _wrap_new_wxCheckListBox, 1 },
 	 { "wxListBox_SetStringSelection", _wrap_wxListBox_SetStringSelection, 1 },
 	 { "wxListBox_SetString", _wrap_wxListBox_SetString, 1 },
 	 { "wxListBox_SetSelection", _wrap_wxListBox_SetSelection, 1 },
@@ -5294,6 +5467,8 @@ SWIGEXPORT(void,initcontrolsc)() {
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxScrollBar",SwigwxScrollBarTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxTextCtrl",SwigwxTextCtrlTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxTextCtrl",SwigwxTextCtrlTowxEvtHandler);
+	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxCheckListBox",SwigwxCheckListBoxTowxEvtHandler);
+	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxCheckListBox",SwigwxCheckListBoxTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxListBox",SwigwxListBoxTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxListBox",SwigwxListBoxTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxStaticText",SwigwxStaticTextTowxEvtHandler);
@@ -5351,12 +5526,12 @@ SWIGEXPORT(void,initcontrolsc)() {
 	 SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
 	 SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
 	 SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-	 SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
 	 SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
 	 SWIG_RegisterMapping("_uint","_unsigned_int",0);
 	 SWIG_RegisterMapping("_uint","_int",0);
 	 SWIG_RegisterMapping("_uint","_wxWindowID",0);
 	 SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
+	 SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
 	 SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
 	 SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
 	 SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
@@ -5401,6 +5576,8 @@ SWIGEXPORT(void,initcontrolsc)() {
 	 SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
 	 SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
 	 SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
+	 SWIG_RegisterMapping("_wxListBox","_class_wxCheckListBox",SwigwxCheckListBoxTowxListBox);
+	 SWIG_RegisterMapping("_wxListBox","_wxCheckListBox",SwigwxCheckListBoxTowxListBox);
 	 SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
 	 SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
 	 SWIG_RegisterMapping("_WXTYPE","_short",0);
@@ -5423,6 +5600,8 @@ SWIGEXPORT(void,initcontrolsc)() {
 	 SWIG_RegisterMapping("_class_wxWindow","_wxScrollBar",SwigwxScrollBarTowxWindow);
 	 SWIG_RegisterMapping("_class_wxWindow","_class_wxTextCtrl",SwigwxTextCtrlTowxWindow);
 	 SWIG_RegisterMapping("_class_wxWindow","_wxTextCtrl",SwigwxTextCtrlTowxWindow);
+	 SWIG_RegisterMapping("_class_wxWindow","_class_wxCheckListBox",SwigwxCheckListBoxTowxWindow);
+	 SWIG_RegisterMapping("_class_wxWindow","_wxCheckListBox",SwigwxCheckListBoxTowxWindow);
 	 SWIG_RegisterMapping("_class_wxWindow","_class_wxListBox",SwigwxListBoxTowxWindow);
 	 SWIG_RegisterMapping("_class_wxWindow","_wxListBox",SwigwxListBoxTowxWindow);
 	 SWIG_RegisterMapping("_class_wxWindow","_class_wxStaticText",SwigwxStaticTextTowxWindow);
@@ -5480,6 +5659,8 @@ SWIGEXPORT(void,initcontrolsc)() {
 	 SWIG_RegisterMapping("_wxControl","_wxScrollBar",SwigwxScrollBarTowxControl);
 	 SWIG_RegisterMapping("_wxControl","_class_wxTextCtrl",SwigwxTextCtrlTowxControl);
 	 SWIG_RegisterMapping("_wxControl","_wxTextCtrl",SwigwxTextCtrlTowxControl);
+	 SWIG_RegisterMapping("_wxControl","_class_wxCheckListBox",SwigwxCheckListBoxTowxControl);
+	 SWIG_RegisterMapping("_wxControl","_wxCheckListBox",SwigwxCheckListBoxTowxControl);
 	 SWIG_RegisterMapping("_wxControl","_class_wxListBox",SwigwxListBoxTowxControl);
 	 SWIG_RegisterMapping("_wxControl","_wxListBox",SwigwxListBoxTowxControl);
 	 SWIG_RegisterMapping("_wxControl","_class_wxStaticText",SwigwxStaticTextTowxControl);
@@ -5499,6 +5680,8 @@ SWIGEXPORT(void,initcontrolsc)() {
 	 SWIG_RegisterMapping("_wxControl","_class_wxButton",SwigwxButtonTowxControl);
 	 SWIG_RegisterMapping("_wxControl","_wxButton",SwigwxButtonTowxControl);
 	 SWIG_RegisterMapping("_wxControl","_class_wxControl",0);
+	 SWIG_RegisterMapping("_class_wxListBox","_class_wxCheckListBox",SwigwxCheckListBoxTowxListBox);
+	 SWIG_RegisterMapping("_class_wxListBox","_wxCheckListBox",SwigwxCheckListBoxTowxListBox);
 	 SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0);
 	 SWIG_RegisterMapping("_unsigned_int","_uint",0);
 	 SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
@@ -5516,7 +5699,6 @@ SWIGEXPORT(void,initcontrolsc)() {
 	 SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
 	 SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
 	 SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
-	 SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0);
 	 SWIG_RegisterMapping("_wxWindowID","_EBool",0);
 	 SWIG_RegisterMapping("_wxWindowID","_uint",0);
 	 SWIG_RegisterMapping("_wxWindowID","_int",0);
@@ -5554,6 +5736,8 @@ SWIGEXPORT(void,initcontrolsc)() {
 	 SWIG_RegisterMapping("_class_wxControl","_wxScrollBar",SwigwxScrollBarTowxControl);
 	 SWIG_RegisterMapping("_class_wxControl","_class_wxTextCtrl",SwigwxTextCtrlTowxControl);
 	 SWIG_RegisterMapping("_class_wxControl","_wxTextCtrl",SwigwxTextCtrlTowxControl);
+	 SWIG_RegisterMapping("_class_wxControl","_class_wxCheckListBox",SwigwxCheckListBoxTowxControl);
+	 SWIG_RegisterMapping("_class_wxControl","_wxCheckListBox",SwigwxCheckListBoxTowxControl);
 	 SWIG_RegisterMapping("_class_wxControl","_class_wxListBox",SwigwxListBoxTowxControl);
 	 SWIG_RegisterMapping("_class_wxControl","_wxListBox",SwigwxListBoxTowxControl);
 	 SWIG_RegisterMapping("_class_wxControl","_class_wxStaticText",SwigwxStaticTextTowxControl);
@@ -5579,11 +5763,11 @@ SWIGEXPORT(void,initcontrolsc)() {
 	 SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
 	 SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
 	 SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
-	 SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0);
 	 SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
 	 SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
 	 SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
 	 SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
+	 SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
 	 SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
 	 SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
 	 SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
@@ -5605,6 +5789,8 @@ SWIGEXPORT(void,initcontrolsc)() {
 	 SWIG_RegisterMapping("_wxEvtHandler","_wxScrollBar",SwigwxScrollBarTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxTextCtrl",SwigwxTextCtrlTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_wxTextCtrl",SwigwxTextCtrlTowxEvtHandler);
+	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxCheckListBox",SwigwxCheckListBoxTowxEvtHandler);
+	 SWIG_RegisterMapping("_wxEvtHandler","_wxCheckListBox",SwigwxCheckListBoxTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxListBox",SwigwxListBoxTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_wxListBox",SwigwxListBoxTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxStaticText",SwigwxStaticTextTowxEvtHandler);
@@ -5648,6 +5834,8 @@ SWIGEXPORT(void,initcontrolsc)() {
 	 SWIG_RegisterMapping("_wxWindow","_wxScrollBar",SwigwxScrollBarTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_class_wxTextCtrl",SwigwxTextCtrlTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_wxTextCtrl",SwigwxTextCtrlTowxWindow);
+	 SWIG_RegisterMapping("_wxWindow","_class_wxCheckListBox",SwigwxCheckListBoxTowxWindow);
+	 SWIG_RegisterMapping("_wxWindow","_wxCheckListBox",SwigwxCheckListBoxTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_class_wxListBox",SwigwxListBoxTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_wxListBox",SwigwxListBoxTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_class_wxStaticText",SwigwxStaticTextTowxWindow);
@@ -5669,5 +5857,4 @@ SWIGEXPORT(void,initcontrolsc)() {
 	 SWIG_RegisterMapping("_wxWindow","_class_wxControl",SwigwxControlTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_wxControl",SwigwxControlTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
-	 SWIG_RegisterMapping("_class_wxFrame","_wxFrame",0);
 }

utils/wxPython/src/msw/controls.py

@@ -8,6 +8,7 @@ from windows import *
 from gdi import *
 
 from events import *
+import wxp
 class wxControlPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
@@ -49,6 +50,7 @@ class wxButton(wxButtonPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxButton,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 
@@ -97,6 +99,7 @@ class wxBitmapButton(wxBitmapButtonPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxBitmapButton,(arg0.this,arg1,arg2.this,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 
@@ -123,6 +126,7 @@ class wxCheckBox(wxCheckBoxPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxCheckBox,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 
@@ -176,6 +180,7 @@ class wxChoice(wxChoicePtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxChoice,(arg0.this,arg1,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 
@@ -259,6 +264,7 @@ class wxComboBox(wxComboBoxPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxComboBox,(arg0.this,arg1,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 
@@ -303,6 +309,7 @@ class wxGauge(wxGaugePtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxGauge,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 
@@ -349,6 +356,7 @@ class wxStaticText(wxStaticTextPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxStaticText,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 
@@ -417,6 +425,37 @@ class wxListBox(wxListBoxPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxListBox,(arg0.this,arg1,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
+
+
+
+
+class wxCheckListBoxPtr(wxListBoxPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def IsChecked(self,arg0):
+        val = controlsc.wxCheckListBox_IsChecked(self.this,arg0)
+        return val
+    def Check(self,arg0,*args):
+        val = apply(controlsc.wxCheckListBox_Check,(self.this,arg0,)+args)
+        return val
+    def GetItemHeight(self):
+        val = controlsc.wxCheckListBox_GetItemHeight(self.this)
+        return val
+    def __repr__(self):
+        return "<C wxCheckListBox instance>"
+class wxCheckListBox(wxCheckListBoxPtr):
+    def __init__(self,arg0,arg1,*args) :
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        try: argl[1] = argl[1].this
+        except: pass
+        args = tuple(argl)
+        self.this = apply(controlsc.new_wxCheckListBox,(arg0.this,arg1,)+args)
+        self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 
@@ -512,6 +551,7 @@ class wxTextCtrl(wxTextCtrlPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxTextCtrl,(arg0.this,arg1,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 
@@ -550,6 +590,7 @@ class wxScrollBar(wxScrollBarPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxScrollBar,(arg0.this,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 
@@ -612,6 +653,7 @@ class wxStaticBitmap(wxStaticBitmapPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxStaticBitmap,(arg0.this,arg1,arg2.this,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 
@@ -677,6 +719,7 @@ class wxRadioBox(wxRadioBoxPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxRadioBox,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 
@@ -703,6 +746,7 @@ class wxRadioButton(wxRadioButtonPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxRadioButton,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 
@@ -780,6 +824,7 @@ class wxSlider(wxSliderPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxSlider,(arg0.this,arg1,arg2,arg3,arg4,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 

utils/wxPython/src/msw/controls2.cpp

@@ -1,5 +1,5 @@
 /*
- * FILE : msw\controls2.cpp
+ * FILE : msw/controls2.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
@@ -56,7 +56,9 @@ extern PyObject *SWIG_newvarlink(void);
 #include "helpers.h"
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
+#if 0
 #include <wx/tabctrl.h>
+#endif
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
@@ -972,6 +974,29 @@ static PyObject *_wrap_wxListCtrl_GetCountPerPage(PyObject *self, PyObject *args
     return _resultobj;
 }
 
+#define wxListCtrl_GetEditControl(_swigobj)  (_swigobj->GetEditControl())
+static PyObject *_wrap_wxListCtrl_GetEditControl(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxTextCtrl * _result;
+    wxListCtrl * _arg0;
+    char * _argc0 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxListCtrl_GetEditControl",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetEditControl. Expected _wxListCtrl_p.");
+        return NULL;
+        }
+    }
+    _result = (wxTextCtrl *)wxListCtrl_GetEditControl(_arg0);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
 #define wxListCtrl_GetImageList(_swigobj,_swigarg0)  (_swigobj->GetImageList(_swigarg0))
 static PyObject *_wrap_wxListCtrl_GetImageList(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -3197,563 +3222,7 @@ static PyObject *_wrap_wxTreeCtrl_SortChildren(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static void *SwigwxTabEventTowxCommandEvent(void *ptr) {
-    wxTabEvent *src;
-    wxCommandEvent *dest;
-    src = (wxTabEvent *) ptr;
-    dest = (wxCommandEvent *) src;
-    return (void *) dest;
-}
-
-static void *SwigwxTabEventTowxEvent(void *ptr) {
-    wxTabEvent *src;
-    wxEvent *dest;
-    src = (wxTabEvent *) ptr;
-    dest = (wxEvent *) src;
-    return (void *) dest;
-}
-
-static void *SwigwxTabCtrlTowxControl(void *ptr) {
-    wxTabCtrl *src;
-    wxControl *dest;
-    src = (wxTabCtrl *) ptr;
-    dest = (wxControl *) src;
-    return (void *) dest;
-}
-
-static void *SwigwxTabCtrlTowxWindow(void *ptr) {
-    wxTabCtrl *src;
-    wxWindow *dest;
-    src = (wxTabCtrl *) ptr;
-    dest = (wxWindow *) src;
-    return (void *) dest;
-}
-
-static void *SwigwxTabCtrlTowxEvtHandler(void *ptr) {
-    wxTabCtrl *src;
-    wxEvtHandler *dest;
-    src = (wxTabCtrl *) ptr;
-    dest = (wxEvtHandler *) src;
-    return (void *) dest;
-}
-
-#define new_wxTabCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxTabCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxTabCtrl(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxTabCtrl * _result;
-    wxWindow * _arg0;
-    wxWindowID  _arg1;
-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = 0;
-    char * _arg5 = "tabCtrl";
-    char * _argc0 = 0;
-    char * _argc2 = 0;
-    char * _argc3 = 0;
-    char _ptemp[128];
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"si|ssls:new_wxTabCtrl",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxTabCtrl. Expected _wxWindow_p.");
-        return NULL;
-        }
-    }
-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxTabCtrl. Expected _wxPoint_p.");
-        return NULL;
-        }
-    }
-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxTabCtrl. Expected _wxSize_p.");
-        return NULL;
-        }
-    }
-    _result = (wxTabCtrl *)new_wxTabCtrl(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxTabCtrl_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
-    return _resultobj;
-}
-
-#define wxTabCtrl_DeleteAllItems(_swigobj)  (_swigobj->DeleteAllItems())
-static PyObject *_wrap_wxTabCtrl_DeleteAllItems(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    bool  _result;
-    wxTabCtrl * _arg0;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"s:wxTabCtrl_DeleteAllItems",&_argc0)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTabCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTabCtrl_DeleteAllItems. Expected _wxTabCtrl_p.");
-        return NULL;
-        }
-    }
-    _result = (bool )wxTabCtrl_DeleteAllItems(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
-#define wxTabCtrl_DeleteItem(_swigobj,_swigarg0)  (_swigobj->DeleteItem(_swigarg0))
-static PyObject *_wrap_wxTabCtrl_DeleteItem(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    bool  _result;
-    wxTabCtrl * _arg0;
-    int  _arg1;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"si:wxTabCtrl_DeleteItem",&_argc0,&_arg1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTabCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTabCtrl_DeleteItem. Expected _wxTabCtrl_p.");
-        return NULL;
-        }
-    }
-    _result = (bool )wxTabCtrl_DeleteItem(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
-#define wxTabCtrl_GetImageList(_swigobj)  (_swigobj->GetImageList())
-static PyObject *_wrap_wxTabCtrl_GetImageList(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxImageList * _result;
-    wxTabCtrl * _arg0;
-    char * _argc0 = 0;
-    char _ptemp[128];
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"s:wxTabCtrl_GetImageList",&_argc0)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTabCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTabCtrl_GetImageList. Expected _wxTabCtrl_p.");
-        return NULL;
-        }
-    }
-    _result = (wxImageList *)wxTabCtrl_GetImageList(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
-    return _resultobj;
-}
-
-#define wxTabCtrl_GetItemCount(_swigobj)  (_swigobj->GetItemCount())
-static PyObject *_wrap_wxTabCtrl_GetItemCount(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    int  _result;
-    wxTabCtrl * _arg0;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"s:wxTabCtrl_GetItemCount",&_argc0)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTabCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTabCtrl_GetItemCount. Expected _wxTabCtrl_p.");
-        return NULL;
-        }
-    }
-    _result = (int )wxTabCtrl_GetItemCount(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
-#define wxTabCtrl_GetItemImage(_swigobj,_swigarg0)  (_swigobj->GetItemImage(_swigarg0))
-static PyObject *_wrap_wxTabCtrl_GetItemImage(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    int  _result;
-    wxTabCtrl * _arg0;
-    int  _arg1;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"si:wxTabCtrl_GetItemImage",&_argc0,&_arg1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTabCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTabCtrl_GetItemImage. Expected _wxTabCtrl_p.");
-        return NULL;
-        }
-    }
-    _result = (int )wxTabCtrl_GetItemImage(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
-static wxRect * wxTabCtrl_GetItemRect(wxTabCtrl *self,int  item) {
-            wxRect* rect = new wxRect;
-            self->GetItemRect(item, *rect);
-            return rect;
-        }
-static PyObject *_wrap_wxTabCtrl_GetItemRect(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxRect * _result;
-    wxTabCtrl * _arg0;
-    int  _arg1;
-    char * _argc0 = 0;
-    char _ptemp[128];
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"si:wxTabCtrl_GetItemRect",&_argc0,&_arg1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTabCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTabCtrl_GetItemRect. Expected _wxTabCtrl_p.");
-        return NULL;
-        }
-    }
-    _result = (wxRect *)wxTabCtrl_GetItemRect(_arg0,_arg1);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxRect_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
-    return _resultobj;
-}
-
-#define wxTabCtrl_GetItemText(_swigobj,_swigarg0)  (_swigobj->GetItemText(_swigarg0))
-static PyObject *_wrap_wxTabCtrl_GetItemText(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxString * _result;
-    wxTabCtrl * _arg0;
-    int  _arg1;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"si:wxTabCtrl_GetItemText",&_argc0,&_arg1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTabCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTabCtrl_GetItemText. Expected _wxTabCtrl_p.");
-        return NULL;
-        }
-    }
-    _result = new wxString (wxTabCtrl_GetItemText(_arg0,_arg1));
-{
-    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
-}
-{
-    delete _result;
-}
-    return _resultobj;
-}
-
-#define wxTabCtrl_GetRowCount(_swigobj)  (_swigobj->GetRowCount())
-static PyObject *_wrap_wxTabCtrl_GetRowCount(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    bool  _result;
-    wxTabCtrl * _arg0;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"s:wxTabCtrl_GetRowCount",&_argc0)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTabCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTabCtrl_GetRowCount. Expected _wxTabCtrl_p.");
-        return NULL;
-        }
-    }
-    _result = (bool )wxTabCtrl_GetRowCount(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
-#define wxTabCtrl_GetSelection(_swigobj)  (_swigobj->GetSelection())
-static PyObject *_wrap_wxTabCtrl_GetSelection(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    int  _result;
-    wxTabCtrl * _arg0;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"s:wxTabCtrl_GetSelection",&_argc0)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTabCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTabCtrl_GetSelection. Expected _wxTabCtrl_p.");
-        return NULL;
-        }
-    }
-    _result = (int )wxTabCtrl_GetSelection(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
-#define wxTabCtrl_HitTest(_swigobj,_swigarg0,_swigarg1)  (_swigobj->HitTest(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTabCtrl_HitTest(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    int  _result;
-    wxTabCtrl * _arg0;
-    wxPoint * _arg1;
-    long * _arg2;
-    long  temp;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-
-    self = self;
-{
-  _arg2 = &temp;
-}
-    if(!PyArg_ParseTuple(args,"ss:wxTabCtrl_HitTest",&_argc0,&_argc1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTabCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTabCtrl_HitTest. Expected _wxTabCtrl_p.");
-        return NULL;
-        }
-    }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTabCtrl_HitTest. Expected _wxPoint_p.");
-        return NULL;
-        }
-    }
-    _result = (int )wxTabCtrl_HitTest(_arg0,*_arg1,*_arg2);
-    _resultobj = Py_BuildValue("i",_result);
-{
-    PyObject *o;
-    o = PyInt_FromLong((long) (*_arg2));
-    _resultobj = t_output_helper(_resultobj, o);
-}
-    return _resultobj;
-}
-
-#define wxTabCtrl_InsertItem(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->InsertItem(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
-static PyObject *_wrap_wxTabCtrl_InsertItem(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxTabCtrl * _arg0;
-    int  _arg1;
-    wxString * _arg2;
-    int  _arg3 = -1;
-    void * _arg4 = NULL;
-    char * _argc0 = 0;
-    PyObject * _obj2 = 0;
-    char * _argc4 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"siO|is:wxTabCtrl_InsertItem",&_argc0,&_arg1,&_obj2,&_arg3,&_argc4)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTabCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTabCtrl_InsertItem. Expected _wxTabCtrl_p.");
-        return NULL;
-        }
-    }
-{
-    if (!PyString_Check(_obj2)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    _arg2 = new wxString(PyString_AsString(_obj2));
-}
-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,(char *) 0 )) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxTabCtrl_InsertItem. Expected _void_p.");
-        return NULL;
-        }
-    }
-    wxTabCtrl_InsertItem(_arg0,_arg1,*_arg2,_arg3,_arg4);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-{
-    if (_obj2)
-        delete _arg2;
-}
-    return _resultobj;
-}
-
-#define wxTabCtrl_SetItemImage(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetItemImage(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTabCtrl_SetItemImage(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    bool  _result;
-    wxTabCtrl * _arg0;
-    int  _arg1;
-    int  _arg2;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"sii:wxTabCtrl_SetItemImage",&_argc0,&_arg1,&_arg2)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTabCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTabCtrl_SetItemImage. Expected _wxTabCtrl_p.");
-        return NULL;
-        }
-    }
-    _result = (bool )wxTabCtrl_SetItemImage(_arg0,_arg1,_arg2);
-    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
-#define wxTabCtrl_SetImageList(_swigobj,_swigarg0)  (_swigobj->SetImageList(_swigarg0))
-static PyObject *_wrap_wxTabCtrl_SetImageList(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxTabCtrl * _arg0;
-    wxImageList * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxTabCtrl_SetImageList",&_argc0,&_argc1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTabCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTabCtrl_SetImageList. Expected _wxTabCtrl_p.");
-        return NULL;
-        }
-    }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxImageList_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTabCtrl_SetImageList. Expected _wxImageList_p.");
-        return NULL;
-        }
-    }
-    wxTabCtrl_SetImageList(_arg0,_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
-#define wxTabCtrl_SetItemSize(_swigobj,_swigarg0)  (_swigobj->SetItemSize(_swigarg0))
-static PyObject *_wrap_wxTabCtrl_SetItemSize(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxTabCtrl * _arg0;
-    wxSize * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxTabCtrl_SetItemSize",&_argc0,&_argc1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTabCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTabCtrl_SetItemSize. Expected _wxTabCtrl_p.");
-        return NULL;
-        }
-    }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTabCtrl_SetItemSize. Expected _wxSize_p.");
-        return NULL;
-        }
-    }
-    wxTabCtrl_SetItemSize(_arg0,*_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
-#define wxTabCtrl_SetItemText(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetItemText(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTabCtrl_SetItemText(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    bool  _result;
-    wxTabCtrl * _arg0;
-    int  _arg1;
-    wxString * _arg2;
-    char * _argc0 = 0;
-    PyObject * _obj2 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"siO:wxTabCtrl_SetItemText",&_argc0,&_arg1,&_obj2)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTabCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTabCtrl_SetItemText. Expected _wxTabCtrl_p.");
-        return NULL;
-        }
-    }
-{
-    if (!PyString_Check(_obj2)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    _arg2 = new wxString(PyString_AsString(_obj2));
-}
-    _result = (bool )wxTabCtrl_SetItemText(_arg0,_arg1,*_arg2);
-    _resultobj = Py_BuildValue("i",_result);
-{
-    if (_obj2)
-        delete _arg2;
-}
-    return _resultobj;
-}
-
-#define wxTabCtrl_SetPadding(_swigobj,_swigarg0)  (_swigobj->SetPadding(_swigarg0))
-static PyObject *_wrap_wxTabCtrl_SetPadding(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxTabCtrl * _arg0;
-    wxSize * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxTabCtrl_SetPadding",&_argc0,&_argc1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTabCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTabCtrl_SetPadding. Expected _wxTabCtrl_p.");
-        return NULL;
-        }
-    }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTabCtrl_SetPadding. Expected _wxSize_p.");
-        return NULL;
-        }
-    }
-    wxTabCtrl_SetPadding(_arg0,*_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
-#define wxTabCtrl_SetSelection(_swigobj,_swigarg0)  (_swigobj->SetSelection(_swigarg0))
-static PyObject *_wrap_wxTabCtrl_SetSelection(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    int  _result;
-    wxTabCtrl * _arg0;
-    int  _arg1;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"si:wxTabCtrl_SetSelection",&_argc0,&_arg1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTabCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTabCtrl_SetSelection. Expected _wxTabCtrl_p.");
-        return NULL;
-        }
-    }
-    _result = (int )wxTabCtrl_SetSelection(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
 static PyMethodDef controls2cMethods[] = {
-	 { "wxTabCtrl_SetSelection", _wrap_wxTabCtrl_SetSelection, 1 },
-	 { "wxTabCtrl_SetPadding", _wrap_wxTabCtrl_SetPadding, 1 },
-	 { "wxTabCtrl_SetItemText", _wrap_wxTabCtrl_SetItemText, 1 },
-	 { "wxTabCtrl_SetItemSize", _wrap_wxTabCtrl_SetItemSize, 1 },
-	 { "wxTabCtrl_SetImageList", _wrap_wxTabCtrl_SetImageList, 1 },
-	 { "wxTabCtrl_SetItemImage", _wrap_wxTabCtrl_SetItemImage, 1 },
-	 { "wxTabCtrl_InsertItem", _wrap_wxTabCtrl_InsertItem, 1 },
-	 { "wxTabCtrl_HitTest", _wrap_wxTabCtrl_HitTest, 1 },
-	 { "wxTabCtrl_GetSelection", _wrap_wxTabCtrl_GetSelection, 1 },
-	 { "wxTabCtrl_GetRowCount", _wrap_wxTabCtrl_GetRowCount, 1 },
-	 { "wxTabCtrl_GetItemText", _wrap_wxTabCtrl_GetItemText, 1 },
-	 { "wxTabCtrl_GetItemRect", _wrap_wxTabCtrl_GetItemRect, 1 },
-	 { "wxTabCtrl_GetItemImage", _wrap_wxTabCtrl_GetItemImage, 1 },
-	 { "wxTabCtrl_GetItemCount", _wrap_wxTabCtrl_GetItemCount, 1 },
-	 { "wxTabCtrl_GetImageList", _wrap_wxTabCtrl_GetImageList, 1 },
-	 { "wxTabCtrl_DeleteItem", _wrap_wxTabCtrl_DeleteItem, 1 },
-	 { "wxTabCtrl_DeleteAllItems", _wrap_wxTabCtrl_DeleteAllItems, 1 },
-	 { "new_wxTabCtrl", _wrap_new_wxTabCtrl, 1 },
 	 { "wxTreeCtrl_SortChildren", _wrap_wxTreeCtrl_SortChildren, 1 },
 	 { "wxTreeCtrl_SetItemData", _wrap_wxTreeCtrl_SetItemData, 1 },
 	 { "wxTreeCtrl_SetItemText", _wrap_wxTreeCtrl_SetItemText, 1 },
@@ -3840,6 +3309,7 @@ static PyMethodDef controls2cMethods[] = {
 	 { "wxListCtrl_GetItem", _wrap_wxListCtrl_GetItem, 1 },
 	 { "wxListCtrl_GetItemData", _wrap_wxListCtrl_GetItemData, 1 },
 	 { "wxListCtrl_GetImageList", _wrap_wxListCtrl_GetImageList, 1 },
+	 { "wxListCtrl_GetEditControl", _wrap_wxListCtrl_GetEditControl, 1 },
 	 { "wxListCtrl_GetCountPerPage", _wrap_wxListCtrl_GetCountPerPage, 1 },
 	 { "wxListCtrl_GetColumnWidth", _wrap_wxListCtrl_GetColumnWidth, 1 },
 	 { "wxListCtrl_GetColumn", _wrap_wxListCtrl_GetColumn, 1 },
@@ -3934,8 +3404,6 @@ SWIGEXPORT(void,initcontrols2c)() {
  * (Used by the SWIG pointer type-checker).
  */
 	 SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-	 SWIG_RegisterMapping("_wxEvent","_class_wxTabEvent",SwigwxTabEventTowxEvent);
-	 SWIG_RegisterMapping("_wxEvent","_wxTabEvent",SwigwxTabEventTowxEvent);
 	 SWIG_RegisterMapping("_wxEvent","_class_wxTreeEvent",SwigwxTreeEventTowxEvent);
 	 SWIG_RegisterMapping("_wxEvent","_wxTreeEvent",SwigwxTreeEventTowxEvent);
 	 SWIG_RegisterMapping("_wxEvent","_class_wxListEvent",SwigwxListEventTowxEvent);
@@ -3945,8 +3413,6 @@ SWIGEXPORT(void,initcontrols2c)() {
 	 SWIG_RegisterMapping("_signed_long","_long",0);
 	 SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
 	 SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxTabCtrl",SwigwxTabCtrlTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxTabCtrl",SwigwxTabCtrlTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxTreeCtrl",SwigwxTreeCtrlTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxTreeCtrl",SwigwxTreeCtrlTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxListCtrl",SwigwxListCtrlTowxEvtHandler);
@@ -3990,21 +3456,17 @@ SWIGEXPORT(void,initcontrols2c)() {
 	 SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
 	 SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
 	 SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-	 SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
 	 SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
 	 SWIG_RegisterMapping("_uint","_unsigned_int",0);
 	 SWIG_RegisterMapping("_uint","_int",0);
 	 SWIG_RegisterMapping("_uint","_wxWindowID",0);
-	 SWIG_RegisterMapping("_class_wxEvent","_class_wxTabEvent",SwigwxTabEventTowxEvent);
-	 SWIG_RegisterMapping("_class_wxEvent","_wxTabEvent",SwigwxTabEventTowxEvent);
 	 SWIG_RegisterMapping("_class_wxEvent","_class_wxTreeEvent",SwigwxTreeEventTowxEvent);
 	 SWIG_RegisterMapping("_class_wxEvent","_wxTreeEvent",SwigwxTreeEventTowxEvent);
 	 SWIG_RegisterMapping("_class_wxEvent","_class_wxListEvent",SwigwxListEventTowxEvent);
 	 SWIG_RegisterMapping("_class_wxEvent","_wxListEvent",SwigwxListEventTowxEvent);
 	 SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
+	 SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
 	 SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-	 SWIG_RegisterMapping("_wxCommandEvent","_class_wxTabEvent",SwigwxTabEventTowxCommandEvent);
-	 SWIG_RegisterMapping("_wxCommandEvent","_wxTabEvent",SwigwxTabEventTowxCommandEvent);
 	 SWIG_RegisterMapping("_wxCommandEvent","_class_wxTreeEvent",SwigwxTreeEventTowxCommandEvent);
 	 SWIG_RegisterMapping("_wxCommandEvent","_wxTreeEvent",SwigwxTreeEventTowxCommandEvent);
 	 SWIG_RegisterMapping("_wxCommandEvent","_class_wxListEvent",SwigwxListEventTowxCommandEvent);
@@ -4060,8 +3522,6 @@ SWIGEXPORT(void,initcontrols2c)() {
 	 SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
 	 SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
 	 SWIG_RegisterMapping("_unsigned_short","_short",0);
-	 SWIG_RegisterMapping("_class_wxWindow","_class_wxTabCtrl",SwigwxTabCtrlTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_wxTabCtrl",SwigwxTabCtrlTowxWindow);
 	 SWIG_RegisterMapping("_class_wxWindow","_class_wxTreeCtrl",SwigwxTreeCtrlTowxWindow);
 	 SWIG_RegisterMapping("_class_wxWindow","_wxTreeCtrl",SwigwxTreeCtrlTowxWindow);
 	 SWIG_RegisterMapping("_class_wxWindow","_class_wxListCtrl",SwigwxListCtrlTowxWindow);
@@ -4091,15 +3551,12 @@ SWIGEXPORT(void,initcontrols2c)() {
 	 SWIG_RegisterMapping("_unsigned_char","_byte",0);
 	 SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
 	 SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
-	 SWIG_RegisterMapping("_wxControl","_class_wxTabCtrl",SwigwxTabCtrlTowxControl);
-	 SWIG_RegisterMapping("_wxControl","_wxTabCtrl",SwigwxTabCtrlTowxControl);
 	 SWIG_RegisterMapping("_wxControl","_class_wxTreeCtrl",SwigwxTreeCtrlTowxControl);
 	 SWIG_RegisterMapping("_wxControl","_wxTreeCtrl",SwigwxTreeCtrlTowxControl);
 	 SWIG_RegisterMapping("_wxControl","_class_wxListCtrl",SwigwxListCtrlTowxControl);
 	 SWIG_RegisterMapping("_wxControl","_wxListCtrl",SwigwxListCtrlTowxControl);
 	 SWIG_RegisterMapping("_wxControl","_class_wxControl",0);
 	 SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0);
-	 SWIG_RegisterMapping("_wxTabCtrl","_class_wxTabCtrl",0);
 	 SWIG_RegisterMapping("_unsigned_int","_uint",0);
 	 SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
 	 SWIG_RegisterMapping("_unsigned_int","_int",0);
@@ -4117,8 +3574,6 @@ SWIGEXPORT(void,initcontrols2c)() {
 	 SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
 	 SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
 	 SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
-	 SWIG_RegisterMapping("_wxTabEvent","_class_wxTabEvent",0);
-	 SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0);
 	 SWIG_RegisterMapping("_wxWindowID","_EBool",0);
 	 SWIG_RegisterMapping("_wxWindowID","_uint",0);
 	 SWIG_RegisterMapping("_wxWindowID","_int",0);
@@ -4142,28 +3597,23 @@ SWIGEXPORT(void,initcontrols2c)() {
 	 SWIG_RegisterMapping("_wxTreeCtrl","_class_wxTreeCtrl",0);
 	 SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
 	 SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
-	 SWIG_RegisterMapping("_class_wxControl","_class_wxTabCtrl",SwigwxTabCtrlTowxControl);
-	 SWIG_RegisterMapping("_class_wxControl","_wxTabCtrl",SwigwxTabCtrlTowxControl);
 	 SWIG_RegisterMapping("_class_wxControl","_class_wxTreeCtrl",SwigwxTreeCtrlTowxControl);
 	 SWIG_RegisterMapping("_class_wxControl","_wxTreeCtrl",SwigwxTreeCtrlTowxControl);
 	 SWIG_RegisterMapping("_class_wxControl","_class_wxListCtrl",SwigwxListCtrlTowxControl);
 	 SWIG_RegisterMapping("_class_wxControl","_wxListCtrl",SwigwxListCtrlTowxControl);
 	 SWIG_RegisterMapping("_class_wxControl","_wxControl",0);
 	 SWIG_RegisterMapping("_wxStaticBitmap","_class_wxStaticBitmap",0);
-	 SWIG_RegisterMapping("_class_wxTabCtrl","_wxTabCtrl",0);
 	 SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
 	 SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
 	 SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
 	 SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
 	 SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
-	 SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0);
 	 SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
 	 SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
 	 SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
 	 SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
+	 SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
 	 SWIG_RegisterMapping("_class_wxTreeItem","_wxTreeItem",0);
-	 SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxTabEvent",SwigwxTabEventTowxCommandEvent);
-	 SWIG_RegisterMapping("_class_wxCommandEvent","_wxTabEvent",SwigwxTabEventTowxCommandEvent);
 	 SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxTreeEvent",SwigwxTreeEventTowxCommandEvent);
 	 SWIG_RegisterMapping("_class_wxCommandEvent","_wxTreeEvent",SwigwxTreeEventTowxCommandEvent);
 	 SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxListEvent",SwigwxListEventTowxCommandEvent);
@@ -4177,8 +3627,6 @@ SWIGEXPORT(void,initcontrols2c)() {
 	 SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
 	 SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
 	 SWIG_RegisterMapping("_wxTreeEvent","_class_wxTreeEvent",0);
-	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxTabCtrl",SwigwxTabCtrlTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_wxTabCtrl",SwigwxTabCtrlTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxTreeCtrl",SwigwxTreeCtrlTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_wxTreeCtrl",SwigwxTreeCtrlTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxListCtrl",SwigwxListCtrlTowxEvtHandler);
@@ -4192,13 +3640,9 @@ SWIGEXPORT(void,initcontrols2c)() {
 	 SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
 	 SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
 	 SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
-	 SWIG_RegisterMapping("_wxWindow","_class_wxTabCtrl",SwigwxTabCtrlTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_wxTabCtrl",SwigwxTabCtrlTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_class_wxTreeCtrl",SwigwxTreeCtrlTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_wxTreeCtrl",SwigwxTreeCtrlTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_class_wxListCtrl",SwigwxListCtrlTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_wxListCtrl",SwigwxListCtrlTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
-	 SWIG_RegisterMapping("_class_wxTabEvent","_wxTabEvent",0);
-	 SWIG_RegisterMapping("_class_wxFrame","_wxFrame",0);
 }

utils/wxPython/src/msw/controls2.py

@@ -10,6 +10,7 @@ from gdi import *
 from events import *
 
 from controls import *
+import wxp
 class wxListItemPtr :
     def __init__(self,this):
         self.this = this
@@ -183,6 +184,10 @@ class wxListCtrlPtr(wxControlPtr):
     def GetCountPerPage(self):
         val = controls2c.wxListCtrl_GetCountPerPage(self.this)
         return val
+    def GetEditControl(self):
+        val = controls2c.wxListCtrl_GetEditControl(self.this)
+        val = wxTextCtrlPtr(val)
+        return val
     def GetImageList(self,arg0):
         val = controls2c.wxListCtrl_GetImageList(self.this,arg0)
         return val
@@ -308,6 +313,7 @@ class wxListCtrl(wxListCtrlPtr):
         args = tuple(argl)
         self.this = apply(controls2c.new_wxListCtrl,(arg0.this,arg1,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 
@@ -542,92 +548,7 @@ class wxTreeCtrl(wxTreeCtrlPtr):
         args = tuple(argl)
         self.this = apply(controls2c.new_wxTreeCtrl,(arg0.this,)+args)
         self.thisown = 1
-
+        wxp._StdWindowCallbacks(self)
-
-
-
-class wxTabEventPtr(wxCommandEventPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def __repr__(self):
-        return "<C wxTabEvent instance>"
-class wxTabEvent(wxTabEventPtr):
-    def __init__(self,this):
-        self.this = this
-
-
-
-
-class wxTabCtrlPtr(wxControlPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def DeleteAllItems(self):
-        val = controls2c.wxTabCtrl_DeleteAllItems(self.this)
-        return val
-    def DeleteItem(self,arg0):
-        val = controls2c.wxTabCtrl_DeleteItem(self.this,arg0)
-        return val
-    def GetImageList(self):
-        val = controls2c.wxTabCtrl_GetImageList(self.this)
-        return val
-    def GetItemCount(self):
-        val = controls2c.wxTabCtrl_GetItemCount(self.this)
-        return val
-    def GetItemImage(self,arg0):
-        val = controls2c.wxTabCtrl_GetItemImage(self.this,arg0)
-        return val
-    def GetItemRect(self,arg0):
-        val = controls2c.wxTabCtrl_GetItemRect(self.this,arg0)
-        val = wxRectPtr(val)
-        val.thisown = 1
-        return val
-    def GetItemText(self,arg0):
-        val = controls2c.wxTabCtrl_GetItemText(self.this,arg0)
-        return val
-    def GetRowCount(self):
-        val = controls2c.wxTabCtrl_GetRowCount(self.this)
-        return val
-    def GetSelection(self):
-        val = controls2c.wxTabCtrl_GetSelection(self.this)
-        return val
-    def HitTest(self,arg0):
-        val = controls2c.wxTabCtrl_HitTest(self.this,arg0.this)
-        return val
-    def InsertItem(self,arg0,arg1,*args):
-        val = apply(controls2c.wxTabCtrl_InsertItem,(self.this,arg0,arg1,)+args)
-        return val
-    def SetItemImage(self,arg0,arg1):
-        val = controls2c.wxTabCtrl_SetItemImage(self.this,arg0,arg1)
-        return val
-    def SetImageList(self,arg0):
-        val = controls2c.wxTabCtrl_SetImageList(self.this,arg0)
-        return val
-    def SetItemSize(self,arg0):
-        val = controls2c.wxTabCtrl_SetItemSize(self.this,arg0.this)
-        return val
-    def SetItemText(self,arg0,arg1):
-        val = controls2c.wxTabCtrl_SetItemText(self.this,arg0,arg1)
-        return val
-    def SetPadding(self,arg0):
-        val = controls2c.wxTabCtrl_SetPadding(self.this,arg0.this)
-        return val
-    def SetSelection(self,arg0):
-        val = controls2c.wxTabCtrl_SetSelection(self.this,arg0)
-        return val
-    def __repr__(self):
-        return "<C wxTabCtrl instance>"
-class wxTabCtrl(wxTabCtrlPtr):
-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controls2c.new_wxTabCtrl,(arg0.this,arg1,)+args)
-        self.thisown = 1
 
 
 

utils/wxPython/src/msw/events.cpp

@@ -1,5 +1,5 @@
 /*
- * FILE : msw\events.cpp
+ * FILE : msw/events.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

utils/wxPython/src/msw/frames.py

@@ -0,0 +1,127 @@
+# This file was created automatically by SWIG.
+import framesc
+
+from misc import *
+
+from gdi import *
+
+from windows import *
+
+from stattool import *
+
+from controls import *
+
+from events import *
+import wxp
+class wxFramePtr(wxWindowPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def Centre(self,*args):
+        val = apply(framesc.wxFrame_Centre,(self.this,)+args)
+        return val
+    def Command(self,arg0):
+        val = framesc.wxFrame_Command(self.this,arg0)
+        return val
+    def CreateStatusBar(self,*args):
+        val = apply(framesc.wxFrame_CreateStatusBar,(self.this,)+args)
+        val = wxStatusBarPtr(val)
+        return val
+    def CreateToolBar(self,*args):
+        val = apply(framesc.wxFrame_CreateToolBar,(self.this,)+args)
+        val = wxToolBarPtr(val)
+        return val
+    def GetMenuBar(self):
+        val = framesc.wxFrame_GetMenuBar(self.this)
+        val = wxMenuBarPtr(val)
+        return val
+    def GetStatusBar(self):
+        val = framesc.wxFrame_GetStatusBar(self.this)
+        val = wxStatusBarPtr(val)
+        return val
+    def GetTitle(self):
+        val = framesc.wxFrame_GetTitle(self.this)
+        return val
+    def GetToolBar(self):
+        val = framesc.wxFrame_GetToolBar(self.this)
+        val = wxToolBarPtr(val)
+        return val
+    def Iconize(self,arg0):
+        val = framesc.wxFrame_Iconize(self.this,arg0)
+        return val
+    def IsIconized(self):
+        val = framesc.wxFrame_IsIconized(self.this)
+        return val
+    def Maximize(self,arg0):
+        val = framesc.wxFrame_Maximize(self.this,arg0)
+        return val
+    def SetAcceleratorTable(self,arg0):
+        val = framesc.wxFrame_SetAcceleratorTable(self.this,arg0.this)
+        return val
+    def SetIcon(self,arg0):
+        val = framesc.wxFrame_SetIcon(self.this,arg0.this)
+        return val
+    def SetMenuBar(self,arg0):
+        val = framesc.wxFrame_SetMenuBar(self.this,arg0.this)
+        return val
+    def SetStatusBar(self,arg0):
+        val = framesc.wxFrame_SetStatusBar(self.this,arg0.this)
+        return val
+    def SetStatusText(self,arg0,*args):
+        val = apply(framesc.wxFrame_SetStatusText,(self.this,arg0,)+args)
+        return val
+    def SetStatusWidths(self,arg0,*args):
+        val = apply(framesc.wxFrame_SetStatusWidths,(self.this,arg0,)+args)
+        return val
+    def SetTitle(self,arg0):
+        val = framesc.wxFrame_SetTitle(self.this,arg0)
+        return val
+    def SetToolBar(self,arg0):
+        val = framesc.wxFrame_SetToolBar(self.this,arg0.this)
+        return val
+    def __repr__(self):
+        return "<C wxFrame instance>"
+class wxFrame(wxFramePtr):
+    def __init__(self,arg0,arg1,arg2,*args) :
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        try: argl[1] = argl[1].this
+        except: pass
+        args = tuple(argl)
+        self.this = apply(framesc.new_wxFrame,(arg0.this,arg1,arg2,)+args)
+        self.thisown = 1
+        wxp._StdFrameCallbacks(self)
+
+
+
+
+class wxMiniFramePtr(wxFramePtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxMiniFrame instance>"
+class wxMiniFrame(wxMiniFramePtr):
+    def __init__(self,arg0,arg1,arg2,*args) :
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        try: argl[1] = argl[1].this
+        except: pass
+        args = tuple(argl)
+        self.this = apply(framesc.new_wxMiniFrame,(arg0.this,arg1,arg2,)+args)
+        self.thisown = 1
+        wxp._StdFrameCallbacks(self)
+
+
+
+
+
+
+#-------------- FUNCTION WRAPPERS ------------------
+
+
+
+#-------------- VARIABLE WRAPPERS ------------------
+

utils/wxPython/src/msw/gdi.cpp

@@ -1,5 +1,5 @@
 /*
- * FILE : msw\gdi.cpp
+ * FILE : msw/gdi.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
@@ -131,7 +131,7 @@ static char* wxStringErrorMsg = "string type is required for parameter";
         return new wxMask(bitmap, colour);
     }
                               // Alternate 'constructor'
-    wxCursor* wxStockCursor(int id) {
+    wxCursor* wxPyStockCursor(int id) {
         return new wxCursor(id);
     }
                                       // Alternate 'constructor'
@@ -256,7 +256,7 @@ static PyObject *_wrap_wxStockCursor(PyObject *self, PyObject *args) {
     self = self;
     if(!PyArg_ParseTuple(args,"i:wxStockCursor",&_arg0)) 
         return NULL;
-    _result = (wxCursor *)wxStockCursor(_arg0);
+    _result = (wxCursor *)wxPyStockCursor(_arg0);
     SWIG_MakePtr(_ptemp, (char *) _result,"_wxCursor_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;

utils/wxPython/src/msw/mdi.cpp

@@ -1,5 +1,5 @@
 /*
- * FILE : msw\mdi.cpp
+ * FILE : msw/mdi.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
@@ -748,7 +748,10 @@ SWIGEXPORT(void,initmdic)() {
  * (Used by the SWIG pointer type-checker).
  */
 	 SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
+	 SWIG_RegisterMapping("_wxEvent","_class_wxEvent",0);
+	 SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
 	 SWIG_RegisterMapping("_signed_long","_long",0);
+	 SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
 	 SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler);
@@ -757,55 +760,102 @@ SWIGEXPORT(void,initmdic)() {
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxMDIParentFrame",SwigwxMDIParentFrameTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
+	 SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
 	 SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
 	 SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
+	 SWIG_RegisterMapping("_class_wxToolBarBase","_wxToolBarBase",0);
 	 SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
 	 SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
 	 SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
+	 SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
 	 SWIG_RegisterMapping("_byte","_unsigned_char",0);
+	 SWIG_RegisterMapping("_wxStaticBox","_class_wxStaticBox",0);
+	 SWIG_RegisterMapping("_wxChoice","_class_wxChoice",0);
+	 SWIG_RegisterMapping("_wxSlider","_class_wxSlider",0);
 	 SWIG_RegisterMapping("_long","_wxDash",0);
 	 SWIG_RegisterMapping("_long","_unsigned_long",0);
 	 SWIG_RegisterMapping("_long","_signed_long",0);
+	 SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
+	 SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
 	 SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
+	 SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
 	 SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
 	 SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
 	 SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
 	 SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
+	 SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
+	 SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
+	 SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0);
 	 SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0);
 	 SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
+	 SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
+	 SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
+	 SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
 	 SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
+	 SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
 	 SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
 	 SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
+	 SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
+	 SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
+	 SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
 	 SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
 	 SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
+	 SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
 	 SWIG_RegisterMapping("_uint","_unsigned_int",0);
 	 SWIG_RegisterMapping("_uint","_int",0);
 	 SWIG_RegisterMapping("_uint","_wxWindowID",0);
+	 SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
+	 SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
 	 SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
+	 SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
+	 SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
 	 SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
+	 SWIG_RegisterMapping("_class_wxButton","_wxButton",0);
+	 SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
 	 SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
 	 SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
+	 SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
+	 SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
+	 SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
 	 SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
+	 SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
+	 SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
+	 SWIG_RegisterMapping("_wxToolBarSimple","_class_wxToolBarSimple",0);
 	 SWIG_RegisterMapping("_wxMDIChildFrame","_class_wxMDIChildFrame",0);
+	 SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
+	 SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
 	 SWIG_RegisterMapping("_EBool","_signed_int",0);
 	 SWIG_RegisterMapping("_EBool","_int",0);
 	 SWIG_RegisterMapping("_EBool","_wxWindowID",0);
+	 SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
+	 SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
 	 SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
+	 SWIG_RegisterMapping("_wxCloseEvent","_class_wxCloseEvent",0);
 	 SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
 	 SWIG_RegisterMapping("_unsigned_long","_long",0);
 	 SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
 	 SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
 	 SWIG_RegisterMapping("_wxMDIParentFrame","_class_wxMDIParentFrame",0);
 	 SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
+	 SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0);
+	 SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0);
+	 SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0);
 	 SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
 	 SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0);
+	 SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0);
+	 SWIG_RegisterMapping("_wxComboBox","_class_wxComboBox",0);
+	 SWIG_RegisterMapping("_wxRadioButton","_class_wxRadioButton",0);
 	 SWIG_RegisterMapping("_signed_int","_EBool",0);
 	 SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
 	 SWIG_RegisterMapping("_signed_int","_int",0);
+	 SWIG_RegisterMapping("_class_wxTextCtrl","_wxTextCtrl",0);
 	 SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
 	 SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
 	 SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
+	 SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
+	 SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
 	 SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
+	 SWIG_RegisterMapping("_class_wxToolBarSimple","_wxToolBarSimple",0);
 	 SWIG_RegisterMapping("_class_wxMDIChildFrame","_wxMDIChildFrame",0);
 	 SWIG_RegisterMapping("_WXTYPE","_short",0);
 	 SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
@@ -821,14 +871,23 @@ SWIGEXPORT(void,initmdic)() {
 	 SWIG_RegisterMapping("_class_wxWindow","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxWindow);
 	 SWIG_RegisterMapping("_class_wxWindow","_wxMDIParentFrame",SwigwxMDIParentFrameTowxWindow);
 	 SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
+	 SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0);
 	 SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
+	 SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0);
+	 SWIG_RegisterMapping("_class_wxMenuEvent","_wxMenuEvent",0);
 	 SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
+	 SWIG_RegisterMapping("_wxMouseEvent","_class_wxMouseEvent",0);
 	 SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
 	 SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
+	 SWIG_RegisterMapping("_class_wxRadioBox","_wxRadioBox",0);
 	 SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
 	 SWIG_RegisterMapping("_signed_short","_short",0);
 	 SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
 	 SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
+	 SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
+	 SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
+	 SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0);
+	 SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0);
 	 SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
 	 SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
 	 SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0);
@@ -836,6 +895,8 @@ SWIGEXPORT(void,initmdic)() {
 	 SWIG_RegisterMapping("_unsigned_char","_byte",0);
 	 SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
 	 SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
+	 SWIG_RegisterMapping("_wxControl","_class_wxControl",0);
+	 SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0);
 	 SWIG_RegisterMapping("_unsigned_int","_uint",0);
 	 SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
 	 SWIG_RegisterMapping("_unsigned_int","_int",0);
@@ -846,6 +907,12 @@ SWIGEXPORT(void,initmdic)() {
 	 SWIG_RegisterMapping("_short","_WXTYPE",0);
 	 SWIG_RegisterMapping("_short","_unsigned_short",0);
 	 SWIG_RegisterMapping("_short","_signed_short",0);
+	 SWIG_RegisterMapping("_class_wxStaticBox","_wxStaticBox",0);
+	 SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0);
+	 SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
+	 SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
+	 SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
+	 SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
 	 SWIG_RegisterMapping("_wxFrame","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame);
 	 SWIG_RegisterMapping("_wxFrame","_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame);
 	 SWIG_RegisterMapping("_wxFrame","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxFrame);
@@ -861,16 +928,35 @@ SWIGEXPORT(void,initmdic)() {
 	 SWIG_RegisterMapping("_int","_wxWindowID",0);
 	 SWIG_RegisterMapping("_int","_unsigned_int",0);
 	 SWIG_RegisterMapping("_int","_signed_int",0);
+	 SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
+	 SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
 	 SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
 	 SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
 	 SWIG_RegisterMapping("_class_wxMDIParentFrame","_wxMDIParentFrame",0);
 	 SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
+	 SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
+	 SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
+	 SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0);
+	 SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0);
+	 SWIG_RegisterMapping("_wxToolBarBase","_class_wxToolBarBase",0);
 	 SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
+	 SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
+	 SWIG_RegisterMapping("_class_wxControl","_wxControl",0);
+	 SWIG_RegisterMapping("_wxStaticBitmap","_class_wxStaticBitmap",0);
 	 SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
 	 SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
 	 SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
+	 SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
+	 SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
+	 SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
 	 SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0);
+	 SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
+	 SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
+	 SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
+	 SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
+	 SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
 	 SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
+	 SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
 	 SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
 	 SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
 	 SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
@@ -883,9 +969,13 @@ SWIGEXPORT(void,initmdic)() {
 	 SWIG_RegisterMapping("_wxEvtHandler","_wxMDIParentFrame",SwigwxMDIParentFrameTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);
 	 SWIG_RegisterMapping("_wxMenuItem","_class_wxMenuItem",0);
+	 SWIG_RegisterMapping("_class_wxScrollBar","_wxScrollBar",0);
 	 SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
 	 SWIG_RegisterMapping("_wxDash","_long",0);
 	 SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
+	 SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
+	 SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
+	 SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
 	 SWIG_RegisterMapping("_wxMDIClientWindow","_class_wxMDIClientWindow",0);
 	 SWIG_RegisterMapping("_wxWindow","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow);

utils/wxPython/src/msw/mdi.py

@@ -6,6 +6,15 @@ from misc import *
 from windows import *
 
 from gdi import *
+
+from frames import *
+
+from stattool import *
+
+from controls import *
+
+from events import *
+import wxp
 class wxMDIParentFramePtr(wxFramePtr):
     def __init__(self,this):
         self.this = this
@@ -38,7 +47,7 @@ class wxMDIParentFramePtr(wxFramePtr):
         val = wxWindowPtr(val)
         return val
     def SetToolBar(self,arg0):
-        val = mdic.wxMDIParentFrame_SetToolBar(self.this,arg0)
+        val = mdic.wxMDIParentFrame_SetToolBar(self.this,arg0.this)
         return val
     def Tile(self):
         val = mdic.wxMDIParentFrame_Tile(self.this)
@@ -55,6 +64,7 @@ class wxMDIParentFrame(wxMDIParentFramePtr):
         args = tuple(argl)
         self.this = apply(mdic.new_wxMDIParentFrame,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
+        wxp._StdFrameCallbacks(self)
 
 
 
@@ -93,6 +103,7 @@ class wxMDIChildFrame(wxMDIChildFramePtr):
         args = tuple(argl)
         self.this = apply(mdic.new_wxMDIChildFrame,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
+        wxp._StdFrameCallbacks(self)
 
 
 
@@ -107,6 +118,8 @@ class wxMDIClientWindow(wxMDIClientWindowPtr):
     def __init__(self,arg0,*args) :
         self.this = apply(mdic.new_wxMDIClientWindow,(arg0.this,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
+        wxp._StdOnScrollCallbacks(self)
 
 
 

utils/wxPython/src/msw/misc.cpp

@@ -1,5 +1,5 @@
 /*
- * FILE : msw\misc.cpp
+ * FILE : msw/misc.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

utils/wxPython/src/msw/stattool.py

@@ -0,0 +1,310 @@
+# This file was created automatically by SWIG.
+import stattoolc
+
+from misc import *
+
+from windows import *
+
+from gdi import *
+
+from controls import *
+
+from events import *
+class wxStatusBarPtr(wxWindowPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetFieldRect(self,arg0):
+        val = stattoolc.wxStatusBar_GetFieldRect(self.this,arg0)
+        val = wxRectPtr(val)
+        val.thisown = 1
+        return val
+    def GetFieldsCount(self):
+        val = stattoolc.wxStatusBar_GetFieldsCount(self.this)
+        return val
+    def GetStatusText(self,*args):
+        val = apply(stattoolc.wxStatusBar_GetStatusText,(self.this,)+args)
+        return val
+    def DrawField(self,arg0,arg1):
+        val = stattoolc.wxStatusBar_DrawField(self.this,arg0.this,arg1)
+        return val
+    def DrawFieldText(self,arg0,arg1):
+        val = stattoolc.wxStatusBar_DrawFieldText(self.this,arg0.this,arg1)
+        return val
+    def InitColours(self):
+        val = stattoolc.wxStatusBar_InitColours(self.this)
+        return val
+    def SetFieldsCount(self,*args):
+        val = apply(stattoolc.wxStatusBar_SetFieldsCount,(self.this,)+args)
+        return val
+    def SetStatusText(self,arg0,*args):
+        val = apply(stattoolc.wxStatusBar_SetStatusText,(self.this,arg0,)+args)
+        return val
+    def SetStatusWidths(self,arg0,*args):
+        val = apply(stattoolc.wxStatusBar_SetStatusWidths,(self.this,arg0,)+args)
+        return val
+    def __repr__(self):
+        return "<C wxStatusBar instance>"
+class wxStatusBar(wxStatusBarPtr):
+    def __init__(self,arg0,arg1,*args) :
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        try: argl[1] = argl[1].this
+        except: pass
+        args = tuple(argl)
+        self.this = apply(stattoolc.new_wxStatusBar,(arg0.this,arg1,)+args)
+        self.thisown = 1
+        wxp._StdWindowCallbacks(self)
+
+
+
+
+class wxToolBarToolPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self):
+        if self.thisown == 1 :
+            stattoolc.delete_wxToolBarTool(self.this)
+    def SetSize(self,arg0,arg1):
+        val = stattoolc.wxToolBarTool_SetSize(self.this,arg0,arg1)
+        return val
+    def GetWidth(self):
+        val = stattoolc.wxToolBarTool_GetWidth(self.this)
+        return val
+    def GetHeight(self):
+        val = stattoolc.wxToolBarTool_GetHeight(self.this)
+        return val
+    def __setattr__(self,name,value):
+        if name == "m_toolStyle" :
+            stattoolc.wxToolBarTool_m_toolStyle_set(self.this,value)
+            return
+        if name == "m_clientData" :
+            stattoolc.wxToolBarTool_m_clientData_set(self.this,value)
+            return
+        if name == "m_index" :
+            stattoolc.wxToolBarTool_m_index_set(self.this,value)
+            return
+        if name == "m_x" :
+            stattoolc.wxToolBarTool_m_x_set(self.this,value)
+            return
+        if name == "m_y" :
+            stattoolc.wxToolBarTool_m_y_set(self.this,value)
+            return
+        if name == "m_width" :
+            stattoolc.wxToolBarTool_m_width_set(self.this,value)
+            return
+        if name == "m_height" :
+            stattoolc.wxToolBarTool_m_height_set(self.this,value)
+            return
+        if name == "m_toggleState" :
+            stattoolc.wxToolBarTool_m_toggleState_set(self.this,value)
+            return
+        if name == "m_isToggle" :
+            stattoolc.wxToolBarTool_m_isToggle_set(self.this,value)
+            return
+        if name == "m_deleteSecondBitmap" :
+            stattoolc.wxToolBarTool_m_deleteSecondBitmap_set(self.this,value)
+            return
+        if name == "m_enabled" :
+            stattoolc.wxToolBarTool_m_enabled_set(self.this,value)
+            return
+        if name == "m_bitmap1" :
+            stattoolc.wxToolBarTool_m_bitmap1_set(self.this,value.this)
+            return
+        if name == "m_bitmap2" :
+            stattoolc.wxToolBarTool_m_bitmap2_set(self.this,value.this)
+            return
+        if name == "m_isMenuCommand" :
+            stattoolc.wxToolBarTool_m_isMenuCommand_set(self.this,value)
+            return
+        if name == "m_shortHelpString" :
+            stattoolc.wxToolBarTool_m_shortHelpString_set(self.this,value)
+            return
+        if name == "m_longHelpString" :
+            stattoolc.wxToolBarTool_m_longHelpString_set(self.this,value)
+            return
+        self.__dict__[name] = value
+    def __getattr__(self,name):
+        if name == "m_toolStyle" : 
+            return stattoolc.wxToolBarTool_m_toolStyle_get(self.this)
+        if name == "m_clientData" : 
+            return stattoolc.wxToolBarTool_m_clientData_get(self.this)
+        if name == "m_index" : 
+            return stattoolc.wxToolBarTool_m_index_get(self.this)
+        if name == "m_x" : 
+            return stattoolc.wxToolBarTool_m_x_get(self.this)
+        if name == "m_y" : 
+            return stattoolc.wxToolBarTool_m_y_get(self.this)
+        if name == "m_width" : 
+            return stattoolc.wxToolBarTool_m_width_get(self.this)
+        if name == "m_height" : 
+            return stattoolc.wxToolBarTool_m_height_get(self.this)
+        if name == "m_toggleState" : 
+            return stattoolc.wxToolBarTool_m_toggleState_get(self.this)
+        if name == "m_isToggle" : 
+            return stattoolc.wxToolBarTool_m_isToggle_get(self.this)
+        if name == "m_deleteSecondBitmap" : 
+            return stattoolc.wxToolBarTool_m_deleteSecondBitmap_get(self.this)
+        if name == "m_enabled" : 
+            return stattoolc.wxToolBarTool_m_enabled_get(self.this)
+        if name == "m_bitmap1" : 
+            return wxBitmapPtr(stattoolc.wxToolBarTool_m_bitmap1_get(self.this))
+        if name == "m_bitmap2" : 
+            return wxBitmapPtr(stattoolc.wxToolBarTool_m_bitmap2_get(self.this))
+        if name == "m_isMenuCommand" : 
+            return stattoolc.wxToolBarTool_m_isMenuCommand_get(self.this)
+        if name == "m_shortHelpString" : 
+            return stattoolc.wxToolBarTool_m_shortHelpString_get(self.this)
+        if name == "m_longHelpString" : 
+            return stattoolc.wxToolBarTool_m_longHelpString_get(self.this)
+        raise AttributeError,name
+    def __repr__(self):
+        return "<C wxToolBarTool instance>"
+class wxToolBarTool(wxToolBarToolPtr):
+    def __init__(self) :
+        self.this = stattoolc.new_wxToolBarTool()
+        self.thisown = 1
+
+
+
+
+class wxToolBarBasePtr(wxControlPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def AddSeparator(self):
+        val = stattoolc.wxToolBarBase_AddSeparator(self.this)
+        return val
+    def AddTool(self,arg0,arg1,*args):
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        args = tuple(argl)
+        val = apply(stattoolc.wxToolBarBase_AddTool,(self.this,arg0,arg1.this,)+args)
+        val = wxToolBarToolPtr(val)
+        return val
+    def EnableTool(self,arg0,arg1):
+        val = stattoolc.wxToolBarBase_EnableTool(self.this,arg0,arg1)
+        return val
+    def FindToolForPosition(self,arg0,arg1):
+        val = stattoolc.wxToolBarBase_FindToolForPosition(self.this,arg0,arg1)
+        val = wxToolBarToolPtr(val)
+        return val
+    def GetToolSize(self):
+        val = stattoolc.wxToolBarBase_GetToolSize(self.this)
+        val = wxSizePtr(val)
+        val.thisown = 1
+        return val
+    def GetToolBitmapSize(self):
+        val = stattoolc.wxToolBarBase_GetToolBitmapSize(self.this)
+        val = wxSizePtr(val)
+        val.thisown = 1
+        return val
+    def GetMaxSize(self):
+        val = stattoolc.wxToolBarBase_GetMaxSize(self.this)
+        val = wxSizePtr(val)
+        val.thisown = 1
+        return val
+    def GetToolEnabled(self,arg0):
+        val = stattoolc.wxToolBarBase_GetToolEnabled(self.this,arg0)
+        return val
+    def GetToolLongHelp(self,arg0):
+        val = stattoolc.wxToolBarBase_GetToolLongHelp(self.this,arg0)
+        return val
+    def GetToolPacking(self):
+        val = stattoolc.wxToolBarBase_GetToolPacking(self.this)
+        return val
+    def GetToolSeparation(self):
+        val = stattoolc.wxToolBarBase_GetToolSeparation(self.this)
+        return val
+    def GetToolShortHelp(self,arg0):
+        val = stattoolc.wxToolBarBase_GetToolShortHelp(self.this,arg0)
+        return val
+    def GetToolState(self,arg0):
+        val = stattoolc.wxToolBarBase_GetToolState(self.this,arg0)
+        return val
+    def Realize(self):
+        val = stattoolc.wxToolBarBase_Realize(self.this)
+        return val
+    def SetToolBitmapSize(self,arg0):
+        val = stattoolc.wxToolBarBase_SetToolBitmapSize(self.this,arg0.this)
+        return val
+    def SetMargins(self,arg0):
+        val = stattoolc.wxToolBarBase_SetMargins(self.this,arg0.this)
+        return val
+    def SetToolLongHelp(self,arg0,arg1):
+        val = stattoolc.wxToolBarBase_SetToolLongHelp(self.this,arg0,arg1)
+        return val
+    def SetToolPacking(self,arg0):
+        val = stattoolc.wxToolBarBase_SetToolPacking(self.this,arg0)
+        return val
+    def SetToolShortHelp(self,arg0,arg1):
+        val = stattoolc.wxToolBarBase_SetToolShortHelp(self.this,arg0,arg1)
+        return val
+    def SetToolSeparation(self,arg0):
+        val = stattoolc.wxToolBarBase_SetToolSeparation(self.this,arg0)
+        return val
+    def ToggleTool(self,arg0,arg1):
+        val = stattoolc.wxToolBarBase_ToggleTool(self.this,arg0,arg1)
+        return val
+    def __repr__(self):
+        return "<C wxToolBarBase instance>"
+class wxToolBarBase(wxToolBarBasePtr):
+    def __init__(self,this):
+        self.this = this
+
+
+
+
+class wxToolBarPtr(wxToolBarBasePtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxToolBar instance>"
+class wxToolBar(wxToolBarPtr):
+    def __init__(self,arg0,arg1,*args) :
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        try: argl[1] = argl[1].this
+        except: pass
+        args = tuple(argl)
+        self.this = apply(stattoolc.new_wxToolBar,(arg0.this,arg1,)+args)
+        self.thisown = 1
+        wxp._StdWindowCallbacks(self)
+
+
+
+
+class wxToolBarSimplePtr(wxToolBarBasePtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxToolBarSimple instance>"
+class wxToolBarSimple(wxToolBarSimplePtr):
+    def __init__(self,arg0,arg1,*args) :
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        try: argl[1] = argl[1].this
+        except: pass
+        args = tuple(argl)
+        self.this = apply(stattoolc.new_wxToolBarSimple,(arg0.this,arg1,)+args)
+        self.thisown = 1
+        wxp._StdWindowCallbacks(self)
+
+
+
+
+
+
+#-------------- FUNCTION WRAPPERS ------------------
+
+
+
+#-------------- VARIABLE WRAPPERS ------------------
+

utils/wxPython/src/msw/windows.cpp

@@ -1,5 +1,5 @@
 /*
- * FILE : msw\windows.cpp
+ * FILE : msw/windows.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
@@ -2148,556 +2148,6 @@ static PyObject *_wrap_wxWindow_WarpPointer(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static void *SwigwxFrameTowxWindow(void *ptr) {
-    wxFrame *src;
-    wxWindow *dest;
-    src = (wxFrame *) ptr;
-    dest = (wxWindow *) src;
-    return (void *) dest;
-}
-
-static void *SwigwxFrameTowxEvtHandler(void *ptr) {
-    wxFrame *src;
-    wxEvtHandler *dest;
-    src = (wxFrame *) ptr;
-    dest = (wxEvtHandler *) src;
-    return (void *) dest;
-}
-
-#define new_wxFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxFrame(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxFrame * _result;
-    wxWindow * _arg0;
-    wxWindowID  _arg1;
-    wxString * _arg2;
-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    long  _arg5 = (wxDEFAULT_FRAME_STYLE);
-    char * _arg6 = "frame";
-    char * _argc0 = 0;
-    PyObject * _obj2 = 0;
-    char * _argc3 = 0;
-    char * _argc4 = 0;
-    char _ptemp[128];
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"siO|ssls:new_wxFrame",&_argc0,&_arg1,&_obj2,&_argc3,&_argc4,&_arg5,&_arg6)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxFrame. Expected _wxWindow_p.");
-        return NULL;
-        }
-    }
-{
-    if (!PyString_Check(_obj2)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    _arg2 = new wxString(PyString_AsString(_obj2));
-}
-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxFrame. Expected _wxPoint_p.");
-        return NULL;
-        }
-    }
-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxFrame. Expected _wxSize_p.");
-        return NULL;
-        }
-    }
-    _result = (wxFrame *)new_wxFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFrame_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
-{
-    if (_obj2)
-        delete _arg2;
-}
-    return _resultobj;
-}
-
-#define wxFrame_Centre(_swigobj,_swigarg0)  (_swigobj->Centre(_swigarg0))
-static PyObject *_wrap_wxFrame_Centre(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxFrame * _arg0;
-    int  _arg1 = (wxBOTH);
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"s|i:wxFrame_Centre",&_argc0,&_arg1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_Centre. Expected _wxFrame_p.");
-        return NULL;
-        }
-    }
-    wxFrame_Centre(_arg0,_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
-#define wxFrame_Command(_swigobj,_swigarg0)  (_swigobj->Command(_swigarg0))
-static PyObject *_wrap_wxFrame_Command(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxFrame * _arg0;
-    int  _arg1;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"si:wxFrame_Command",&_argc0,&_arg1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_Command. Expected _wxFrame_p.");
-        return NULL;
-        }
-    }
-    wxFrame_Command(_arg0,_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
-#define wxFrame_CreateStatusBar(_swigobj,_swigarg0)  (_swigobj->CreateStatusBar(_swigarg0))
-static PyObject *_wrap_wxFrame_CreateStatusBar(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    bool  _result;
-    wxFrame * _arg0;
-    int  _arg1 = 1;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"s|i:wxFrame_CreateStatusBar",&_argc0,&_arg1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_CreateStatusBar. Expected _wxFrame_p.");
-        return NULL;
-        }
-    }
-    _result = (bool )wxFrame_CreateStatusBar(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
-#define wxFrame_GetMenuBar(_swigobj)  (_swigobj->GetMenuBar())
-static PyObject *_wrap_wxFrame_GetMenuBar(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxMenuBar * _result;
-    wxFrame * _arg0;
-    char * _argc0 = 0;
-    char _ptemp[128];
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFrame_GetMenuBar",&_argc0)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_GetMenuBar. Expected _wxFrame_p.");
-        return NULL;
-        }
-    }
-    _result = (wxMenuBar *)wxFrame_GetMenuBar(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuBar_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
-    return _resultobj;
-}
-
-#define wxFrame_GetStatusBar(_swigobj)  (_swigobj->GetStatusBar())
-static PyObject *_wrap_wxFrame_GetStatusBar(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxStatusBar * _result;
-    wxFrame * _arg0;
-    char * _argc0 = 0;
-    char _ptemp[128];
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFrame_GetStatusBar",&_argc0)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_GetStatusBar. Expected _wxFrame_p.");
-        return NULL;
-        }
-    }
-    _result = (wxStatusBar *)wxFrame_GetStatusBar(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxStatusBar_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
-    return _resultobj;
-}
-
-#define wxFrame_GetTitle(_swigobj)  (_swigobj->GetTitle())
-static PyObject *_wrap_wxFrame_GetTitle(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxString * _result;
-    wxFrame * _arg0;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFrame_GetTitle",&_argc0)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_GetTitle. Expected _wxFrame_p.");
-        return NULL;
-        }
-    }
-    _result = new wxString (wxFrame_GetTitle(_arg0));
-{
-    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
-}
-{
-    delete _result;
-}
-    return _resultobj;
-}
-
-#define wxFrame_Iconize(_swigobj,_swigarg0)  (_swigobj->Iconize(_swigarg0))
-static PyObject *_wrap_wxFrame_Iconize(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxFrame * _arg0;
-    bool  _arg1;
-    char * _argc0 = 0;
-    int tempbool1;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"si:wxFrame_Iconize",&_argc0,&tempbool1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_Iconize. Expected _wxFrame_p.");
-        return NULL;
-        }
-    }
-    _arg1 = (bool ) tempbool1;
-    wxFrame_Iconize(_arg0,_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
-#define wxFrame_IsIconized(_swigobj)  (_swigobj->IsIconized())
-static PyObject *_wrap_wxFrame_IsIconized(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    bool  _result;
-    wxFrame * _arg0;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFrame_IsIconized",&_argc0)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_IsIconized. Expected _wxFrame_p.");
-        return NULL;
-        }
-    }
-    _result = (bool )wxFrame_IsIconized(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
-#define wxFrame_Maximize(_swigobj,_swigarg0)  (_swigobj->Maximize(_swigarg0))
-static PyObject *_wrap_wxFrame_Maximize(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxFrame * _arg0;
-    bool  _arg1;
-    char * _argc0 = 0;
-    int tempbool1;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"si:wxFrame_Maximize",&_argc0,&tempbool1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_Maximize. Expected _wxFrame_p.");
-        return NULL;
-        }
-    }
-    _arg1 = (bool ) tempbool1;
-    wxFrame_Maximize(_arg0,_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
-#define wxFrame_SetAcceleratorTable(_swigobj,_swigarg0)  (_swigobj->SetAcceleratorTable(_swigarg0))
-static PyObject *_wrap_wxFrame_SetAcceleratorTable(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxFrame * _arg0;
-    wxAcceleratorTable * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxFrame_SetAcceleratorTable",&_argc0,&_argc1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetAcceleratorTable. Expected _wxFrame_p.");
-        return NULL;
-        }
-    }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxAcceleratorTable_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFrame_SetAcceleratorTable. Expected _wxAcceleratorTable_p.");
-        return NULL;
-        }
-    }
-    wxFrame_SetAcceleratorTable(_arg0,*_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
-#define wxFrame_SetIcon(_swigobj,_swigarg0)  (_swigobj->SetIcon(_swigarg0))
-static PyObject *_wrap_wxFrame_SetIcon(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxFrame * _arg0;
-    wxIcon * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxFrame_SetIcon",&_argc0,&_argc1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetIcon. Expected _wxFrame_p.");
-        return NULL;
-        }
-    }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxIcon_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFrame_SetIcon. Expected _wxIcon_p.");
-        return NULL;
-        }
-    }
-    wxFrame_SetIcon(_arg0,*_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
-#define wxFrame_SetMenuBar(_swigobj,_swigarg0)  (_swigobj->SetMenuBar(_swigarg0))
-static PyObject *_wrap_wxFrame_SetMenuBar(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxFrame * _arg0;
-    wxMenuBar * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxFrame_SetMenuBar",&_argc0,&_argc1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetMenuBar. Expected _wxFrame_p.");
-        return NULL;
-        }
-    }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxMenuBar_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFrame_SetMenuBar. Expected _wxMenuBar_p.");
-        return NULL;
-        }
-    }
-    wxFrame_SetMenuBar(_arg0,_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
-#define wxFrame_SetStatusText(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetStatusText(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxFrame_SetStatusText(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxFrame * _arg0;
-    wxString * _arg1;
-    int  _arg2 = 0;
-    char * _argc0 = 0;
-    PyObject * _obj1 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"sO|i:wxFrame_SetStatusText",&_argc0,&_obj1,&_arg2)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetStatusText. Expected _wxFrame_p.");
-        return NULL;
-        }
-    }
-{
-    if (!PyString_Check(_obj1)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    _arg1 = new wxString(PyString_AsString(_obj1));
-}
-    wxFrame_SetStatusText(_arg0,*_arg1,_arg2);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-{
-    if (_obj1)
-        delete _arg1;
-}
-    return _resultobj;
-}
-
-#define wxFrame_SetStatusWidths(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetStatusWidths(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxFrame_SetStatusWidths(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxFrame * _arg0;
-    int  _arg1;
-    int * _arg2;
-    char * _argc0 = 0;
-    PyObject * _obj2 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"sO:wxFrame_SetStatusWidths",&_argc0,&_obj2)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetStatusWidths. Expected _wxFrame_p.");
-        return NULL;
-        }
-    }
-    if (_obj2)
-{
-    _arg2 = int_LIST_helper(_obj2);
-    if (_arg2 == NULL) {
-        return NULL;
-    }
-}
-{
-    _arg1 = PyList_Size(_obj2);
-}
-    wxFrame_SetStatusWidths(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-{
-    delete [] _arg2;
-}
-    return _resultobj;
-}
-
-#define wxFrame_SetTitle(_swigobj,_swigarg0)  (_swigobj->SetTitle(_swigarg0))
-static PyObject *_wrap_wxFrame_SetTitle(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxFrame * _arg0;
-    wxString * _arg1;
-    char * _argc0 = 0;
-    PyObject * _obj1 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"sO:wxFrame_SetTitle",&_argc0,&_obj1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetTitle. Expected _wxFrame_p.");
-        return NULL;
-        }
-    }
-{
-    if (!PyString_Check(_obj1)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    _arg1 = new wxString(PyString_AsString(_obj1));
-}
-    wxFrame_SetTitle(_arg0,*_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-{
-    if (_obj1)
-        delete _arg1;
-}
-    return _resultobj;
-}
-
-static void *SwigwxMiniFrameTowxFrame(void *ptr) {
-    wxMiniFrame *src;
-    wxFrame *dest;
-    src = (wxMiniFrame *) ptr;
-    dest = (wxFrame *) src;
-    return (void *) dest;
-}
-
-static void *SwigwxMiniFrameTowxWindow(void *ptr) {
-    wxMiniFrame *src;
-    wxWindow *dest;
-    src = (wxMiniFrame *) ptr;
-    dest = (wxWindow *) src;
-    return (void *) dest;
-}
-
-static void *SwigwxMiniFrameTowxEvtHandler(void *ptr) {
-    wxMiniFrame *src;
-    wxEvtHandler *dest;
-    src = (wxMiniFrame *) ptr;
-    dest = (wxEvtHandler *) src;
-    return (void *) dest;
-}
-
-#define new_wxMiniFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxMiniFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxMiniFrame * _result;
-    wxWindow * _arg0;
-    wxWindowID  _arg1;
-    wxString * _arg2;
-    wxPoint * _arg3 = &wxPyDefaultPosition;
-    wxSize * _arg4 = &wxPyDefaultSize;
-    long  _arg5 = (wxDEFAULT_FRAME_STYLE);
-    char * _arg6 = "frame";
-    char * _argc0 = 0;
-    PyObject * _obj2 = 0;
-    char * _argc3 = 0;
-    char * _argc4 = 0;
-    char _ptemp[128];
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"siO|ssls:new_wxMiniFrame",&_argc0,&_arg1,&_obj2,&_argc3,&_argc4,&_arg5,&_arg6)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMiniFrame. Expected _wxWindow_p.");
-        return NULL;
-        }
-    }
-{
-    if (!PyString_Check(_obj2)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    _arg2 = new wxString(PyString_AsString(_obj2));
-}
-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxMiniFrame. Expected _wxPoint_p.");
-        return NULL;
-        }
-    }
-    if (_argc4) {
-        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxMiniFrame. Expected _wxSize_p.");
-        return NULL;
-        }
-    }
-    _result = (wxMiniFrame *)new_wxMiniFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMiniFrame_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
-{
-    if (_obj2)
-        delete _arg2;
-}
-    return _resultobj;
-}
-
 static void *SwigwxPanelTowxWindow(void *ptr) {
     wxPanel *src;
     wxWindow *dest;
@@ -4868,23 +4318,6 @@ static PyMethodDef windowscMethods[] = {
 	 { "new_wxDialog", _wrap_new_wxDialog, 1 },
 	 { "wxPanel_InitDialog", _wrap_wxPanel_InitDialog, 1 },
 	 { "new_wxPanel", _wrap_new_wxPanel, 1 },
-	 { "new_wxMiniFrame", _wrap_new_wxMiniFrame, 1 },
-	 { "wxFrame_SetTitle", _wrap_wxFrame_SetTitle, 1 },
-	 { "wxFrame_SetStatusWidths", _wrap_wxFrame_SetStatusWidths, 1 },
-	 { "wxFrame_SetStatusText", _wrap_wxFrame_SetStatusText, 1 },
-	 { "wxFrame_SetMenuBar", _wrap_wxFrame_SetMenuBar, 1 },
-	 { "wxFrame_SetIcon", _wrap_wxFrame_SetIcon, 1 },
-	 { "wxFrame_SetAcceleratorTable", _wrap_wxFrame_SetAcceleratorTable, 1 },
-	 { "wxFrame_Maximize", _wrap_wxFrame_Maximize, 1 },
-	 { "wxFrame_IsIconized", _wrap_wxFrame_IsIconized, 1 },
-	 { "wxFrame_Iconize", _wrap_wxFrame_Iconize, 1 },
-	 { "wxFrame_GetTitle", _wrap_wxFrame_GetTitle, 1 },
-	 { "wxFrame_GetStatusBar", _wrap_wxFrame_GetStatusBar, 1 },
-	 { "wxFrame_GetMenuBar", _wrap_wxFrame_GetMenuBar, 1 },
-	 { "wxFrame_CreateStatusBar", _wrap_wxFrame_CreateStatusBar, 1 },
-	 { "wxFrame_Command", _wrap_wxFrame_Command, 1 },
-	 { "wxFrame_Centre", _wrap_wxFrame_Centre, 1 },
-	 { "new_wxFrame", _wrap_new_wxFrame, 1 },
 	 { "wxWindow_WarpPointer", _wrap_wxWindow_WarpPointer, 1 },
 	 { "wxWindow_Validate", _wrap_wxWindow_Validate, 1 },
 	 { "wxWindow_TransferDataToWindow", _wrap_wxWindow_TransferDataToWindow, 1 },
@@ -4991,10 +4424,6 @@ SWIGEXPORT(void,initwindowsc)() {
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxDialog",SwigwxDialogTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxPanel",SwigwxPanelTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxPanel",SwigwxPanelTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxFrame",SwigwxFrameTowxEvtHandler);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxFrame",SwigwxFrameTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxWindow",SwigwxWindowTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxWindow",SwigwxWindowTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
@@ -5020,7 +4449,6 @@ SWIGEXPORT(void,initwindowsc)() {
 	 SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
 	 SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
 	 SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-	 SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
 	 SWIG_RegisterMapping("_uint","_unsigned_int",0);
 	 SWIG_RegisterMapping("_uint","_int",0);
 	 SWIG_RegisterMapping("_uint","_wxWindowID",0);
@@ -5063,10 +4491,6 @@ SWIGEXPORT(void,initwindowsc)() {
 	 SWIG_RegisterMapping("_class_wxWindow","_wxDialog",SwigwxDialogTowxWindow);
 	 SWIG_RegisterMapping("_class_wxWindow","_class_wxPanel",SwigwxPanelTowxWindow);
 	 SWIG_RegisterMapping("_class_wxWindow","_wxPanel",SwigwxPanelTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_class_wxMiniFrame",SwigwxMiniFrameTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_wxMiniFrame",SwigwxMiniFrameTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_class_wxFrame",SwigwxFrameTowxWindow);
-	 SWIG_RegisterMapping("_class_wxWindow","_wxFrame",SwigwxFrameTowxWindow);
 	 SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
 	 SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
 	 SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
@@ -5095,9 +4519,6 @@ SWIGEXPORT(void,initwindowsc)() {
 	 SWIG_RegisterMapping("_short","_WXTYPE",0);
 	 SWIG_RegisterMapping("_short","_unsigned_short",0);
 	 SWIG_RegisterMapping("_short","_signed_short",0);
-	 SWIG_RegisterMapping("_wxFrame","_class_wxMiniFrame",SwigwxMiniFrameTowxFrame);
-	 SWIG_RegisterMapping("_wxFrame","_wxMiniFrame",SwigwxMiniFrameTowxFrame);
-	 SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0);
 	 SWIG_RegisterMapping("_wxWindowID","_EBool",0);
 	 SWIG_RegisterMapping("_wxWindowID","_uint",0);
 	 SWIG_RegisterMapping("_wxWindowID","_int",0);
@@ -5115,7 +4536,6 @@ SWIGEXPORT(void,initwindowsc)() {
 	 SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
 	 SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
 	 SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-	 SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0);
 	 SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
 	 SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
 	 SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
@@ -5133,10 +4553,6 @@ SWIGEXPORT(void,initwindowsc)() {
 	 SWIG_RegisterMapping("_wxEvtHandler","_wxDialog",SwigwxDialogTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxPanel",SwigwxPanelTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_wxPanel",SwigwxPanelTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxFrame",SwigwxFrameTowxEvtHandler);
-	 SWIG_RegisterMapping("_wxEvtHandler","_wxFrame",SwigwxFrameTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxWindow",SwigwxWindowTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_wxWindow",SwigwxWindowTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);
@@ -5150,12 +4566,5 @@ SWIGEXPORT(void,initwindowsc)() {
 	 SWIG_RegisterMapping("_wxWindow","_wxDialog",SwigwxDialogTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_class_wxPanel",SwigwxPanelTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_wxPanel",SwigwxPanelTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_class_wxMiniFrame",SwigwxMiniFrameTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_wxMiniFrame",SwigwxMiniFrameTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_class_wxFrame",SwigwxFrameTowxWindow);
-	 SWIG_RegisterMapping("_wxWindow","_wxFrame",SwigwxFrameTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
-	 SWIG_RegisterMapping("_class_wxFrame","_class_wxMiniFrame",SwigwxMiniFrameTowxFrame);
-	 SWIG_RegisterMapping("_class_wxFrame","_wxMiniFrame",SwigwxMiniFrameTowxFrame);
-	 SWIG_RegisterMapping("_class_wxFrame","_wxFrame",0);
 }

utils/wxPython/src/msw/windows.py

@@ -4,6 +4,7 @@ import windowsc
 from misc import *
 
 from gdi import *
+import wxp
 class wxEvtHandlerPtr :
     def __init__(self,this):
         self.this = this
@@ -274,92 +275,7 @@ class wxWindow(wxWindowPtr):
         args = tuple(argl)
         self.this = apply(windowsc.new_wxWindow,(arg0.this,arg1,)+args)
         self.thisown = 1
-
+        wxp._StdWindowCallbacks(self)
-
-
-
-class wxFramePtr(wxWindowPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def Centre(self,*args):
-        val = apply(windowsc.wxFrame_Centre,(self.this,)+args)
-        return val
-    def Command(self,arg0):
-        val = windowsc.wxFrame_Command(self.this,arg0)
-        return val
-    def CreateStatusBar(self,*args):
-        val = apply(windowsc.wxFrame_CreateStatusBar,(self.this,)+args)
-        return val
-    def GetMenuBar(self):
-        val = windowsc.wxFrame_GetMenuBar(self.this)
-        val = wxMenuBarPtr(val)
-        return val
-    def GetStatusBar(self):
-        val = windowsc.wxFrame_GetStatusBar(self.this)
-        return val
-    def GetTitle(self):
-        val = windowsc.wxFrame_GetTitle(self.this)
-        return val
-    def Iconize(self,arg0):
-        val = windowsc.wxFrame_Iconize(self.this,arg0)
-        return val
-    def IsIconized(self):
-        val = windowsc.wxFrame_IsIconized(self.this)
-        return val
-    def Maximize(self,arg0):
-        val = windowsc.wxFrame_Maximize(self.this,arg0)
-        return val
-    def SetAcceleratorTable(self,arg0):
-        val = windowsc.wxFrame_SetAcceleratorTable(self.this,arg0.this)
-        return val
-    def SetIcon(self,arg0):
-        val = windowsc.wxFrame_SetIcon(self.this,arg0.this)
-        return val
-    def SetMenuBar(self,arg0):
-        val = windowsc.wxFrame_SetMenuBar(self.this,arg0.this)
-        return val
-    def SetStatusText(self,arg0,*args):
-        val = apply(windowsc.wxFrame_SetStatusText,(self.this,arg0,)+args)
-        return val
-    def SetStatusWidths(self,arg0,*args):
-        val = apply(windowsc.wxFrame_SetStatusWidths,(self.this,arg0,)+args)
-        return val
-    def SetTitle(self,arg0):
-        val = windowsc.wxFrame_SetTitle(self.this,arg0)
-        return val
-    def __repr__(self):
-        return "<C wxFrame instance>"
-class wxFrame(wxFramePtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxFrame,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-
-
-
-
-class wxMiniFramePtr(wxFramePtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def __repr__(self):
-        return "<C wxMiniFrame instance>"
-class wxMiniFrame(wxMiniFramePtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxMiniFrame,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
 
 
 
@@ -383,6 +299,7 @@ class wxPanel(wxPanelPtr):
         args = tuple(argl)
         self.this = apply(windowsc.new_wxPanel,(arg0.this,arg1,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 
@@ -433,6 +350,7 @@ class wxDialog(wxDialogPtr):
         args = tuple(argl)
         self.this = apply(windowsc.new_wxDialog,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
+        wxp._StdDialogCallbacks(self)
 
 
 
@@ -477,6 +395,8 @@ class wxScrolledWindow(wxScrolledWindowPtr):
         args = tuple(argl)
         self.this = apply(windowsc.new_wxScrolledWindow,(arg0.this,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
+        wxp._StdOnScrollCallbacks(self)
 
 
 

utils/wxPython/src/msw/windows2.cpp

@@ -1,5 +1,5 @@
 /*
- * FILE : msw\windows2.cpp
+ * FILE : msw/windows2.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
@@ -56,6 +56,7 @@ extern PyObject *SWIG_newvarlink(void);
 #include "helpers.h"
 #include <wx/grid.h>
 #include <wx/notebook.h>
+#include <wx/splitter.h>
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
@@ -2640,7 +2641,410 @@ static PyObject *_wrap_wxNotebook_GetPage(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+static void *SwigwxSplitterWindowTowxWindow(void *ptr) {
+    wxSplitterWindow *src;
+    wxWindow *dest;
+    src = (wxSplitterWindow *) ptr;
+    dest = (wxWindow *) src;
+    return (void *) dest;
+}
+
+static void *SwigwxSplitterWindowTowxEvtHandler(void *ptr) {
+    wxSplitterWindow *src;
+    wxEvtHandler *dest;
+    src = (wxSplitterWindow *) ptr;
+    dest = (wxEvtHandler *) src;
+    return (void *) dest;
+}
+
+#define new_wxSplitterWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxSplitterWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
+static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxSplitterWindow * _result;
+    wxWindow * _arg0;
+    wxWindowID  _arg1;
+    wxPoint * _arg2 = &wxPyDefaultPosition;
+    wxSize * _arg3 = &wxPyDefaultSize;
+    long  _arg4 = (wxSP_3D);
+    char * _arg5 = "splitterWindow";
+    char * _argc0 = 0;
+    char * _argc2 = 0;
+    char * _argc3 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si|ssls:new_wxSplitterWindow",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxSplitterWindow. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc2) {
+        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxSplitterWindow. Expected _wxPoint_p.");
+        return NULL;
+        }
+    }
+    if (_argc3) {
+        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxSplitterWindow. Expected _wxSize_p.");
+        return NULL;
+        }
+    }
+    _result = (wxSplitterWindow *)new_wxSplitterWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxSplitterWindow_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxSplitterWindow_GetMinimumPaneSize(_swigobj)  (_swigobj->GetMinimumPaneSize())
+static PyObject *_wrap_wxSplitterWindow_GetMinimumPaneSize(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxSplitterWindow * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxSplitterWindow_GetMinimumPaneSize",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetMinimumPaneSize. Expected _wxSplitterWindow_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxSplitterWindow_GetMinimumPaneSize(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxSplitterWindow_GetSashPosition(_swigobj)  (_swigobj->GetSashPosition())
+static PyObject *_wrap_wxSplitterWindow_GetSashPosition(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxSplitterWindow * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxSplitterWindow_GetSashPosition",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetSashPosition. Expected _wxSplitterWindow_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxSplitterWindow_GetSashPosition(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxSplitterWindow_GetSplitMode(_swigobj)  (_swigobj->GetSplitMode())
+static PyObject *_wrap_wxSplitterWindow_GetSplitMode(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxSplitterWindow * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxSplitterWindow_GetSplitMode",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetSplitMode. Expected _wxSplitterWindow_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxSplitterWindow_GetSplitMode(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxSplitterWindow_GetWindow1(_swigobj)  (_swigobj->GetWindow1())
+static PyObject *_wrap_wxSplitterWindow_GetWindow1(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxWindow * _result;
+    wxSplitterWindow * _arg0;
+    char * _argc0 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxSplitterWindow_GetWindow1",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetWindow1. Expected _wxSplitterWindow_p.");
+        return NULL;
+        }
+    }
+    _result = (wxWindow *)wxSplitterWindow_GetWindow1(_arg0);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxSplitterWindow_GetWindow2(_swigobj)  (_swigobj->GetWindow2())
+static PyObject *_wrap_wxSplitterWindow_GetWindow2(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxWindow * _result;
+    wxSplitterWindow * _arg0;
+    char * _argc0 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxSplitterWindow_GetWindow2",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetWindow2. Expected _wxSplitterWindow_p.");
+        return NULL;
+        }
+    }
+    _result = (wxWindow *)wxSplitterWindow_GetWindow2(_arg0);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxSplitterWindow_Initialize(_swigobj,_swigarg0)  (_swigobj->Initialize(_swigarg0))
+static PyObject *_wrap_wxSplitterWindow_Initialize(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxSplitterWindow * _arg0;
+    wxWindow * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxSplitterWindow_Initialize",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_Initialize. Expected _wxSplitterWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSplitterWindow_Initialize. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    wxSplitterWindow_Initialize(_arg0,_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxSplitterWindow_IsSplit(_swigobj)  (_swigobj->IsSplit())
+static PyObject *_wrap_wxSplitterWindow_IsSplit(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxSplitterWindow * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxSplitterWindow_IsSplit",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_IsSplit. Expected _wxSplitterWindow_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxSplitterWindow_IsSplit(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxSplitterWindow_SetSashPosition(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetSashPosition(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxSplitterWindow_SetSashPosition(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxSplitterWindow * _arg0;
+    int  _arg1;
+    int  _arg2 = (1);
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si|i:wxSplitterWindow_SetSashPosition",&_argc0,&_arg1,&_arg2)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SetSashPosition. Expected _wxSplitterWindow_p.");
+        return NULL;
+        }
+    }
+    wxSplitterWindow_SetSashPosition(_arg0,_arg1,_arg2);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxSplitterWindow_SetMinimumPaneSize(_swigobj,_swigarg0)  (_swigobj->SetMinimumPaneSize(_swigarg0))
+static PyObject *_wrap_wxSplitterWindow_SetMinimumPaneSize(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxSplitterWindow * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxSplitterWindow_SetMinimumPaneSize",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SetMinimumPaneSize. Expected _wxSplitterWindow_p.");
+        return NULL;
+        }
+    }
+    wxSplitterWindow_SetMinimumPaneSize(_arg0,_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxSplitterWindow_SetSplitMode(_swigobj,_swigarg0)  (_swigobj->SetSplitMode(_swigarg0))
+static PyObject *_wrap_wxSplitterWindow_SetSplitMode(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxSplitterWindow * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxSplitterWindow_SetSplitMode",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SetSplitMode. Expected _wxSplitterWindow_p.");
+        return NULL;
+        }
+    }
+    wxSplitterWindow_SetSplitMode(_arg0,_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxSplitterWindow_SplitHorizontally(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->SplitHorizontally(_swigarg0,_swigarg1,_swigarg2))
+static PyObject *_wrap_wxSplitterWindow_SplitHorizontally(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxSplitterWindow * _arg0;
+    wxWindow * _arg1;
+    wxWindow * _arg2;
+    int  _arg3 = -1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char * _argc2 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sss|i:wxSplitterWindow_SplitHorizontally",&_argc0,&_argc1,&_argc2,&_arg3)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SplitHorizontally. Expected _wxSplitterWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSplitterWindow_SplitHorizontally. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc2) {
+        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxSplitterWindow_SplitHorizontally. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxSplitterWindow_SplitHorizontally(_arg0,_arg1,_arg2,_arg3);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxSplitterWindow_SplitVertically(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->SplitVertically(_swigarg0,_swigarg1,_swigarg2))
+static PyObject *_wrap_wxSplitterWindow_SplitVertically(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxSplitterWindow * _arg0;
+    wxWindow * _arg1;
+    wxWindow * _arg2;
+    int  _arg3 = -1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char * _argc2 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sss|i:wxSplitterWindow_SplitVertically",&_argc0,&_argc1,&_argc2,&_arg3)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SplitVertically. Expected _wxSplitterWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSplitterWindow_SplitVertically. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc2) {
+        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxSplitterWindow_SplitVertically. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxSplitterWindow_SplitVertically(_arg0,_arg1,_arg2,_arg3);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxSplitterWindow_Unsplit(_swigobj,_swigarg0)  (_swigobj->Unsplit(_swigarg0))
+static PyObject *_wrap_wxSplitterWindow_Unsplit(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxSplitterWindow * _arg0;
+    wxWindow * _arg1 = NULL;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s|s:wxSplitterWindow_Unsplit",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_Unsplit. Expected _wxSplitterWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSplitterWindow_Unsplit. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxSplitterWindow_Unsplit(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
 static PyMethodDef windows2cMethods[] = {
+	 { "wxSplitterWindow_Unsplit", _wrap_wxSplitterWindow_Unsplit, 1 },
+	 { "wxSplitterWindow_SplitVertically", _wrap_wxSplitterWindow_SplitVertically, 1 },
+	 { "wxSplitterWindow_SplitHorizontally", _wrap_wxSplitterWindow_SplitHorizontally, 1 },
+	 { "wxSplitterWindow_SetSplitMode", _wrap_wxSplitterWindow_SetSplitMode, 1 },
+	 { "wxSplitterWindow_SetMinimumPaneSize", _wrap_wxSplitterWindow_SetMinimumPaneSize, 1 },
+	 { "wxSplitterWindow_SetSashPosition", _wrap_wxSplitterWindow_SetSashPosition, 1 },
+	 { "wxSplitterWindow_IsSplit", _wrap_wxSplitterWindow_IsSplit, 1 },
+	 { "wxSplitterWindow_Initialize", _wrap_wxSplitterWindow_Initialize, 1 },
+	 { "wxSplitterWindow_GetWindow2", _wrap_wxSplitterWindow_GetWindow2, 1 },
+	 { "wxSplitterWindow_GetWindow1", _wrap_wxSplitterWindow_GetWindow1, 1 },
+	 { "wxSplitterWindow_GetSplitMode", _wrap_wxSplitterWindow_GetSplitMode, 1 },
+	 { "wxSplitterWindow_GetSashPosition", _wrap_wxSplitterWindow_GetSashPosition, 1 },
+	 { "wxSplitterWindow_GetMinimumPaneSize", _wrap_wxSplitterWindow_GetMinimumPaneSize, 1 },
+	 { "new_wxSplitterWindow", _wrap_new_wxSplitterWindow, 1 },
 	 { "wxNotebook_GetPage", _wrap_wxNotebook_GetPage, 1 },
 	 { "wxNotebook_InsertPage", _wrap_wxNotebook_InsertPage, 1 },
 	 { "wxNotebook_AddPage", _wrap_wxNotebook_AddPage, 1 },
@@ -2763,6 +3167,8 @@ SWIGEXPORT(void,initwindows2c)() {
 	 SWIG_RegisterMapping("_signed_long","_long",0);
 	 SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
 	 SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
+	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler);
+	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxNotebook",SwigwxNotebookTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxNotebook",SwigwxNotebookTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxGrid",SwigwxGridTowxEvtHandler);
@@ -2809,7 +3215,6 @@ SWIGEXPORT(void,initwindows2c)() {
 	 SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
 	 SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
 	 SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-	 SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
 	 SWIG_RegisterMapping("_class_wxNotebookEvent","_wxNotebookEvent",0);
 	 SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
 	 SWIG_RegisterMapping("_uint","_unsigned_int",0);
@@ -2818,6 +3223,7 @@ SWIGEXPORT(void,initwindows2c)() {
 	 SWIG_RegisterMapping("_class_wxEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxEvent);
 	 SWIG_RegisterMapping("_class_wxEvent","_wxNotebookEvent",SwigwxNotebookEventTowxEvent);
 	 SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
+	 SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
 	 SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
 	 SWIG_RegisterMapping("_wxCommandEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent);
 	 SWIG_RegisterMapping("_wxCommandEvent","_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent);
@@ -2873,11 +3279,14 @@ SWIGEXPORT(void,initwindows2c)() {
 	 SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
 	 SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
 	 SWIG_RegisterMapping("_unsigned_short","_short",0);
+	 SWIG_RegisterMapping("_class_wxWindow","_class_wxSplitterWindow",SwigwxSplitterWindowTowxWindow);
+	 SWIG_RegisterMapping("_class_wxWindow","_wxSplitterWindow",SwigwxSplitterWindowTowxWindow);
 	 SWIG_RegisterMapping("_class_wxWindow","_class_wxNotebook",SwigwxNotebookTowxWindow);
 	 SWIG_RegisterMapping("_class_wxWindow","_wxNotebook",SwigwxNotebookTowxWindow);
 	 SWIG_RegisterMapping("_class_wxWindow","_class_wxGrid",SwigwxGridTowxWindow);
 	 SWIG_RegisterMapping("_class_wxWindow","_wxGrid",SwigwxGridTowxWindow);
 	 SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
+	 SWIG_RegisterMapping("_wxSplitterWindow","_class_wxSplitterWindow",0);
 	 SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0);
 	 SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
 	 SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0);
@@ -2921,7 +3330,6 @@ SWIGEXPORT(void,initwindows2c)() {
 	 SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
 	 SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
 	 SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
-	 SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0);
 	 SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0);
 	 SWIG_RegisterMapping("_wxWindowID","_EBool",0);
 	 SWIG_RegisterMapping("_wxWindowID","_uint",0);
@@ -2953,11 +3361,12 @@ SWIGEXPORT(void,initwindows2c)() {
 	 SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
 	 SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
 	 SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
-	 SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0);
 	 SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
+	 SWIG_RegisterMapping("_class_wxSplitterWindow","_wxSplitterWindow",0);
 	 SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
 	 SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
 	 SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
+	 SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
 	 SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent);
 	 SWIG_RegisterMapping("_class_wxCommandEvent","_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent);
 	 SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
@@ -2968,6 +3377,8 @@ SWIGEXPORT(void,initwindows2c)() {
 	 SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
 	 SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
 	 SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
+	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler);
+	 SWIG_RegisterMapping("_wxEvtHandler","_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxNotebook",SwigwxNotebookTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_wxNotebook",SwigwxNotebookTowxEvtHandler);
 	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxGrid",SwigwxGridTowxEvtHandler);
@@ -2981,10 +3392,11 @@ SWIGEXPORT(void,initwindows2c)() {
 	 SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
 	 SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
 	 SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
+	 SWIG_RegisterMapping("_wxWindow","_class_wxSplitterWindow",SwigwxSplitterWindowTowxWindow);
+	 SWIG_RegisterMapping("_wxWindow","_wxSplitterWindow",SwigwxSplitterWindowTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_class_wxNotebook",SwigwxNotebookTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_wxNotebook",SwigwxNotebookTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_class_wxGrid",SwigwxGridTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_wxGrid",SwigwxGridTowxWindow);
 	 SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
-	 SWIG_RegisterMapping("_class_wxFrame","_wxFrame",0);
 }

utils/wxPython/src/msw/windows2.py

@@ -10,6 +10,7 @@ from windows import *
 from controls import *
 
 from events import *
+import wxp
 class wxGridCellPtr :
     def __init__(self,this):
         self.this = this
@@ -286,6 +287,7 @@ class wxGrid(wxGridPtr):
         args = tuple(argl)
         self.this = apply(windows2c.new_wxGrid,(arg0.this,arg1,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 
@@ -373,6 +375,73 @@ class wxNotebook(wxNotebookPtr):
         args = tuple(argl)
         self.this = apply(windows2c.new_wxNotebook,(arg0.this,arg1,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
+
+
+
+
+class wxSplitterWindowPtr(wxWindowPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetMinimumPaneSize(self):
+        val = windows2c.wxSplitterWindow_GetMinimumPaneSize(self.this)
+        return val
+    def GetSashPosition(self):
+        val = windows2c.wxSplitterWindow_GetSashPosition(self.this)
+        return val
+    def GetSplitMode(self):
+        val = windows2c.wxSplitterWindow_GetSplitMode(self.this)
+        return val
+    def GetWindow1(self):
+        val = windows2c.wxSplitterWindow_GetWindow1(self.this)
+        val = wxWindowPtr(val)
+        return val
+    def GetWindow2(self):
+        val = windows2c.wxSplitterWindow_GetWindow2(self.this)
+        val = wxWindowPtr(val)
+        return val
+    def Initialize(self,arg0):
+        val = windows2c.wxSplitterWindow_Initialize(self.this,arg0.this)
+        return val
+    def IsSplit(self):
+        val = windows2c.wxSplitterWindow_IsSplit(self.this)
+        return val
+    def SetSashPosition(self,arg0,*args):
+        val = apply(windows2c.wxSplitterWindow_SetSashPosition,(self.this,arg0,)+args)
+        return val
+    def SetMinimumPaneSize(self,arg0):
+        val = windows2c.wxSplitterWindow_SetMinimumPaneSize(self.this,arg0)
+        return val
+    def SetSplitMode(self,arg0):
+        val = windows2c.wxSplitterWindow_SetSplitMode(self.this,arg0)
+        return val
+    def SplitHorizontally(self,arg0,arg1,*args):
+        val = apply(windows2c.wxSplitterWindow_SplitHorizontally,(self.this,arg0.this,arg1.this,)+args)
+        return val
+    def SplitVertically(self,arg0,arg1,*args):
+        val = apply(windows2c.wxSplitterWindow_SplitVertically,(self.this,arg0.this,arg1.this,)+args)
+        return val
+    def Unsplit(self,*args):
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        args = tuple(argl)
+        val = apply(windows2c.wxSplitterWindow_Unsplit,(self.this,)+args)
+        return val
+    def __repr__(self):
+        return "<C wxSplitterWindow instance>"
+class wxSplitterWindow(wxSplitterWindowPtr):
+    def __init__(self,arg0,arg1,*args) :
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        try: argl[1] = argl[1].this
+        except: pass
+        args = tuple(argl)
+        self.this = apply(windows2c.new_wxSplitterWindow,(arg0.this,arg1,)+args)
+        self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 

utils/wxPython/src/msw/wxp.cpp

@@ -1,5 +1,5 @@
 /*
- * FILE : msw\wxp.cpp
+ * FILE : msw/wxp.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
@@ -33,8 +33,8 @@
  * and things like that.
  *
  * $Log$
- * Revision 1.1  1998/08/18 21:52:29  RD
+ * Revision 1.2  1998/10/02 06:42:02  RD
- * MSW version of the SWIG-generated files
+ * Version 0.4 of wxPython for MSW.
  *
  ************************************************************************/
 
@@ -556,15 +556,6 @@ char *SWIG_GetPtr(char *_c, void **ptr, char *_t)
 
 #define SWIG_name    "wxpc"
 
-
-#ifdef __WXMSW__
-#include <windows.h>
-#undef FindWindow
-#undef GetCharWidth
-#undef LoadAccelerators
-#endif
-
-
 #include "helpers.h"
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
@@ -627,21 +618,6 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
-#ifdef __WXMSW__             // If building for win32...
-extern HINSTANCE wxhInstance;
-
-BOOL WINAPI DllMain(
-    HINSTANCE   hinstDLL,    // handle to DLL module
-    DWORD       fdwReason,   // reason for calling function
-    LPVOID      lpvReserved  // reserved
-   )
-{
-    wxhInstance = hinstDLL;
-    return 1;
-}
-#endif
-
-
 extern "C" SWIGEXPORT(void,initwindowsc)();
 extern "C" SWIGEXPORT(void,initwindows2c)();
 extern "C" SWIGEXPORT(void,initeventsc)();
@@ -651,6 +627,8 @@ extern "C" SWIGEXPORT(void,initmdic)();
 extern "C" SWIGEXPORT(void,initcontrolsc)();
 extern "C" SWIGEXPORT(void,initcontrols2c)();
 extern "C" SWIGEXPORT(void,initcmndlgsc)();
+extern "C" SWIGEXPORT(void,initstattoolc)();
+extern "C" SWIGEXPORT(void,initframesc)();
 
 static int _wrap_wxPyDefaultPosition_set(PyObject *val) {
 
@@ -1238,7 +1216,6 @@ SWIGEXPORT(void,initwxpc)() {
 	 PyDict_SetItemString(d,"wxMAJOR_VERSION", PyInt_FromLong((long) wxMAJOR_VERSION));
 	 PyDict_SetItemString(d,"wxMINOR_VERSION", PyInt_FromLong((long) wxMINOR_VERSION));
 	 PyDict_SetItemString(d,"wxRELEASE_NUMBER", PyInt_FromLong((long) wxRELEASE_NUMBER));
-	 PyDict_SetItemString(d,"UNKNOWN", PyInt_FromLong((long) UNKNOWN));
 	 PyDict_SetItemString(d,"NOT_FOUND", PyInt_FromLong((long) NOT_FOUND));
 	 PyDict_SetItemString(d,"wxVSCROLL", PyInt_FromLong((long) wxVSCROLL));
 	 PyDict_SetItemString(d,"wxHSCROLL", PyInt_FromLong((long) wxHSCROLL));
@@ -1279,6 +1256,7 @@ SWIGEXPORT(void,initwxpc)() {
 	 PyDict_SetItemString(d,"wxTB_3DBUTTONS", PyInt_FromLong((long) wxTB_3DBUTTONS));
 	 PyDict_SetItemString(d,"wxTB_HORIZONTAL", PyInt_FromLong((long) wxTB_HORIZONTAL));
 	 PyDict_SetItemString(d,"wxTB_VERTICAL", PyInt_FromLong((long) wxTB_VERTICAL));
+	 PyDict_SetItemString(d,"wxTB_FLAT", PyInt_FromLong((long) wxTB_FLAT));
 	 PyDict_SetItemString(d,"wxCOLOURED", PyInt_FromLong((long) wxCOLOURED));
 	 PyDict_SetItemString(d,"wxFIXED_LENGTH", PyInt_FromLong((long) wxFIXED_LENGTH));
 	 PyDict_SetItemString(d,"wxALIGN_LEFT", PyInt_FromLong((long) wxALIGN_LEFT));
@@ -1581,6 +1559,7 @@ SWIGEXPORT(void,initwxpc)() {
 	 PyDict_SetItemString(d,"WXK_SCROLL", PyInt_FromLong((long) WXK_SCROLL));
 	 PyDict_SetItemString(d,"WXK_PAGEUP", PyInt_FromLong((long) WXK_PAGEUP));
 	 PyDict_SetItemString(d,"WXK_PAGEDOWN", PyInt_FromLong((long) WXK_PAGEDOWN));
+	 PyDict_SetItemString(d,"wxCURSOR_NONE", PyInt_FromLong((long) wxCURSOR_NONE));
 	 PyDict_SetItemString(d,"wxCURSOR_ARROW", PyInt_FromLong((long) wxCURSOR_ARROW));
 	 PyDict_SetItemString(d,"wxCURSOR_BULLSEYE", PyInt_FromLong((long) wxCURSOR_BULLSEYE));
 	 PyDict_SetItemString(d,"wxCURSOR_CHAR", PyInt_FromLong((long) wxCURSOR_CHAR));
@@ -1745,13 +1724,8 @@ SWIGEXPORT(void,initwxpc)() {
 	 SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set);
 	 SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set);
 
-        // We don't want to run the wxEntry or OnInit yet, so we just do the
-        // beginings of what it would have done...  See __wxStart() for the
-        // rest.
-#ifdef __WXMSW__
-    wxApp::Initialize((WXHINSTANCE)wxhInstance);
-#endif
 
+    __wxPreStart();     // initialize the GUI toolkit, if needed.
 
 //    wxPyWindows = new wxHashTable(wxKEY_INTEGER, 100);
 
@@ -1767,6 +1741,9 @@ SWIGEXPORT(void,initwxpc)() {
     initcontrolsc();
     initcontrols2c();
     initcmndlgsc();
+    initstattoolc();
+    initframesc();
+
 /*
  * These are the pointer type-equivalency mappings. 
  * (Used by the SWIG pointer type-checker).
@@ -1784,6 +1761,7 @@ SWIGEXPORT(void,initwxpc)() {
 	 SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
 	 SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
 	 SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
+	 SWIG_RegisterMapping("_class_wxToolBarBase","_wxToolBarBase",0);
 	 SWIG_RegisterMapping("_class_wxTreeCtrl","_wxTreeCtrl",0);
 	 SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
 	 SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0);
@@ -1812,6 +1790,7 @@ SWIGEXPORT(void,initwxpc)() {
 	 SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
 	 SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
 	 SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
+	 SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0);
 	 SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0);
 	 SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
 	 SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
@@ -1826,6 +1805,7 @@ SWIGEXPORT(void,initwxpc)() {
 	 SWIG_RegisterMapping("_wxPageSetupDialog","_class_wxPageSetupDialog",0);
 	 SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
 	 SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
+	 SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
 	 SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
 	 SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
 	 SWIG_RegisterMapping("_class_wxNotebookEvent","_wxNotebookEvent",0);
@@ -1834,6 +1814,7 @@ SWIGEXPORT(void,initwxpc)() {
 	 SWIG_RegisterMapping("_uint","_int",0);
 	 SWIG_RegisterMapping("_uint","_wxWindowID",0);
 	 SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
+	 SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
 	 SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
 	 SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
 	 SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
@@ -1846,6 +1827,7 @@ SWIGEXPORT(void,initwxpc)() {
 	 SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
 	 SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
 	 SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
+	 SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
 	 SWIG_RegisterMapping("_wxColourDialog","_class_wxColourDialog",0);
 	 SWIG_RegisterMapping("_wxPrintData","_class_wxPrintData",0);
 	 SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
@@ -1853,8 +1835,10 @@ SWIGEXPORT(void,initwxpc)() {
 	 SWIG_RegisterMapping("_wxTextEntryDialog","_class_wxTextEntryDialog",0);
 	 SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
 	 SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
+	 SWIG_RegisterMapping("_wxToolBarSimple","_class_wxToolBarSimple",0);
 	 SWIG_RegisterMapping("_wxMDIChildFrame","_class_wxMDIChildFrame",0);
 	 SWIG_RegisterMapping("_wxListItem","_class_wxListItem",0);
+	 SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
 	 SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
 	 SWIG_RegisterMapping("_EBool","_signed_int",0);
 	 SWIG_RegisterMapping("_EBool","_int",0);
@@ -1892,6 +1876,7 @@ SWIGEXPORT(void,initwxpc)() {
 	 SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
 	 SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
 	 SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
+	 SWIG_RegisterMapping("_class_wxToolBarSimple","_wxToolBarSimple",0);
 	 SWIG_RegisterMapping("_class_wxMDIChildFrame","_wxMDIChildFrame",0);
 	 SWIG_RegisterMapping("_WXTYPE","_short",0);
 	 SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
@@ -1902,6 +1887,7 @@ SWIGEXPORT(void,initwxpc)() {
 	 SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
 	 SWIG_RegisterMapping("_unsigned_short","_short",0);
 	 SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
+	 SWIG_RegisterMapping("_wxSplitterWindow","_class_wxSplitterWindow",0);
 	 SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0);
 	 SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
 	 SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0);
@@ -1922,6 +1908,8 @@ SWIGEXPORT(void,initwxpc)() {
 	 SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
 	 SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
 	 SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
+	 SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0);
+	 SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0);
 	 SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
 	 SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
 	 SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0);
@@ -1931,7 +1919,6 @@ SWIGEXPORT(void,initwxpc)() {
 	 SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
 	 SWIG_RegisterMapping("_wxControl","_class_wxControl",0);
 	 SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0);
-	 SWIG_RegisterMapping("_wxTabCtrl","_class_wxTabCtrl",0);
 	 SWIG_RegisterMapping("_unsigned_int","_uint",0);
 	 SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
 	 SWIG_RegisterMapping("_unsigned_int","_int",0);
@@ -1950,7 +1937,6 @@ SWIGEXPORT(void,initwxpc)() {
 	 SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
 	 SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
 	 SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
-	 SWIG_RegisterMapping("_wxTabEvent","_class_wxTabEvent",0);
 	 SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0);
 	 SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0);
 	 SWIG_RegisterMapping("_wxWindowID","_EBool",0);
@@ -1975,24 +1961,26 @@ SWIGEXPORT(void,initwxpc)() {
 	 SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
 	 SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0);
 	 SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0);
+	 SWIG_RegisterMapping("_wxToolBarBase","_class_wxToolBarBase",0);
 	 SWIG_RegisterMapping("_wxTreeCtrl","_class_wxTreeCtrl",0);
 	 SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
 	 SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
 	 SWIG_RegisterMapping("_class_wxControl","_wxControl",0);
 	 SWIG_RegisterMapping("_wxStaticBitmap","_class_wxStaticBitmap",0);
-	 SWIG_RegisterMapping("_class_wxTabCtrl","_wxTabCtrl",0);
 	 SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
 	 SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
 	 SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
 	 SWIG_RegisterMapping("_class_wxPageSetupDialog","_wxPageSetupDialog",0);
 	 SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
 	 SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
-	 SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0);
 	 SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
+	 SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0);
 	 SWIG_RegisterMapping("_wxFontDialog","_class_wxFontDialog",0);
+	 SWIG_RegisterMapping("_class_wxSplitterWindow","_wxSplitterWindow",0);
 	 SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
 	 SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
 	 SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
+	 SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
 	 SWIG_RegisterMapping("_class_wxTreeItem","_wxTreeItem",0);
 	 SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
 	 SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
@@ -2023,6 +2011,5 @@ SWIGEXPORT(void,initwxpc)() {
 	 SWIG_RegisterMapping("_wxMDIClientWindow","_class_wxMDIClientWindow",0);
 	 SWIG_RegisterMapping("_class_wxFontDialog","_wxFontDialog",0);
 	 SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
-	 SWIG_RegisterMapping("_class_wxTabEvent","_wxTabEvent",0);
 	 SWIG_RegisterMapping("_class_wxFrame","_wxFrame",0);
 }

utils/wxPython/src/msw/wxp.py

@@ -11,6 +11,10 @@ from events import *
 
 from mdi import *
 
+from frames import *
+
+from stattool import *
+
 from controls import *
 
 from controls2 import *
@@ -108,7 +112,6 @@ _wxSetDictionary = wxpc._wxSetDictionary
 wxMAJOR_VERSION = wxpc.wxMAJOR_VERSION
 wxMINOR_VERSION = wxpc.wxMINOR_VERSION
 wxRELEASE_NUMBER = wxpc.wxRELEASE_NUMBER
-UNKNOWN = wxpc.UNKNOWN
 NOT_FOUND = wxpc.NOT_FOUND
 wxVSCROLL = wxpc.wxVSCROLL
 wxHSCROLL = wxpc.wxHSCROLL
@@ -149,6 +152,7 @@ wxBACKINGSTORE = wxpc.wxBACKINGSTORE
 wxTB_3DBUTTONS = wxpc.wxTB_3DBUTTONS
 wxTB_HORIZONTAL = wxpc.wxTB_HORIZONTAL
 wxTB_VERTICAL = wxpc.wxTB_VERTICAL
+wxTB_FLAT = wxpc.wxTB_FLAT
 wxCOLOURED = wxpc.wxCOLOURED
 wxFIXED_LENGTH = wxpc.wxFIXED_LENGTH
 wxALIGN_LEFT = wxpc.wxALIGN_LEFT
@@ -451,6 +455,7 @@ WXK_NUMLOCK = wxpc.WXK_NUMLOCK
 WXK_SCROLL = wxpc.WXK_SCROLL
 WXK_PAGEUP = wxpc.WXK_PAGEUP
 WXK_PAGEDOWN = wxpc.WXK_PAGEDOWN
+wxCURSOR_NONE = wxpc.wxCURSOR_NONE
 wxCURSOR_ARROW = wxpc.wxCURSOR_ARROW
 wxCURSOR_BULLSEYE = wxpc.wxCURSOR_BULLSEYE
 wxCURSOR_CHAR = wxpc.wxCURSOR_CHAR
@@ -665,6 +670,15 @@ def _StdFrameCallbacks(win):
     _checkForCallback(win, "OnCloseWindow",        wxEVT_CLOSE_WINDOW)
 
 
+def _StdDialogCallbacks(win):
+    _StdWindowCallbacks(win)
+    _checkForCallback(win, "OnOk",     wxEVT_COMMAND_BUTTON_CLICKED,   wxID_OK)
+    _checkForCallback(win, "OnApply",  wxEVT_COMMAND_BUTTON_CLICKED,   wxID_APPLY)
+    _checkForCallback(win, "OnCancel", wxEVT_COMMAND_BUTTON_CLICKED,   wxID_CANCEL)
+    _checkForCallback(win, "OnCloseWindow", wxEVT_CLOSE_WINDOW)
+    _checkForCallback(win, "OnCharHook",    wxEVT_CHAR_HOOK)
+
+
 def _StdOnScrollCallback(win):
     try:    cb = getattr(win, "OnScroll")
     except: pass
@@ -959,336 +973,8 @@ def EVT_NOTEBOOK_PAGE_CHANGING(win, id, func):
 
 
 
+
 #----------------------------------------------------------------------
-#----------------------------------------------------------------------
-# We need to add to the shadow classes a bit to facilitate callbacks via
-# virtual functions.  These classes replace the shadows generated by SWIG.
-
-class wxWindow(wxWindowPtr):
-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxWindow,(arg0.this,arg1,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-
-class wxFrame(wxFramePtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxFrame,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdFrameCallbacks(self)
-
-
-if wxPlatform == '__WXMSW__':
-    class wxMiniFrame(wxMiniFramePtr):
-        def __init__(self,arg0,arg1,arg2,*args) :
-            argl = map(None,args)
-            try: argl[0] = argl[0].this
-            except: pass
-            try: argl[1] = argl[1].this
-            except: pass
-            args = tuple(argl)
-            self.this = apply(windowsc.new_wxMiniFrame,(arg0.this,arg1,arg2,)+args)
-            self.thisown = 1
-            _StdFrameCallbacks(self)
-
-
-class wxPanel(wxPanelPtr):
-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxPanel,(arg0.this,arg1,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-
-class wxDialog(wxDialogPtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxDialog,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-        _checkForCallback(self, "OnOk",     wxEVT_COMMAND_BUTTON_CLICKED,   wxID_OK)
-        _checkForCallback(self, "OnApply",  wxEVT_COMMAND_BUTTON_CLICKED,   wxID_APPLY)
-        _checkForCallback(self, "OnCancel", wxEVT_COMMAND_BUTTON_CLICKED,   wxID_CANCEL)
-        _checkForCallback(self, "OnCloseWindow", wxEVT_CLOSE_WINDOW)
-        _checkForCallback(self, "OnCharHook",    wxEVT_CHAR_HOOK)
-
-
-class wxScrolledWindow(wxScrolledWindowPtr):
-    def __init__(self,arg0,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxScrolledWindow,(arg0.this,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-        _StdOnScrollCallback(self)
-
-
-
-class wxMDIParentFrame(wxMDIParentFramePtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(mdic.new_wxMDIParentFrame,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdFrameCallbacks(self)
-
-
-class wxMDIChildFrame(wxMDIChildFramePtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(mdic.new_wxMDIChildFrame,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdFrameCallbacks(self)
-
-
-class wxMDIClientWindow(wxMDIClientWindowPtr):
-    def __init__(self,arg0,*args) :
-        self.this = apply(mdic.new_wxMDIClientWindow,(arg0.this,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-        _StdOnScrollCallback(self)
-
-
-
-class wxControl(wxControlPtr):
-    def __init__(self,this):
-        self.this = this
-        _StdWindowCallbacks(self)
-
-class wxButton(wxButtonPtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxButton,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxBitmapButton(wxBitmapButtonPtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxBitmapButton,(arg0.this,arg1,arg2.this,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxCheckBox(wxCheckBoxPtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxCheckBox,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-
-
-class wxChoice(wxChoicePtr):
-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxChoice,(arg0.this,arg1,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxComboBox(wxComboBoxPtr):
-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxComboBox,(arg0.this,arg1,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxGauge(wxGaugePtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxGauge,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxStaticBox(wxStaticBoxPtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxStaticBox,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxStaticText(wxStaticTextPtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxStaticText,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxListBox(wxListBoxPtr):
-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxListBox,(arg0.this,arg1,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxTextCtrl(wxTextCtrlPtr):
-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxTextCtrl,(arg0.this,arg1,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxScrollBar(wxScrollBarPtr):
-    def __init__(self,arg0,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxScrollBar,(arg0.this,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-if wxPlatform == '__WXMSW__':
-    class wxSpinButton(wxSpinButtonPtr):
-        def __init__(self,arg0,*args) :
-            argl = map(None,args)
-            try: argl[1] = argl[1].this
-            except: pass
-            try: argl[2] = argl[2].this
-            except: pass
-            args = tuple(argl)
-            self.this = apply(controlsc.new_wxSpinButton,(arg0.this,)+args)
-            self.thisown = 1
-            _StdWindowCallbacks(self)
-
-class wxStaticBitmap(wxStaticBitmapPtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxStaticBitmap,(arg0.this,arg1,arg2.this,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxRadioBox(wxRadioBoxPtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxRadioBox,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxRadioButton(wxRadioButtonPtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxRadioButton,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-class wxSlider(wxSliderPtr):
-    def __init__(self,arg0,arg1,arg2,arg3,arg4,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxSlider,(arg0.this,arg1,arg2,arg3,arg4,)+args)
-        self.thisown = 1
-        _StdWindowCallbacks(self)
-
-
-
-
-
 
 class wxTimer(wxPyTimer):
     def __init__(self):
@@ -1382,8 +1068,8 @@ class wxApp(wxPyApp):
 #----------------------------------------------------------------------------
 #
 # $Log$
-# Revision 1.1  1998/08/18 21:52:31  RD
+# Revision 1.2  1998/10/02 06:42:04  RD
-# MSW version of the SWIG-generated files
+# Version 0.4 of wxPython for MSW.
 #
 # Revision 1.2  1998/08/18 19:48:12  RD
 # more wxGTK compatibility things.

utils/wxPython/src/stattool.i

@@ -0,0 +1,196 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        stattool.i
+// Purpose:     SWIG definitions for StatusBar and ToolBar classes
+//
+// Author:      Robin Dunn
+//
+// Created:     08/24/1998
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 by Total Control Software
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+
+%module stattool
+
+%{
+#include "helpers.h"
+#include <wx/toolbar.h>
+#include <wx/tbarsmpl.h>
+%}
+
+//----------------------------------------------------------------------
+
+%include typemaps.i
+%include my_typemaps.i
+
+// Import some definitions of other classes, etc.
+%import _defs.i
+%import misc.i
+%import windows.i
+%import controls.i
+
+
+//---------------------------------------------------------------------------
+
+class wxStatusBar : public wxWindow {
+public:
+    wxStatusBar(wxWindow* parent, wxWindowID id,
+                const wxPoint& pos = wxPyDefaultPosition,
+                const wxSize& size = wxPyDefaultSize,
+                long style = wxST_SIZEGRIP,
+                char* name = "statusBar");
+
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
+    %addmethods {
+        %new wxRect* GetFieldRect(long item) {
+            wxRect* rect= new wxRect;
+            self->GetFieldRect(item, *rect);
+            return rect;
+        }
+    }
+    int GetFieldsCount(void);
+    wxString GetStatusText(int ir = 0);
+    void DrawField(wxDC& dc, int i);
+    void DrawFieldText(wxDC& dc, int i);
+    void InitColours(void);
+
+    // OnSysColourChanged(wxSysColourChangedEvent& event);
+
+    void SetFieldsCount(int number = 1);
+    void SetStatusText(const wxString& text, int i = 0);
+    void SetStatusWidths(int LCOUNT, int* LIST);
+};
+
+
+//---------------------------------------------------------------------------
+
+class wxToolBarTool {
+public:
+    wxToolBarTool();
+    ~wxToolBarTool();
+    void SetSize( long w, long h ) { m_width = w; m_height = h; }
+    long GetWidth () const { return m_width; }
+    long GetHeight () const { return m_height; }
+
+public:
+    int                   m_toolStyle;
+    wxObject *            m_clientData;
+    int                   m_index;
+    long                  m_x;
+    long                  m_y;
+    long                  m_width;
+    long                  m_height;
+    bool                  m_toggleState;
+    bool                  m_isToggle;
+    bool                  m_deleteSecondBitmap;
+    bool                  m_enabled;
+    wxBitmap              m_bitmap1;
+    wxBitmap              m_bitmap2;
+    bool                  m_isMenuCommand;
+    wxString              m_shortHelpString;
+    wxString              m_longHelpString;
+};
+
+
+
+class wxToolBarBase : public wxControl {
+public:
+
+
+    void AddSeparator(void);
+
+    // Ignoge the clientData for now...
+    %addmethods {
+        wxToolBarTool* AddTool(int toolIndex,
+                               const wxBitmap& bitmap1,
+                               const wxBitmap& bitmap2 = wxNullBitmap,
+                               int  isToggle = FALSE,
+                               long xPos = -1,
+                               long yPos = -1,
+                               //wxObject* clientData = NULL,
+                               const wxString& shortHelpString = wxPyEmptyStr,
+                               const wxString& longHelpString = wxPyEmptyStr) {
+            return self->AddTool(toolIndex, bitmap1, bitmap2,
+                                 isToggle, xPos, yPos, NULL,
+                                 shortHelpString, longHelpString);
+        }
+    }
+
+//    void DrawTool(wxMemoryDC& memDC, wxToolBarTool* tool);
+    void EnableTool(int toolIndex, const bool enable);
+    wxToolBarTool* FindToolForPosition(const float x, const float y);
+    wxSize GetToolSize();
+    wxSize GetToolBitmapSize();
+//    wxSize GetMargins();
+    wxSize GetMaxSize();
+//    wxObject* GetToolClientData(int toolIndex);
+    bool GetToolEnabled(int toolIndex);
+    wxString GetToolLongHelp(int toolIndex);
+    int GetToolPacking();
+    int GetToolSeparation();
+    wxString GetToolShortHelp(int toolIndex);
+    bool GetToolState(int toolIndex);
+
+    // TODO:  figure out how to handle these
+    //bool OnLeftClick(int toolIndex, bool toggleDown);
+    //void OnMouseEnter(int toolIndex);
+    //void OnRightClick(int toolIndex, float x, float y);
+
+    bool Realize();
+    void SetToolBitmapSize(const wxSize& size);
+    void SetMargins(const wxSize& size);
+    void SetToolLongHelp(int toolIndex, const wxString& helpString);
+    void SetToolPacking(int packing);
+    void SetToolShortHelp(int toolIndex, const wxString& helpString);
+    void SetToolSeparation(int separation);
+    void ToggleTool(int toolIndex, const bool toggle);
+};
+
+
+
+// The Native Toolbar
+class wxToolBar : public wxToolBarBase {
+public:
+    wxToolBar(wxWindow* parent, wxWindowID id,
+              const wxPoint& pos = wxPyDefaultPosition,
+              const wxSize& size = wxPyDefaultSize,
+              long style = wxTB_HORIZONTAL | wxNO_BORDER,
+              char* name = "toolBar");
+
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
+};
+
+
+// A generic toolbar
+class wxToolBarSimple : public wxToolBarBase {
+public:
+    wxToolBarSimple(wxWindow* parent, wxWindowID id,
+                    const wxPoint& pos = wxPyDefaultPosition,
+                    const wxSize& size = wxPyDefaultSize,
+                    long style = wxTB_HORIZONTAL | wxNO_BORDER,
+                    char* name = "toolBar");
+
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
+};
+
+
+//---------------------------------------------------------------------------
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// $Log$
+// Revision 1.1  1998/10/02 06:40:42  RD
+// Version 0.4 of wxPython for MSW.
+//
+//
+
+
+
+
+
+
+

utils/wxPython/src/windows.i

@@ -36,6 +36,7 @@
 %import misc.i
 %import gdi.i
 
+%pragma(python) code = "import wxp"
 
 //---------------------------------------------------------------------------
 
@@ -65,6 +66,7 @@ public:
              long style = 0,
              char* name = "panel");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
 
     void CaptureMouse();
     void Center(int direction = wxHORIZONTAL);
@@ -179,50 +181,6 @@ public:
 %}
 #endif
 
-//----------------------------------------------------------------------
-
-class wxFrame : public wxWindow {
-public:
-    wxFrame(wxWindow* parent, const wxWindowID id, const wxString& title,
-            const wxPoint& pos = wxPyDefaultPosition,
-            const wxSize& size = wxPyDefaultSize,
-            long style = wxDEFAULT_FRAME_STYLE,
-            char* name = "frame");
-
-    void Centre(int direction = wxBOTH);
-#ifdef __WXMSW__
-    void Command(int id);
-#endif
-    bool CreateStatusBar(int number = 1);
-    wxMenuBar* GetMenuBar();
-    wxStatusBar* GetStatusBar();
-    wxString GetTitle();
-    void Iconize(bool iconize);
-    bool IsIconized();
-    void Maximize(bool maximize);
-#ifdef __WXMSW__
-    void SetAcceleratorTable(const wxAcceleratorTable& accel);
-#endif
-    void SetIcon(const wxIcon& icon);
-    void SetMenuBar(wxMenuBar* menuBar);
-    void SetStatusText(const wxString& text, int number = 0);
-    void SetStatusWidths(int LCOUNT, int* LIST); // use typemap
-    void SetTitle(const wxString& title);
-
-};
-
-//---------------------------------------------------------------------------
-
-#ifdef __WXMSW__
-class wxMiniFrame : public wxFrame {
-public:
-    wxMiniFrame(wxWindow* parent, const wxWindowID id, const wxString& title,
-                const wxPoint& pos = wxPyDefaultPosition,
-                const wxSize& size = wxPyDefaultSize,
-                long style = wxDEFAULT_FRAME_STYLE,
-                char* name = "frame");
-};
-#endif
 
 //---------------------------------------------------------------------------
 
@@ -235,6 +193,8 @@ public:
             long style = wxTAB_TRAVERSAL,
             const char* name = "panel");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     void InitDialog();
 };
 
@@ -250,6 +210,8 @@ public:
              long style = wxDEFAULT_DIALOG_STYLE,
              const char* name = "dialogBox");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+
     void Centre(int direction = wxBOTH);
     void EndModal(int retCode);
     wxString GetTitle();
@@ -273,6 +235,9 @@ public:
                      long style = wxHSCROLL | wxVSCROLL,
                      char* name = "scrolledWindow");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:wxp._StdOnScrollCallbacks(self)"
+
     void EnableScrolling(bool xScrolling, bool yScrolling);
     void GetScrollPixelsPerUnit(int* OUTPUT, int* OUTPUT);
     void GetVirtualSize(int* OUTPUT, int* OUTPUT);
@@ -382,6 +347,9 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.6  1998/10/02 06:40:43  RD
+// Version 0.4 of wxPython for MSW.
+//
 // Revision 1.5  1998/08/17 18:29:40  RD
 // Removed an extra method definition
 //

utils/wxPython/src/windows2.i

@@ -16,6 +16,7 @@
 #include "helpers.h"
 #include <wx/grid.h>
 #include <wx/notebook.h>
+#include <wx/splitter.h>
 %}
 
 //----------------------------------------------------------------------
@@ -31,6 +32,8 @@
 %import controls.i
 %import events.i
 
+%pragma(python) code = "import wxp"
+
 //---------------------------------------------------------------------------
 
 enum {
@@ -70,6 +73,8 @@ public:
            long style=0,
            char* name="grid");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     void AdjustScrollbars();
     bool AppendCols(int n=1, bool updateLabels=TRUE);
     bool AppendRows(int n=1, bool updateLabels=TRUE);
@@ -189,6 +194,8 @@ public:
                long style = 0,
                char* name = "notebook");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     int GetPageCount();
     int SetSelection(int nPage);
     void AdvanceSelection(bool bForward = TRUE);
@@ -220,10 +227,51 @@ public:
 
 };
 
+//---------------------------------------------------------------------------
+
+class wxSplitterWindow : public wxWindow {
+public:
+    wxSplitterWindow(wxWindow* parent, wxWindowID id,
+                     const wxPoint& point = wxPyDefaultPosition,
+                     const wxSize& size = wxPyDefaultSize,
+                     long style=wxSP_3D,
+                     char* name = "splitterWindow");
+
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
+    int GetMinimumPaneSize();
+    int GetSashPosition();
+    int GetSplitMode();
+    wxWindow* GetWindow1();
+    wxWindow* GetWindow2();
+    void Initialize(wxWindow* window);
+    bool IsSplit();
+
+    // TODO:  How to handle callbacks that don't come from
+    //        event system???
+    //
+    //void OnDoubleClickSash(int x, int y);
+    //void OnUnsplit(wxWindow* removed);
+
+    void SetSashPosition(int position, int redraw = TRUE);
+    void SetMinimumPaneSize(int paneSize);
+    void SetSplitMode(int mode);
+    bool SplitHorizontally(wxWindow* window1, wxWindow* window2, int sashPosition = -1);
+    bool SplitVertically(wxWindow* window1, wxWindow* window2, int sashPosition = -1);
+    bool Unsplit(wxWindow* toRemove = NULL);
+};
+
+//---------------------------------------------------------------------------
+
+
+
 //---------------------------------------------------------------------------
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.4  1998/10/02 06:40:43  RD
+// Version 0.4 of wxPython for MSW.
+//
 // Revision 1.3  1998/08/18 19:48:20  RD
 // more wxGTK compatibility things.
 //

utils/wxPython/src/wxp.i

@@ -34,6 +34,8 @@
 %import controls2.i
 %import windows2.i
 %import cmndlgs.i
+%import stattool.i
+%import frames.i
 
 
 
@@ -107,6 +109,8 @@ extern "C" SWIGEXPORT(void,initmdic)();
 extern "C" SWIGEXPORT(void,initcontrolsc)();
 extern "C" SWIGEXPORT(void,initcontrols2c)();
 extern "C" SWIGEXPORT(void,initcmndlgsc)();
+extern "C" SWIGEXPORT(void,initstattoolc)();
+extern "C" SWIGEXPORT(void,initframesc)();
 
 %}
 
@@ -128,6 +132,9 @@ extern "C" SWIGEXPORT(void,initcmndlgsc)();
     initcontrolsc();
     initcontrols2c();
     initcmndlgsc();
+    initstattoolc();
+    initframesc();
+
 %}
 
 //----------------------------------------------------------------------
@@ -140,6 +147,9 @@ extern "C" SWIGEXPORT(void,initcmndlgsc)();
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.7  1998/10/02 06:40:44  RD
+// Version 0.4 of wxPython for MSW.
+//
 // Revision 1.6  1998/08/27 21:59:10  RD
 // Some chicken-and-egg problems solved for wxPython on wxGTK
 //

utils/wxPython/tests/test1.py

@@ -30,7 +30,6 @@ class MyFrame(wxFrame):
         print "size:", size.width, size.height
 
     def OnMove(self, event):
-        # Hmmm...  Doesn't seem to be implmented in wxWin yet...
         pos = event.GetPosition()
         print "pos:", pos.x, pos.y
 
@@ -66,6 +65,9 @@ if __name__ == '__main__':
 #----------------------------------------------------------------------------
 #
 # $Log$
+# Revision 1.2  1998/10/02 06:42:27  RD
+# Version 0.4 of wxPython for MSW.
+#
 # Revision 1.1  1998/08/09 08:28:05  RD
 # Initial version
 #

utils/wxPython/tests/test4.py

@@ -14,6 +14,7 @@
 
 from wxPython import *
 
+import time
 
 #---------------------------------------------------------------------------
 
@@ -221,6 +222,14 @@ class TestGrid(wxFrame):
 
 #---------------------------------------------------------------------------
 
+
+class ColoredPanel(wxWindow):
+    def __init__(self, parent, color):
+        wxWindow.__init__(self, parent, -1,
+                          wxPyDefaultPosition, wxPyDefaultSize, wxRAISED_BORDER)
+        self.SetBackgroundColour(color)
+
+
 class TestNotebookWindow(wxFrame):
     def __init__(self, parent):
         wxFrame.__init__(self, parent, -1, 'Test wxNotebook',
@@ -228,41 +237,36 @@ class TestNotebookWindow(wxFrame):
 
         nb = wxNotebook(self, -1)
 
-        win = wxWindow(nb, -1, wxPyDefaultPosition, wxPyDefaultSize, wxRAISED_BORDER)
+        win = ColoredPanel(nb, wxBLUE)
-        win.SetBackgroundColour(wxBLUE)
         nb.AddPage(win, "Blue")
+        st = wxStaticText(win, -1, "You can put any type of window here!", wxPoint(10, 10))
+        st.SetForegroundColour(wxWHITE)
+        st.SetBackgroundColour(wxBLUE)
 
-        win = wxWindow(nb, -1, wxPyDefaultPosition, wxPyDefaultSize, wxRAISED_BORDER)
+        win = ColoredPanel(nb, wxRED)
-        win.SetBackgroundColour(wxRED)
         nb.AddPage(win, "Red")
 
-        win = wxWindow(nb, -1, wxPyDefaultPosition, wxPyDefaultSize, wxRAISED_BORDER)
+        win = ColoredPanel(nb, wxGREEN)
-        win.SetBackgroundColour(wxGREEN)
         nb.AddPage(win, "Green")
 
-        win = wxWindow(nb, -1, wxPyDefaultPosition, wxPyDefaultSize, wxRAISED_BORDER)
+        win = ColoredPanel(nb, wxCYAN)
-        win.SetBackgroundColour(wxCYAN)
         nb.AddPage(win, "Cyan")
 
-        win = wxWindow(nb, -1, wxPyDefaultPosition, wxPyDefaultSize, wxRAISED_BORDER)
+        win = ColoredPanel(nb, wxWHITE)
-        win.SetBackgroundColour(wxWHITE)
         nb.AddPage(win, "White")
 
-        win = wxWindow(nb, -1, wxPyDefaultPosition, wxPyDefaultSize, wxRAISED_BORDER)
+        win = ColoredPanel(nb, wxBLACK)
-        win.SetBackgroundColour(wxBLACK)
         nb.AddPage(win, "Black")
 
-        win = wxWindow(nb, -1, wxPyDefaultPosition, wxPyDefaultSize, wxRAISED_BORDER)
+        win = ColoredPanel(nb, wxNamedColour('MIDNIGHT BLUE'))
-        win.SetBackgroundColour(wxNamedColour('MIDNIGHT BLUE'))
         nb.AddPage(win, "MIDNIGHT BLUE")
 
-        win = wxWindow(nb, -1, wxPyDefaultPosition, wxPyDefaultSize, wxRAISED_BORDER)
+        win = ColoredPanel(nb, wxNamedColour('INDIAN RED'))
-        win.SetBackgroundColour(wxNamedColour('INDIAN RED'))
         nb.AddPage(win, "INDIAN RED")
 
 
         nb.SetSelection(0)
-        self.SetSize(wxSize(500, 300))  # force a redraw so the notebook will draw
+        self.SetSize(wxSize(300, 300))  # force a redraw so the notebook will draw
 
 
     def OnCloseWindow(self, event):
@@ -270,6 +274,154 @@ class TestNotebookWindow(wxFrame):
 
 #---------------------------------------------------------------------------
 
+class TestSplitterWindow(wxFrame):
+    def __init__(self, parent):
+        wxFrame.__init__(self, parent, -1, 'Test wxSplitterWindow',
+                         wxPyDefaultPosition, wxSize(500, 300))
+
+        splitter = wxSplitterWindow(self, -1)
+
+        p1 = ColoredPanel(splitter, wxRED)
+        wxStaticText(p1, -1, "Panel One", wxPoint(5,5)).SetBackgroundColour(wxRED)
+
+        p2 = ColoredPanel(splitter, wxBLUE)
+        wxStaticText(p2, -1, "Panel Two", wxPoint(5,5)).SetBackgroundColour(wxBLUE)
+
+        splitter.SplitVertically(p1, p2)
+
+
+    def OnCloseWindow(self, event):
+        self.Destroy()
+
+
+#---------------------------------------------------------------------------
+
+class CustomStatusBar(wxStatusBar):
+    def __init__(self, parent):
+        wxStatusBar.__init__(self, parent, -1)
+        self.SetFieldsCount(3)
+
+        self.SetStatusText("A Custom StatusBar...", 0)
+
+        self.cb = wxCheckBox(self, 1001, "toggle clock")
+        EVT_CHECKBOX(self, 1001, self.OnToggleClock)
+        self.cb.SetValue(true)
+
+        # figure out how tall to make it.
+        dc = wxClientDC(self)
+        dc.SetFont(self.GetFont())
+        (w,h, d,e) = dc.GetTextExtent('X')
+        h = int(h * 1.8)
+        self.SetSize(wxSize(100, h))
+
+        # start our timer
+        self.timer = wxPyTimer(self.Notify)
+        self.timer.Start(1000)
+        self.Notify()
+
+
+    # Time-out handler
+    def Notify(self):
+        t = time.localtime(time.time())
+        st = time.strftime("%d-%b-%Y   %I:%M:%S", t)
+        self.SetStatusText(st, 2)
+
+    # the checkbox was clicked
+    def OnToggleClock(self, event):
+        if self.cb.GetValue():
+            self.timer.Start(1000)
+            self.Notify()
+        else:
+            self.timer.Stop()
+
+    # reposition the checkbox
+    def OnSize(self, event):
+        rect = self.GetFieldRect(1)
+        self.cb.SetPosition(wxPoint(rect.x+2, rect.y+2))
+        self.cb.SetSize(wxSize(rect.width-4, rect.height-4))
+
+
+
+class TestCustomStatusBar(wxFrame):
+    def __init__(self, parent):
+        wxFrame.__init__(self, parent, -1, 'Test Custom StatusBar',
+                         wxPyDefaultPosition, wxSize(500, 300))
+        wxWindow(self, -1)
+
+        self.sb = CustomStatusBar(self)
+        self.SetStatusBar(self.sb)
+
+    def OnCloseWindow(self, event):
+        self.sb.timer.Stop()
+        self.Destroy()
+
+
+#---------------------------------------------------------------------------
+
+class TestToolBar(wxFrame):
+    def __init__(self, parent, log):
+        wxFrame.__init__(self, parent, -1, 'Test ToolBar',
+                         wxPyDefaultPosition, wxSize(500, 300))
+        self.log = log
+
+        wxWindow(self, -1)
+
+        tb = self.CreateToolBar()
+        #tb = wxToolBar(self, -1, wxPyDefaultPosition, wxPyDefaultSize,
+        #               wxTB_HORIZONTAL | wxNO_BORDER | wxTB_FLAT)
+        #self.SetToolBar(tb)
+
+        tb.AddTool(10, wxNoRefBitmap('bitmaps/new.bmp',   wxBITMAP_TYPE_BMP),
+                        NULL, false, -1, -1, "New")
+        EVT_TOOL(self, 10, self.OnToolClick)
+        EVT_TOOL_RCLICKED(self, 10, self.OnToolRClick)
+
+        tb.AddTool(20, wxNoRefBitmap('bitmaps/open.bmp',  wxBITMAP_TYPE_BMP),
+                        NULL, false, -1, -1, "Open")
+        EVT_TOOL(self, 20, self.OnToolClick)
+        EVT_TOOL_RCLICKED(self, 20, self.OnToolRClick)
+
+        tb.AddSeparator()
+        tb.AddTool(30, wxNoRefBitmap('bitmaps/copy.bmp',  wxBITMAP_TYPE_BMP),
+                        NULL, false, -1, -1, "Copy")
+        EVT_TOOL(self, 30, self.OnToolClick)
+        EVT_TOOL_RCLICKED(self, 30, self.OnToolRClick)
+
+        tb.AddTool(40, wxNoRefBitmap('bitmaps/paste.bmp', wxBITMAP_TYPE_BMP),
+                        NULL, false, -1, -1, "Paste")
+        EVT_TOOL(self, 40, self.OnToolClick)
+        EVT_TOOL_RCLICKED(self, 40, self.OnToolRClick)
+
+        tb.AddSeparator()
+
+        tb.AddTool(50, wxNoRefBitmap('bitmaps/tog1.bmp', wxBITMAP_TYPE_BMP),
+                        NULL, true, -1, -1, "Toggle this")
+        EVT_TOOL(self, 50, self.OnToolClick)
+        EVT_TOOL_RCLICKED(self, 50, self.OnToolRClick)
+
+        tb.AddTool(60, wxNoRefBitmap('bitmaps/tog1.bmp', wxBITMAP_TYPE_BMP),
+                        wxNoRefBitmap('bitmaps/tog2.bmp', wxBITMAP_TYPE_BMP),
+                        true, -1, -1, "Toggle with 2 bitmaps")
+        EVT_TOOL(self, 60, self.OnToolClick)
+        EVT_TOOL_RCLICKED(self, 60, self.OnToolRClick)
+
+        tb.Realize()
+
+
+    def OnCloseWindow(self, event):
+        self.Destroy()
+
+    def OnToolClick(self, event):
+        self.log.WriteText("tool %s clicked\n" % event.GetId())
+
+    def OnToolRClick(self, event):
+        self.log.WriteText("tool %s right-clicked\n" % event.GetId())
+
+
+#---------------------------------------------------------------------------
+#---------------------------------------------------------------------------
+#---------------------------------------------------------------------------
+
 class AppFrame(wxFrame):
     def __init__(self, parent, id, title):
         wxFrame.__init__(self, parent, id, title, wxPyDefaultPosition,
@@ -362,6 +514,18 @@ class AppFrame(wxFrame):
         menu.Append(mID, '&Notebook')
         EVT_MENU(self, mID, self.OnTestNotebook)
 
+        mID = NewId()
+        menu.Append(mID, '&Splitter Window')
+        EVT_MENU(self, mID, self.OnTestSplitter)
+
+        mID = NewId()
+        menu.Append(mID, '&Custom StatusBar')
+        EVT_MENU(self, mID, self.OnTestCustomStatusBar)
+
+        mID = NewId()
+        menu.Append(mID, '&ToolBar')
+        EVT_MENU(self, mID, self.OnTestToolBar)
+
         return menu
 
 
@@ -492,6 +656,19 @@ class AppFrame(wxFrame):
         win = TestNotebookWindow(self)
         win.Show(true)
 
+    def OnTestSplitter(self, event):
+        win = TestSplitterWindow(self)
+        win.Show(true)
+
+    def OnTestCustomStatusBar(self, event):
+        win = TestCustomStatusBar(self)
+        win.Show(true)
+
+    def OnTestToolBar(self, event):
+        win = TestToolBar(self, self)
+        win.Show(true)
+
+
 #---------------------------------------------------------------------------
 
 
@@ -540,6 +717,9 @@ if __name__ == '__main__':
 #----------------------------------------------------------------------------
 #
 # $Log$
+# Revision 1.5  1998/10/02 06:42:28  RD
+# Version 0.4 of wxPython for MSW.
+#
 # Revision 1.4  1998/08/27 21:59:51  RD
 # Some chicken-and-egg problems solved for wxPython on wxGTK
 #

utils/wxPython/tests/test4s.py

@@ -0,0 +1,18 @@
+#!/bin/env python
+#----------------------------------------------------------------------------
+# Name:         test4s.py
+# Purpose:      Stub for test4.  Speeds startup time by using compiled version
+#               of test4.py.
+#
+# Author:       Robin Dunn
+#
+# Created:
+# RCS-ID:       $Id$
+# Copyright:    (c) 1998 by Total Control Software
+# Licence:      wxWindows license
+#----------------------------------------------------------------------------
+
+
+import test4
+
+test4.main()