]> git.saurik.com Git - wxWidgets.git/commitdiff
Tweaks needed to be able to build wxPython with wxGTK.
authorRobin Dunn <robin@alldunn.com>
Wed, 16 Dec 1998 22:12:47 +0000 (22:12 +0000)
committerRobin Dunn <robin@alldunn.com>
Wed, 16 Dec 1998 22:12:47 +0000 (22:12 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

38 files changed:
utils/wxPython/src/Makefile.pre.in
utils/wxPython/src/Setup.in
utils/wxPython/src/Setup.in.linux
utils/wxPython/src/Setup.in.solaris
utils/wxPython/src/controls2.i
utils/wxPython/src/frames.i
utils/wxPython/src/gdi.i
utils/wxPython/src/gtk/cmndlgs.cpp
utils/wxPython/src/gtk/cmndlgs.py
utils/wxPython/src/gtk/controls.cpp
utils/wxPython/src/gtk/controls.py
utils/wxPython/src/gtk/controls2.cpp
utils/wxPython/src/gtk/controls2.py
utils/wxPython/src/gtk/events.cpp
utils/wxPython/src/gtk/events.py
utils/wxPython/src/gtk/frames.cpp
utils/wxPython/src/gtk/frames.py
utils/wxPython/src/gtk/gdi.cpp
utils/wxPython/src/gtk/gdi.py
utils/wxPython/src/gtk/mdi.cpp
utils/wxPython/src/gtk/mdi.py
utils/wxPython/src/gtk/misc.cpp
utils/wxPython/src/gtk/misc.py
utils/wxPython/src/gtk/stattool.cpp
utils/wxPython/src/gtk/stattool.py
utils/wxPython/src/gtk/utils.cpp [new file with mode: 0644]
utils/wxPython/src/gtk/utils.py [new file with mode: 0644]
utils/wxPython/src/gtk/windows.cpp
utils/wxPython/src/gtk/windows.py
utils/wxPython/src/gtk/windows2.cpp
utils/wxPython/src/gtk/windows2.py
utils/wxPython/src/gtk/wx.cpp
utils/wxPython/src/gtk/wx.py
utils/wxPython/src/misc.i
utils/wxPython/src/windows.i
utils/wxPython/src/wx.i
utils/wxPython/tests/test3.py
utils/wxPython/tests/test4.py

index 273d32820fbfc001338bff6d6b7ef6cdbb93f8ff..293791062c9c2f047324c8176caa357a1f2926ba 100644 (file)
@@ -328,7 +328,7 @@ distclean:  clobber
 SWIGFLAGS=-c++ -shadow -python -dnone -D__WXGTK__
 
 
-PYMODULES = $(GENCODEDIR)/wxp.py       $(GENCODEDIR)/events.py    \
+PYMODULES = $(GENCODEDIR)/wx.py        $(GENCODEDIR)/events.py    \
            $(GENCODEDIR)/windows.py   $(GENCODEDIR)/misc.py      \
            $(GENCODEDIR)/gdi.py       $(GENCODEDIR)/mdi.py       \
            $(GENCODEDIR)/controls.py  $(GENCODEDIR)/controls2.py \
index 87841966f412b518e6cb12829b54fd8a08cd1948..66f164a26417157deee68b498141cb70fadc4b23 100644 (file)
@@ -32,9 +32,9 @@ TARGETDIR=..
 #TARGETDIR=$(BINLIBDEST)/site-packages/wxPython
 
 
-wxpc   wxp.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
+wxc    wx.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
        mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \
-       frames.cpp stattool.cpp \
+       frames.cpp stattool.cpp utils.cpp \
        # CFLAGS
        -I. -I$(WXWIN)/include -I/usr/local/lib/glib/include -I$(WXWIN)/src \
        -I/usr/X/include -DSWIG_GLOBAL -D__WXGTK__ \
index e8f803367961c9d97f466e4ced3b184eef246542..c5a39b3d64e34f7c2bde79e321c829f3b6532e03 100644 (file)
@@ -32,9 +32,9 @@ TARGETDIR=..
 #TARGETDIR=$(BINLIBDEST)/site-packages/wxPython
 
 
-wxpc   wxp.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
+wxc    wx.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
        mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \
-       frames.cpp stattool.cpp \
+       frames.cpp stattool.cpp utils.cpp \
        # CFLAGS
        -I. -I$(WXWIN)/include -I/usr/lib/glib/include -I$(WXWIN)/src \
        -I/usr/X11R6/include -DSWIG_GLOBAL -D__WXGTK__ \
index 87841966f412b518e6cb12829b54fd8a08cd1948..66f164a26417157deee68b498141cb70fadc4b23 100644 (file)
@@ -32,9 +32,9 @@ TARGETDIR=..
 #TARGETDIR=$(BINLIBDEST)/site-packages/wxPython
 
 
-wxpc   wxp.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
+wxc    wx.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
        mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \
-       frames.cpp stattool.cpp \
+       frames.cpp stattool.cpp utils.cpp \
        # CFLAGS
        -I. -I$(WXWIN)/include -I/usr/local/lib/glib/include -I$(WXWIN)/src \
        -I/usr/X/include -DSWIG_GLOBAL -D__WXGTK__ \
index 2996269eabc84598da8a672ad9189f28f58d12ee..211ce72b14ade95b906c93376c3d92230f7e8cb2 100644 (file)
@@ -318,7 +318,9 @@ public:
 
     void SetItemBold(const wxTreeItemId& item, bool bold = TRUE);
     bool IsBold(const wxTreeItemId& item) const;
+#ifdef __WXMSW__
     wxTreeItemId HitTest(const wxPoint& point);
+#endif
 };
 
 
@@ -382,6 +384,9 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.12  1998/12/16 22:10:52  RD
+// Tweaks needed to be able to build wxPython with wxGTK.
+//
 // Revision 1.11  1998/12/15 20:41:16  RD
 // Changed the import semantics from "from wxPython import *" to "from
 // wxPython.wx import *"  This is for people who are worried about
index 5d55dbdcea6742eff2238ba2b0385b4bd16b5d45..69d76332b1f026bb727f00cff01ec7856470f9f9 100644 (file)
 
 %{
 #include "helpers.h"
-
-#ifdef __WXMSW__
 #include <wx/minifram.h>
-#endif
 %}
 
 //----------------------------------------------------------------------
@@ -95,6 +92,9 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.4  1998/12/16 22:10:53  RD
+// Tweaks needed to be able to build wxPython with wxGTK.
+//
 // Revision 1.3  1998/12/15 20:41:18  RD
 // Changed the import semantics from "from wxPython import *" to "from
 // wxPython.wx import *"  This is for people who are worried about
index 6bc2672b724ff558e8e9f1f549edb3a9838e2ef2..659f3d9cffb7b93d850969d93b62d7119f0f672a 100644 (file)
@@ -16,6 +16,9 @@
 %{
 #include "helpers.h"
 #include <wx/metafile.h>
+#ifndef __WXMSW__
+#include <wx/postscrp.h>
+#endif
 %}
 
 //----------------------------------------------------------------------
@@ -286,23 +289,31 @@ public:
     void EndDoc();
     void EndDrawing();
     void EndPage();
-#ifdef __WXWIN__
     void FloodFill(long x, long y, const wxColour& colour, int style=wxFLOOD_SURFACE);
-#endif
-#ifdef __WXGTK__
-    void FloodFill(long x, long y, wxColour* colour, int style=wxFLOOD_SURFACE);
-#endif
+#ifdef __WXMSW__
     wxBrush&  GetBackground();
     wxBrush&  GetBrush();
+#else
+    wxBrush  GetBackground();
+    wxBrush  GetBrush();
+#endif
     long GetCharHeight();
     long GetCharWidth();
     void GetClippingBox(long *OUTPUT, long *OUTPUT,
                         long *OUTPUT, long *OUTPUT);
+#ifdef __WXMSW__
     wxFont& GetFont();
+#else
+    wxFont GetFont();
+#endif
     int GetLogicalFunction();
     int GetMapMode();
     bool GetOptimization();
+#ifdef __WXMSW__
     wxPen& GetPen();
+#else
+    wxPen GetPen();
+#endif
     %addmethods {
         %new wxColour* GetPixel(long x, long y) {
             wxColour* wc = new wxColour();
@@ -511,6 +522,9 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.8  1998/12/16 22:10:54  RD
+// Tweaks needed to be able to build wxPython with wxGTK.
+//
 // Revision 1.7  1998/12/15 20:41:18  RD
 // Changed the import semantics from "from wxPython import *" to "from
 // wxPython.wx import *"  This is for people who are worried about
index 829453a08b36f6bf571b9a57d80e526e37b421d9..3ef87d368df4c5ebf1a2e95f5b2a8b416f1ed70a 100644 (file)
@@ -107,6 +107,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
+extern byte* byte_LIST_helper(PyObject* source);
 extern int* int_LIST_helper(PyObject* source);
 extern long* long_LIST_helper(PyObject* source);
 extern char** string_LIST_helper(PyObject* source);
@@ -3309,6 +3310,7 @@ SWIGEXPORT(void,initcmndlgsc)() {
         SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_signed_long","_long",0);
         SWIG_RegisterMapping("_wxFontData","_class_wxFontData",0);
+        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
         SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler);
         SWIG_RegisterMapping("_class_wxEvtHandler","_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler);
@@ -3400,6 +3402,7 @@ SWIGEXPORT(void,initcmndlgsc)() {
         SWIG_RegisterMapping("_EBool","_signed_int",0);
         SWIG_RegisterMapping("_EBool","_int",0);
         SWIG_RegisterMapping("_EBool","_wxWindowID",0);
+        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
         SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
         SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
         SWIG_RegisterMapping("_unsigned_long","_long",0);
@@ -3509,13 +3512,16 @@ SWIGEXPORT(void,initcmndlgsc)() {
         SWIG_RegisterMapping("_int","_unsigned_int",0);
         SWIG_RegisterMapping("_int","_signed_int",0);
         SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
+        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
         SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",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("_wxPalette","_class_wxPalette",0);
         SWIG_RegisterMapping("_wxFontDialog","_class_wxFontDialog",0);
+        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
         SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
         SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
         SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
@@ -3546,6 +3552,7 @@ SWIGEXPORT(void,initcmndlgsc)() {
         SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
         SWIG_RegisterMapping("_class_wxTextEntryDialog","_wxTextEntryDialog",0);
         SWIG_RegisterMapping("_wxColourData","_class_wxColourData",0);
+        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
         SWIG_RegisterMapping("_class_wxFontDialog","_wxFontDialog",0);
         SWIG_RegisterMapping("_wxWindow","_class_wxMessageDialog",SwigwxMessageDialogTowxWindow);
         SWIG_RegisterMapping("_wxWindow","_wxMessageDialog",SwigwxMessageDialogTowxWindow);
index d0be6c7e9eefaf36191aa96b8d801debbfe1710e..88675ee1b47ce0f5cc5e4634829a4d4dd0956c9a 100644 (file)
@@ -6,6 +6,7 @@ from misc import *
 from gdi import *
 
 from windows import *
+import wx
 class wxColourDataPtr :
     def __init__(self,this):
         self.this = this
@@ -66,7 +67,7 @@ class wxColourDialog(wxColourDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxColourDialog,(arg0.this,)+args)
         self.thisown = 1
-        wxp._StdDialogCallbacks(self)
+        wx._StdDialogCallbacks(self)
 
 
 
@@ -130,7 +131,7 @@ class wxFileDialog(wxFileDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxFileDialog,(arg0.this,)+args)
         self.thisown = 1
-        wxp._StdDialogCallbacks(self)
+        wx._StdDialogCallbacks(self)
 
 
 
@@ -161,7 +162,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)
+        wx._StdDialogCallbacks(self)
 
 
 
@@ -189,7 +190,7 @@ class wxTextEntryDialog(wxTextEntryDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxTextEntryDialog,(arg0.this,arg1,)+args)
         self.thisown = 1
-        wxp._StdDialogCallbacks(self)
+        wx._StdDialogCallbacks(self)
 
 
 
@@ -276,7 +277,7 @@ class wxFontDialog(wxFontDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxFontDialog,(arg0.this,)+args)
         self.thisown = 1
-        wxp._StdDialogCallbacks(self)
+        wx._StdDialogCallbacks(self)
 
 
 
@@ -407,7 +408,7 @@ class wxPageSetupDialog(wxPageSetupDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxPageSetupDialog,(arg0.this,)+args)
         self.thisown = 1
-        wxp._StdDialogCallbacks(self)
+        wx._StdDialogCallbacks(self)
 
 
 
@@ -503,6 +504,7 @@ class wxPrintDialogPtr(wxDialogPtr):
     def GetPrintDC(self):
         val = cmndlgsc.wxPrintDialog_GetPrintDC(self.this)
         val = wxDCPtr(val)
+        val.thisown = 1
         return val
     def ShowModal(self):
         val = cmndlgsc.wxPrintDialog_ShowModal(self.this)
@@ -517,7 +519,7 @@ class wxPrintDialog(wxPrintDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxPrintDialog,(arg0.this,)+args)
         self.thisown = 1
-        wxp._StdDialogCallbacks(self)
+        wx._StdDialogCallbacks(self)
 
 
 
@@ -539,7 +541,7 @@ class wxMessageDialog(wxMessageDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxMessageDialog,(arg0.this,arg1,)+args)
         self.thisown = 1
-        wxp._StdDialogCallbacks(self)
+        wx._StdDialogCallbacks(self)
 
 
 
index 190082e8a483e8e38aaee8f0a8653a88cf6aac50..87f3176e57c3dbc061c6996ccead2682d04cd273 100644 (file)
@@ -111,6 +111,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
+extern byte* byte_LIST_helper(PyObject* source);
 extern int* int_LIST_helper(PyObject* source);
 extern long* long_LIST_helper(PyObject* source);
 extern char** string_LIST_helper(PyObject* source);
@@ -3418,23 +3419,23 @@ static PyObject *_wrap_wxScrollBar_GetPageSize(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxScrollBar_GetPosition(_swigobj)  (_swigobj->GetPosition())
-static PyObject *_wrap_wxScrollBar_GetPosition(PyObject *self, PyObject *args) {
+#define wxScrollBar_GetThumbPosition(_swigobj)  (_swigobj->GetThumbPosition())
+static PyObject *_wrap_wxScrollBar_GetThumbPosition(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     int  _result;
     wxScrollBar * _arg0;
     char * _argc0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxScrollBar_GetPosition",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxScrollBar_GetThumbPosition",&_argc0)) 
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrollBar_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_GetPosition. Expected _wxScrollBar_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_GetThumbPosition. Expected _wxScrollBar_p.");
         return NULL;
         }
     }
-    _result = (int )wxScrollBar_GetPosition(_arg0);
+    _result = (int )wxScrollBar_GetThumbPosition(_arg0);
     _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
@@ -3460,23 +3461,23 @@ static PyObject *_wrap_wxScrollBar_GetThumbSize(PyObject *self, PyObject *args)
     return _resultobj;
 }
 
-#define wxScrollBar_SetPosition(_swigobj,_swigarg0)  (_swigobj->SetPosition(_swigarg0))
-static PyObject *_wrap_wxScrollBar_SetPosition(PyObject *self, PyObject *args) {
+#define wxScrollBar_SetThumbPosition(_swigobj,_swigarg0)  (_swigobj->SetThumbPosition(_swigarg0))
+static PyObject *_wrap_wxScrollBar_SetThumbPosition(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxScrollBar * _arg0;
     int  _arg1;
     char * _argc0 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxScrollBar_SetPosition",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"si:wxScrollBar_SetThumbPosition",&_argc0,&_arg1)) 
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrollBar_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_SetPosition. Expected _wxScrollBar_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_SetThumbPosition. Expected _wxScrollBar_p.");
         return NULL;
         }
     }
-    wxScrollBar_SetPosition(_arg0,_arg1);
+    wxScrollBar_SetThumbPosition(_arg0,_arg1);
     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
@@ -4962,9 +4963,9 @@ static PyMethodDef controlscMethods[] = {
         { "wxSpinButton_GetMax", _wrap_wxSpinButton_GetMax, 1 },
         { "new_wxSpinButton", _wrap_new_wxSpinButton, 1 },
         { "wxScrollBar_SetScrollbar", _wrap_wxScrollBar_SetScrollbar, 1 },
-        { "wxScrollBar_SetPosition", _wrap_wxScrollBar_SetPosition, 1 },
+        { "wxScrollBar_SetThumbPosition", _wrap_wxScrollBar_SetThumbPosition, 1 },
         { "wxScrollBar_GetThumbSize", _wrap_wxScrollBar_GetThumbSize, 1 },
-        { "wxScrollBar_GetPosition", _wrap_wxScrollBar_GetPosition, 1 },
+        { "wxScrollBar_GetThumbPosition", _wrap_wxScrollBar_GetThumbPosition, 1 },
         { "wxScrollBar_GetPageSize", _wrap_wxScrollBar_GetPageSize, 1 },
         { "wxScrollBar_GetRange", _wrap_wxScrollBar_GetRange, 1 },
         { "new_wxScrollBar", _wrap_new_wxScrollBar, 1 },
@@ -5089,6 +5090,7 @@ SWIGEXPORT(void,initcontrolsc)() {
         SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
         SWIG_RegisterMapping("_signed_long","_long",0);
         SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
+        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
         SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxSlider",SwigwxSliderTowxEvtHandler);
         SWIG_RegisterMapping("_class_wxEvtHandler","_wxSlider",SwigwxSliderTowxEvtHandler);
@@ -5185,6 +5187,7 @@ SWIGEXPORT(void,initcontrolsc)() {
         SWIG_RegisterMapping("_EBool","_signed_int",0);
         SWIG_RegisterMapping("_EBool","_int",0);
         SWIG_RegisterMapping("_EBool","_wxWindowID",0);
+        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
         SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
         SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
@@ -5339,6 +5342,7 @@ SWIGEXPORT(void,initcontrolsc)() {
         SWIG_RegisterMapping("_wxButton","_wxBitmapButton",SwigwxBitmapButtonTowxButton);
         SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
         SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
+        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
         SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
         SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
@@ -5383,9 +5387,11 @@ SWIGEXPORT(void,initcontrolsc)() {
         SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
         SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
         SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
+        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
         SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
         SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
         SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
+        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
         SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
         SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
         SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
@@ -5438,6 +5444,7 @@ SWIGEXPORT(void,initcontrolsc)() {
         SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
         SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
+        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
         SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
         SWIG_RegisterMapping("_wxWindow","_class_wxSlider",SwigwxSliderTowxWindow);
         SWIG_RegisterMapping("_wxWindow","_wxSlider",SwigwxSliderTowxWindow);
index a64d77d6672950a0abd203d0b21dbe1af789f61d..9d9947e2b39be23f399d82c3efac636f2fd8de0b 100644 (file)
@@ -8,7 +8,7 @@ from windows import *
 from gdi import *
 
 from events import *
-import wxp
+import wx
 class wxControlPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
@@ -50,7 +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)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -78,7 +78,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)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -105,7 +105,7 @@ class wxCheckBox(wxCheckBoxPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxCheckBox,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -159,7 +159,7 @@ class wxChoice(wxChoicePtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxChoice,(arg0.this,arg1,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -243,7 +243,7 @@ class wxComboBox(wxComboBoxPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxComboBox,(arg0.this,arg1,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -288,7 +288,7 @@ class wxGauge(wxGaugePtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxGauge,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -335,7 +335,7 @@ class wxStaticText(wxStaticTextPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxStaticText,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -404,7 +404,7 @@ class wxListBox(wxListBoxPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxListBox,(arg0.this,arg1,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -500,7 +500,7 @@ class wxTextCtrl(wxTextCtrlPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxTextCtrl,(arg0.this,arg1,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -515,14 +515,14 @@ class wxScrollBarPtr(wxControlPtr):
     def GetPageSize(self):
         val = controlsc.wxScrollBar_GetPageSize(self.this)
         return val
-    def GetPosition(self):
-        val = controlsc.wxScrollBar_GetPosition(self.this)
+    def GetThumbPosition(self):
+        val = controlsc.wxScrollBar_GetThumbPosition(self.this)
         return val
     def GetThumbSize(self):
         val = controlsc.wxScrollBar_GetThumbSize(self.this)
         return val
-    def SetPosition(self,arg0):
-        val = controlsc.wxScrollBar_SetPosition(self.this,arg0)
+    def SetThumbPosition(self,arg0):
+        val = controlsc.wxScrollBar_SetThumbPosition(self.this,arg0)
         return val
     def SetScrollbar(self,arg0,arg1,arg2,arg3,*args):
         val = apply(controlsc.wxScrollBar_SetScrollbar,(self.this,arg0,arg1,arg2,arg3,)+args)
@@ -539,7 +539,7 @@ class wxScrollBar(wxScrollBarPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxScrollBar,(arg0.this,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -602,7 +602,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)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -665,7 +665,7 @@ class wxRadioBox(wxRadioBoxPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxRadioBox,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -692,7 +692,7 @@ class wxRadioButton(wxRadioButtonPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxRadioButton,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -770,7 +770,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)
+        wx._StdWindowCallbacks(self)
 
 
 
index 52f5782e12426490f02678ee36ad84220f3e106f..7208c9267362d265248f4937e6f304c08d81a75d 100644 (file)
@@ -56,9 +56,6 @@ 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;
@@ -108,6 +105,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
+extern byte* byte_LIST_helper(PyObject* source);
 extern int* int_LIST_helper(PyObject* source);
 extern long* long_LIST_helper(PyObject* source);
 extern char** string_LIST_helper(PyObject* source);
@@ -3560,7 +3558,70 @@ static PyObject *_wrap_wxTreeCtrl_EndEditLabel(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define wxTreeCtrl_SetItemBold(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetItemBold(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxTreeCtrl_SetItemBold(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxTreeCtrl * _arg0;
+    wxTreeItemId * _arg1;
+    bool  _arg2 = (1);
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    int tempbool2;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss|i:wxTreeCtrl_SetItemBold",&_argc0,&_argc1,&tempbool2)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemBold. Expected _wxTreeCtrl_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItemBold. Expected _wxTreeItemId_p.");
+        return NULL;
+        }
+    }
+    _arg2 = (bool ) tempbool2;
+    wxTreeCtrl_SetItemBold(_arg0,*_arg1,_arg2);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxTreeCtrl_IsBold(_swigobj,_swigarg0)  (_swigobj->IsBold(_swigarg0))
+static PyObject *_wrap_wxTreeCtrl_IsBold(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxTreeCtrl * _arg0;
+    wxTreeItemId * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_IsBold",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_IsBold. Expected _wxTreeCtrl_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_IsBold. Expected _wxTreeItemId_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxTreeCtrl_IsBold(_arg0,*_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
 static PyMethodDef controls2cMethods[] = {
+        { "wxTreeCtrl_IsBold", _wrap_wxTreeCtrl_IsBold, 1 },
+        { "wxTreeCtrl_SetItemBold", _wrap_wxTreeCtrl_SetItemBold, 1 },
         { "wxTreeCtrl_EndEditLabel", _wrap_wxTreeCtrl_EndEditLabel, 1 },
         { "wxTreeCtrl_GetEditControl", _wrap_wxTreeCtrl_GetEditControl, 1 },
         { "wxTreeCtrl_EditLabel", _wrap_wxTreeCtrl_EditLabel, 1 },
@@ -3708,6 +3769,7 @@ SWIGEXPORT(void,initcontrols2c)() {
         SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
         SWIG_RegisterMapping("_signed_long","_long",0);
         SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
+        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
         SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxTreeCtrl",SwigwxTreeCtrlTowxEvtHandler);
         SWIG_RegisterMapping("_class_wxEvtHandler","_wxTreeCtrl",SwigwxTreeCtrlTowxEvtHandler);
@@ -3784,6 +3846,7 @@ SWIGEXPORT(void,initcontrols2c)() {
         SWIG_RegisterMapping("_EBool","_signed_int",0);
         SWIG_RegisterMapping("_EBool","_int",0);
         SWIG_RegisterMapping("_EBool","_wxWindowID",0);
+        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
         SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
         SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
@@ -3883,6 +3946,7 @@ SWIGEXPORT(void,initcontrols2c)() {
         SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
         SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
         SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
+        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
         SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
         SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
@@ -3901,9 +3965,11 @@ SWIGEXPORT(void,initcontrols2c)() {
         SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
         SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
         SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
+        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
         SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
         SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
         SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
+        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
         SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
         SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
         SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
@@ -3933,6 +3999,7 @@ SWIGEXPORT(void,initcontrols2c)() {
         SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
         SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
+        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
         SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
         SWIG_RegisterMapping("_wxWindow","_class_wxTreeCtrl",SwigwxTreeCtrlTowxWindow);
         SWIG_RegisterMapping("_wxWindow","_wxTreeCtrl",SwigwxTreeCtrlTowxWindow);
index e41eefb960b4d938f3b6f3a683f30bd277258858..5eefce0c982b3ddf8e2848203da1c301b10291ce 100644 (file)
@@ -10,7 +10,7 @@ from gdi import *
 from events import *
 
 from controls import *
-import wxp
+import wx
 class wxListItemPtr :
     def __init__(self,this):
         self.this = this
@@ -288,7 +288,7 @@ class wxListCtrl(wxListCtrlPtr):
         args = tuple(argl)
         self.this = apply(controls2c.new_wxListCtrl,(arg0.this,arg1,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -556,6 +556,12 @@ class wxTreeCtrlPtr(wxControlPtr):
     def EndEditLabel(self,arg0,*args):
         val = apply(controls2c.wxTreeCtrl_EndEditLabel,(self.this,arg0.this,)+args)
         return val
+    def SetItemBold(self,arg0,*args):
+        val = apply(controls2c.wxTreeCtrl_SetItemBold,(self.this,arg0.this,)+args)
+        return val
+    def IsBold(self,arg0):
+        val = controls2c.wxTreeCtrl_IsBold(self.this,arg0.this)
+        return val
     def __repr__(self):
         return "<C wxTreeCtrl instance>"
 class wxTreeCtrl(wxTreeCtrlPtr):
@@ -568,7 +574,7 @@ class wxTreeCtrl(wxTreeCtrlPtr):
         args = tuple(argl)
         self.this = apply(controls2c.new_wxTreeCtrl,(arg0.this,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
 
 
 
index d98ad63dbf1a03630bc5df4297ebc937a4a878bb..d0009d9d6afdc82f3183d2ae9397dd6740bb3357 100644 (file)
@@ -104,6 +104,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
+extern byte* byte_LIST_helper(PyObject* source);
 extern int* int_LIST_helper(PyObject* source);
 extern long* long_LIST_helper(PyObject* source);
 extern char** string_LIST_helper(PyObject* source);
@@ -379,6 +380,27 @@ static void *SwigwxCloseEventTowxEvent(void *ptr) {
     return (void *) dest;
 }
 
+#define wxCloseEvent_CanVeto(_swigobj)  (_swigobj->CanVeto())
+static PyObject *_wrap_wxCloseEvent_CanVeto(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxCloseEvent * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxCloseEvent_CanVeto",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCloseEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_CanVeto. Expected _wxCloseEvent_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxCloseEvent_CanVeto(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
 #define wxCloseEvent_GetLoggingOff(_swigobj)  (_swigobj->GetLoggingOff())
 static PyObject *_wrap_wxCloseEvent_GetLoggingOff(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -469,6 +491,54 @@ static PyObject *_wrap_wxCloseEvent_SetForce(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define wxCloseEvent_SetCanVeto(_swigobj,_swigarg0)  (_swigobj->SetCanVeto(_swigarg0))
+static PyObject *_wrap_wxCloseEvent_SetCanVeto(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxCloseEvent * _arg0;
+    bool  _arg1;
+    char * _argc0 = 0;
+    int tempbool1;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxCloseEvent_SetCanVeto",&_argc0,&tempbool1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCloseEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_SetCanVeto. Expected _wxCloseEvent_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+    wxCloseEvent_SetCanVeto(_arg0,_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxCloseEvent_SetLoggingOff(_swigobj,_swigarg0)  (_swigobj->SetLoggingOff(_swigarg0))
+static PyObject *_wrap_wxCloseEvent_SetLoggingOff(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxCloseEvent * _arg0;
+    bool  _arg1;
+    char * _argc0 = 0;
+    int tempbool1;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxCloseEvent_SetLoggingOff",&_argc0,&tempbool1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCloseEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_SetLoggingOff. Expected _wxCloseEvent_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+    wxCloseEvent_SetLoggingOff(_arg0,_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 #define wxCloseEvent_GetForce(_swigobj)  (_swigobj->GetForce())
 static PyObject *_wrap_wxCloseEvent_GetForce(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -2628,10 +2698,13 @@ static PyMethodDef eventscMethods[] = {
         { "wxCommandEvent_GetExtraLong", _wrap_wxCommandEvent_GetExtraLong, 1 },
         { "wxCommandEvent_Checked", _wrap_wxCommandEvent_Checked, 1 },
         { "wxCloseEvent_GetForce", _wrap_wxCloseEvent_GetForce, 1 },
+        { "wxCloseEvent_SetLoggingOff", _wrap_wxCloseEvent_SetLoggingOff, 1 },
+        { "wxCloseEvent_SetCanVeto", _wrap_wxCloseEvent_SetCanVeto, 1 },
         { "wxCloseEvent_SetForce", _wrap_wxCloseEvent_SetForce, 1 },
         { "wxCloseEvent_GetVeto", _wrap_wxCloseEvent_GetVeto, 1 },
         { "wxCloseEvent_Veto", _wrap_wxCloseEvent_Veto, 1 },
         { "wxCloseEvent_GetLoggingOff", _wrap_wxCloseEvent_GetLoggingOff, 1 },
+        { "wxCloseEvent_CanVeto", _wrap_wxCloseEvent_CanVeto, 1 },
         { "wxSizeEvent_GetSize", _wrap_wxSizeEvent_GetSize, 1 },
         { "wxEvent_Skip", _wrap_wxEvent_Skip, 1 },
         { "wxEvent_SetTimestamp", _wrap_wxEvent_SetTimestamp, 1 },
@@ -2707,6 +2780,7 @@ SWIGEXPORT(void,initeventsc)() {
         SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
         SWIG_RegisterMapping("_signed_long","_long",0);
         SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
+        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
         SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
@@ -2789,6 +2863,7 @@ SWIGEXPORT(void,initeventsc)() {
         SWIG_RegisterMapping("_EBool","_signed_int",0);
         SWIG_RegisterMapping("_EBool","_int",0);
         SWIG_RegisterMapping("_EBool","_wxWindowID",0);
+        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
         SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxCloseEvent","_class_wxCloseEvent",0);
         SWIG_RegisterMapping("_unsigned_long","_long",0);
@@ -2841,6 +2916,7 @@ SWIGEXPORT(void,initeventsc)() {
         SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
         SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
         SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
+        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
         SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
@@ -2848,6 +2924,7 @@ SWIGEXPORT(void,initeventsc)() {
         SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
         SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
         SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
+        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
         SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
         SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
         SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxSpinEvent",SwigwxSpinEventTowxCommandEvent);
index 7d20bbc8278bc42f986a68736b23c8d5b88355e9..f8a052d14b2a4226153a95aa29d9a21a0dcebf73 100644 (file)
@@ -67,6 +67,9 @@ class wxCloseEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def CanVeto(self):
+        val = eventsc.wxCloseEvent_CanVeto(self.this)
+        return val
     def GetLoggingOff(self):
         val = eventsc.wxCloseEvent_GetLoggingOff(self.this)
         return val
@@ -79,6 +82,12 @@ class wxCloseEventPtr(wxEventPtr):
     def SetForce(self,arg0):
         val = eventsc.wxCloseEvent_SetForce(self.this,arg0)
         return val
+    def SetCanVeto(self,arg0):
+        val = eventsc.wxCloseEvent_SetCanVeto(self.this,arg0)
+        return val
+    def SetLoggingOff(self,arg0):
+        val = eventsc.wxCloseEvent_SetLoggingOff(self.this,arg0)
+        return val
     def GetForce(self):
         val = eventsc.wxCloseEvent_GetForce(self.this)
         return val
index 564006d6c16c3165b5a93e227c6d4a169e5c69a0..39051a79462e6f3d9f3b2881ce7a4ad0d4f7a816 100644 (file)
@@ -54,10 +54,7 @@ extern PyObject *SWIG_newvarlink(void);
 #define SWIG_name    "framesc"
 
 #include "helpers.h"
-
-#ifdef __WXMSW__
 #include <wx/minifram.h>
-#endif
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
@@ -107,6 +104,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
+extern byte* byte_LIST_helper(PyObject* source);
 extern int* int_LIST_helper(PyObject* source);
 extern long* long_LIST_helper(PyObject* source);
 extern char** string_LIST_helper(PyObject* source);
@@ -242,7 +240,7 @@ static PyObject *_wrap_wxFrame_CreateToolBar(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxToolBar * _result;
     wxFrame * _arg0;
-    long  _arg1 = (wxNO_BORDER)|(wxTB_HORIZONTAL);
+    long  _arg1 = (wxNO_BORDER)|(wxTB_HORIZONTAL)|(wxTB_FLAT);
     wxWindowID  _arg2 = -1;
     char * _arg3 = "toolBar";
     char * _argc0 = 0;
@@ -678,7 +676,87 @@ static PyObject *_wrap_wxFrame_SetToolBar(PyObject *self, PyObject *args) {
     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 PyMethodDef framescMethods[] = {
+        { "new_wxMiniFrame", _wrap_new_wxMiniFrame, 1 },
         { "wxFrame_SetToolBar", _wrap_wxFrame_SetToolBar, 1 },
         { "wxFrame_SetTitle", _wrap_wxFrame_SetTitle, 1 },
         { "wxFrame_SetStatusWidths", _wrap_wxFrame_SetStatusWidths, 1 },
@@ -718,7 +796,10 @@ SWIGEXPORT(void,initframesc)() {
         SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
         SWIG_RegisterMapping("_signed_long","_long",0);
         SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
+        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
+        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","_wxEvtHandler",0);
@@ -760,6 +841,7 @@ SWIGEXPORT(void,initframesc)() {
         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);
@@ -784,6 +866,7 @@ SWIGEXPORT(void,initframesc)() {
         SWIG_RegisterMapping("_EBool","_signed_int",0);
         SWIG_RegisterMapping("_EBool","_int",0);
         SWIG_RegisterMapping("_EBool","_wxWindowID",0);
+        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
         SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
         SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
@@ -816,6 +899,8 @@ SWIGEXPORT(void,initframesc)() {
         SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
         SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
         SWIG_RegisterMapping("_unsigned_short","_short",0);
+        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);
@@ -860,6 +945,8 @@ SWIGEXPORT(void,initframesc)() {
         SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
         SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
         SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",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);
@@ -875,6 +962,7 @@ SWIGEXPORT(void,initframesc)() {
         SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
         SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
         SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
+        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
         SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
         SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
@@ -887,9 +975,12 @@ SWIGEXPORT(void,initframesc)() {
         SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
         SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
         SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
+        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",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("_wxRegion","_class_wxRegion",0);
         SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
         SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
         SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
@@ -900,6 +991,8 @@ SWIGEXPORT(void,initframesc)() {
         SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
         SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
         SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
+        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_wxEvtHandler",0);
@@ -910,9 +1003,14 @@ SWIGEXPORT(void,initframesc)() {
         SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
         SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
+        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
         SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
+        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);
 }
index 086d1cd5ae74cee1096c3647522430bc4f541136..0a3796059f31332ebe06e218441c1254b52856b2 100644 (file)
@@ -12,7 +12,7 @@ from stattool import *
 from controls import *
 
 from events import *
-import wxp
+import wx
 class wxFramePtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
@@ -88,7 +88,28 @@ class wxFrame(wxFramePtr):
         args = tuple(argl)
         self.this = apply(framesc.new_wxFrame,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
-        wxp._StdFrameCallbacks(self)
+        wx._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
+        wx._StdFrameCallbacks(self)
 
 
 
index 2f8e65470622c4e6675b1bc260f3b4fab92dac78..0f9b89c248aca4f4fe769e5985049fee777eeb9d 100644 (file)
@@ -55,6 +55,9 @@ extern PyObject *SWIG_newvarlink(void);
 
 #include "helpers.h"
 #include <wx/metafile.h>
+#ifndef __WXMSW__
+#include <wx/postscrp.h>
+#endif
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
@@ -104,6 +107,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
+extern byte* byte_LIST_helper(PyObject* source);
 extern int* int_LIST_helper(PyObject* source);
 extern long* long_LIST_helper(PyObject* source);
 extern char** string_LIST_helper(PyObject* source);
@@ -3026,7 +3030,7 @@ static PyObject *_wrap_wxDC_FloodFill(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    wxDC_FloodFill(_arg0,_arg1,_arg2,_arg3,_arg4);
+    wxDC_FloodFill(_arg0,_arg1,_arg2,*_arg3,_arg4);
     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
@@ -3049,8 +3053,8 @@ static PyObject *_wrap_wxDC_GetBackground(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = (wxBrush *)wxDC_GetBackground(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
+    _result = new wxBrush (wxDC_GetBackground(_arg0));
+    SWIG_MakePtr(_ptemp, (void *) _result,"_wxBrush_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -3072,8 +3076,8 @@ static PyObject *_wrap_wxDC_GetBrush(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = (wxBrush *)wxDC_GetBrush(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
+    _result = new wxBrush (wxDC_GetBrush(_arg0));
+    SWIG_MakePtr(_ptemp, (void *) _result,"_wxBrush_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -3198,8 +3202,8 @@ static PyObject *_wrap_wxDC_GetFont(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = (wxFont *)wxDC_GetFont(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
+    _result = new wxFont (wxDC_GetFont(_arg0));
+    SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -3284,8 +3288,8 @@ static PyObject *_wrap_wxDC_GetPen(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = (wxPen *)wxDC_GetPen(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPen_p");
+    _result = new wxPen (wxDC_GetPen(_arg0));
+    SWIG_MakePtr(_ptemp, (void *) _result,"_wxPen_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -4094,12 +4098,12 @@ static PyObject *_wrap_wxDC_StartPage(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static void  wxDC_DrawBitmap(wxDC *self,wxBitmap * bitmap,long  x,long  y,bool  swapPalette) {
+static void  wxDC_DrawBitmap(wxDC *self,wxBitmap & bitmap,long  x,long  y,bool  swapPalette) {
             wxMemoryDC* memDC = new wxMemoryDC;
             memDC->SelectObject(bitmap);
             if (swapPalette)
-                self->SetPalette(bitmap->GetPalette());
-            self->Blit(x, y, bitmap->GetWidth(), bitmap->GetHeight(), memDC,
+                self->SetPalette(*bitmap.GetPalette());
+            self->Blit(x, y, bitmap.GetWidth(), bitmap.GetHeight(), memDC,
                     0, 0, self->GetLogicalFunction());
             memDC->SelectObject(wxNullBitmap);
             delete memDC;
@@ -4131,7 +4135,7 @@ static PyObject *_wrap_wxDC_DrawBitmap(PyObject *self, PyObject *args) {
         }
     }
     _arg4 = (bool ) tempbool4;
-    wxDC_DrawBitmap(_arg0,_arg1,_arg2,_arg3,_arg4);
+    wxDC_DrawBitmap(_arg0,*_arg1,_arg2,_arg3,_arg4);
     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
@@ -4400,7 +4404,177 @@ static PyObject *_wrap_new_wxPostScriptDC(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define new_wxPalette(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxPalette(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
+static PyObject *_wrap_new_wxPalette(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxPalette * _result;
+    int  _arg0;
+    byte * _arg1;
+    byte * _arg2;
+    byte * _arg3;
+    PyObject * _obj1 = 0;
+    PyObject * _obj2 = 0;
+    PyObject * _obj3 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"OOO:new_wxPalette",&_obj1,&_obj2,&_obj3)) 
+        return NULL;
+{
+    _arg1 = byte_LIST_helper(_obj1);
+    if (_arg1 == NULL) {
+        return NULL;
+    }
+}
+{
+    _arg2 = byte_LIST_helper(_obj2);
+    if (_arg2 == NULL) {
+        return NULL;
+    }
+}
+    if (_obj3)
+{
+    _arg3 = byte_LIST_helper(_obj3);
+    if (_arg3 == NULL) {
+        return NULL;
+    }
+}
+{
+    _arg0 = PyList_Size(_obj1);
+}
+    _result = (wxPalette *)new_wxPalette(_arg0,_arg1,_arg2,_arg3);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPalette_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    delete [] _arg1;
+}
+{
+    delete [] _arg2;
+}
+{
+    delete [] _arg3;
+}
+    return _resultobj;
+}
+
+#define delete_wxPalette(_swigobj) (delete _swigobj)
+static PyObject *_wrap_delete_wxPalette(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxPalette * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:delete_wxPalette",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPalette. Expected _wxPalette_p.");
+        return NULL;
+        }
+    }
+    delete_wxPalette(_arg0);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxPalette_GetPixel(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->GetPixel(_swigarg0,_swigarg1,_swigarg2))
+static PyObject *_wrap_wxPalette_GetPixel(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxPalette * _arg0;
+    byte  _arg1;
+    byte  _arg2;
+    byte  _arg3;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sbbb:wxPalette_GetPixel",&_argc0,&_arg1,&_arg2,&_arg3)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_GetPixel. Expected _wxPalette_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxPalette_GetPixel(_arg0,_arg1,_arg2,_arg3);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxPalette_GetRGB(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->GetRGB(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
+static PyObject *_wrap_wxPalette_GetRGB(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxPalette * _arg0;
+    int  _arg1;
+    byte * _arg2;
+    byte * _arg3;
+    byte * _arg4;
+    char * _argc0 = 0;
+    char * _argc2 = 0;
+    char * _argc3 = 0;
+    char * _argc4 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sisss:wxPalette_GetRGB",&_argc0,&_arg1,&_argc2,&_argc3,&_argc4)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_GetRGB. Expected _wxPalette_p.");
+        return NULL;
+        }
+    }
+    if (_argc2) {
+        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_byte_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPalette_GetRGB. Expected _byte_p.");
+        return NULL;
+        }
+    }
+    if (_argc3) {
+        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_byte_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxPalette_GetRGB. Expected _byte_p.");
+        return NULL;
+        }
+    }
+    if (_argc4) {
+        if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_byte_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxPalette_GetRGB. Expected _byte_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxPalette_GetRGB(_arg0,_arg1,_arg2,_arg3,_arg4);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxPalette_Ok(_swigobj)  (_swigobj->Ok())
+static PyObject *_wrap_wxPalette_Ok(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxPalette * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxPalette_Ok",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_Ok. Expected _wxPalette_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxPalette_Ok(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
 static PyMethodDef gdicMethods[] = {
+        { "wxPalette_Ok", _wrap_wxPalette_Ok, 1 },
+        { "wxPalette_GetRGB", _wrap_wxPalette_GetRGB, 1 },
+        { "wxPalette_GetPixel", _wrap_wxPalette_GetPixel, 1 },
+        { "delete_wxPalette", _wrap_delete_wxPalette, 1 },
+        { "new_wxPalette", _wrap_new_wxPalette, 1 },
         { "new_wxPostScriptDC", _wrap_new_wxPostScriptDC, 1 },
         { "new_wxPaintDC", _wrap_new_wxPaintDC, 1 },
         { "new_wxClientDC", _wrap_new_wxClientDC, 1 },
@@ -4603,6 +4777,7 @@ SWIGEXPORT(void,initgdic)() {
  */
         SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_signed_long","_long",0);
+        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
@@ -4643,6 +4818,7 @@ SWIGEXPORT(void,initgdic)() {
         SWIG_RegisterMapping("_EBool","_signed_int",0);
         SWIG_RegisterMapping("_EBool","_int",0);
         SWIG_RegisterMapping("_EBool","_wxWindowID",0);
+        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
         SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
         SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
         SWIG_RegisterMapping("_unsigned_long","_long",0);
@@ -4702,11 +4878,14 @@ SWIGEXPORT(void,initgdic)() {
         SWIG_RegisterMapping("_int","_unsigned_int",0);
         SWIG_RegisterMapping("_int","_signed_int",0);
         SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
+        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
         SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
         SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
         SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
         SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
+        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
+        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
         SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
         SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
         SWIG_RegisterMapping("_class_wxBitmap","_class_wxCursor",SwigwxCursorTowxBitmap);
@@ -4717,4 +4896,5 @@ SWIGEXPORT(void,initgdic)() {
         SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
         SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
         SWIG_RegisterMapping("_wxDash","_long",0);
+        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
 }
index 3a24275f915ad17ec4bc23168045e4c91a0ef63f..840dfb0bf37153bf88eea858c9891fc3a10576d4 100644 (file)
@@ -17,6 +17,7 @@ class wxBitmapPtr :
         return val
     def GetPalette(self):
         val = gdic.wxBitmap_GetPalette(self.this)
+        val = wxPalettePtr(val)
         return val
     def GetMask(self):
         val = gdic.wxBitmap_GetMask(self.this)
@@ -32,6 +33,10 @@ class wxBitmapPtr :
         val = gdic.wxBitmap_Ok(self.this)
         return val
     def SaveFile(self,arg0,arg1,*args):
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        args = tuple(argl)
         val = apply(gdic.wxBitmap_SaveFile,(self.this,arg0,arg1,)+args)
         return val
     def SetDepth(self,arg0):
@@ -375,10 +380,12 @@ class wxDCPtr :
     def GetBackground(self):
         val = gdic.wxDC_GetBackground(self.this)
         val = wxBrushPtr(val)
+        val.thisown = 1
         return val
     def GetBrush(self):
         val = gdic.wxDC_GetBrush(self.this)
         val = wxBrushPtr(val)
+        val.thisown = 1
         return val
     def GetCharHeight(self):
         val = gdic.wxDC_GetCharHeight(self.this)
@@ -392,6 +399,7 @@ class wxDCPtr :
     def GetFont(self):
         val = gdic.wxDC_GetFont(self.this)
         val = wxFontPtr(val)
+        val.thisown = 1
         return val
     def GetLogicalFunction(self):
         val = gdic.wxDC_GetLogicalFunction(self.this)
@@ -405,6 +413,7 @@ class wxDCPtr :
     def GetPen(self):
         val = gdic.wxDC_GetPen(self.this)
         val = wxPenPtr(val)
+        val.thisown = 1
         return val
     def GetPixel(self,arg0,arg1):
         val = gdic.wxDC_GetPixel(self.this,arg0,arg1)
@@ -465,7 +474,7 @@ class wxDCPtr :
         val = gdic.wxDC_SetClippingRegion(self.this,arg0,arg1,arg2,arg3)
         return val
     def SetPalette(self,arg0):
-        val = gdic.wxDC_SetPalette(self.this,arg0)
+        val = gdic.wxDC_SetPalette(self.this,arg0.this)
         return val
     def SetBrush(self,arg0):
         val = gdic.wxDC_SetBrush(self.this,arg0.this)
@@ -602,6 +611,32 @@ class wxPostScriptDC(wxPostScriptDCPtr):
 
 
 
+class wxPalettePtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self):
+        if self.thisown == 1 :
+            gdic.delete_wxPalette(self.this)
+    def GetPixel(self,arg0,arg1,arg2):
+        val = gdic.wxPalette_GetPixel(self.this,arg0,arg1,arg2)
+        return val
+    def GetRGB(self,arg0,arg1,arg2,arg3):
+        val = gdic.wxPalette_GetRGB(self.this,arg0,arg1,arg2,arg3)
+        return val
+    def Ok(self):
+        val = gdic.wxPalette_Ok(self.this)
+        return val
+    def __repr__(self):
+        return "<C wxPalette instance>"
+class wxPalette(wxPalettePtr):
+    def __init__(self,arg0,arg1,arg2) :
+        self.this = gdic.new_wxPalette(arg0,arg1,arg2)
+        self.thisown = 1
+
+
+
+
 
 
 #-------------- FUNCTION WRAPPERS ------------------
index 47a7b27f78b1f0d5291e1ddd135382cd0dd5d1ae..7ff3c84ba474b3fecc906bd8304cb9006835d0ee 100644 (file)
@@ -103,6 +103,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
+extern byte* byte_LIST_helper(PyObject* source);
 extern int* int_LIST_helper(PyObject* source);
 extern long* long_LIST_helper(PyObject* source);
 extern char** string_LIST_helper(PyObject* source);
@@ -721,6 +722,7 @@ SWIGEXPORT(void,initmdic)() {
         SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
         SWIG_RegisterMapping("_signed_long","_long",0);
         SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
+        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
         SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler);
         SWIG_RegisterMapping("_class_wxEvtHandler","_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler);
@@ -767,6 +769,7 @@ SWIGEXPORT(void,initmdic)() {
         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);
@@ -792,6 +795,7 @@ SWIGEXPORT(void,initmdic)() {
         SWIG_RegisterMapping("_EBool","_signed_int",0);
         SWIG_RegisterMapping("_EBool","_int",0);
         SWIG_RegisterMapping("_EBool","_wxWindowID",0);
+        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
         SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
         SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
@@ -894,6 +898,7 @@ SWIGEXPORT(void,initmdic)() {
         SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
         SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
         SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
+        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxMDIParentFrame","_wxMDIParentFrame",0);
         SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
         SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
@@ -907,9 +912,12 @@ SWIGEXPORT(void,initmdic)() {
         SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
         SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
         SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
+        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",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("_wxRegion","_class_wxRegion",0);
         SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
         SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
         SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
@@ -934,6 +942,7 @@ SWIGEXPORT(void,initmdic)() {
         SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
         SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
+        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
         SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
         SWIG_RegisterMapping("_wxMDIClientWindow","_class_wxMDIClientWindow",0);
         SWIG_RegisterMapping("_wxWindow","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow);
index 7ece3fc198ba9f58b7bf66bb91b3594ede007864..3bd0fa00a102a9cf94c2f636f1173d4c0309eff7 100644 (file)
@@ -14,7 +14,7 @@ from stattool import *
 from controls import *
 
 from events import *
-import wxp
+import wx
 class wxMDIParentFramePtr(wxFramePtr):
     def __init__(self,this):
         self.this = this
@@ -61,7 +61,7 @@ class wxMDIParentFrame(wxMDIParentFramePtr):
         args = tuple(argl)
         self.this = apply(mdic.new_wxMDIParentFrame,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
-        wxp._StdFrameCallbacks(self)
+        wx._StdFrameCallbacks(self)
 
 
 
@@ -100,7 +100,7 @@ class wxMDIChildFrame(wxMDIChildFramePtr):
         args = tuple(argl)
         self.this = apply(mdic.new_wxMDIChildFrame,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
-        wxp._StdFrameCallbacks(self)
+        wx._StdFrameCallbacks(self)
 
 
 
@@ -115,8 +115,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)
+        wx._StdWindowCallbacks(self)
+        wx._StdOnScrollCallbacks(self)
 
 
 
index eab0aa53a361aee6f42e99b022c537d407c686b9..1c4db2a82039fc28f1e31bf261e1ba79099306e4 100644 (file)
@@ -104,6 +104,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
+extern byte* byte_LIST_helper(PyObject* source);
 extern int* int_LIST_helper(PyObject* source);
 extern long* long_LIST_helper(PyObject* source);
 extern char** string_LIST_helper(PyObject* source);
@@ -450,7 +451,7 @@ static PyObject *_wrap_wxSetCursor(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    wxSetCursor(_arg0);
+    wxSetCursor(*_arg0);
     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
@@ -2507,6 +2508,541 @@ static PyObject *_wrap_wxLayoutConstraints_width_get(PyObject *self, PyObject *a
     return _resultobj;
 }
 
+#define new_wxRegion() (new wxRegion())
+static PyObject *_wrap_new_wxRegion(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxRegion * _result;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,":new_wxRegion")) 
+        return NULL;
+    _result = (wxRegion *)new_wxRegion();
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxRegion_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define delete_wxRegion(_swigobj) (delete _swigobj)
+static PyObject *_wrap_delete_wxRegion(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxRegion * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:delete_wxRegion",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxRegion. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+    delete_wxRegion(_arg0);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxRegion_Clear(_swigobj)  (_swigobj->Clear())
+static PyObject *_wrap_wxRegion_Clear(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxRegion * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxRegion_Clear",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Clear. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+    wxRegion_Clear(_arg0);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxRegion_Contains(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Contains(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxRegion_Contains(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxRegionContain  _result;
+    wxRegion * _arg0;
+    long  _arg1;
+    long  _arg2;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sll:wxRegion_Contains",&_argc0,&_arg1,&_arg2)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Contains. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+    _result = (wxRegionContain )wxRegion_Contains(_arg0,_arg1,_arg2);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxRegion_ContainsPoint(_swigobj,_swigarg0)  (_swigobj->Contains(_swigarg0))
+static PyObject *_wrap_wxRegion_ContainsPoint(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxRegionContain  _result;
+    wxRegion * _arg0;
+    wxPoint * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxRegion_ContainsPoint",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_ContainsPoint. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_ContainsPoint. Expected _wxPoint_p.");
+        return NULL;
+        }
+    }
+    _result = (wxRegionContain )wxRegion_ContainsPoint(_arg0,*_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxRegion_ContainsRect(_swigobj,_swigarg0)  (_swigobj->Contains(_swigarg0))
+static PyObject *_wrap_wxRegion_ContainsRect(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxRegionContain  _result;
+    wxRegion * _arg0;
+    wxRect * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxRegion_ContainsRect",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_ContainsRect. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_ContainsRect. Expected _wxRect_p.");
+        return NULL;
+        }
+    }
+    _result = (wxRegionContain )wxRegion_ContainsRect(_arg0,*_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxRegion_GetBox(_swigobj)  (_swigobj->GetBox())
+static PyObject *_wrap_wxRegion_GetBox(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxRect * _result;
+    wxRegion * _arg0;
+    char * _argc0 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxRegion_GetBox",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_GetBox. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+    _result = new wxRect (wxRegion_GetBox(_arg0));
+    SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxRegion_Intersect(_swigobj,_swigarg0)  (_swigobj->Intersect(_swigarg0))
+static PyObject *_wrap_wxRegion_Intersect(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxRegion * _arg0;
+    wxRect * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxRegion_Intersect",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Intersect. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Intersect. Expected _wxRect_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxRegion_Intersect(_arg0,*_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxRegion_Subtract(_swigobj,_swigarg0)  (_swigobj->Subtract(_swigarg0))
+static PyObject *_wrap_wxRegion_Subtract(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxRegion * _arg0;
+    wxRect * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxRegion_Subtract",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Subtract. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Subtract. Expected _wxRect_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxRegion_Subtract(_arg0,*_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxRegion_Union(_swigobj,_swigarg0)  (_swigobj->Union(_swigarg0))
+static PyObject *_wrap_wxRegion_Union(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxRegion * _arg0;
+    wxRect * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxRegion_Union",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Union. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Union. Expected _wxRect_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxRegion_Union(_arg0,*_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxRegion_Xor(_swigobj,_swigarg0)  (_swigobj->Xor(_swigarg0))
+static PyObject *_wrap_wxRegion_Xor(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxRegion * _arg0;
+    wxRect * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxRegion_Xor",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Xor. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Xor. Expected _wxRect_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxRegion_Xor(_arg0,*_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define new_wxRegionIterator(_swigarg0) (new wxRegionIterator(_swigarg0))
+static PyObject *_wrap_new_wxRegionIterator(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxRegionIterator * _result;
+    wxRegion * _arg0;
+    char * _argc0 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:new_wxRegionIterator",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxRegionIterator. Expected _wxRegion_p.");
+        return NULL;
+        }
+    }
+    _result = (wxRegionIterator *)new_wxRegionIterator(*_arg0);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxRegionIterator_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define delete_wxRegionIterator(_swigobj) (delete _swigobj)
+static PyObject *_wrap_delete_wxRegionIterator(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxRegionIterator * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:delete_wxRegionIterator",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxRegionIterator. Expected _wxRegionIterator_p.");
+        return NULL;
+        }
+    }
+    delete_wxRegionIterator(_arg0);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxRegionIterator_GetX(_swigobj)  (_swigobj->GetX())
+static PyObject *_wrap_wxRegionIterator_GetX(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxRegionIterator * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetX",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetX. Expected _wxRegionIterator_p.");
+        return NULL;
+        }
+    }
+    _result = (long )wxRegionIterator_GetX(_arg0);
+    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+
+#define wxRegionIterator_GetY(_swigobj)  (_swigobj->GetY())
+static PyObject *_wrap_wxRegionIterator_GetY(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxRegionIterator * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetY",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetY. Expected _wxRegionIterator_p.");
+        return NULL;
+        }
+    }
+    _result = (long )wxRegionIterator_GetY(_arg0);
+    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+
+#define wxRegionIterator_GetW(_swigobj)  (_swigobj->GetW())
+static PyObject *_wrap_wxRegionIterator_GetW(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxRegionIterator * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetW",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetW. Expected _wxRegionIterator_p.");
+        return NULL;
+        }
+    }
+    _result = (long )wxRegionIterator_GetW(_arg0);
+    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+
+#define wxRegionIterator_GetWidth(_swigobj)  (_swigobj->GetWidth())
+static PyObject *_wrap_wxRegionIterator_GetWidth(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxRegionIterator * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetWidth",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetWidth. Expected _wxRegionIterator_p.");
+        return NULL;
+        }
+    }
+    _result = (long )wxRegionIterator_GetWidth(_arg0);
+    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+
+#define wxRegionIterator_GetH(_swigobj)  (_swigobj->GetH())
+static PyObject *_wrap_wxRegionIterator_GetH(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxRegionIterator * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetH",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetH. Expected _wxRegionIterator_p.");
+        return NULL;
+        }
+    }
+    _result = (long )wxRegionIterator_GetH(_arg0);
+    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+
+#define wxRegionIterator_GetHeight(_swigobj)  (_swigobj->GetHeight())
+static PyObject *_wrap_wxRegionIterator_GetHeight(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxRegionIterator * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetHeight",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetHeight. Expected _wxRegionIterator_p.");
+        return NULL;
+        }
+    }
+    _result = (long )wxRegionIterator_GetHeight(_arg0);
+    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+
+#define wxRegionIterator_GetRect(_swigobj)  (_swigobj->GetRect())
+static PyObject *_wrap_wxRegionIterator_GetRect(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxRect * _result;
+    wxRegionIterator * _arg0;
+    char * _argc0 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetRect",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetRect. Expected _wxRegionIterator_p.");
+        return NULL;
+        }
+    }
+    _result = new wxRect (wxRegionIterator_GetRect(_arg0));
+    SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxRegionIterator_HaveRects(_swigobj)  (_swigobj->HaveRects())
+static PyObject *_wrap_wxRegionIterator_HaveRects(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxRegionIterator * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_HaveRects",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_HaveRects. Expected _wxRegionIterator_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxRegionIterator_HaveRects(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxRegionIterator_Reset(_swigobj)  (_swigobj->Reset())
+static PyObject *_wrap_wxRegionIterator_Reset(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxRegionIterator * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_Reset",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_Reset. Expected _wxRegionIterator_p.");
+        return NULL;
+        }
+    }
+    wxRegionIterator_Reset(_arg0);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+static void  wxRegionIterator_Next(wxRegionIterator *self) {
+            (*self) ++;
+        }
+static PyObject *_wrap_wxRegionIterator_Next(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxRegionIterator * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxRegionIterator_Next",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_Next. Expected _wxRegionIterator_p.");
+        return NULL;
+        }
+    }
+    wxRegionIterator_Next(_arg0);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 #define new_wxAcceleratorEntry(_swigarg0,_swigarg1,_swigarg2) (new wxAcceleratorEntry(_swigarg0,_swigarg1,_swigarg2))
 static PyObject *_wrap_new_wxAcceleratorEntry(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -2650,6 +3186,29 @@ static PyMethodDef misccMethods[] = {
         { "wxAcceleratorEntry_GetFlags", _wrap_wxAcceleratorEntry_GetFlags, 1 },
         { "wxAcceleratorEntry_Set", _wrap_wxAcceleratorEntry_Set, 1 },
         { "new_wxAcceleratorEntry", _wrap_new_wxAcceleratorEntry, 1 },
+        { "wxRegionIterator_Next", _wrap_wxRegionIterator_Next, 1 },
+        { "wxRegionIterator_Reset", _wrap_wxRegionIterator_Reset, 1 },
+        { "wxRegionIterator_HaveRects", _wrap_wxRegionIterator_HaveRects, 1 },
+        { "wxRegionIterator_GetRect", _wrap_wxRegionIterator_GetRect, 1 },
+        { "wxRegionIterator_GetHeight", _wrap_wxRegionIterator_GetHeight, 1 },
+        { "wxRegionIterator_GetH", _wrap_wxRegionIterator_GetH, 1 },
+        { "wxRegionIterator_GetWidth", _wrap_wxRegionIterator_GetWidth, 1 },
+        { "wxRegionIterator_GetW", _wrap_wxRegionIterator_GetW, 1 },
+        { "wxRegionIterator_GetY", _wrap_wxRegionIterator_GetY, 1 },
+        { "wxRegionIterator_GetX", _wrap_wxRegionIterator_GetX, 1 },
+        { "delete_wxRegionIterator", _wrap_delete_wxRegionIterator, 1 },
+        { "new_wxRegionIterator", _wrap_new_wxRegionIterator, 1 },
+        { "wxRegion_Xor", _wrap_wxRegion_Xor, 1 },
+        { "wxRegion_Union", _wrap_wxRegion_Union, 1 },
+        { "wxRegion_Subtract", _wrap_wxRegion_Subtract, 1 },
+        { "wxRegion_Intersect", _wrap_wxRegion_Intersect, 1 },
+        { "wxRegion_GetBox", _wrap_wxRegion_GetBox, 1 },
+        { "wxRegion_ContainsRect", _wrap_wxRegion_ContainsRect, 1 },
+        { "wxRegion_ContainsPoint", _wrap_wxRegion_ContainsPoint, 1 },
+        { "wxRegion_Contains", _wrap_wxRegion_Contains, 1 },
+        { "wxRegion_Clear", _wrap_wxRegion_Clear, 1 },
+        { "delete_wxRegion", _wrap_delete_wxRegion, 1 },
+        { "new_wxRegion", _wrap_new_wxRegion, 1 },
         { "wxLayoutConstraints_width_get", _wrap_wxLayoutConstraints_width_get, 1 },
         { "wxLayoutConstraints_top_get", _wrap_wxLayoutConstraints_top_get, 1 },
         { "wxLayoutConstraints_right_get", _wrap_wxLayoutConstraints_right_get, 1 },
@@ -2783,12 +3342,16 @@ SWIGEXPORT(void,initmiscc)() {
         PyDict_SetItemString(d,"wxRightOf", PyInt_FromLong((long) wxRightOf));
         PyDict_SetItemString(d,"wxSameAs", PyInt_FromLong((long) wxSameAs));
         PyDict_SetItemString(d,"wxAbsolute", PyInt_FromLong((long) wxAbsolute));
+        PyDict_SetItemString(d,"wxOutRegion", PyInt_FromLong((long) wxOutRegion));
+        PyDict_SetItemString(d,"wxPartRegion", PyInt_FromLong((long) wxPartRegion));
+        PyDict_SetItemString(d,"wxInRegion", PyInt_FromLong((long) wxInRegion));
 /*
  * These are the pointer type-equivalency mappings. 
  * (Used by the SWIG pointer type-checker).
  */
         SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_signed_long","_long",0);
+        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_byte","_unsigned_char",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
@@ -2805,6 +3368,7 @@ SWIGEXPORT(void,initmiscc)() {
         SWIG_RegisterMapping("_EBool","_signed_int",0);
         SWIG_RegisterMapping("_EBool","_int",0);
         SWIG_RegisterMapping("_EBool","_wxWindowID",0);
+        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
         SWIG_RegisterMapping("_unsigned_long","_long",0);
         SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
         SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
@@ -2841,6 +3405,8 @@ SWIGEXPORT(void,initmiscc)() {
         SWIG_RegisterMapping("_int","_unsigned_int",0);
         SWIG_RegisterMapping("_int","_signed_int",0);
         SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
+        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
+        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
         SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
 }
index cfc622abe1bfb053b571178d447db0fe17865954..5b6db41e764f580d2666c87618a1c5b38b701012 100644 (file)
@@ -325,6 +325,101 @@ class wxLayoutConstraints(wxLayoutConstraintsPtr):
 
 
 
+class wxRegionPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self):
+        if self.thisown == 1 :
+            miscc.delete_wxRegion(self.this)
+    def Clear(self):
+        val = miscc.wxRegion_Clear(self.this)
+        return val
+    def Contains(self,arg0,arg1):
+        val = miscc.wxRegion_Contains(self.this,arg0,arg1)
+        return val
+    def ContainsPoint(self,arg0):
+        val = miscc.wxRegion_ContainsPoint(self.this,arg0.this)
+        return val
+    def ContainsRect(self,arg0):
+        val = miscc.wxRegion_ContainsRect(self.this,arg0.this)
+        return val
+    def GetBox(self):
+        val = miscc.wxRegion_GetBox(self.this)
+        val = wxRectPtr(val)
+        val.thisown = 1
+        return val
+    def Intersect(self,arg0):
+        val = miscc.wxRegion_Intersect(self.this,arg0.this)
+        return val
+    def Subtract(self,arg0):
+        val = miscc.wxRegion_Subtract(self.this,arg0.this)
+        return val
+    def Union(self,arg0):
+        val = miscc.wxRegion_Union(self.this,arg0.this)
+        return val
+    def Xor(self,arg0):
+        val = miscc.wxRegion_Xor(self.this,arg0.this)
+        return val
+    def __repr__(self):
+        return "<C wxRegion instance>"
+class wxRegion(wxRegionPtr):
+    def __init__(self) :
+        self.this = miscc.new_wxRegion()
+        self.thisown = 1
+
+
+
+
+class wxRegionIteratorPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self):
+        if self.thisown == 1 :
+            miscc.delete_wxRegionIterator(self.this)
+    def GetX(self):
+        val = miscc.wxRegionIterator_GetX(self.this)
+        return val
+    def GetY(self):
+        val = miscc.wxRegionIterator_GetY(self.this)
+        return val
+    def GetW(self):
+        val = miscc.wxRegionIterator_GetW(self.this)
+        return val
+    def GetWidth(self):
+        val = miscc.wxRegionIterator_GetWidth(self.this)
+        return val
+    def GetH(self):
+        val = miscc.wxRegionIterator_GetH(self.this)
+        return val
+    def GetHeight(self):
+        val = miscc.wxRegionIterator_GetHeight(self.this)
+        return val
+    def GetRect(self):
+        val = miscc.wxRegionIterator_GetRect(self.this)
+        val = wxRectPtr(val)
+        val.thisown = 1
+        return val
+    def HaveRects(self):
+        val = miscc.wxRegionIterator_HaveRects(self.this)
+        return val
+    def Reset(self):
+        val = miscc.wxRegionIterator_Reset(self.this)
+        return val
+    def Next(self):
+        val = miscc.wxRegionIterator_Next(self.this)
+        return val
+    def __repr__(self):
+        return "<C wxRegionIterator instance>"
+class wxRegionIterator(wxRegionIteratorPtr):
+    def __init__(self,arg0) :
+        self.this = miscc.new_wxRegionIterator(arg0.this)
+        self.thisown = 1
+
+
+
+
 class wxAcceleratorEntryPtr :
     def __init__(self,this):
         self.this = this
@@ -517,3 +612,6 @@ wxLeftOf = miscc.wxLeftOf
 wxRightOf = miscc.wxRightOf
 wxSameAs = miscc.wxSameAs
 wxAbsolute = miscc.wxAbsolute
+wxOutRegion = miscc.wxOutRegion
+wxPartRegion = miscc.wxPartRegion
+wxInRegion = miscc.wxInRegion
index 74158eafafaa9a1f15d80c5fb3ff8d484b6fbc39..dc926d3ceff4aa7402284f1732391c4a563689df 100644 (file)
@@ -105,6 +105,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
+extern byte* byte_LIST_helper(PyObject* source);
 extern int* int_LIST_helper(PyObject* source);
 extern long* long_LIST_helper(PyObject* source);
 extern char** string_LIST_helper(PyObject* source);
@@ -1128,6 +1129,7 @@ SWIGEXPORT(void,initstattoolc)() {
         SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
         SWIG_RegisterMapping("_signed_long","_long",0);
         SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
+        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
         SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxToolBar",SwigwxToolBarTowxEvtHandler);
         SWIG_RegisterMapping("_class_wxEvtHandler","_wxToolBar",SwigwxToolBarTowxEvtHandler);
@@ -1196,6 +1198,7 @@ SWIGEXPORT(void,initstattoolc)() {
         SWIG_RegisterMapping("_EBool","_signed_int",0);
         SWIG_RegisterMapping("_EBool","_int",0);
         SWIG_RegisterMapping("_EBool","_wxWindowID",0);
+        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
         SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
         SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
@@ -1290,6 +1293,7 @@ SWIGEXPORT(void,initstattoolc)() {
         SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
         SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
         SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
+        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
         SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
         SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
@@ -1304,9 +1308,11 @@ SWIGEXPORT(void,initstattoolc)() {
         SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
         SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
         SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
+        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
         SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
         SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
         SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
+        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
         SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
         SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
         SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
@@ -1329,6 +1335,7 @@ SWIGEXPORT(void,initstattoolc)() {
         SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
         SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
+        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
         SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
         SWIG_RegisterMapping("_wxWindow","_class_wxToolBar",SwigwxToolBarTowxWindow);
         SWIG_RegisterMapping("_wxWindow","_wxToolBar",SwigwxToolBarTowxWindow);
index f7e24332e185ac19e87bba27c555d05705b6c9db..9e8c7ed4ec531fb9e2d6305f44256d31df0a2379 100644 (file)
@@ -10,6 +10,7 @@ from gdi import *
 from controls import *
 
 from events import *
+import wx
 class wxStatusBarPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
@@ -55,7 +56,7 @@ class wxStatusBar(wxStatusBarPtr):
         args = tuple(argl)
         self.this = apply(stattoolc.new_wxStatusBar,(arg0.this,arg1,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -192,7 +193,7 @@ class wxToolBar(wxToolBarPtr):
         args = tuple(argl)
         self.this = apply(stattoolc.new_wxToolBar,(arg0.this,arg1,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
 
 
 
diff --git a/utils/wxPython/src/gtk/utils.cpp b/utils/wxPython/src/gtk/utils.cpp
new file mode 100644 (file)
index 0000000..32a5941
--- /dev/null
@@ -0,0 +1,1178 @@
+/*
+ * FILE : gtk/utils.cpp
+ * 
+ * This file was automatically generated by :
+ * Simplified Wrapper and Interface Generator (SWIG)
+ * Version 1.1 (Patch 5)
+ * 
+ * Portions Copyright (c) 1995-1998
+ * The University of Utah and The Regents of the University of California.
+ * Permission is granted to distribute this file in any manner provided
+ * this notice remains intact.
+ * 
+ * Do not make changes to this file--changes will be lost!
+ *
+ */
+
+
+#define SWIGCODE
+/* Implementation : PYTHON */
+
+#define SWIGPYTHON
+#include <string.h>
+#include <stdlib.h>
+/* Definitions for Windows/Unix exporting */
+#if defined(__WIN32__)
+#   if defined(_MSC_VER)
+#      define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#   else
+#      if defined(__BORLANDC__)
+#          define SWIGEXPORT(a,b) a _export b
+#      else
+#          define SWIGEXPORT(a,b) a b
+#      endif
+#   endif
+#else
+#   define SWIGEXPORT(a,b) a b
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "Python.h"
+extern void SWIG_MakePtr(char *, void *, char *);
+extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
+extern char *SWIG_GetPtr(char *, void **, char *);
+extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
+extern PyObject *SWIG_newvarlink(void);
+#ifdef __cplusplus
+}
+#endif
+
+#define SWIG_init    initutilsc
+
+#define SWIG_name    "utilsc"
+
+#include "helpers.h"
+#include <wx/config.h>
+
+static PyObject* l_output_helper(PyObject* target, PyObject* o) {
+    PyObject*   o2;
+    PyObject*   o3;
+    if (!target) {                   
+        target = o;
+    } else if (target == Py_None) {  
+        Py_DECREF(Py_None);
+        target = o;
+    } else {                         
+        if (!PyList_Check(target)) {
+            o2 = target;
+            target = PyList_New(0);
+            PyList_Append(target, o2);
+           Py_XDECREF(o2);
+        }
+        PyList_Append(target,o);
+       Py_XDECREF(o);
+    }
+    return target;
+}
+
+static PyObject* t_output_helper(PyObject* target, PyObject* o) {
+    PyObject*   o2;
+    PyObject*   o3;
+
+    if (!target) {                   
+        target = o;
+    } else if (target == Py_None) {  
+        Py_DECREF(Py_None);
+        target = o;
+    } else {                         
+        if (!PyTuple_Check(target)) {
+            o2 = target;
+            target = PyTuple_New(1);
+            PyTuple_SetItem(target, 0, o2);
+        }
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      
+
+        o2 = target;
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      
+        Py_DECREF(o3);
+    }
+    return target;
+}
+
+
+extern byte* byte_LIST_helper(PyObject* source);
+extern int* int_LIST_helper(PyObject* source);
+extern long* long_LIST_helper(PyObject* source);
+extern char** string_LIST_helper(PyObject* source);
+extern wxPoint* wxPoint_LIST_helper(PyObject* source);
+extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
+extern wxString* wxString_LIST_helper(PyObject* source);
+extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
+
+
+static char* wxStringErrorMsg = "string type is required for parameter";
+
+    static PyObject* __EnumerationHelper(bool flag, wxString& str, long index) {
+        PyObject* ret = PyTuple_New(3);
+        if (ret) {
+            PyTuple_SET_ITEM(ret, 0, PyInt_FromLong(flag));
+            PyTuple_SET_ITEM(ret, 1, PyString_FromString(str));
+            PyTuple_SET_ITEM(ret, 2, PyInt_FromLong(index));
+        }
+        return ret;
+    }
+#define new_wxConfig(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxConfig(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
+static PyObject *_wrap_new_wxConfig(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxConfig * _result;
+    wxString * _arg0 = &wxPyEmptyStr;
+    wxString * _arg1 = &wxPyEmptyStr;
+    wxString * _arg2 = &wxPyEmptyStr;
+    wxString * _arg3 = &wxPyEmptyStr;
+    long  _arg4 = 0;
+    PyObject * _obj0 = 0;
+    PyObject * _obj1 = 0;
+    PyObject * _obj2 = 0;
+    PyObject * _obj3 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"|OOOOl:new_wxConfig",&_obj0,&_obj1,&_obj2,&_obj3,&_arg4)) 
+        return NULL;
+    if (_obj0)
+{
+    if (!PyString_Check(_obj0)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg0 = new wxString(PyString_AsString(_obj0));
+}
+    if (_obj1)
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    if (_obj2)
+{
+    if (!PyString_Check(_obj2)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg2 = new wxString(PyString_AsString(_obj2));
+}
+    if (_obj3)
+{
+    if (!PyString_Check(_obj3)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg3 = new wxString(PyString_AsString(_obj3));
+}
+    _result = (wxConfig *)new_wxConfig(*_arg0,*_arg1,*_arg2,*_arg3,_arg4);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxConfig_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    if (_obj0)
+        delete _arg0;
+}
+{
+    if (_obj1)
+        delete _arg1;
+}
+{
+    if (_obj2)
+        delete _arg2;
+}
+{
+    if (_obj3)
+        delete _arg3;
+}
+    return _resultobj;
+}
+
+#define delete_wxConfig(_swigobj) (delete _swigobj)
+static PyObject *_wrap_delete_wxConfig(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxConfig * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:delete_wxConfig",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxConfig. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+    delete_wxConfig(_arg0);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxConfig_DontCreateOnDemand(_swigobj)  (_swigobj->DontCreateOnDemand())
+static PyObject *_wrap_wxConfig_DontCreateOnDemand(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxConfig * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxConfig_DontCreateOnDemand",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_DontCreateOnDemand. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+    wxConfig_DontCreateOnDemand(_arg0);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxConfig_DeleteEntry(_swigobj,_swigarg0,_swigarg1)  (_swigobj->DeleteEntry(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxConfig_DeleteEntry(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxConfig * _arg0;
+    wxString * _arg1;
+    bool  _arg2 = TRUE;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+    int tempbool2;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sO|i:wxConfig_DeleteEntry",&_argc0,&_obj1,&tempbool2)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_DeleteEntry. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    _arg2 = (bool ) tempbool2;
+    _result = (bool )wxConfig_DeleteEntry(_arg0,*_arg1,_arg2);
+    _resultobj = Py_BuildValue("i",_result);
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+#define wxConfig_DeleteGroup(_swigobj,_swigarg0)  (_swigobj->DeleteGroup(_swigarg0))
+static PyObject *_wrap_wxConfig_DeleteGroup(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxConfig * _arg0;
+    wxString * _arg1;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sO:wxConfig_DeleteGroup",&_argc0,&_obj1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_DeleteGroup. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    _result = (bool )wxConfig_DeleteGroup(_arg0,*_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+#define wxConfig_Exists(_swigobj,_swigarg0)  (_swigobj->Exists(_swigarg0))
+static PyObject *_wrap_wxConfig_Exists(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxConfig * _arg0;
+    wxString * _arg1;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sO:wxConfig_Exists",&_argc0,&_obj1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_Exists. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    _result = (bool )wxConfig_Exists(_arg0,*_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+#define wxConfig_Flush(_swigobj,_swigarg0)  (_swigobj->Flush(_swigarg0))
+static PyObject *_wrap_wxConfig_Flush(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxConfig * _arg0;
+    bool  _arg1 = FALSE;
+    char * _argc0 = 0;
+    int tempbool1;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s|i:wxConfig_Flush",&_argc0,&tempbool1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_Flush. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+    _result = (bool )wxConfig_Flush(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxConfig_GetAppName(_swigobj)  (_swigobj->GetAppName())
+static PyObject *_wrap_wxConfig_GetAppName(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxString * _result;
+    wxConfig * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxConfig_GetAppName",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetAppName. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+    _result = new wxString (wxConfig_GetAppName(_arg0));
+{
+    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
+}
+{
+    delete _result;
+}
+    return _resultobj;
+}
+
+static PyObject * wxConfig_GetFirstGroup(wxConfig *self) {
+            bool     cont;
+            long     index = 0;
+            wxString value;
+
+            cont = self->GetFirstGroup(value, index);
+            return __EnumerationHelper(cont, value, index);
+        }
+static PyObject *_wrap_wxConfig_GetFirstGroup(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    PyObject * _result;
+    wxConfig * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxConfig_GetFirstGroup",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetFirstGroup. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+    _result = (PyObject *)wxConfig_GetFirstGroup(_arg0);
+{
+  _resultobj = _result;
+}
+    return _resultobj;
+}
+
+static PyObject * wxConfig_GetFirstEntry(wxConfig *self) {
+            bool     cont;
+            long     index = 0;
+            wxString value;
+
+            cont = self->GetFirstEntry(value, index);
+            return __EnumerationHelper(cont, value, index);
+        }
+static PyObject *_wrap_wxConfig_GetFirstEntry(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    PyObject * _result;
+    wxConfig * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxConfig_GetFirstEntry",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetFirstEntry. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+    _result = (PyObject *)wxConfig_GetFirstEntry(_arg0);
+{
+  _resultobj = _result;
+}
+    return _resultobj;
+}
+
+static PyObject * wxConfig_GetNextGroup(wxConfig *self,long  index) {
+            bool     cont;
+            wxString value;
+
+            cont = self->GetNextGroup(value, index);
+            return __EnumerationHelper(cont, value, index);
+        }
+static PyObject *_wrap_wxConfig_GetNextGroup(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    PyObject * _result;
+    wxConfig * _arg0;
+    long  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sl:wxConfig_GetNextGroup",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetNextGroup. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+    _result = (PyObject *)wxConfig_GetNextGroup(_arg0,_arg1);
+{
+  _resultobj = _result;
+}
+    return _resultobj;
+}
+
+static PyObject * wxConfig_GetNextEntry(wxConfig *self,long  index) {
+            bool     cont;
+            wxString value;
+
+            cont = self->GetNextEntry(value, index);
+            return __EnumerationHelper(cont, value, index);
+        }
+static PyObject *_wrap_wxConfig_GetNextEntry(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    PyObject * _result;
+    wxConfig * _arg0;
+    long  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sl:wxConfig_GetNextEntry",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetNextEntry. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+    _result = (PyObject *)wxConfig_GetNextEntry(_arg0,_arg1);
+{
+  _resultobj = _result;
+}
+    return _resultobj;
+}
+
+#define wxConfig_GetNumberOfEntries(_swigobj,_swigarg0)  (_swigobj->GetNumberOfEntries(_swigarg0))
+static PyObject *_wrap_wxConfig_GetNumberOfEntries(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxConfig * _arg0;
+    bool  _arg1 = FALSE;
+    char * _argc0 = 0;
+    int tempbool1;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s|i:wxConfig_GetNumberOfEntries",&_argc0,&tempbool1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetNumberOfEntries. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+    _result = (int )wxConfig_GetNumberOfEntries(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxConfig_GetNumberOfGroups(_swigobj,_swigarg0)  (_swigobj->GetNumberOfGroups(_swigarg0))
+static PyObject *_wrap_wxConfig_GetNumberOfGroups(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxConfig * _arg0;
+    bool  _arg1 = FALSE;
+    char * _argc0 = 0;
+    int tempbool1;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s|i:wxConfig_GetNumberOfGroups",&_argc0,&tempbool1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetNumberOfGroups. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+    _result = (int )wxConfig_GetNumberOfGroups(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxConfig_GetPath(_swigobj)  (_swigobj->GetPath())
+static PyObject *_wrap_wxConfig_GetPath(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxString * _result;
+    wxConfig * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxConfig_GetPath",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetPath. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+    _result = new wxString (wxConfig_GetPath(_arg0));
+{
+    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
+}
+{
+    delete _result;
+}
+    return _resultobj;
+}
+
+#define wxConfig_GetVendorName(_swigobj)  (_swigobj->GetVendorName())
+static PyObject *_wrap_wxConfig_GetVendorName(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxString * _result;
+    wxConfig * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxConfig_GetVendorName",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_GetVendorName. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+    _result = new wxString (wxConfig_GetVendorName(_arg0));
+{
+    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
+}
+{
+    delete _result;
+}
+    return _resultobj;
+}
+
+#define wxConfig_HasEntry(_swigobj,_swigarg0)  (_swigobj->HasEntry(_swigarg0))
+static PyObject *_wrap_wxConfig_HasEntry(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxConfig * _arg0;
+    wxString * _arg1;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sO:wxConfig_HasEntry",&_argc0,&_obj1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_HasEntry. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    _result = (bool )wxConfig_HasEntry(_arg0,*_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+#define wxConfig_HasGroup(_swigobj,_swigarg0)  (_swigobj->HasGroup(_swigarg0))
+static PyObject *_wrap_wxConfig_HasGroup(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxConfig * _arg0;
+    wxString * _arg1;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sO:wxConfig_HasGroup",&_argc0,&_obj1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_HasGroup. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    _result = (bool )wxConfig_HasGroup(_arg0,*_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+#define wxConfig_IsExpandingEnvVars(_swigobj)  (_swigobj->IsExpandingEnvVars())
+static PyObject *_wrap_wxConfig_IsExpandingEnvVars(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxConfig * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxConfig_IsExpandingEnvVars",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_IsExpandingEnvVars. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxConfig_IsExpandingEnvVars(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxConfig_IsRecordingDefaults(_swigobj)  (_swigobj->IsRecordingDefaults())
+static PyObject *_wrap_wxConfig_IsRecordingDefaults(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxConfig * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxConfig_IsRecordingDefaults",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_IsRecordingDefaults. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxConfig_IsRecordingDefaults(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxConfig_Read(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Read(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxConfig_Read(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxString * _result;
+    wxConfig * _arg0;
+    wxString * _arg1;
+    wxString * _arg2 = &wxPyEmptyStr;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+    PyObject * _obj2 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sO|O:wxConfig_Read",&_argc0,&_obj1,&_obj2)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_Read. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    if (_obj2)
+{
+    if (!PyString_Check(_obj2)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg2 = new wxString(PyString_AsString(_obj2));
+}
+    _result = new wxString (wxConfig_Read(_arg0,*_arg1,*_arg2));
+{
+    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
+}
+{
+    if (_obj1)
+        delete _arg1;
+}
+{
+    if (_obj2)
+        delete _arg2;
+}
+{
+    delete _result;
+}
+    return _resultobj;
+}
+
+#define wxConfig_ReadInt(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Read(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxConfig_ReadInt(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxConfig * _arg0;
+    wxString * _arg1;
+    long  _arg2 = 0;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sO|l:wxConfig_ReadInt",&_argc0,&_obj1,&_arg2)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_ReadInt. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    _result = (long )wxConfig_ReadInt(_arg0,*_arg1,_arg2);
+    _resultobj = Py_BuildValue("l",_result);
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+#define wxConfig_ReadFloat(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Read(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxConfig_ReadFloat(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    double  _result;
+    wxConfig * _arg0;
+    wxString * _arg1;
+    double  _arg2 = 0.0;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sO|d:wxConfig_ReadFloat",&_argc0,&_obj1,&_arg2)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_ReadFloat. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    _result = (double )wxConfig_ReadFloat(_arg0,*_arg1,_arg2);
+    _resultobj = Py_BuildValue("d",_result);
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+#define wxConfig_SetAppName(_swigobj,_swigarg0)  (_swigobj->SetAppName(_swigarg0))
+static PyObject *_wrap_wxConfig_SetAppName(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxConfig * _arg0;
+    wxString * _arg1;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sO:wxConfig_SetAppName",&_argc0,&_obj1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_SetAppName. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    wxConfig_SetAppName(_arg0,*_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+#define wxConfig_SetExpandEnvVars(_swigobj,_swigarg0)  (_swigobj->SetExpandEnvVars(_swigarg0))
+static PyObject *_wrap_wxConfig_SetExpandEnvVars(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxConfig * _arg0;
+    bool  _arg1 = TRUE;
+    char * _argc0 = 0;
+    int tempbool1;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s|i:wxConfig_SetExpandEnvVars",&_argc0,&tempbool1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_SetExpandEnvVars. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+    wxConfig_SetExpandEnvVars(_arg0,_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxConfig_SetPath(_swigobj,_swigarg0)  (_swigobj->SetPath(_swigarg0))
+static PyObject *_wrap_wxConfig_SetPath(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxConfig * _arg0;
+    wxString * _arg1;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sO:wxConfig_SetPath",&_argc0,&_obj1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_SetPath. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    wxConfig_SetPath(_arg0,*_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+#define wxConfig_SetRecordDefaults(_swigobj,_swigarg0)  (_swigobj->SetRecordDefaults(_swigarg0))
+static PyObject *_wrap_wxConfig_SetRecordDefaults(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxConfig * _arg0;
+    bool  _arg1 = TRUE;
+    char * _argc0 = 0;
+    int tempbool1;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s|i:wxConfig_SetRecordDefaults",&_argc0,&tempbool1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_SetRecordDefaults. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+    wxConfig_SetRecordDefaults(_arg0,_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxConfig_SetVendorName(_swigobj,_swigarg0)  (_swigobj->SetVendorName(_swigarg0))
+static PyObject *_wrap_wxConfig_SetVendorName(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxConfig * _arg0;
+    wxString * _arg1;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sO:wxConfig_SetVendorName",&_argc0,&_obj1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_SetVendorName. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    wxConfig_SetVendorName(_arg0,*_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+#define wxConfig_Write(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Write(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxConfig_Write(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxConfig * _arg0;
+    wxString * _arg1;
+    wxString * _arg2;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+    PyObject * _obj2 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sOO:wxConfig_Write",&_argc0,&_obj1,&_obj2)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_Write. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+{
+    if (!PyString_Check(_obj2)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg2 = new wxString(PyString_AsString(_obj2));
+}
+    _result = (bool )wxConfig_Write(_arg0,*_arg1,*_arg2);
+    _resultobj = Py_BuildValue("i",_result);
+{
+    if (_obj1)
+        delete _arg1;
+}
+{
+    if (_obj2)
+        delete _arg2;
+}
+    return _resultobj;
+}
+
+#define wxConfig_WriteInt(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Write(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxConfig_WriteInt(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxConfig * _arg0;
+    wxString * _arg1;
+    long  _arg2;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sOl:wxConfig_WriteInt",&_argc0,&_obj1,&_arg2)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_WriteInt. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    _result = (bool )wxConfig_WriteInt(_arg0,*_arg1,_arg2);
+    _resultobj = Py_BuildValue("i",_result);
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+#define wxConfig_WriteFloat(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Write(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxConfig_WriteFloat(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxConfig * _arg0;
+    wxString * _arg1;
+    double  _arg2;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sOd:wxConfig_WriteFloat",&_argc0,&_obj1,&_arg2)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_WriteFloat. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    _result = (bool )wxConfig_WriteFloat(_arg0,*_arg1,_arg2);
+    _resultobj = Py_BuildValue("i",_result);
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+static PyMethodDef utilscMethods[] = {
+        { "wxConfig_WriteFloat", _wrap_wxConfig_WriteFloat, 1 },
+        { "wxConfig_WriteInt", _wrap_wxConfig_WriteInt, 1 },
+        { "wxConfig_Write", _wrap_wxConfig_Write, 1 },
+        { "wxConfig_SetVendorName", _wrap_wxConfig_SetVendorName, 1 },
+        { "wxConfig_SetRecordDefaults", _wrap_wxConfig_SetRecordDefaults, 1 },
+        { "wxConfig_SetPath", _wrap_wxConfig_SetPath, 1 },
+        { "wxConfig_SetExpandEnvVars", _wrap_wxConfig_SetExpandEnvVars, 1 },
+        { "wxConfig_SetAppName", _wrap_wxConfig_SetAppName, 1 },
+        { "wxConfig_ReadFloat", _wrap_wxConfig_ReadFloat, 1 },
+        { "wxConfig_ReadInt", _wrap_wxConfig_ReadInt, 1 },
+        { "wxConfig_Read", _wrap_wxConfig_Read, 1 },
+        { "wxConfig_IsRecordingDefaults", _wrap_wxConfig_IsRecordingDefaults, 1 },
+        { "wxConfig_IsExpandingEnvVars", _wrap_wxConfig_IsExpandingEnvVars, 1 },
+        { "wxConfig_HasGroup", _wrap_wxConfig_HasGroup, 1 },
+        { "wxConfig_HasEntry", _wrap_wxConfig_HasEntry, 1 },
+        { "wxConfig_GetVendorName", _wrap_wxConfig_GetVendorName, 1 },
+        { "wxConfig_GetPath", _wrap_wxConfig_GetPath, 1 },
+        { "wxConfig_GetNumberOfGroups", _wrap_wxConfig_GetNumberOfGroups, 1 },
+        { "wxConfig_GetNumberOfEntries", _wrap_wxConfig_GetNumberOfEntries, 1 },
+        { "wxConfig_GetNextEntry", _wrap_wxConfig_GetNextEntry, 1 },
+        { "wxConfig_GetNextGroup", _wrap_wxConfig_GetNextGroup, 1 },
+        { "wxConfig_GetFirstEntry", _wrap_wxConfig_GetFirstEntry, 1 },
+        { "wxConfig_GetFirstGroup", _wrap_wxConfig_GetFirstGroup, 1 },
+        { "wxConfig_GetAppName", _wrap_wxConfig_GetAppName, 1 },
+        { "wxConfig_Flush", _wrap_wxConfig_Flush, 1 },
+        { "wxConfig_Exists", _wrap_wxConfig_Exists, 1 },
+        { "wxConfig_DeleteGroup", _wrap_wxConfig_DeleteGroup, 1 },
+        { "wxConfig_DeleteEntry", _wrap_wxConfig_DeleteEntry, 1 },
+        { "wxConfig_DontCreateOnDemand", _wrap_wxConfig_DontCreateOnDemand, 1 },
+        { "delete_wxConfig", _wrap_delete_wxConfig, 1 },
+        { "new_wxConfig", _wrap_new_wxConfig, 1 },
+        { NULL, NULL }
+};
+static PyObject *SWIG_globals;
+#ifdef __cplusplus
+extern "C" 
+#endif
+SWIGEXPORT(void,initutilsc)() {
+        PyObject *m, *d;
+        SWIG_globals = SWIG_newvarlink();
+        m = Py_InitModule("utilsc", utilscMethods);
+        d = PyModule_GetDict(m);
+/*
+ * These are the pointer type-equivalency mappings. 
+ * (Used by the SWIG pointer type-checker).
+ */
+        SWIG_RegisterMapping("_signed_long","_long",0);
+        SWIG_RegisterMapping("_long","_unsigned_long",0);
+        SWIG_RegisterMapping("_long","_signed_long",0);
+        SWIG_RegisterMapping("_wxConfig","_class_wxConfig",0);
+        SWIG_RegisterMapping("_unsigned_long","_long",0);
+        SWIG_RegisterMapping("_signed_int","_int",0);
+        SWIG_RegisterMapping("_unsigned_short","_short",0);
+        SWIG_RegisterMapping("_signed_short","_short",0);
+        SWIG_RegisterMapping("_unsigned_int","_int",0);
+        SWIG_RegisterMapping("_short","_unsigned_short",0);
+        SWIG_RegisterMapping("_short","_signed_short",0);
+        SWIG_RegisterMapping("_int","_unsigned_int",0);
+        SWIG_RegisterMapping("_int","_signed_int",0);
+        SWIG_RegisterMapping("_class_wxConfig","_wxConfig",0);
+}
diff --git a/utils/wxPython/src/gtk/utils.py b/utils/wxPython/src/gtk/utils.py
new file mode 100644 (file)
index 0000000..3128077
--- /dev/null
@@ -0,0 +1,114 @@
+# This file was created automatically by SWIG.
+import utilsc
+class wxConfigPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self):
+        if self.thisown == 1 :
+            utilsc.delete_wxConfig(self.this)
+    def DontCreateOnDemand(self):
+        val = utilsc.wxConfig_DontCreateOnDemand(self.this)
+        return val
+    def DeleteEntry(self,arg0,*args):
+        val = apply(utilsc.wxConfig_DeleteEntry,(self.this,arg0,)+args)
+        return val
+    def DeleteGroup(self,arg0):
+        val = utilsc.wxConfig_DeleteGroup(self.this,arg0)
+        return val
+    def Exists(self,arg0):
+        val = utilsc.wxConfig_Exists(self.this,arg0)
+        return val
+    def Flush(self,*args):
+        val = apply(utilsc.wxConfig_Flush,(self.this,)+args)
+        return val
+    def GetAppName(self):
+        val = utilsc.wxConfig_GetAppName(self.this)
+        return val
+    def GetFirstGroup(self):
+        val = utilsc.wxConfig_GetFirstGroup(self.this)
+        return val
+    def GetFirstEntry(self):
+        val = utilsc.wxConfig_GetFirstEntry(self.this)
+        return val
+    def GetNextGroup(self,arg0):
+        val = utilsc.wxConfig_GetNextGroup(self.this,arg0)
+        return val
+    def GetNextEntry(self,arg0):
+        val = utilsc.wxConfig_GetNextEntry(self.this,arg0)
+        return val
+    def GetNumberOfEntries(self,*args):
+        val = apply(utilsc.wxConfig_GetNumberOfEntries,(self.this,)+args)
+        return val
+    def GetNumberOfGroups(self,*args):
+        val = apply(utilsc.wxConfig_GetNumberOfGroups,(self.this,)+args)
+        return val
+    def GetPath(self):
+        val = utilsc.wxConfig_GetPath(self.this)
+        return val
+    def GetVendorName(self):
+        val = utilsc.wxConfig_GetVendorName(self.this)
+        return val
+    def HasEntry(self,arg0):
+        val = utilsc.wxConfig_HasEntry(self.this,arg0)
+        return val
+    def HasGroup(self,arg0):
+        val = utilsc.wxConfig_HasGroup(self.this,arg0)
+        return val
+    def IsExpandingEnvVars(self):
+        val = utilsc.wxConfig_IsExpandingEnvVars(self.this)
+        return val
+    def IsRecordingDefaults(self):
+        val = utilsc.wxConfig_IsRecordingDefaults(self.this)
+        return val
+    def Read(self,arg0,*args):
+        val = apply(utilsc.wxConfig_Read,(self.this,arg0,)+args)
+        return val
+    def ReadInt(self,arg0,*args):
+        val = apply(utilsc.wxConfig_ReadInt,(self.this,arg0,)+args)
+        return val
+    def ReadFloat(self,arg0,*args):
+        val = apply(utilsc.wxConfig_ReadFloat,(self.this,arg0,)+args)
+        return val
+    def SetAppName(self,arg0):
+        val = utilsc.wxConfig_SetAppName(self.this,arg0)
+        return val
+    def SetExpandEnvVars(self,*args):
+        val = apply(utilsc.wxConfig_SetExpandEnvVars,(self.this,)+args)
+        return val
+    def SetPath(self,arg0):
+        val = utilsc.wxConfig_SetPath(self.this,arg0)
+        return val
+    def SetRecordDefaults(self,*args):
+        val = apply(utilsc.wxConfig_SetRecordDefaults,(self.this,)+args)
+        return val
+    def SetVendorName(self,arg0):
+        val = utilsc.wxConfig_SetVendorName(self.this,arg0)
+        return val
+    def Write(self,arg0,arg1):
+        val = utilsc.wxConfig_Write(self.this,arg0,arg1)
+        return val
+    def WriteInt(self,arg0,arg1):
+        val = utilsc.wxConfig_WriteInt(self.this,arg0,arg1)
+        return val
+    def WriteFloat(self,arg0,arg1):
+        val = utilsc.wxConfig_WriteFloat(self.this,arg0,arg1)
+        return val
+    def __repr__(self):
+        return "<C wxConfig instance>"
+class wxConfig(wxConfigPtr):
+    def __init__(self,*args) :
+        self.this = apply(utilsc.new_wxConfig,()+args)
+        self.thisown = 1
+
+
+
+
+
+
+#-------------- FUNCTION WRAPPERS ------------------
+
+
+
+#-------------- VARIABLE WRAPPERS ------------------
+
index ee3cf8f12ddc37b621ca90a6e05ab0501bbc4175..756fb28147548d82dcd3054886375354068ad2e6 100644 (file)
@@ -112,6 +112,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
+extern byte* byte_LIST_helper(PyObject* source);
 extern int* int_LIST_helper(PyObject* source);
 extern long* long_LIST_helper(PyObject* source);
 extern char** string_LIST_helper(PyObject* source);
@@ -551,8 +552,8 @@ static PyObject *_wrap_wxWindow_GetCharWidth(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxWindow_GetClientSize(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetClientSize(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_GetClientSize(PyObject *self, PyObject *args) {
+#define wxWindow_GetClientSizeTuple(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetClientSize(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxWindow_GetClientSizeTuple(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int * _arg1;
@@ -568,15 +569,15 @@ static PyObject *_wrap_wxWindow_GetClientSize(PyObject *self, PyObject *args) {
 {
   _arg2 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetClientSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxWindow_GetClientSizeTuple",&_argc0)) 
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetClientSize. Expected _wxWindow_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetClientSizeTuple. Expected _wxWindow_p.");
         return NULL;
         }
     }
-    wxWindow_GetClientSize(_arg0,_arg1,_arg2);
+    wxWindow_GetClientSizeTuple(_arg0,_arg1,_arg2);
     Py_INCREF(Py_None);
     _resultobj = Py_None;
 {
@@ -592,6 +593,33 @@ static PyObject *_wrap_wxWindow_GetClientSize(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+static wxSize  wxWindow_GetClientSize(wxWindow *self) {
+            int w, h;
+            self->GetClientSize(&w, &h);
+            return wxSize(w, h);
+        }
+static PyObject *_wrap_wxWindow_GetClientSize(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxSize * _result;
+    wxWindow * _arg0;
+    char * _argc0 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxWindow_GetClientSize",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetClientSize. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    _result = new wxSize (wxWindow_GetClientSize(_arg0));
+    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
 #define wxWindow_GetConstraints(_swigobj)  (_swigobj->GetConstraints())
 static PyObject *_wrap_wxWindow_GetConstraints(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -632,8 +660,8 @@ static PyObject *_wrap_wxWindow_GetFont(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = (wxFont *)wxWindow_GetFont(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
+    _result = new wxFont (wxWindow_GetFont(_arg0));
+    SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -705,47 +733,6 @@ static PyObject *_wrap_wxWindow_GetId(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxWindow_GetPosition(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetPosition(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_GetPosition(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxWindow * _arg0;
-    int * _arg1;
-    int  temp;
-    int * _arg2;
-    int  temp0;
-    char * _argc0 = 0;
-
-    self = self;
-{
-  _arg1 = &temp;
-}
-{
-  _arg2 = &temp0;
-}
-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetPosition",&_argc0)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetPosition. Expected _wxWindow_p.");
-        return NULL;
-        }
-    }
-    wxWindow_GetPosition(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-{
-    PyObject *o;
-    o = PyInt_FromLong((long) (*_arg1));
-    _resultobj = t_output_helper(_resultobj, o);
-}
-{
-    PyObject *o;
-    o = PyInt_FromLong((long) (*_arg2));
-    _resultobj = t_output_helper(_resultobj, o);
-}
-    return _resultobj;
-}
-
 #define wxWindow_GetLabel(_swigobj)  (_swigobj->GetLabel())
 static PyObject *_wrap_wxWindow_GetLabel(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -821,6 +808,47 @@ static PyObject *_wrap_wxWindow_GetParent(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define wxWindow_GetPositionTuple(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetPosition(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxWindow_GetPositionTuple(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    int * _arg1;
+    int  temp;
+    int * _arg2;
+    int  temp0;
+    char * _argc0 = 0;
+
+    self = self;
+{
+  _arg1 = &temp;
+}
+{
+  _arg2 = &temp0;
+}
+    if(!PyArg_ParseTuple(args,"s:wxWindow_GetPositionTuple",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetPositionTuple. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    wxWindow_GetPositionTuple(_arg0,_arg1,_arg2);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+{
+    PyObject *o;
+    o = PyInt_FromLong((long) (*_arg1));
+    _resultobj = t_output_helper(_resultobj, o);
+}
+{
+    PyObject *o;
+    o = PyInt_FromLong((long) (*_arg2));
+    _resultobj = t_output_helper(_resultobj, o);
+}
+    return _resultobj;
+}
+
 #define wxWindow_GetReturnCode(_swigobj)  (_swigobj->GetReturnCode())
 static PyObject *_wrap_wxWindow_GetReturnCode(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -908,8 +936,8 @@ static PyObject *_wrap_wxWindow_GetScrollRange(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxWindow_GetSize(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetSize(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_GetSize(PyObject *self, PyObject *args) {
+#define wxWindow_GetSizeTuple(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetSize(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxWindow_GetSizeTuple(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int * _arg1;
@@ -925,15 +953,15 @@ static PyObject *_wrap_wxWindow_GetSize(PyObject *self, PyObject *args) {
 {
   _arg2 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"s:wxWindow_GetSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxWindow_GetSizeTuple",&_argc0)) 
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetSize. Expected _wxWindow_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetSizeTuple. Expected _wxWindow_p.");
         return NULL;
         }
     }
-    wxWindow_GetSize(_arg0,_arg1,_arg2);
+    wxWindow_GetSizeTuple(_arg0,_arg1,_arg2);
     Py_INCREF(Py_None);
     _resultobj = Py_None;
 {
@@ -1454,6 +1482,35 @@ static PyObject *_wrap_wxWindow_ScrollWindow(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define wxWindow_SetAcceleratorTable(_swigobj,_swigarg0)  (_swigobj->SetAcceleratorTable(_swigarg0))
+static PyObject *_wrap_wxWindow_SetAcceleratorTable(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    wxAcceleratorTable * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetAcceleratorTable",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetAcceleratorTable. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxAcceleratorTable_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetAcceleratorTable. Expected _wxAcceleratorTable_p.");
+        return NULL;
+        }
+    }
+    wxWindow_SetAcceleratorTable(_arg0,*_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 #define wxWindow_SetAutoLayout(_swigobj,_swigarg0)  (_swigobj->SetAutoLayout(_swigarg0))
 static PyObject *_wrap_wxWindow_SetAutoLayout(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -2059,6 +2116,130 @@ static PyObject *_wrap_wxWindow_Validate(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define wxWindow_ConvertDialogPointToPixels(_swigobj,_swigarg0)  (_swigobj->ConvertDialogToPixels(_swigarg0))
+static PyObject *_wrap_wxWindow_ConvertDialogPointToPixels(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxPoint * _result;
+    wxWindow * _arg0;
+    wxPoint * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxWindow_ConvertDialogPointToPixels",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertDialogPointToPixels. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertDialogPointToPixels. Expected _wxPoint_p.");
+        return NULL;
+        }
+    }
+    _result = new wxPoint (wxWindow_ConvertDialogPointToPixels(_arg0,*_arg1));
+    SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxWindow_ConvertDialogSizeToPixels(_swigobj,_swigarg0)  (_swigobj->ConvertDialogToPixels(_swigarg0))
+static PyObject *_wrap_wxWindow_ConvertDialogSizeToPixels(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxSize * _result;
+    wxWindow * _arg0;
+    wxSize * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxWindow_ConvertDialogSizeToPixels",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertDialogSizeToPixels. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertDialogSizeToPixels. Expected _wxSize_p.");
+        return NULL;
+        }
+    }
+    _result = new wxSize (wxWindow_ConvertDialogSizeToPixels(_arg0,*_arg1));
+    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxWindow_ConvertPixelPointToDialog(_swigobj,_swigarg0)  (_swigobj->ConvertPixelsToDialog(_swigarg0))
+static PyObject *_wrap_wxWindow_ConvertPixelPointToDialog(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxPoint * _result;
+    wxWindow * _arg0;
+    wxPoint * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxWindow_ConvertPixelPointToDialog",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertPixelPointToDialog. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertPixelPointToDialog. Expected _wxPoint_p.");
+        return NULL;
+        }
+    }
+    _result = new wxPoint (wxWindow_ConvertPixelPointToDialog(_arg0,*_arg1));
+    SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxWindow_ConvertPixelSizeToDialog(_swigobj,_swigarg0)  (_swigobj->ConvertPixelsToDialog(_swigarg0))
+static PyObject *_wrap_wxWindow_ConvertPixelSizeToDialog(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxSize * _result;
+    wxWindow * _arg0;
+    wxSize * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxWindow_ConvertPixelSizeToDialog",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertPixelSizeToDialog. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertPixelSizeToDialog. Expected _wxSize_p.");
+        return NULL;
+        }
+    }
+    _result = new wxSize (wxWindow_ConvertPixelSizeToDialog(_arg0,*_arg1));
+    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
 static void *SwigwxPanelTowxWindow(void *ptr) {
     wxPanel *src;
     wxWindow *dest;
@@ -3867,6 +4048,10 @@ static PyMethodDef windowscMethods[] = {
         { "new_wxDialog", _wrap_new_wxDialog, 1 },
         { "wxPanel_InitDialog", _wrap_wxPanel_InitDialog, 1 },
         { "new_wxPanel", _wrap_new_wxPanel, 1 },
+        { "wxWindow_ConvertPixelSizeToDialog", _wrap_wxWindow_ConvertPixelSizeToDialog, 1 },
+        { "wxWindow_ConvertPixelPointToDialog", _wrap_wxWindow_ConvertPixelPointToDialog, 1 },
+        { "wxWindow_ConvertDialogSizeToPixels", _wrap_wxWindow_ConvertDialogSizeToPixels, 1 },
+        { "wxWindow_ConvertDialogPointToPixels", _wrap_wxWindow_ConvertDialogPointToPixels, 1 },
         { "wxWindow_Validate", _wrap_wxWindow_Validate, 1 },
         { "wxWindow_TransferDataToWindow", _wrap_wxWindow_TransferDataToWindow, 1 },
         { "wxWindow_TransferDataFromWindow", _wrap_wxWindow_TransferDataFromWindow, 1 },
@@ -3890,6 +4075,7 @@ static PyMethodDef windowscMethods[] = {
         { "wxWindow_SetConstraints", _wrap_wxWindow_SetConstraints, 1 },
         { "wxWindow_SetBackgroundColour", _wrap_wxWindow_SetBackgroundColour, 1 },
         { "wxWindow_SetAutoLayout", _wrap_wxWindow_SetAutoLayout, 1 },
+        { "wxWindow_SetAcceleratorTable", _wrap_wxWindow_SetAcceleratorTable, 1 },
         { "wxWindow_ScrollWindow", _wrap_wxWindow_ScrollWindow, 1 },
         { "wxWindow_ScreenToClient", _wrap_wxWindow_ScreenToClient, 1 },
         { "wxWindow_ReleaseMouse", _wrap_wxWindow_ReleaseMouse, 1 },
@@ -3908,21 +4094,22 @@ static PyMethodDef windowscMethods[] = {
         { "wxWindow_GetWindowStyleFlag", _wrap_wxWindow_GetWindowStyleFlag, 1 },
         { "wxWindow_GetTitle", _wrap_wxWindow_GetTitle, 1 },
         { "wxWindow_GetTextExtent", _wrap_wxWindow_GetTextExtent, 1 },
-        { "wxWindow_GetSize", _wrap_wxWindow_GetSize, 1 },
+        { "wxWindow_GetSizeTuple", _wrap_wxWindow_GetSizeTuple, 1 },
         { "wxWindow_GetScrollRange", _wrap_wxWindow_GetScrollRange, 1 },
         { "wxWindow_GetScrollPos", _wrap_wxWindow_GetScrollPos, 1 },
         { "wxWindow_GetScrollThumb", _wrap_wxWindow_GetScrollThumb, 1 },
         { "wxWindow_GetReturnCode", _wrap_wxWindow_GetReturnCode, 1 },
+        { "wxWindow_GetPositionTuple", _wrap_wxWindow_GetPositionTuple, 1 },
         { "wxWindow_GetParent", _wrap_wxWindow_GetParent, 1 },
         { "wxWindow_GetName", _wrap_wxWindow_GetName, 1 },
         { "wxWindow_GetLabel", _wrap_wxWindow_GetLabel, 1 },
-        { "wxWindow_GetPosition", _wrap_wxWindow_GetPosition, 1 },
         { "wxWindow_GetId", _wrap_wxWindow_GetId, 1 },
         { "wxWindow_GetGrandParent", _wrap_wxWindow_GetGrandParent, 1 },
         { "wxWindow_GetForegroundColour", _wrap_wxWindow_GetForegroundColour, 1 },
         { "wxWindow_GetFont", _wrap_wxWindow_GetFont, 1 },
         { "wxWindow_GetConstraints", _wrap_wxWindow_GetConstraints, 1 },
         { "wxWindow_GetClientSize", _wrap_wxWindow_GetClientSize, 1 },
+        { "wxWindow_GetClientSizeTuple", _wrap_wxWindow_GetClientSizeTuple, 1 },
         { "wxWindow_GetCharWidth", _wrap_wxWindow_GetCharWidth, 1 },
         { "wxWindow_GetCharHeight", _wrap_wxWindow_GetCharHeight, 1 },
         { "wxWindow_GetBackgroundColour", _wrap_wxWindow_GetBackgroundColour, 1 },
@@ -3956,6 +4143,7 @@ SWIGEXPORT(void,initwindowsc)() {
  */
         SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_signed_long","_long",0);
+        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
         SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
         SWIG_RegisterMapping("_class_wxEvtHandler","_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
@@ -4004,6 +4192,7 @@ SWIGEXPORT(void,initwindowsc)() {
         SWIG_RegisterMapping("_EBool","_signed_int",0);
         SWIG_RegisterMapping("_EBool","_int",0);
         SWIG_RegisterMapping("_EBool","_wxWindowID",0);
+        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
         SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
         SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
         SWIG_RegisterMapping("_unsigned_long","_long",0);
@@ -4072,11 +4261,14 @@ SWIGEXPORT(void,initwindowsc)() {
         SWIG_RegisterMapping("_int","_unsigned_int",0);
         SWIG_RegisterMapping("_int","_signed_int",0);
         SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
+        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
         SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
         SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
         SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
         SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
+        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
+        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
         SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
         SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
         SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
@@ -4101,6 +4293,7 @@ SWIGEXPORT(void,initwindowsc)() {
         SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
         SWIG_RegisterMapping("_wxDash","_long",0);
         SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
+        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
         SWIG_RegisterMapping("_wxWindow","_class_wxScrolledWindow",SwigwxScrolledWindowTowxWindow);
         SWIG_RegisterMapping("_wxWindow","_wxScrolledWindow",SwigwxScrolledWindowTowxWindow);
         SWIG_RegisterMapping("_wxWindow","_class_wxDialog",SwigwxDialogTowxWindow);
index b05195b3d554b5f065dd2a36acdc030ccc964056..835c542d4f4550e179101a2199aa9cb29fd024a1 100644 (file)
@@ -4,7 +4,14 @@ import windowsc
 from misc import *
 
 from gdi import *
-import wxp
+import wx
+
+def wxDLG_PNT(win, point):
+    return win.ConvertDialogPointToPixels(point)
+
+def wxDLG_SZE(win, size):
+    return win.ConvertDialogPointToPixels(size)
+
 class wxEvtHandlerPtr :
     def __init__(self,this):
         self.this = this
@@ -71,8 +78,13 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def GetCharWidth(self):
         val = windowsc.wxWindow_GetCharWidth(self.this)
         return val
+    def GetClientSizeTuple(self):
+        val = windowsc.wxWindow_GetClientSizeTuple(self.this)
+        return val
     def GetClientSize(self):
         val = windowsc.wxWindow_GetClientSize(self.this)
+        val = wxSizePtr(val)
+        val.thisown = 1
         return val
     def GetConstraints(self):
         val = windowsc.wxWindow_GetConstraints(self.this)
@@ -81,6 +93,7 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def GetFont(self):
         val = windowsc.wxWindow_GetFont(self.this)
         val = wxFontPtr(val)
+        val.thisown = 1
         return val
     def GetForegroundColour(self):
         val = windowsc.wxWindow_GetForegroundColour(self.this)
@@ -94,9 +107,6 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def GetId(self):
         val = windowsc.wxWindow_GetId(self.this)
         return val
-    def GetPosition(self):
-        val = windowsc.wxWindow_GetPosition(self.this)
-        return val
     def GetLabel(self):
         val = windowsc.wxWindow_GetLabel(self.this)
         return val
@@ -107,6 +117,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
         val = windowsc.wxWindow_GetParent(self.this)
         val = wxWindowPtr(val)
         return val
+    def GetPositionTuple(self):
+        val = windowsc.wxWindow_GetPositionTuple(self.this)
+        return val
     def GetReturnCode(self):
         val = windowsc.wxWindow_GetReturnCode(self.this)
         return val
@@ -119,8 +132,8 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def GetScrollRange(self,arg0):
         val = windowsc.wxWindow_GetScrollRange(self.this,arg0)
         return val
-    def GetSize(self):
-        val = windowsc.wxWindow_GetSize(self.this)
+    def GetSizeTuple(self):
+        val = windowsc.wxWindow_GetSizeTuple(self.this)
         return val
     def GetTextExtent(self,arg0):
         val = windowsc.wxWindow_GetTextExtent(self.this,arg0)
@@ -184,6 +197,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
         args = tuple(argl)
         val = apply(windowsc.wxWindow_ScrollWindow,(self.this,arg0,arg1,)+args)
         return val
+    def SetAcceleratorTable(self,arg0):
+        val = windowsc.wxWindow_SetAcceleratorTable(self.this,arg0.this)
+        return val
     def SetAutoLayout(self,arg0):
         val = windowsc.wxWindow_SetAutoLayout(self.this,arg0)
         return val
@@ -253,6 +269,26 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def Validate(self):
         val = windowsc.wxWindow_Validate(self.this)
         return val
+    def ConvertDialogPointToPixels(self,arg0):
+        val = windowsc.wxWindow_ConvertDialogPointToPixels(self.this,arg0.this)
+        val = wxPointPtr(val)
+        val.thisown = 1
+        return val
+    def ConvertDialogSizeToPixels(self,arg0):
+        val = windowsc.wxWindow_ConvertDialogSizeToPixels(self.this,arg0.this)
+        val = wxSizePtr(val)
+        val.thisown = 1
+        return val
+    def ConvertPixelPointToDialog(self,arg0):
+        val = windowsc.wxWindow_ConvertPixelPointToDialog(self.this,arg0.this)
+        val = wxPointPtr(val)
+        val.thisown = 1
+        return val
+    def ConvertPixelSizeToDialog(self,arg0):
+        val = windowsc.wxWindow_ConvertPixelSizeToDialog(self.this,arg0.this)
+        val = wxSizePtr(val)
+        val.thisown = 1
+        return val
     def __repr__(self):
         return "<C wxWindow instance>"
 class wxWindow(wxWindowPtr):
@@ -265,7 +301,7 @@ class wxWindow(wxWindowPtr):
         args = tuple(argl)
         self.this = apply(windowsc.new_wxWindow,(arg0.this,arg1,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -289,7 +325,7 @@ class wxPanel(wxPanelPtr):
         args = tuple(argl)
         self.this = apply(windowsc.new_wxPanel,(arg0.this,arg1,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -340,7 +376,7 @@ class wxDialog(wxDialogPtr):
         args = tuple(argl)
         self.this = apply(windowsc.new_wxDialog,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
-        wxp._StdDialogCallbacks(self)
+        wx._StdDialogCallbacks(self)
 
 
 
@@ -385,8 +421,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)
+        wx._StdWindowCallbacks(self)
+        wx._StdOnScrollCallbacks(self)
 
 
 
index a7e72d2212d203a064d6e0ea954975b5b1d9edb9..62c8b46bf4243498abf7e3f8e9e84eefa982cec3 100644 (file)
@@ -57,6 +57,9 @@ extern PyObject *SWIG_newvarlink(void);
 #include <wx/grid.h>
 #include <wx/notebook.h>
 #include <wx/splitter.h>
+#ifdef __WXMSW__
+#include <wx/msw/taskbar.h>
+#endif
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
@@ -106,6 +109,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
+extern byte* byte_LIST_helper(PyObject* source);
 extern int* int_LIST_helper(PyObject* source);
 extern long* long_LIST_helper(PyObject* source);
 extern char** string_LIST_helper(PyObject* source);
@@ -116,6 +120,42 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";
+#define new_wxGridCell() (new wxGridCell())
+static PyObject *_wrap_new_wxGridCell(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxGridCell * _result;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,":new_wxGridCell")) 
+        return NULL;
+    _result = (wxGridCell *)new_wxGridCell();
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCell_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define delete_wxGridCell(_swigobj) (delete _swigobj)
+static PyObject *_wrap_delete_wxGridCell(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxGridCell * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:delete_wxGridCell",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridCell_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxGridCell. Expected _wxGridCell_p.");
+        return NULL;
+        }
+    }
+    delete_wxGridCell(_arg0);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 #define wxGridCell_GetTextValue(_swigobj)  (_swigobj->GetTextValue())
 static PyObject *_wrap_wxGridCell_GetTextValue(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -191,7 +231,8 @@ static PyObject *_wrap_wxGridCell_GetFont(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = (wxFont *)wxGridCell_GetFont(_arg0);
+    wxFont & _result_ref = wxGridCell_GetFont(_arg0);
+    _result = (wxFont *) &_result_ref;
     SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
@@ -220,7 +261,7 @@ static PyObject *_wrap_wxGridCell_SetFont(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    wxGridCell_SetFont(_arg0,_arg1);
+    wxGridCell_SetFont(_arg0,*_arg1);
     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
@@ -349,7 +390,8 @@ static PyObject *_wrap_wxGridCell_GetBackgroundBrush(PyObject *self, PyObject *a
         return NULL;
         }
     }
-    _result = (wxBrush *)wxGridCell_GetBackgroundBrush(_arg0);
+    wxBrush & _result_ref = wxGridCell_GetBackgroundBrush(_arg0);
+    _result = (wxBrush *) &_result_ref;
     SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
@@ -982,7 +1024,8 @@ static PyObject *_wrap_wxGrid_GetCellTextFont(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = (wxFont *)wxGrid_GetCellTextFont(_arg0,_arg1,_arg2);
+    wxFont & _result_ref = wxGrid_GetCellTextFont(_arg0,_arg1,_arg2);
+    _result = (wxFont *) &_result_ref;
     SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
@@ -1005,7 +1048,8 @@ static PyObject *_wrap_wxGrid_GetDefCellTextFont(PyObject *self, PyObject *args)
         return NULL;
         }
     }
-    _result = (wxFont *)wxGrid_GetDefCellTextFont(_arg0);
+    wxFont & _result_ref = wxGrid_GetDefCellTextFont(_arg0);
+    _result = (wxFont *) &_result_ref;
     SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
@@ -1299,7 +1343,8 @@ static PyObject *_wrap_wxGrid_GetLabelTextFont(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = (wxFont *)wxGrid_GetLabelTextFont(_arg0);
+    wxFont & _result_ref = wxGrid_GetLabelTextFont(_arg0);
+    _result = (wxFont *) &_result_ref;
     SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
@@ -1514,6 +1559,30 @@ static PyObject *_wrap_wxGrid_InsertRows(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define wxGrid_OnActivate(_swigobj,_swigarg0)  (_swigobj->OnActivate(_swigarg0))
+static PyObject *_wrap_wxGrid_OnActivate(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxGrid * _arg0;
+    bool  _arg1;
+    char * _argc0 = 0;
+    int tempbool1;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxGrid_OnActivate",&_argc0,&tempbool1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_OnActivate. Expected _wxGrid_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+    wxGrid_OnActivate(_arg0,_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 #define wxGrid_SetCellAlignment(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->SetCellAlignment(_swigarg0,_swigarg1,_swigarg2))
 static PyObject *_wrap_wxGrid_SetCellAlignment(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -1705,7 +1774,7 @@ static PyObject *_wrap_wxGrid_SetCellTextFont(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    wxGrid_SetCellTextFont(_arg0,_arg1,_arg2,_arg3);
+    wxGrid_SetCellTextFont(_arg0,*_arg1,_arg2,_arg3);
     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
@@ -1734,7 +1803,7 @@ static PyObject *_wrap_wxGrid_SetDefCellTextFont(PyObject *self, PyObject *args)
         return NULL;
         }
     }
-    wxGrid_SetDefCellTextFont(_arg0,_arg1);
+    wxGrid_SetDefCellTextFont(_arg0,*_arg1);
     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
@@ -1822,7 +1891,7 @@ static PyObject *_wrap_wxGrid_SetDividerPen(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    wxGrid_SetDividerPen(_arg0,_arg1);
+    wxGrid_SetDividerPen(_arg0,*_arg1);
     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
@@ -2002,7 +2071,7 @@ static PyObject *_wrap_wxGrid_SetLabelTextFont(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    wxGrid_SetLabelTextFont(_arg0,_arg1);
+    wxGrid_SetLabelTextFont(_arg0,*_arg1);
     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
@@ -2088,6 +2157,163 @@ static PyObject *_wrap_wxGrid_UpdateDimensions(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+static void *SwigwxGridEventTowxEvent(void *ptr) {
+    wxGridEvent *src;
+    wxEvent *dest;
+    src = (wxGridEvent *) ptr;
+    dest = (wxEvent *) src;
+    return (void *) dest;
+}
+
+#define wxGridEvent_m_row_get(_swigobj) ((int ) _swigobj->m_row)
+static PyObject *_wrap_wxGridEvent_m_row_get(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxGridEvent * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_row_get",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_row_get. Expected _wxGridEvent_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxGridEvent_m_row_get(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxGridEvent_m_col_get(_swigobj) ((int ) _swigobj->m_col)
+static PyObject *_wrap_wxGridEvent_m_col_get(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxGridEvent * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_col_get",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_col_get. Expected _wxGridEvent_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxGridEvent_m_col_get(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxGridEvent_m_x_get(_swigobj) ((int ) _swigobj->m_x)
+static PyObject *_wrap_wxGridEvent_m_x_get(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxGridEvent * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_x_get",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_x_get. Expected _wxGridEvent_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxGridEvent_m_x_get(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxGridEvent_m_y_get(_swigobj) ((int ) _swigobj->m_y)
+static PyObject *_wrap_wxGridEvent_m_y_get(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxGridEvent * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_y_get",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_y_get. Expected _wxGridEvent_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxGridEvent_m_y_get(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxGridEvent_m_control_get(_swigobj) ((bool ) _swigobj->m_control)
+static PyObject *_wrap_wxGridEvent_m_control_get(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxGridEvent * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_control_get",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_control_get. Expected _wxGridEvent_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxGridEvent_m_control_get(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxGridEvent_m_shift_get(_swigobj) ((bool ) _swigobj->m_shift)
+static PyObject *_wrap_wxGridEvent_m_shift_get(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxGridEvent * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_shift_get",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_shift_get. Expected _wxGridEvent_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxGridEvent_m_shift_get(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxGridEvent_m_cell_get(_swigobj) ((wxGridCell *) _swigobj->m_cell)
+static PyObject *_wrap_wxGridEvent_m_cell_get(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxGridCell * _result;
+    wxGridEvent * _arg0;
+    char * _argc0 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_cell_get",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_cell_get. Expected _wxGridEvent_p.");
+        return NULL;
+        }
+    }
+    _result = (wxGridCell *)wxGridEvent_m_cell_get(_arg0);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCell_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
 static void *SwigwxNotebookEventTowxCommandEvent(void *ptr) {
     wxNotebookEvent *src;
     wxCommandEvent *dest;
@@ -2617,7 +2843,7 @@ static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args) {
     wxWindowID  _arg1;
     wxPoint * _arg2 = &wxPyDefaultPosition;
     wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = (wxSP_3D);
+    long  _arg4 = (wxSP_3D)|wxCLIP_CHILDREN;
     char * _arg5 = "splitterWindow";
     char * _argc0 = 0;
     char * _argc2 = 0;
@@ -2651,6 +2877,27 @@ static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define wxSplitterWindow_GetBorderSize(_swigobj)  (_swigobj->GetBorderSize())
+static PyObject *_wrap_wxSplitterWindow_GetBorderSize(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxSplitterWindow * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxSplitterWindow_GetBorderSize",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetBorderSize. Expected _wxSplitterWindow_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxSplitterWindow_GetBorderSize(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
 #define wxSplitterWindow_GetMinimumPaneSize(_swigobj)  (_swigobj->GetMinimumPaneSize())
 static PyObject *_wrap_wxSplitterWindow_GetMinimumPaneSize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -2693,6 +2940,27 @@ static PyObject *_wrap_wxSplitterWindow_GetSashPosition(PyObject *self, PyObject
     return _resultobj;
 }
 
+#define wxSplitterWindow_GetSashSize(_swigobj)  (_swigobj->GetSashSize())
+static PyObject *_wrap_wxSplitterWindow_GetSashSize(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxSplitterWindow * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxSplitterWindow_GetSashSize",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetSashSize. Expected _wxSplitterWindow_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxSplitterWindow_GetSashSize(_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;
@@ -2810,6 +3078,28 @@ static PyObject *_wrap_wxSplitterWindow_IsSplit(PyObject *self, PyObject *args)
     return _resultobj;
 }
 
+#define wxSplitterWindow_SetBorderSize(_swigobj,_swigarg0)  (_swigobj->SetBorderSize(_swigarg0))
+static PyObject *_wrap_wxSplitterWindow_SetBorderSize(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxSplitterWindow * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxSplitterWindow_SetBorderSize",&_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_SetBorderSize. Expected _wxSplitterWindow_p.");
+        return NULL;
+        }
+    }
+    wxSplitterWindow_SetBorderSize(_arg0,_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 #define wxSplitterWindow_SetSashPosition(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetSashPosition(_swigarg0,_swigarg1))
 static PyObject *_wrap_wxSplitterWindow_SetSashPosition(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -2833,6 +3123,28 @@ static PyObject *_wrap_wxSplitterWindow_SetSashPosition(PyObject *self, PyObject
     return _resultobj;
 }
 
+#define wxSplitterWindow_SetSashSize(_swigobj,_swigarg0)  (_swigobj->SetSashSize(_swigarg0))
+static PyObject *_wrap_wxSplitterWindow_SetSashSize(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxSplitterWindow * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxSplitterWindow_SetSashSize",&_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_SetSashSize. Expected _wxSplitterWindow_p.");
+        return NULL;
+        }
+    }
+    wxSplitterWindow_SetSashSize(_arg0,_arg1);
+    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;
@@ -2988,14 +3300,18 @@ static PyMethodDef windows2cMethods[] = {
         { "wxSplitterWindow_SplitHorizontally", _wrap_wxSplitterWindow_SplitHorizontally, 1 },
         { "wxSplitterWindow_SetSplitMode", _wrap_wxSplitterWindow_SetSplitMode, 1 },
         { "wxSplitterWindow_SetMinimumPaneSize", _wrap_wxSplitterWindow_SetMinimumPaneSize, 1 },
+        { "wxSplitterWindow_SetSashSize", _wrap_wxSplitterWindow_SetSashSize, 1 },
         { "wxSplitterWindow_SetSashPosition", _wrap_wxSplitterWindow_SetSashPosition, 1 },
+        { "wxSplitterWindow_SetBorderSize", _wrap_wxSplitterWindow_SetBorderSize, 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_GetSashSize", _wrap_wxSplitterWindow_GetSashSize, 1 },
         { "wxSplitterWindow_GetSashPosition", _wrap_wxSplitterWindow_GetSashPosition, 1 },
         { "wxSplitterWindow_GetMinimumPaneSize", _wrap_wxSplitterWindow_GetMinimumPaneSize, 1 },
+        { "wxSplitterWindow_GetBorderSize", _wrap_wxSplitterWindow_GetBorderSize, 1 },
         { "new_wxSplitterWindow", _wrap_new_wxSplitterWindow, 1 },
         { "wxNotebook_GetPage", _wrap_wxNotebook_GetPage, 1 },
         { "wxNotebook_AddPage", _wrap_wxNotebook_AddPage, 1 },
@@ -3015,6 +3331,13 @@ static PyMethodDef windows2cMethods[] = {
         { "new_wxNotebook", _wrap_new_wxNotebook, 1 },
         { "wxNotebookEvent_GetOldSelection", _wrap_wxNotebookEvent_GetOldSelection, 1 },
         { "wxNotebookEvent_GetSelection", _wrap_wxNotebookEvent_GetSelection, 1 },
+        { "wxGridEvent_m_cell_get", _wrap_wxGridEvent_m_cell_get, 1 },
+        { "wxGridEvent_m_shift_get", _wrap_wxGridEvent_m_shift_get, 1 },
+        { "wxGridEvent_m_control_get", _wrap_wxGridEvent_m_control_get, 1 },
+        { "wxGridEvent_m_y_get", _wrap_wxGridEvent_m_y_get, 1 },
+        { "wxGridEvent_m_x_get", _wrap_wxGridEvent_m_x_get, 1 },
+        { "wxGridEvent_m_col_get", _wrap_wxGridEvent_m_col_get, 1 },
+        { "wxGridEvent_m_row_get", _wrap_wxGridEvent_m_row_get, 1 },
         { "wxGrid_UpdateDimensions", _wrap_wxGrid_UpdateDimensions, 1 },
         { "wxGrid_SetRowHeight", _wrap_wxGrid_SetRowHeight, 1 },
         { "wxGrid_SetLabelValue", _wrap_wxGrid_SetLabelValue, 1 },
@@ -3036,6 +3359,7 @@ static PyMethodDef windows2cMethods[] = {
         { "wxGrid_SetCellBackgroundColour", _wrap_wxGrid_SetCellBackgroundColour, 1 },
         { "wxGrid_SetDefCellAlignment", _wrap_wxGrid_SetDefCellAlignment, 1 },
         { "wxGrid_SetCellAlignment", _wrap_wxGrid_SetCellAlignment, 1 },
+        { "wxGrid_OnActivate", _wrap_wxGrid_OnActivate, 1 },
         { "wxGrid_InsertRows", _wrap_wxGrid_InsertRows, 1 },
         { "wxGrid_InsertCols", _wrap_wxGrid_InsertCols, 1 },
         { "wxGrid_GetVertScrollBar", _wrap_wxGrid_GetVertScrollBar, 1 },
@@ -3092,6 +3416,8 @@ static PyMethodDef windows2cMethods[] = {
         { "wxGridCell_GetFont", _wrap_wxGridCell_GetFont, 1 },
         { "wxGridCell_SetTextValue", _wrap_wxGridCell_SetTextValue, 1 },
         { "wxGridCell_GetTextValue", _wrap_wxGridCell_GetTextValue, 1 },
+        { "delete_wxGridCell", _wrap_delete_wxGridCell, 1 },
+        { "new_wxGridCell", _wrap_new_wxGridCell, 1 },
         { NULL, NULL }
 };
 static PyObject *SWIG_globals;
@@ -3106,6 +3432,15 @@ SWIGEXPORT(void,initwindows2c)() {
         PyDict_SetItemString(d,"wxGRID_TEXT_CTRL", PyInt_FromLong((long) wxGRID_TEXT_CTRL));
         PyDict_SetItemString(d,"wxGRID_HSCROLL", PyInt_FromLong((long) wxGRID_HSCROLL));
         PyDict_SetItemString(d,"wxGRID_VSCROLL", PyInt_FromLong((long) wxGRID_VSCROLL));
+        PyDict_SetItemString(d,"wxEVT_GRID_SELECT_CELL", PyInt_FromLong((long) wxEVT_GRID_SELECT_CELL));
+        PyDict_SetItemString(d,"wxEVT_GRID_CREATE_CELL", PyInt_FromLong((long) wxEVT_GRID_CREATE_CELL));
+        PyDict_SetItemString(d,"wxEVT_GRID_CHANGE_LABELS", PyInt_FromLong((long) wxEVT_GRID_CHANGE_LABELS));
+        PyDict_SetItemString(d,"wxEVT_GRID_CHANGE_SEL_LABEL", PyInt_FromLong((long) wxEVT_GRID_CHANGE_SEL_LABEL));
+        PyDict_SetItemString(d,"wxEVT_GRID_CELL_CHANGE", PyInt_FromLong((long) wxEVT_GRID_CELL_CHANGE));
+        PyDict_SetItemString(d,"wxEVT_GRID_CELL_LCLICK", PyInt_FromLong((long) wxEVT_GRID_CELL_LCLICK));
+        PyDict_SetItemString(d,"wxEVT_GRID_CELL_RCLICK", PyInt_FromLong((long) wxEVT_GRID_CELL_RCLICK));
+        PyDict_SetItemString(d,"wxEVT_GRID_LABEL_LCLICK", PyInt_FromLong((long) wxEVT_GRID_LABEL_LCLICK));
+        PyDict_SetItemString(d,"wxEVT_GRID_LABEL_RCLICK", PyInt_FromLong((long) wxEVT_GRID_LABEL_RCLICK));
 /*
  * These are the pointer type-equivalency mappings. 
  * (Used by the SWIG pointer type-checker).
@@ -3113,10 +3448,13 @@ SWIGEXPORT(void,initwindows2c)() {
         SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_wxEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxEvent);
         SWIG_RegisterMapping("_wxEvent","_wxNotebookEvent",SwigwxNotebookEventTowxEvent);
+        SWIG_RegisterMapping("_wxEvent","_class_wxGridEvent",SwigwxGridEventTowxEvent);
+        SWIG_RegisterMapping("_wxEvent","_wxGridEvent",SwigwxGridEventTowxEvent);
         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_wxRegionIterator","_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
         SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler);
         SWIG_RegisterMapping("_class_wxEvtHandler","_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler);
@@ -3173,7 +3511,10 @@ SWIGEXPORT(void,initwindows2c)() {
         SWIG_RegisterMapping("_uint","_wxWindowID",0);
         SWIG_RegisterMapping("_class_wxEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxEvent);
         SWIG_RegisterMapping("_class_wxEvent","_wxNotebookEvent",SwigwxNotebookEventTowxEvent);
+        SWIG_RegisterMapping("_class_wxEvent","_class_wxGridEvent",SwigwxGridEventTowxEvent);
+        SWIG_RegisterMapping("_class_wxEvent","_wxGridEvent",SwigwxGridEventTowxEvent);
         SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
+        SWIG_RegisterMapping("_wxGridEvent","_class_wxGridEvent",0);
         SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
         SWIG_RegisterMapping("_wxCommandEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent);
         SWIG_RegisterMapping("_wxCommandEvent","_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent);
@@ -3193,6 +3534,7 @@ SWIGEXPORT(void,initwindows2c)() {
         SWIG_RegisterMapping("_EBool","_signed_int",0);
         SWIG_RegisterMapping("_EBool","_int",0);
         SWIG_RegisterMapping("_EBool","_wxWindowID",0);
+        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
         SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
         SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
@@ -3293,6 +3635,7 @@ SWIGEXPORT(void,initwindows2c)() {
         SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
         SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
         SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
+        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
         SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
         SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
@@ -3307,13 +3650,16 @@ SWIGEXPORT(void,initwindows2c)() {
         SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
         SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
         SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
+        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
         SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
         SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
         SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
+        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",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_wxGridEvent","_wxGridEvent",0);
         SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent);
         SWIG_RegisterMapping("_class_wxCommandEvent","_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent);
         SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
@@ -3338,6 +3684,7 @@ SWIGEXPORT(void,initwindows2c)() {
         SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
         SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
+        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
         SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
         SWIG_RegisterMapping("_wxWindow","_class_wxSplitterWindow",SwigwxSplitterWindowTowxWindow);
         SWIG_RegisterMapping("_wxWindow","_wxSplitterWindow",SwigwxSplitterWindowTowxWindow);
index 91916a227f65aeb606c9945f5419c6e52dfeca74..c4c763bf68b85fd6f1cc8b6f2b82fdaa02b44565 100644 (file)
@@ -10,11 +10,14 @@ from windows import *
 from controls import *
 
 from events import *
-import wxp
+import wx
 class wxGridCellPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def __del__(self):
+        if self.thisown == 1 :
+            windows2c.delete_wxGridCell(self.this)
     def GetTextValue(self):
         val = windows2c.wxGridCell_GetTextValue(self.this)
         return val
@@ -62,8 +65,9 @@ class wxGridCellPtr :
     def __repr__(self):
         return "<C wxGridCell instance>"
 class wxGridCell(wxGridCellPtr):
-    def __init__(self,this):
-        self.this = this
+    def __init__(self) :
+        self.this = windows2c.new_wxGridCell()
+        self.thisown = 1
 
 
 
@@ -212,6 +216,9 @@ class wxGridPtr(wxPanelPtr):
     def InsertRows(self,*args):
         val = apply(windows2c.wxGrid_InsertRows,(self.this,)+args)
         return val
+    def OnActivate(self,arg0):
+        val = windows2c.wxGrid_OnActivate(self.this,arg0)
+        return val
     def SetCellAlignment(self,arg0,arg1,arg2):
         val = windows2c.wxGrid_SetCellAlignment(self.this,arg0,arg1,arg2)
         return val
@@ -287,7 +294,68 @@ class wxGrid(wxGridPtr):
         args = tuple(argl)
         self.this = apply(windows2c.new_wxGrid,(arg0.this,arg1,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
+        wx._checkForCallback(self, 'OnSelectCell',           wxEVT_GRID_SELECT_CELL)
+        wx._checkForCallback(self, 'OnCreateCell',           wxEVT_GRID_CREATE_CELL)
+        wx._checkForCallback(self, 'OnChangeLabels',         wxEVT_GRID_CHANGE_LABELS)
+        wx._checkForCallback(self, 'OnChangeSelectionLabel', wxEVT_GRID_CHANGE_SEL_LABEL)
+        wx._checkForCallback(self, 'OnCellChange',           wxEVT_GRID_CELL_CHANGE)
+        wx._checkForCallback(self, 'OnCellLeftClick',        wxEVT_GRID_CELL_LCLICK)
+        wx._checkForCallback(self, 'OnCellRightClick',       wxEVT_GRID_CELL_RCLICK)
+        wx._checkForCallback(self, 'OnLabelLeftClick',       wxEVT_GRID_LABEL_LCLICK)
+        wx._checkForCallback(self, 'OnLabelRightClick',      wxEVT_GRID_LABEL_RCLICK)
+
+
+
+
+class wxGridEventPtr(wxEventPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __setattr__(self,name,value):
+        if name == "m_row" :
+            windows2c.wxGridEvent_m_row_set(self.this,value)
+            return
+        if name == "m_col" :
+            windows2c.wxGridEvent_m_col_set(self.this,value)
+            return
+        if name == "m_x" :
+            windows2c.wxGridEvent_m_x_set(self.this,value)
+            return
+        if name == "m_y" :
+            windows2c.wxGridEvent_m_y_set(self.this,value)
+            return
+        if name == "m_control" :
+            windows2c.wxGridEvent_m_control_set(self.this,value)
+            return
+        if name == "m_shift" :
+            windows2c.wxGridEvent_m_shift_set(self.this,value)
+            return
+        if name == "m_cell" :
+            windows2c.wxGridEvent_m_cell_set(self.this,value.this)
+            return
+        self.__dict__[name] = value
+    def __getattr__(self,name):
+        if name == "m_row" : 
+            return windows2c.wxGridEvent_m_row_get(self.this)
+        if name == "m_col" : 
+            return windows2c.wxGridEvent_m_col_get(self.this)
+        if name == "m_x" : 
+            return windows2c.wxGridEvent_m_x_get(self.this)
+        if name == "m_y" : 
+            return windows2c.wxGridEvent_m_y_get(self.this)
+        if name == "m_control" : 
+            return windows2c.wxGridEvent_m_control_get(self.this)
+        if name == "m_shift" : 
+            return windows2c.wxGridEvent_m_shift_get(self.this)
+        if name == "m_cell" : 
+            return wxGridCellPtr(windows2c.wxGridEvent_m_cell_get(self.this))
+        raise AttributeError,name
+    def __repr__(self):
+        return "<C wxGridEvent instance>"
+class wxGridEvent(wxGridEventPtr):
+    def __init__(self,this):
+        self.this = this
 
 
 
@@ -372,7 +440,7 @@ class wxNotebook(wxNotebookPtr):
         args = tuple(argl)
         self.this = apply(windows2c.new_wxNotebook,(arg0.this,arg1,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -381,12 +449,18 @@ class wxSplitterWindowPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def GetBorderSize(self):
+        val = windows2c.wxSplitterWindow_GetBorderSize(self.this)
+        return val
     def GetMinimumPaneSize(self):
         val = windows2c.wxSplitterWindow_GetMinimumPaneSize(self.this)
         return val
     def GetSashPosition(self):
         val = windows2c.wxSplitterWindow_GetSashPosition(self.this)
         return val
+    def GetSashSize(self):
+        val = windows2c.wxSplitterWindow_GetSashSize(self.this)
+        return val
     def GetSplitMode(self):
         val = windows2c.wxSplitterWindow_GetSplitMode(self.this)
         return val
@@ -404,9 +478,15 @@ class wxSplitterWindowPtr(wxWindowPtr):
     def IsSplit(self):
         val = windows2c.wxSplitterWindow_IsSplit(self.this)
         return val
+    def SetBorderSize(self,arg0):
+        val = windows2c.wxSplitterWindow_SetBorderSize(self.this,arg0)
+        return val
     def SetSashPosition(self,arg0,*args):
         val = apply(windows2c.wxSplitterWindow_SetSashPosition,(self.this,arg0,)+args)
         return val
+    def SetSashSize(self,arg0):
+        val = windows2c.wxSplitterWindow_SetSashSize(self.this,arg0)
+        return val
     def SetMinimumPaneSize(self,arg0):
         val = windows2c.wxSplitterWindow_SetMinimumPaneSize(self.this,arg0)
         return val
@@ -438,7 +518,7 @@ class wxSplitterWindow(wxSplitterWindowPtr):
         args = tuple(argl)
         self.this = apply(windows2c.new_wxSplitterWindow,(arg0.this,arg1,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -454,3 +534,12 @@ class wxSplitterWindow(wxSplitterWindowPtr):
 wxGRID_TEXT_CTRL = windows2c.wxGRID_TEXT_CTRL
 wxGRID_HSCROLL = windows2c.wxGRID_HSCROLL
 wxGRID_VSCROLL = windows2c.wxGRID_VSCROLL
+wxEVT_GRID_SELECT_CELL = windows2c.wxEVT_GRID_SELECT_CELL
+wxEVT_GRID_CREATE_CELL = windows2c.wxEVT_GRID_CREATE_CELL
+wxEVT_GRID_CHANGE_LABELS = windows2c.wxEVT_GRID_CHANGE_LABELS
+wxEVT_GRID_CHANGE_SEL_LABEL = windows2c.wxEVT_GRID_CHANGE_SEL_LABEL
+wxEVT_GRID_CELL_CHANGE = windows2c.wxEVT_GRID_CELL_CHANGE
+wxEVT_GRID_CELL_LCLICK = windows2c.wxEVT_GRID_CELL_LCLICK
+wxEVT_GRID_CELL_RCLICK = windows2c.wxEVT_GRID_CELL_RCLICK
+wxEVT_GRID_LABEL_LCLICK = windows2c.wxEVT_GRID_LABEL_LCLICK
+wxEVT_GRID_LABEL_RCLICK = windows2c.wxEVT_GRID_LABEL_RCLICK
index fb9f50ed39c7013186afbeeb0b048f376f5f227e..f1fb860524435356c00b5dcbc0f304d0ee820d7d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * FILE : gtk/wxp.cpp
+ * FILE : gtk/wx.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * and things like that.
  *
  * $Log$
- * Revision 1.1  1998/12/15 20:41:59  RD
- * Changed the import semantics from "from wxPython import *" to "from
- * wxPython.wx import *"  This is for people who are worried about
- * namespace pollution, they can use "from wxPython import wx" and then
- * prefix all the wxPython identifiers with "wx."
- *
- * Added wxTaskbarIcon for wxMSW.
- *
- * Made the events work for wxGrid.
- *
- * Added wxConfig.
- *
- * Added wxMiniFrame for wxGTK, (untested.)
- *
- * Changed many of the args and return values that were pointers to gdi
- * objects to references to reflect changes in the wxWindows API.
- *
- * Other assorted fixes and additions.
- *
- * Revision 1.9  1998/11/16 00:01:41  RD
- * Generic treectrl for wxPython/GTK compiles...
+ * Revision 1.2  1998/12/16 22:12:20  RD
+ * Tweaks needed to be able to build wxPython with wxGTK.
  *
  ************************************************************************/
 
@@ -571,9 +552,9 @@ char *SWIG_GetPtr(char *_c, void **ptr, char *_t)
 
 #define _swig_get_hex  SWIG_GetPtr
 
-#define SWIG_init    initwxpc
+#define SWIG_init    initwxc
 
-#define SWIG_name    "wxpc"
+#define SWIG_name    "wxc"
 
 #include "helpers.h"
 
@@ -625,6 +606,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
+extern byte* byte_LIST_helper(PyObject* source);
 extern int* int_LIST_helper(PyObject* source);
 extern long* long_LIST_helper(PyObject* source);
 extern char** string_LIST_helper(PyObject* source);
@@ -647,6 +629,7 @@ extern "C" SWIGEXPORT(void,initcontrols2c)();
 extern "C" SWIGEXPORT(void,initcmndlgsc)();
 extern "C" SWIGEXPORT(void,initstattoolc)();
 extern "C" SWIGEXPORT(void,initframesc)();
+extern "C" SWIGEXPORT(void,initutilsc)();
 
 static int _wrap_wxPyDefaultPosition_set(PyObject *val) {
 
@@ -1151,7 +1134,7 @@ static PyObject *_wrap_wxPyApp_AfterMainLoop(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyMethodDef wxpcMethods[] = {
+static PyMethodDef wxcMethods[] = {
         { "wxPyApp_AfterMainLoop", _wrap_wxPyApp_AfterMainLoop, 1 },
         { "wxPyApp_SetVendorName", _wrap_wxPyApp_SetVendorName, 1 },
         { "wxPyApp_SetTopWindow", _wrap_wxPyApp_SetTopWindow, 1 },
@@ -1179,10 +1162,10 @@ static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
-SWIGEXPORT(void,initwxpc)() {
+SWIGEXPORT(void,initwxc)() {
         PyObject *m, *d;
         SWIG_globals = SWIG_newvarlink();
-        m = Py_InitModule("wxpc", wxpcMethods);
+        m = Py_InitModule("wxc", wxcMethods);
         d = PyModule_GetDict(m);
         PyDict_SetItemString(d,"wxMAJOR_VERSION", PyInt_FromLong((long) wxMAJOR_VERSION));
         PyDict_SetItemString(d,"wxMINOR_VERSION", PyInt_FromLong((long) wxMINOR_VERSION));
@@ -1222,6 +1205,7 @@ SWIGEXPORT(void,initwxpc)() {
         PyDict_SetItemString(d,"wxDIALOG_MODELESS", PyInt_FromLong((long) wxDIALOG_MODELESS));
         PyDict_SetItemString(d,"wxDEFAULT_FRAME_STYLE", PyInt_FromLong((long) wxDEFAULT_FRAME_STYLE));
         PyDict_SetItemString(d,"wxDEFAULT_DIALOG_STYLE", PyInt_FromLong((long) wxDEFAULT_DIALOG_STYLE));
+        PyDict_SetItemString(d,"wxFRAME_TOOL_WINDOW", PyInt_FromLong((long) wxFRAME_TOOL_WINDOW));
         PyDict_SetItemString(d,"wxRETAINED", PyInt_FromLong((long) wxRETAINED));
         PyDict_SetItemString(d,"wxBACKINGSTORE", PyInt_FromLong((long) wxBACKINGSTORE));
         PyDict_SetItemString(d,"wxTB_3DBUTTONS", PyInt_FromLong((long) wxTB_3DBUTTONS));
@@ -1693,7 +1677,7 @@ SWIGEXPORT(void,initwxpc)() {
         PyDict_SetItemString(d,"wxEVT_COMMAND_TAB_SEL_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_TAB_SEL_CHANGING));
         PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED));
         PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING));
-        PyDict_SetItemString(d,"__version__", PyString_FromString("0.4.2"));
+        PyDict_SetItemString(d,"__version__", PyString_FromString("0.5.1"));
         PyDict_SetItemString(d,"cvar", SWIG_globals);
         SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set);
         SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set);
@@ -1717,7 +1701,9 @@ SWIGEXPORT(void,initwxpc)() {
     initcmndlgsc();
     initstattoolc();
     initframesc();
-
+#ifndef SEPARATE
+    initutilsc();
+#endif
 /*
  * These are the pointer type-equivalency mappings. 
  * (Used by the SWIG pointer type-checker).
@@ -1728,6 +1714,7 @@ SWIGEXPORT(void,initwxpc)() {
         SWIG_RegisterMapping("_signed_long","_long",0);
         SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
         SWIG_RegisterMapping("_wxFontData","_class_wxFontData",0);
+        SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
         SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxPyApp",SwigwxPyAppTowxEvtHandler);
         SWIG_RegisterMapping("_class_wxEvtHandler","_wxPyApp",SwigwxPyAppTowxEvtHandler);
@@ -1780,12 +1767,14 @@ SWIGEXPORT(void,initwxpc)() {
         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);
         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("_wxGridEvent","_class_wxGridEvent",0);
         SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
         SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
         SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
@@ -1805,6 +1794,7 @@ SWIGEXPORT(void,initwxpc)() {
         SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxMessageDialog","_class_wxMessageDialog",0);
         SWIG_RegisterMapping("_wxTextEntryDialog","_class_wxTextEntryDialog",0);
+        SWIG_RegisterMapping("_wxConfig","_class_wxConfig",0);
         SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
         SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
         SWIG_RegisterMapping("_wxMDIChildFrame","_class_wxMDIChildFrame",0);
@@ -1814,6 +1804,7 @@ SWIGEXPORT(void,initwxpc)() {
         SWIG_RegisterMapping("_EBool","_signed_int",0);
         SWIG_RegisterMapping("_EBool","_int",0);
         SWIG_RegisterMapping("_EBool","_wxWindowID",0);
+        SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
         SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
         SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
@@ -1922,6 +1913,7 @@ SWIGEXPORT(void,initwxpc)() {
         SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
         SWIG_RegisterMapping("_class_wxPyApp","_wxPyApp",0);
         SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
+        SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
         SWIG_RegisterMapping("_class_wxMDIParentFrame","_wxMDIParentFrame",0);
         SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
         SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
@@ -1938,14 +1930,18 @@ SWIGEXPORT(void,initwxpc)() {
         SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
         SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
         SWIG_RegisterMapping("_class_wxPageSetupDialog","_wxPageSetupDialog",0);
+        SWIG_RegisterMapping("_wxPalette","_class_wxPalette",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("_wxFontDialog","_class_wxFontDialog",0);
+        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",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_wxGridEvent","_wxGridEvent",0);
         SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
         SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
         SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
@@ -1968,9 +1964,11 @@ SWIGEXPORT(void,initwxpc)() {
         SWIG_RegisterMapping("_wxDash","_long",0);
         SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
         SWIG_RegisterMapping("_class_wxTextEntryDialog","_wxTextEntryDialog",0);
+        SWIG_RegisterMapping("_class_wxConfig","_wxConfig",0);
         SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
         SWIG_RegisterMapping("_wxColourData","_class_wxColourData",0);
+        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
         SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
         SWIG_RegisterMapping("_wxMDIClientWindow","_class_wxMDIClientWindow",0);
         SWIG_RegisterMapping("_class_wxFontDialog","_wxFontDialog",0);
index 3ff09e450eedacc7a69adba947ca4257fe779a4d..d761711eebf55e4fcae14503ee5b15340bfa0aff 100644 (file)
@@ -1,5 +1,5 @@
 # This file was created automatically by SWIG.
-import wxpc
+import wxc
 
 from misc import *
 
@@ -22,70 +22,72 @@ from controls2 import *
 from windows2 import *
 
 from cmndlgs import *
+
+from utils import *
 class wxPyAppPtr(wxEvtHandlerPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def GetAppName(self):
-        val = wxpc.wxPyApp_GetAppName(self.this)
+        val = wxc.wxPyApp_GetAppName(self.this)
         return val
     def GetClassName(self):
-        val = wxpc.wxPyApp_GetClassName(self.this)
+        val = wxc.wxPyApp_GetClassName(self.this)
         return val
     def GetExitOnFrameDelete(self):
-        val = wxpc.wxPyApp_GetExitOnFrameDelete(self.this)
+        val = wxc.wxPyApp_GetExitOnFrameDelete(self.this)
         return val
     def GetPrintMode(self):
-        val = wxpc.wxPyApp_GetPrintMode(self.this)
+        val = wxc.wxPyApp_GetPrintMode(self.this)
         return val
     def GetTopWindow(self):
-        val = wxpc.wxPyApp_GetTopWindow(self.this)
+        val = wxc.wxPyApp_GetTopWindow(self.this)
         val = wxWindowPtr(val)
         return val
     def GetVendorName(self):
-        val = wxpc.wxPyApp_GetVendorName(self.this)
+        val = wxc.wxPyApp_GetVendorName(self.this)
         return val
     def Dispatch(self):
-        val = wxpc.wxPyApp_Dispatch(self.this)
+        val = wxc.wxPyApp_Dispatch(self.this)
         return val
     def ExitMainLoop(self):
-        val = wxpc.wxPyApp_ExitMainLoop(self.this)
+        val = wxc.wxPyApp_ExitMainLoop(self.this)
         return val
     def Initialized(self):
-        val = wxpc.wxPyApp_Initialized(self.this)
+        val = wxc.wxPyApp_Initialized(self.this)
         return val
     def MainLoop(self):
-        val = wxpc.wxPyApp_MainLoop(self.this)
+        val = wxc.wxPyApp_MainLoop(self.this)
         return val
     def Pending(self):
-        val = wxpc.wxPyApp_Pending(self.this)
+        val = wxc.wxPyApp_Pending(self.this)
         return val
     def SetAppName(self,arg0):
-        val = wxpc.wxPyApp_SetAppName(self.this,arg0)
+        val = wxc.wxPyApp_SetAppName(self.this,arg0)
         return val
     def SetClassName(self,arg0):
-        val = wxpc.wxPyApp_SetClassName(self.this,arg0)
+        val = wxc.wxPyApp_SetClassName(self.this,arg0)
         return val
     def SetExitOnFrameDelete(self,arg0):
-        val = wxpc.wxPyApp_SetExitOnFrameDelete(self.this,arg0)
+        val = wxc.wxPyApp_SetExitOnFrameDelete(self.this,arg0)
         return val
     def SetPrintMode(self,arg0):
-        val = wxpc.wxPyApp_SetPrintMode(self.this,arg0)
+        val = wxc.wxPyApp_SetPrintMode(self.this,arg0)
         return val
     def SetTopWindow(self,arg0):
-        val = wxpc.wxPyApp_SetTopWindow(self.this,arg0.this)
+        val = wxc.wxPyApp_SetTopWindow(self.this,arg0.this)
         return val
     def SetVendorName(self,arg0):
-        val = wxpc.wxPyApp_SetVendorName(self.this,arg0)
+        val = wxc.wxPyApp_SetVendorName(self.this,arg0)
         return val
     def AfterMainLoop(self):
-        val = wxpc.wxPyApp_AfterMainLoop(self.this)
+        val = wxc.wxPyApp_AfterMainLoop(self.this)
         return val
     def __repr__(self):
         return "<C wxPyApp instance>"
 class wxPyApp(wxPyAppPtr):
     def __init__(self) :
-        self.this = wxpc.new_wxPyApp()
+        self.this = wxc.new_wxPyApp()
         self.thisown = 1
 
 
@@ -95,527 +97,528 @@ class wxPyApp(wxPyAppPtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
-_wxStart = wxpc._wxStart
+_wxStart = wxc._wxStart
 
-_wxSetDictionary = wxpc._wxSetDictionary
+_wxSetDictionary = wxc._wxSetDictionary
 
 
 
 #-------------- VARIABLE WRAPPERS ------------------
 
-wxMAJOR_VERSION = wxpc.wxMAJOR_VERSION
-wxMINOR_VERSION = wxpc.wxMINOR_VERSION
-wxRELEASE_NUMBER = wxpc.wxRELEASE_NUMBER
-NOT_FOUND = wxpc.NOT_FOUND
-wxVSCROLL = wxpc.wxVSCROLL
-wxHSCROLL = wxpc.wxHSCROLL
-wxCAPTION = wxpc.wxCAPTION
-wxDOUBLE_BORDER = wxpc.wxDOUBLE_BORDER
-wxSUNKEN_BORDER = wxpc.wxSUNKEN_BORDER
-wxRAISED_BORDER = wxpc.wxRAISED_BORDER
-wxBORDER = wxpc.wxBORDER
-wxSIMPLE_BORDER = wxpc.wxSIMPLE_BORDER
-wxSTATIC_BORDER = wxpc.wxSTATIC_BORDER
-wxTRANSPARENT_WINDOW = wxpc.wxTRANSPARENT_WINDOW
-wxNO_BORDER = wxpc.wxNO_BORDER
-wxUSER_COLOURS = wxpc.wxUSER_COLOURS
-wxNO_3D = wxpc.wxNO_3D
-wxTAB_TRAVERSAL = wxpc.wxTAB_TRAVERSAL
-wxHORIZONTAL = wxpc.wxHORIZONTAL
-wxVERTICAL = wxpc.wxVERTICAL
-wxBOTH = wxpc.wxBOTH
-wxCENTER_FRAME = wxpc.wxCENTER_FRAME
-wxSTAY_ON_TOP = wxpc.wxSTAY_ON_TOP
-wxICONIZE = wxpc.wxICONIZE
-wxMINIMIZE = wxpc.wxMINIMIZE
-wxMAXIMIZE = wxpc.wxMAXIMIZE
-wxTHICK_FRAME = wxpc.wxTHICK_FRAME
-wxSYSTEM_MENU = wxpc.wxSYSTEM_MENU
-wxMINIMIZE_BOX = wxpc.wxMINIMIZE_BOX
-wxMAXIMIZE_BOX = wxpc.wxMAXIMIZE_BOX
-wxTINY_CAPTION_HORIZ = wxpc.wxTINY_CAPTION_HORIZ
-wxTINY_CAPTION_VERT = wxpc.wxTINY_CAPTION_VERT
-wxRESIZE_BOX = wxpc.wxRESIZE_BOX
-wxRESIZE_BORDER = wxpc.wxRESIZE_BORDER
-wxDIALOG_MODAL = wxpc.wxDIALOG_MODAL
-wxDIALOG_MODELESS = wxpc.wxDIALOG_MODELESS
-wxDEFAULT_FRAME_STYLE = wxpc.wxDEFAULT_FRAME_STYLE
-wxDEFAULT_DIALOG_STYLE = wxpc.wxDEFAULT_DIALOG_STYLE
-wxRETAINED = wxpc.wxRETAINED
-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
-wxALIGN_CENTER = wxpc.wxALIGN_CENTER
-wxALIGN_CENTRE = wxpc.wxALIGN_CENTRE
-wxALIGN_RIGHT = wxpc.wxALIGN_RIGHT
-wxLB_NEEDED_SB = wxpc.wxLB_NEEDED_SB
-wxLB_ALWAYS_SB = wxpc.wxLB_ALWAYS_SB
-wxLB_SORT = wxpc.wxLB_SORT
-wxLB_SINGLE = wxpc.wxLB_SINGLE
-wxLB_MULTIPLE = wxpc.wxLB_MULTIPLE
-wxLB_EXTENDED = wxpc.wxLB_EXTENDED
-wxLB_OWNERDRAW = wxpc.wxLB_OWNERDRAW
-wxLB_HSCROLL = wxpc.wxLB_HSCROLL
-wxPROCESS_ENTER = wxpc.wxPROCESS_ENTER
-wxPASSWORD = wxpc.wxPASSWORD
-wxTE_PROCESS_ENTER = wxpc.wxTE_PROCESS_ENTER
-wxTE_PASSWORD = wxpc.wxTE_PASSWORD
-wxTE_READONLY = wxpc.wxTE_READONLY
-wxTE_MULTILINE = wxpc.wxTE_MULTILINE
-wxCB_SIMPLE = wxpc.wxCB_SIMPLE
-wxCB_DROPDOWN = wxpc.wxCB_DROPDOWN
-wxCB_SORT = wxpc.wxCB_SORT
-wxCB_READONLY = wxpc.wxCB_READONLY
-wxRA_HORIZONTAL = wxpc.wxRA_HORIZONTAL
-wxRA_VERTICAL = wxpc.wxRA_VERTICAL
-wxRB_GROUP = wxpc.wxRB_GROUP
-wxGA_PROGRESSBAR = wxpc.wxGA_PROGRESSBAR
-wxGA_HORIZONTAL = wxpc.wxGA_HORIZONTAL
-wxGA_VERTICAL = wxpc.wxGA_VERTICAL
-wxSL_HORIZONTAL = wxpc.wxSL_HORIZONTAL
-wxSL_VERTICAL = wxpc.wxSL_VERTICAL
-wxSL_AUTOTICKS = wxpc.wxSL_AUTOTICKS
-wxSL_LABELS = wxpc.wxSL_LABELS
-wxSL_LEFT = wxpc.wxSL_LEFT
-wxSL_TOP = wxpc.wxSL_TOP
-wxSL_RIGHT = wxpc.wxSL_RIGHT
-wxSL_BOTTOM = wxpc.wxSL_BOTTOM
-wxSL_BOTH = wxpc.wxSL_BOTH
-wxSL_SELRANGE = wxpc.wxSL_SELRANGE
-wxSB_HORIZONTAL = wxpc.wxSB_HORIZONTAL
-wxSB_VERTICAL = wxpc.wxSB_VERTICAL
-wxBU_AUTODRAW = wxpc.wxBU_AUTODRAW
-wxBU_NOAUTODRAW = wxpc.wxBU_NOAUTODRAW
-wxTR_HAS_BUTTONS = wxpc.wxTR_HAS_BUTTONS
-wxTR_EDIT_LABELS = wxpc.wxTR_EDIT_LABELS
-wxTR_LINES_AT_ROOT = wxpc.wxTR_LINES_AT_ROOT
-wxLC_ICON = wxpc.wxLC_ICON
-wxLC_SMALL_ICON = wxpc.wxLC_SMALL_ICON
-wxLC_LIST = wxpc.wxLC_LIST
-wxLC_REPORT = wxpc.wxLC_REPORT
-wxLC_ALIGN_TOP = wxpc.wxLC_ALIGN_TOP
-wxLC_ALIGN_LEFT = wxpc.wxLC_ALIGN_LEFT
-wxLC_AUTOARRANGE = wxpc.wxLC_AUTOARRANGE
-wxLC_USER_TEXT = wxpc.wxLC_USER_TEXT
-wxLC_EDIT_LABELS = wxpc.wxLC_EDIT_LABELS
-wxLC_NO_HEADER = wxpc.wxLC_NO_HEADER
-wxLC_NO_SORT_HEADER = wxpc.wxLC_NO_SORT_HEADER
-wxLC_SINGLE_SEL = wxpc.wxLC_SINGLE_SEL
-wxLC_SORT_ASCENDING = wxpc.wxLC_SORT_ASCENDING
-wxLC_SORT_DESCENDING = wxpc.wxLC_SORT_DESCENDING
-wxLC_MASK_TYPE = wxpc.wxLC_MASK_TYPE
-wxLC_MASK_ALIGN = wxpc.wxLC_MASK_ALIGN
-wxLC_MASK_SORT = wxpc.wxLC_MASK_SORT
-wxSP_VERTICAL = wxpc.wxSP_VERTICAL
-wxSP_HORIZONTAL = wxpc.wxSP_HORIZONTAL
-wxSP_ARROW_KEYS = wxpc.wxSP_ARROW_KEYS
-wxSP_WRAP = wxpc.wxSP_WRAP
-wxSP_NOBORDER = wxpc.wxSP_NOBORDER
-wxSP_3D = wxpc.wxSP_3D
-wxSP_BORDER = wxpc.wxSP_BORDER
-wxTAB_MULTILINE = wxpc.wxTAB_MULTILINE
-wxTAB_RIGHTJUSTIFY = wxpc.wxTAB_RIGHTJUSTIFY
-wxTAB_FIXEDWIDTH = wxpc.wxTAB_FIXEDWIDTH
-wxTAB_OWNERDRAW = wxpc.wxTAB_OWNERDRAW
-wxFLOOD_SURFACE = wxpc.wxFLOOD_SURFACE
-wxFLOOD_BORDER = wxpc.wxFLOOD_BORDER
-wxODDEVEN_RULE = wxpc.wxODDEVEN_RULE
-wxWINDING_RULE = wxpc.wxWINDING_RULE
-wxTOOL_TOP = wxpc.wxTOOL_TOP
-wxTOOL_BOTTOM = wxpc.wxTOOL_BOTTOM
-wxTOOL_LEFT = wxpc.wxTOOL_LEFT
-wxTOOL_RIGHT = wxpc.wxTOOL_RIGHT
-wxOK = wxpc.wxOK
-wxYES_NO = wxpc.wxYES_NO
-wxCANCEL = wxpc.wxCANCEL
-wxYES = wxpc.wxYES
-wxNO = wxpc.wxNO
-wxICON_EXCLAMATION = wxpc.wxICON_EXCLAMATION
-wxICON_HAND = wxpc.wxICON_HAND
-wxICON_QUESTION = wxpc.wxICON_QUESTION
-wxICON_INFORMATION = wxpc.wxICON_INFORMATION
-wxICON_STOP = wxpc.wxICON_STOP
-wxICON_ASTERISK = wxpc.wxICON_ASTERISK
-wxICON_MASK = wxpc.wxICON_MASK
-wxCENTRE = wxpc.wxCENTRE
-wxCENTER = wxpc.wxCENTER
-wxSIZE_AUTO_WIDTH = wxpc.wxSIZE_AUTO_WIDTH
-wxSIZE_AUTO_HEIGHT = wxpc.wxSIZE_AUTO_HEIGHT
-wxSIZE_AUTO = wxpc.wxSIZE_AUTO
-wxSIZE_USE_EXISTING = wxpc.wxSIZE_USE_EXISTING
-wxSIZE_ALLOW_MINUS_ONE = wxpc.wxSIZE_ALLOW_MINUS_ONE
-wxDF_TEXT = wxpc.wxDF_TEXT
-wxDF_BITMAP = wxpc.wxDF_BITMAP
-wxDF_METAFILE = wxpc.wxDF_METAFILE
-wxDF_DIB = wxpc.wxDF_DIB
-wxDF_OEMTEXT = wxpc.wxDF_OEMTEXT
-wxDF_FILENAME = wxpc.wxDF_FILENAME
-wxPORTRAIT = wxpc.wxPORTRAIT
-wxLANDSCAPE = wxpc.wxLANDSCAPE
-wxID_OPEN = wxpc.wxID_OPEN
-wxID_CLOSE = wxpc.wxID_CLOSE
-wxID_NEW = wxpc.wxID_NEW
-wxID_SAVE = wxpc.wxID_SAVE
-wxID_SAVEAS = wxpc.wxID_SAVEAS
-wxID_REVERT = wxpc.wxID_REVERT
-wxID_EXIT = wxpc.wxID_EXIT
-wxID_UNDO = wxpc.wxID_UNDO
-wxID_REDO = wxpc.wxID_REDO
-wxID_HELP = wxpc.wxID_HELP
-wxID_PRINT = wxpc.wxID_PRINT
-wxID_PRINT_SETUP = wxpc.wxID_PRINT_SETUP
-wxID_PREVIEW = wxpc.wxID_PREVIEW
-wxID_ABOUT = wxpc.wxID_ABOUT
-wxID_HELP_CONTENTS = wxpc.wxID_HELP_CONTENTS
-wxID_HELP_COMMANDS = wxpc.wxID_HELP_COMMANDS
-wxID_HELP_PROCEDURES = wxpc.wxID_HELP_PROCEDURES
-wxID_HELP_CONTEXT = wxpc.wxID_HELP_CONTEXT
-wxID_CUT = wxpc.wxID_CUT
-wxID_COPY = wxpc.wxID_COPY
-wxID_PASTE = wxpc.wxID_PASTE
-wxID_CLEAR = wxpc.wxID_CLEAR
-wxID_FIND = wxpc.wxID_FIND
-wxID_FILE1 = wxpc.wxID_FILE1
-wxID_FILE2 = wxpc.wxID_FILE2
-wxID_FILE3 = wxpc.wxID_FILE3
-wxID_FILE4 = wxpc.wxID_FILE4
-wxID_FILE5 = wxpc.wxID_FILE5
-wxID_FILE6 = wxpc.wxID_FILE6
-wxID_FILE7 = wxpc.wxID_FILE7
-wxID_FILE8 = wxpc.wxID_FILE8
-wxID_FILE9 = wxpc.wxID_FILE9
-wxID_OK = wxpc.wxID_OK
-wxID_CANCEL = wxpc.wxID_CANCEL
-wxID_APPLY = wxpc.wxID_APPLY
-wxID_YES = wxpc.wxID_YES
-wxID_NO = wxpc.wxID_NO
-wxBITMAP_TYPE_BMP = wxpc.wxBITMAP_TYPE_BMP
-wxBITMAP_TYPE_BMP_RESOURCE = wxpc.wxBITMAP_TYPE_BMP_RESOURCE
-wxBITMAP_TYPE_ICO = wxpc.wxBITMAP_TYPE_ICO
-wxBITMAP_TYPE_ICO_RESOURCE = wxpc.wxBITMAP_TYPE_ICO_RESOURCE
-wxBITMAP_TYPE_CUR = wxpc.wxBITMAP_TYPE_CUR
-wxBITMAP_TYPE_CUR_RESOURCE = wxpc.wxBITMAP_TYPE_CUR_RESOURCE
-wxBITMAP_TYPE_XBM = wxpc.wxBITMAP_TYPE_XBM
-wxBITMAP_TYPE_XBM_DATA = wxpc.wxBITMAP_TYPE_XBM_DATA
-wxBITMAP_TYPE_XPM = wxpc.wxBITMAP_TYPE_XPM
-wxBITMAP_TYPE_XPM_DATA = wxpc.wxBITMAP_TYPE_XPM_DATA
-wxBITMAP_TYPE_TIF = wxpc.wxBITMAP_TYPE_TIF
-wxBITMAP_TYPE_TIF_RESOURCE = wxpc.wxBITMAP_TYPE_TIF_RESOURCE
-wxBITMAP_TYPE_GIF = wxpc.wxBITMAP_TYPE_GIF
-wxBITMAP_TYPE_GIF_RESOURCE = wxpc.wxBITMAP_TYPE_GIF_RESOURCE
-wxBITMAP_TYPE_PNG = wxpc.wxBITMAP_TYPE_PNG
-wxBITMAP_TYPE_PNG_RESOURCE = wxpc.wxBITMAP_TYPE_PNG_RESOURCE
-wxBITMAP_TYPE_ANY = wxpc.wxBITMAP_TYPE_ANY
-wxBITMAP_TYPE_RESOURCE = wxpc.wxBITMAP_TYPE_RESOURCE
-wxOPEN = wxpc.wxOPEN
-wxSAVE = wxpc.wxSAVE
-wxHIDE_READONLY = wxpc.wxHIDE_READONLY
-wxOVERWRITE_PROMPT = wxpc.wxOVERWRITE_PROMPT
-wxACCEL_ALT = wxpc.wxACCEL_ALT
-wxACCEL_CTRL = wxpc.wxACCEL_CTRL
-wxACCEL_SHIFT = wxpc.wxACCEL_SHIFT
-ERR_PARAM = wxpc.ERR_PARAM
-ERR_NODATA = wxpc.ERR_NODATA
-ERR_CANCEL = wxpc.ERR_CANCEL
-ERR_SUCCESS = wxpc.ERR_SUCCESS
-wxDEFAULT = wxpc.wxDEFAULT
-wxDECORATIVE = wxpc.wxDECORATIVE
-wxROMAN = wxpc.wxROMAN
-wxSCRIPT = wxpc.wxSCRIPT
-wxSWISS = wxpc.wxSWISS
-wxMODERN = wxpc.wxMODERN
-wxTELETYPE = wxpc.wxTELETYPE
-wxVARIABLE = wxpc.wxVARIABLE
-wxFIXED = wxpc.wxFIXED
-wxNORMAL = wxpc.wxNORMAL
-wxLIGHT = wxpc.wxLIGHT
-wxBOLD = wxpc.wxBOLD
-wxITALIC = wxpc.wxITALIC
-wxSLANT = wxpc.wxSLANT
-wxSOLID = wxpc.wxSOLID
-wxDOT = wxpc.wxDOT
-wxLONG_DASH = wxpc.wxLONG_DASH
-wxSHORT_DASH = wxpc.wxSHORT_DASH
-wxDOT_DASH = wxpc.wxDOT_DASH
-wxUSER_DASH = wxpc.wxUSER_DASH
-wxTRANSPARENT = wxpc.wxTRANSPARENT
-wxSTIPPLE = wxpc.wxSTIPPLE
-wxBDIAGONAL_HATCH = wxpc.wxBDIAGONAL_HATCH
-wxCROSSDIAG_HATCH = wxpc.wxCROSSDIAG_HATCH
-wxFDIAGONAL_HATCH = wxpc.wxFDIAGONAL_HATCH
-wxCROSS_HATCH = wxpc.wxCROSS_HATCH
-wxHORIZONTAL_HATCH = wxpc.wxHORIZONTAL_HATCH
-wxVERTICAL_HATCH = wxpc.wxVERTICAL_HATCH
-wxJOIN_BEVEL = wxpc.wxJOIN_BEVEL
-wxJOIN_MITER = wxpc.wxJOIN_MITER
-wxJOIN_ROUND = wxpc.wxJOIN_ROUND
-wxCAP_ROUND = wxpc.wxCAP_ROUND
-wxCAP_PROJECTING = wxpc.wxCAP_PROJECTING
-wxCAP_BUTT = wxpc.wxCAP_BUTT
-wxCLEAR = wxpc.wxCLEAR
-wxXOR = wxpc.wxXOR
-wxINVERT = wxpc.wxINVERT
-wxOR_REVERSE = wxpc.wxOR_REVERSE
-wxAND_REVERSE = wxpc.wxAND_REVERSE
-wxCOPY = wxpc.wxCOPY
-wxAND = wxpc.wxAND
-wxAND_INVERT = wxpc.wxAND_INVERT
-wxNO_OP = wxpc.wxNO_OP
-wxNOR = wxpc.wxNOR
-wxEQUIV = wxpc.wxEQUIV
-wxSRC_INVERT = wxpc.wxSRC_INVERT
-wxOR_INVERT = wxpc.wxOR_INVERT
-wxNAND = wxpc.wxNAND
-wxOR = wxpc.wxOR
-wxSET = wxpc.wxSET
-wxSRC_OR = wxpc.wxSRC_OR
-wxSRC_AND = wxpc.wxSRC_AND
-WXK_BACK = wxpc.WXK_BACK
-WXK_TAB = wxpc.WXK_TAB
-WXK_RETURN = wxpc.WXK_RETURN
-WXK_ESCAPE = wxpc.WXK_ESCAPE
-WXK_SPACE = wxpc.WXK_SPACE
-WXK_DELETE = wxpc.WXK_DELETE
-WXK_START = wxpc.WXK_START
-WXK_LBUTTON = wxpc.WXK_LBUTTON
-WXK_RBUTTON = wxpc.WXK_RBUTTON
-WXK_CANCEL = wxpc.WXK_CANCEL
-WXK_MBUTTON = wxpc.WXK_MBUTTON
-WXK_CLEAR = wxpc.WXK_CLEAR
-WXK_SHIFT = wxpc.WXK_SHIFT
-WXK_CONTROL = wxpc.WXK_CONTROL
-WXK_MENU = wxpc.WXK_MENU
-WXK_PAUSE = wxpc.WXK_PAUSE
-WXK_CAPITAL = wxpc.WXK_CAPITAL
-WXK_PRIOR = wxpc.WXK_PRIOR
-WXK_NEXT = wxpc.WXK_NEXT
-WXK_END = wxpc.WXK_END
-WXK_HOME = wxpc.WXK_HOME
-WXK_LEFT = wxpc.WXK_LEFT
-WXK_UP = wxpc.WXK_UP
-WXK_RIGHT = wxpc.WXK_RIGHT
-WXK_DOWN = wxpc.WXK_DOWN
-WXK_SELECT = wxpc.WXK_SELECT
-WXK_PRINT = wxpc.WXK_PRINT
-WXK_EXECUTE = wxpc.WXK_EXECUTE
-WXK_SNAPSHOT = wxpc.WXK_SNAPSHOT
-WXK_INSERT = wxpc.WXK_INSERT
-WXK_HELP = wxpc.WXK_HELP
-WXK_NUMPAD0 = wxpc.WXK_NUMPAD0
-WXK_NUMPAD1 = wxpc.WXK_NUMPAD1
-WXK_NUMPAD2 = wxpc.WXK_NUMPAD2
-WXK_NUMPAD3 = wxpc.WXK_NUMPAD3
-WXK_NUMPAD4 = wxpc.WXK_NUMPAD4
-WXK_NUMPAD5 = wxpc.WXK_NUMPAD5
-WXK_NUMPAD6 = wxpc.WXK_NUMPAD6
-WXK_NUMPAD7 = wxpc.WXK_NUMPAD7
-WXK_NUMPAD8 = wxpc.WXK_NUMPAD8
-WXK_NUMPAD9 = wxpc.WXK_NUMPAD9
-WXK_MULTIPLY = wxpc.WXK_MULTIPLY
-WXK_ADD = wxpc.WXK_ADD
-WXK_SEPARATOR = wxpc.WXK_SEPARATOR
-WXK_SUBTRACT = wxpc.WXK_SUBTRACT
-WXK_DECIMAL = wxpc.WXK_DECIMAL
-WXK_DIVIDE = wxpc.WXK_DIVIDE
-WXK_F1 = wxpc.WXK_F1
-WXK_F2 = wxpc.WXK_F2
-WXK_F3 = wxpc.WXK_F3
-WXK_F4 = wxpc.WXK_F4
-WXK_F5 = wxpc.WXK_F5
-WXK_F6 = wxpc.WXK_F6
-WXK_F7 = wxpc.WXK_F7
-WXK_F8 = wxpc.WXK_F8
-WXK_F9 = wxpc.WXK_F9
-WXK_F10 = wxpc.WXK_F10
-WXK_F11 = wxpc.WXK_F11
-WXK_F12 = wxpc.WXK_F12
-WXK_F13 = wxpc.WXK_F13
-WXK_F14 = wxpc.WXK_F14
-WXK_F15 = wxpc.WXK_F15
-WXK_F16 = wxpc.WXK_F16
-WXK_F17 = wxpc.WXK_F17
-WXK_F18 = wxpc.WXK_F18
-WXK_F19 = wxpc.WXK_F19
-WXK_F20 = wxpc.WXK_F20
-WXK_F21 = wxpc.WXK_F21
-WXK_F22 = wxpc.WXK_F22
-WXK_F23 = wxpc.WXK_F23
-WXK_F24 = wxpc.WXK_F24
-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
-wxCURSOR_CROSS = wxpc.wxCURSOR_CROSS
-wxCURSOR_HAND = wxpc.wxCURSOR_HAND
-wxCURSOR_IBEAM = wxpc.wxCURSOR_IBEAM
-wxCURSOR_LEFT_BUTTON = wxpc.wxCURSOR_LEFT_BUTTON
-wxCURSOR_MAGNIFIER = wxpc.wxCURSOR_MAGNIFIER
-wxCURSOR_MIDDLE_BUTTON = wxpc.wxCURSOR_MIDDLE_BUTTON
-wxCURSOR_NO_ENTRY = wxpc.wxCURSOR_NO_ENTRY
-wxCURSOR_PAINT_BRUSH = wxpc.wxCURSOR_PAINT_BRUSH
-wxCURSOR_PENCIL = wxpc.wxCURSOR_PENCIL
-wxCURSOR_POINT_LEFT = wxpc.wxCURSOR_POINT_LEFT
-wxCURSOR_POINT_RIGHT = wxpc.wxCURSOR_POINT_RIGHT
-wxCURSOR_QUESTION_ARROW = wxpc.wxCURSOR_QUESTION_ARROW
-wxCURSOR_RIGHT_BUTTON = wxpc.wxCURSOR_RIGHT_BUTTON
-wxCURSOR_SIZENESW = wxpc.wxCURSOR_SIZENESW
-wxCURSOR_SIZENS = wxpc.wxCURSOR_SIZENS
-wxCURSOR_SIZENWSE = wxpc.wxCURSOR_SIZENWSE
-wxCURSOR_SIZEWE = wxpc.wxCURSOR_SIZEWE
-wxCURSOR_SIZING = wxpc.wxCURSOR_SIZING
-wxCURSOR_SPRAYCAN = wxpc.wxCURSOR_SPRAYCAN
-wxCURSOR_WAIT = wxpc.wxCURSOR_WAIT
-wxCURSOR_WATCH = wxpc.wxCURSOR_WATCH
-wxCURSOR_BLANK = wxpc.wxCURSOR_BLANK
-FALSE = wxpc.FALSE
-false = wxpc.false
-TRUE = wxpc.TRUE
-true = wxpc.true
-wxEVT_NULL = wxpc.wxEVT_NULL
-wxEVT_FIRST = wxpc.wxEVT_FIRST
-wxEVT_COMMAND_BUTTON_CLICKED = wxpc.wxEVT_COMMAND_BUTTON_CLICKED
-wxEVT_COMMAND_CHECKBOX_CLICKED = wxpc.wxEVT_COMMAND_CHECKBOX_CLICKED
-wxEVT_COMMAND_CHOICE_SELECTED = wxpc.wxEVT_COMMAND_CHOICE_SELECTED
-wxEVT_COMMAND_LISTBOX_SELECTED = wxpc.wxEVT_COMMAND_LISTBOX_SELECTED
-wxEVT_COMMAND_LISTBOX_DOUBLECLICKED = wxpc.wxEVT_COMMAND_LISTBOX_DOUBLECLICKED
-wxEVT_COMMAND_CHECKLISTBOX_TOGGLED = wxpc.wxEVT_COMMAND_CHECKLISTBOX_TOGGLED
-wxEVT_COMMAND_TEXT_UPDATED = wxpc.wxEVT_COMMAND_TEXT_UPDATED
-wxEVT_COMMAND_TEXT_ENTER = wxpc.wxEVT_COMMAND_TEXT_ENTER
-wxEVT_COMMAND_MENU_SELECTED = wxpc.wxEVT_COMMAND_MENU_SELECTED
-wxEVT_COMMAND_SLIDER_UPDATED = wxpc.wxEVT_COMMAND_SLIDER_UPDATED
-wxEVT_COMMAND_RADIOBOX_SELECTED = wxpc.wxEVT_COMMAND_RADIOBOX_SELECTED
-wxEVT_COMMAND_RADIOBUTTON_SELECTED = wxpc.wxEVT_COMMAND_RADIOBUTTON_SELECTED
-wxEVT_COMMAND_SCROLLBAR_UPDATED = wxpc.wxEVT_COMMAND_SCROLLBAR_UPDATED
-wxEVT_COMMAND_VLBOX_SELECTED = wxpc.wxEVT_COMMAND_VLBOX_SELECTED
-wxEVT_COMMAND_COMBOBOX_SELECTED = wxpc.wxEVT_COMMAND_COMBOBOX_SELECTED
-wxEVT_COMMAND_TOOL_CLICKED = wxpc.wxEVT_COMMAND_TOOL_CLICKED
-wxEVT_COMMAND_TOOL_RCLICKED = wxpc.wxEVT_COMMAND_TOOL_RCLICKED
-wxEVT_COMMAND_TOOL_ENTER = wxpc.wxEVT_COMMAND_TOOL_ENTER
-wxEVT_SET_FOCUS = wxpc.wxEVT_SET_FOCUS
-wxEVT_KILL_FOCUS = wxpc.wxEVT_KILL_FOCUS
-wxEVT_LEFT_DOWN = wxpc.wxEVT_LEFT_DOWN
-wxEVT_LEFT_UP = wxpc.wxEVT_LEFT_UP
-wxEVT_MIDDLE_DOWN = wxpc.wxEVT_MIDDLE_DOWN
-wxEVT_MIDDLE_UP = wxpc.wxEVT_MIDDLE_UP
-wxEVT_RIGHT_DOWN = wxpc.wxEVT_RIGHT_DOWN
-wxEVT_RIGHT_UP = wxpc.wxEVT_RIGHT_UP
-wxEVT_MOTION = wxpc.wxEVT_MOTION
-wxEVT_ENTER_WINDOW = wxpc.wxEVT_ENTER_WINDOW
-wxEVT_LEAVE_WINDOW = wxpc.wxEVT_LEAVE_WINDOW
-wxEVT_LEFT_DCLICK = wxpc.wxEVT_LEFT_DCLICK
-wxEVT_MIDDLE_DCLICK = wxpc.wxEVT_MIDDLE_DCLICK
-wxEVT_RIGHT_DCLICK = wxpc.wxEVT_RIGHT_DCLICK
-wxEVT_NC_LEFT_DOWN = wxpc.wxEVT_NC_LEFT_DOWN
-wxEVT_NC_LEFT_UP = wxpc.wxEVT_NC_LEFT_UP
-wxEVT_NC_MIDDLE_DOWN = wxpc.wxEVT_NC_MIDDLE_DOWN
-wxEVT_NC_MIDDLE_UP = wxpc.wxEVT_NC_MIDDLE_UP
-wxEVT_NC_RIGHT_DOWN = wxpc.wxEVT_NC_RIGHT_DOWN
-wxEVT_NC_RIGHT_UP = wxpc.wxEVT_NC_RIGHT_UP
-wxEVT_NC_MOTION = wxpc.wxEVT_NC_MOTION
-wxEVT_NC_ENTER_WINDOW = wxpc.wxEVT_NC_ENTER_WINDOW
-wxEVT_NC_LEAVE_WINDOW = wxpc.wxEVT_NC_LEAVE_WINDOW
-wxEVT_NC_LEFT_DCLICK = wxpc.wxEVT_NC_LEFT_DCLICK
-wxEVT_NC_MIDDLE_DCLICK = wxpc.wxEVT_NC_MIDDLE_DCLICK
-wxEVT_NC_RIGHT_DCLICK = wxpc.wxEVT_NC_RIGHT_DCLICK
-wxEVT_CHAR = wxpc.wxEVT_CHAR
-wxEVT_SCROLL_TOP = wxpc.wxEVT_SCROLL_TOP
-wxEVT_SCROLL_BOTTOM = wxpc.wxEVT_SCROLL_BOTTOM
-wxEVT_SCROLL_LINEUP = wxpc.wxEVT_SCROLL_LINEUP
-wxEVT_SCROLL_LINEDOWN = wxpc.wxEVT_SCROLL_LINEDOWN
-wxEVT_SCROLL_PAGEUP = wxpc.wxEVT_SCROLL_PAGEUP
-wxEVT_SCROLL_PAGEDOWN = wxpc.wxEVT_SCROLL_PAGEDOWN
-wxEVT_SCROLL_THUMBTRACK = wxpc.wxEVT_SCROLL_THUMBTRACK
-wxEVT_SIZE = wxpc.wxEVT_SIZE
-wxEVT_MOVE = wxpc.wxEVT_MOVE
-wxEVT_CLOSE_WINDOW = wxpc.wxEVT_CLOSE_WINDOW
-wxEVT_END_SESSION = wxpc.wxEVT_END_SESSION
-wxEVT_QUERY_END_SESSION = wxpc.wxEVT_QUERY_END_SESSION
-wxEVT_ACTIVATE_APP = wxpc.wxEVT_ACTIVATE_APP
-wxEVT_POWER = wxpc.wxEVT_POWER
-wxEVT_CHAR_HOOK = wxpc.wxEVT_CHAR_HOOK
-wxEVT_KEY_UP = wxpc.wxEVT_KEY_UP
-wxEVT_ACTIVATE = wxpc.wxEVT_ACTIVATE
-wxEVT_CREATE = wxpc.wxEVT_CREATE
-wxEVT_DESTROY = wxpc.wxEVT_DESTROY
-wxEVT_SHOW = wxpc.wxEVT_SHOW
-wxEVT_ICONIZE = wxpc.wxEVT_ICONIZE
-wxEVT_MAXIMIZE = wxpc.wxEVT_MAXIMIZE
-wxEVT_MOUSE_CAPTURE_CHANGED = wxpc.wxEVT_MOUSE_CAPTURE_CHANGED
-wxEVT_PAINT = wxpc.wxEVT_PAINT
-wxEVT_ERASE_BACKGROUND = wxpc.wxEVT_ERASE_BACKGROUND
-wxEVT_NC_PAINT = wxpc.wxEVT_NC_PAINT
-wxEVT_PAINT_ICON = wxpc.wxEVT_PAINT_ICON
-wxEVT_MENU_CHAR = wxpc.wxEVT_MENU_CHAR
-wxEVT_MENU_INIT = wxpc.wxEVT_MENU_INIT
-wxEVT_MENU_HIGHLIGHT = wxpc.wxEVT_MENU_HIGHLIGHT
-wxEVT_POPUP_MENU_INIT = wxpc.wxEVT_POPUP_MENU_INIT
-wxEVT_CONTEXT_MENU = wxpc.wxEVT_CONTEXT_MENU
-wxEVT_SYS_COLOUR_CHANGED = wxpc.wxEVT_SYS_COLOUR_CHANGED
-wxEVT_SETTING_CHANGED = wxpc.wxEVT_SETTING_CHANGED
-wxEVT_QUERY_NEW_PALETTE = wxpc.wxEVT_QUERY_NEW_PALETTE
-wxEVT_PALETTE_CHANGED = wxpc.wxEVT_PALETTE_CHANGED
-wxEVT_JOY_BUTTON_DOWN = wxpc.wxEVT_JOY_BUTTON_DOWN
-wxEVT_JOY_BUTTON_UP = wxpc.wxEVT_JOY_BUTTON_UP
-wxEVT_JOY_MOVE = wxpc.wxEVT_JOY_MOVE
-wxEVT_JOY_ZMOVE = wxpc.wxEVT_JOY_ZMOVE
-wxEVT_DROP_FILES = wxpc.wxEVT_DROP_FILES
-wxEVT_DRAW_ITEM = wxpc.wxEVT_DRAW_ITEM
-wxEVT_MEASURE_ITEM = wxpc.wxEVT_MEASURE_ITEM
-wxEVT_COMPARE_ITEM = wxpc.wxEVT_COMPARE_ITEM
-wxEVT_INIT_DIALOG = wxpc.wxEVT_INIT_DIALOG
-wxEVT_IDLE = wxpc.wxEVT_IDLE
-wxEVT_UPDATE_UI = wxpc.wxEVT_UPDATE_UI
-wxEVT_COMMAND_LEFT_CLICK = wxpc.wxEVT_COMMAND_LEFT_CLICK
-wxEVT_COMMAND_LEFT_DCLICK = wxpc.wxEVT_COMMAND_LEFT_DCLICK
-wxEVT_COMMAND_RIGHT_CLICK = wxpc.wxEVT_COMMAND_RIGHT_CLICK
-wxEVT_COMMAND_RIGHT_DCLICK = wxpc.wxEVT_COMMAND_RIGHT_DCLICK
-wxEVT_COMMAND_SET_FOCUS = wxpc.wxEVT_COMMAND_SET_FOCUS
-wxEVT_COMMAND_KILL_FOCUS = wxpc.wxEVT_COMMAND_KILL_FOCUS
-wxEVT_COMMAND_ENTER = wxpc.wxEVT_COMMAND_ENTER
-wxEVT_COMMAND_TREE_BEGIN_DRAG = wxpc.wxEVT_COMMAND_TREE_BEGIN_DRAG
-wxEVT_COMMAND_TREE_BEGIN_RDRAG = wxpc.wxEVT_COMMAND_TREE_BEGIN_RDRAG
-wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT = wxpc.wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT
-wxEVT_COMMAND_TREE_END_LABEL_EDIT = wxpc.wxEVT_COMMAND_TREE_END_LABEL_EDIT
-wxEVT_COMMAND_TREE_DELETE_ITEM = wxpc.wxEVT_COMMAND_TREE_DELETE_ITEM
-wxEVT_COMMAND_TREE_GET_INFO = wxpc.wxEVT_COMMAND_TREE_GET_INFO
-wxEVT_COMMAND_TREE_SET_INFO = wxpc.wxEVT_COMMAND_TREE_SET_INFO
-wxEVT_COMMAND_TREE_ITEM_EXPANDED = wxpc.wxEVT_COMMAND_TREE_ITEM_EXPANDED
-wxEVT_COMMAND_TREE_ITEM_EXPANDING = wxpc.wxEVT_COMMAND_TREE_ITEM_EXPANDING
-wxEVT_COMMAND_TREE_ITEM_COLLAPSED = wxpc.wxEVT_COMMAND_TREE_ITEM_COLLAPSED
-wxEVT_COMMAND_TREE_ITEM_COLLAPSING = wxpc.wxEVT_COMMAND_TREE_ITEM_COLLAPSING
-wxEVT_COMMAND_TREE_SEL_CHANGED = wxpc.wxEVT_COMMAND_TREE_SEL_CHANGED
-wxEVT_COMMAND_TREE_SEL_CHANGING = wxpc.wxEVT_COMMAND_TREE_SEL_CHANGING
-wxEVT_COMMAND_TREE_KEY_DOWN = wxpc.wxEVT_COMMAND_TREE_KEY_DOWN
-wxEVT_COMMAND_LIST_BEGIN_DRAG = wxpc.wxEVT_COMMAND_LIST_BEGIN_DRAG
-wxEVT_COMMAND_LIST_BEGIN_RDRAG = wxpc.wxEVT_COMMAND_LIST_BEGIN_RDRAG
-wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = wxpc.wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT
-wxEVT_COMMAND_LIST_END_LABEL_EDIT = wxpc.wxEVT_COMMAND_LIST_END_LABEL_EDIT
-wxEVT_COMMAND_LIST_DELETE_ITEM = wxpc.wxEVT_COMMAND_LIST_DELETE_ITEM
-wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS = wxpc.wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS
-wxEVT_COMMAND_LIST_GET_INFO = wxpc.wxEVT_COMMAND_LIST_GET_INFO
-wxEVT_COMMAND_LIST_SET_INFO = wxpc.wxEVT_COMMAND_LIST_SET_INFO
-wxEVT_COMMAND_LIST_ITEM_SELECTED = wxpc.wxEVT_COMMAND_LIST_ITEM_SELECTED
-wxEVT_COMMAND_LIST_ITEM_DESELECTED = wxpc.wxEVT_COMMAND_LIST_ITEM_DESELECTED
-wxEVT_COMMAND_LIST_KEY_DOWN = wxpc.wxEVT_COMMAND_LIST_KEY_DOWN
-wxEVT_COMMAND_LIST_INSERT_ITEM = wxpc.wxEVT_COMMAND_LIST_INSERT_ITEM
-wxEVT_COMMAND_LIST_COL_CLICK = wxpc.wxEVT_COMMAND_LIST_COL_CLICK
-wxEVT_COMMAND_TAB_SEL_CHANGED = wxpc.wxEVT_COMMAND_TAB_SEL_CHANGED
-wxEVT_COMMAND_TAB_SEL_CHANGING = wxpc.wxEVT_COMMAND_TAB_SEL_CHANGING
-wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wxpc.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
-wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = wxpc.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
-__version__ = wxpc.__version__
-cvar = wxpc.cvar
-wxPyDefaultPosition = wxPointPtr(wxpc.cvar.wxPyDefaultPosition)
-wxPyDefaultSize = wxSizePtr(wxpc.cvar.wxPyDefaultSize)
+wxMAJOR_VERSION = wxc.wxMAJOR_VERSION
+wxMINOR_VERSION = wxc.wxMINOR_VERSION
+wxRELEASE_NUMBER = wxc.wxRELEASE_NUMBER
+NOT_FOUND = wxc.NOT_FOUND
+wxVSCROLL = wxc.wxVSCROLL
+wxHSCROLL = wxc.wxHSCROLL
+wxCAPTION = wxc.wxCAPTION
+wxDOUBLE_BORDER = wxc.wxDOUBLE_BORDER
+wxSUNKEN_BORDER = wxc.wxSUNKEN_BORDER
+wxRAISED_BORDER = wxc.wxRAISED_BORDER
+wxBORDER = wxc.wxBORDER
+wxSIMPLE_BORDER = wxc.wxSIMPLE_BORDER
+wxSTATIC_BORDER = wxc.wxSTATIC_BORDER
+wxTRANSPARENT_WINDOW = wxc.wxTRANSPARENT_WINDOW
+wxNO_BORDER = wxc.wxNO_BORDER
+wxUSER_COLOURS = wxc.wxUSER_COLOURS
+wxNO_3D = wxc.wxNO_3D
+wxTAB_TRAVERSAL = wxc.wxTAB_TRAVERSAL
+wxHORIZONTAL = wxc.wxHORIZONTAL
+wxVERTICAL = wxc.wxVERTICAL
+wxBOTH = wxc.wxBOTH
+wxCENTER_FRAME = wxc.wxCENTER_FRAME
+wxSTAY_ON_TOP = wxc.wxSTAY_ON_TOP
+wxICONIZE = wxc.wxICONIZE
+wxMINIMIZE = wxc.wxMINIMIZE
+wxMAXIMIZE = wxc.wxMAXIMIZE
+wxTHICK_FRAME = wxc.wxTHICK_FRAME
+wxSYSTEM_MENU = wxc.wxSYSTEM_MENU
+wxMINIMIZE_BOX = wxc.wxMINIMIZE_BOX
+wxMAXIMIZE_BOX = wxc.wxMAXIMIZE_BOX
+wxTINY_CAPTION_HORIZ = wxc.wxTINY_CAPTION_HORIZ
+wxTINY_CAPTION_VERT = wxc.wxTINY_CAPTION_VERT
+wxRESIZE_BOX = wxc.wxRESIZE_BOX
+wxRESIZE_BORDER = wxc.wxRESIZE_BORDER
+wxDIALOG_MODAL = wxc.wxDIALOG_MODAL
+wxDIALOG_MODELESS = wxc.wxDIALOG_MODELESS
+wxDEFAULT_FRAME_STYLE = wxc.wxDEFAULT_FRAME_STYLE
+wxDEFAULT_DIALOG_STYLE = wxc.wxDEFAULT_DIALOG_STYLE
+wxFRAME_TOOL_WINDOW = wxc.wxFRAME_TOOL_WINDOW
+wxRETAINED = wxc.wxRETAINED
+wxBACKINGSTORE = wxc.wxBACKINGSTORE
+wxTB_3DBUTTONS = wxc.wxTB_3DBUTTONS
+wxTB_HORIZONTAL = wxc.wxTB_HORIZONTAL
+wxTB_VERTICAL = wxc.wxTB_VERTICAL
+wxTB_FLAT = wxc.wxTB_FLAT
+wxCOLOURED = wxc.wxCOLOURED
+wxFIXED_LENGTH = wxc.wxFIXED_LENGTH
+wxALIGN_LEFT = wxc.wxALIGN_LEFT
+wxALIGN_CENTER = wxc.wxALIGN_CENTER
+wxALIGN_CENTRE = wxc.wxALIGN_CENTRE
+wxALIGN_RIGHT = wxc.wxALIGN_RIGHT
+wxLB_NEEDED_SB = wxc.wxLB_NEEDED_SB
+wxLB_ALWAYS_SB = wxc.wxLB_ALWAYS_SB
+wxLB_SORT = wxc.wxLB_SORT
+wxLB_SINGLE = wxc.wxLB_SINGLE
+wxLB_MULTIPLE = wxc.wxLB_MULTIPLE
+wxLB_EXTENDED = wxc.wxLB_EXTENDED
+wxLB_OWNERDRAW = wxc.wxLB_OWNERDRAW
+wxLB_HSCROLL = wxc.wxLB_HSCROLL
+wxPROCESS_ENTER = wxc.wxPROCESS_ENTER
+wxPASSWORD = wxc.wxPASSWORD
+wxTE_PROCESS_ENTER = wxc.wxTE_PROCESS_ENTER
+wxTE_PASSWORD = wxc.wxTE_PASSWORD
+wxTE_READONLY = wxc.wxTE_READONLY
+wxTE_MULTILINE = wxc.wxTE_MULTILINE
+wxCB_SIMPLE = wxc.wxCB_SIMPLE
+wxCB_DROPDOWN = wxc.wxCB_DROPDOWN
+wxCB_SORT = wxc.wxCB_SORT
+wxCB_READONLY = wxc.wxCB_READONLY
+wxRA_HORIZONTAL = wxc.wxRA_HORIZONTAL
+wxRA_VERTICAL = wxc.wxRA_VERTICAL
+wxRB_GROUP = wxc.wxRB_GROUP
+wxGA_PROGRESSBAR = wxc.wxGA_PROGRESSBAR
+wxGA_HORIZONTAL = wxc.wxGA_HORIZONTAL
+wxGA_VERTICAL = wxc.wxGA_VERTICAL
+wxSL_HORIZONTAL = wxc.wxSL_HORIZONTAL
+wxSL_VERTICAL = wxc.wxSL_VERTICAL
+wxSL_AUTOTICKS = wxc.wxSL_AUTOTICKS
+wxSL_LABELS = wxc.wxSL_LABELS
+wxSL_LEFT = wxc.wxSL_LEFT
+wxSL_TOP = wxc.wxSL_TOP
+wxSL_RIGHT = wxc.wxSL_RIGHT
+wxSL_BOTTOM = wxc.wxSL_BOTTOM
+wxSL_BOTH = wxc.wxSL_BOTH
+wxSL_SELRANGE = wxc.wxSL_SELRANGE
+wxSB_HORIZONTAL = wxc.wxSB_HORIZONTAL
+wxSB_VERTICAL = wxc.wxSB_VERTICAL
+wxBU_AUTODRAW = wxc.wxBU_AUTODRAW
+wxBU_NOAUTODRAW = wxc.wxBU_NOAUTODRAW
+wxTR_HAS_BUTTONS = wxc.wxTR_HAS_BUTTONS
+wxTR_EDIT_LABELS = wxc.wxTR_EDIT_LABELS
+wxTR_LINES_AT_ROOT = wxc.wxTR_LINES_AT_ROOT
+wxLC_ICON = wxc.wxLC_ICON
+wxLC_SMALL_ICON = wxc.wxLC_SMALL_ICON
+wxLC_LIST = wxc.wxLC_LIST
+wxLC_REPORT = wxc.wxLC_REPORT
+wxLC_ALIGN_TOP = wxc.wxLC_ALIGN_TOP
+wxLC_ALIGN_LEFT = wxc.wxLC_ALIGN_LEFT
+wxLC_AUTOARRANGE = wxc.wxLC_AUTOARRANGE
+wxLC_USER_TEXT = wxc.wxLC_USER_TEXT
+wxLC_EDIT_LABELS = wxc.wxLC_EDIT_LABELS
+wxLC_NO_HEADER = wxc.wxLC_NO_HEADER
+wxLC_NO_SORT_HEADER = wxc.wxLC_NO_SORT_HEADER
+wxLC_SINGLE_SEL = wxc.wxLC_SINGLE_SEL
+wxLC_SORT_ASCENDING = wxc.wxLC_SORT_ASCENDING
+wxLC_SORT_DESCENDING = wxc.wxLC_SORT_DESCENDING
+wxLC_MASK_TYPE = wxc.wxLC_MASK_TYPE
+wxLC_MASK_ALIGN = wxc.wxLC_MASK_ALIGN
+wxLC_MASK_SORT = wxc.wxLC_MASK_SORT
+wxSP_VERTICAL = wxc.wxSP_VERTICAL
+wxSP_HORIZONTAL = wxc.wxSP_HORIZONTAL
+wxSP_ARROW_KEYS = wxc.wxSP_ARROW_KEYS
+wxSP_WRAP = wxc.wxSP_WRAP
+wxSP_NOBORDER = wxc.wxSP_NOBORDER
+wxSP_3D = wxc.wxSP_3D
+wxSP_BORDER = wxc.wxSP_BORDER
+wxTAB_MULTILINE = wxc.wxTAB_MULTILINE
+wxTAB_RIGHTJUSTIFY = wxc.wxTAB_RIGHTJUSTIFY
+wxTAB_FIXEDWIDTH = wxc.wxTAB_FIXEDWIDTH
+wxTAB_OWNERDRAW = wxc.wxTAB_OWNERDRAW
+wxFLOOD_SURFACE = wxc.wxFLOOD_SURFACE
+wxFLOOD_BORDER = wxc.wxFLOOD_BORDER
+wxODDEVEN_RULE = wxc.wxODDEVEN_RULE
+wxWINDING_RULE = wxc.wxWINDING_RULE
+wxTOOL_TOP = wxc.wxTOOL_TOP
+wxTOOL_BOTTOM = wxc.wxTOOL_BOTTOM
+wxTOOL_LEFT = wxc.wxTOOL_LEFT
+wxTOOL_RIGHT = wxc.wxTOOL_RIGHT
+wxOK = wxc.wxOK
+wxYES_NO = wxc.wxYES_NO
+wxCANCEL = wxc.wxCANCEL
+wxYES = wxc.wxYES
+wxNO = wxc.wxNO
+wxICON_EXCLAMATION = wxc.wxICON_EXCLAMATION
+wxICON_HAND = wxc.wxICON_HAND
+wxICON_QUESTION = wxc.wxICON_QUESTION
+wxICON_INFORMATION = wxc.wxICON_INFORMATION
+wxICON_STOP = wxc.wxICON_STOP
+wxICON_ASTERISK = wxc.wxICON_ASTERISK
+wxICON_MASK = wxc.wxICON_MASK
+wxCENTRE = wxc.wxCENTRE
+wxCENTER = wxc.wxCENTER
+wxSIZE_AUTO_WIDTH = wxc.wxSIZE_AUTO_WIDTH
+wxSIZE_AUTO_HEIGHT = wxc.wxSIZE_AUTO_HEIGHT
+wxSIZE_AUTO = wxc.wxSIZE_AUTO
+wxSIZE_USE_EXISTING = wxc.wxSIZE_USE_EXISTING
+wxSIZE_ALLOW_MINUS_ONE = wxc.wxSIZE_ALLOW_MINUS_ONE
+wxDF_TEXT = wxc.wxDF_TEXT
+wxDF_BITMAP = wxc.wxDF_BITMAP
+wxDF_METAFILE = wxc.wxDF_METAFILE
+wxDF_DIB = wxc.wxDF_DIB
+wxDF_OEMTEXT = wxc.wxDF_OEMTEXT
+wxDF_FILENAME = wxc.wxDF_FILENAME
+wxPORTRAIT = wxc.wxPORTRAIT
+wxLANDSCAPE = wxc.wxLANDSCAPE
+wxID_OPEN = wxc.wxID_OPEN
+wxID_CLOSE = wxc.wxID_CLOSE
+wxID_NEW = wxc.wxID_NEW
+wxID_SAVE = wxc.wxID_SAVE
+wxID_SAVEAS = wxc.wxID_SAVEAS
+wxID_REVERT = wxc.wxID_REVERT
+wxID_EXIT = wxc.wxID_EXIT
+wxID_UNDO = wxc.wxID_UNDO
+wxID_REDO = wxc.wxID_REDO
+wxID_HELP = wxc.wxID_HELP
+wxID_PRINT = wxc.wxID_PRINT
+wxID_PRINT_SETUP = wxc.wxID_PRINT_SETUP
+wxID_PREVIEW = wxc.wxID_PREVIEW
+wxID_ABOUT = wxc.wxID_ABOUT
+wxID_HELP_CONTENTS = wxc.wxID_HELP_CONTENTS
+wxID_HELP_COMMANDS = wxc.wxID_HELP_COMMANDS
+wxID_HELP_PROCEDURES = wxc.wxID_HELP_PROCEDURES
+wxID_HELP_CONTEXT = wxc.wxID_HELP_CONTEXT
+wxID_CUT = wxc.wxID_CUT
+wxID_COPY = wxc.wxID_COPY
+wxID_PASTE = wxc.wxID_PASTE
+wxID_CLEAR = wxc.wxID_CLEAR
+wxID_FIND = wxc.wxID_FIND
+wxID_FILE1 = wxc.wxID_FILE1
+wxID_FILE2 = wxc.wxID_FILE2
+wxID_FILE3 = wxc.wxID_FILE3
+wxID_FILE4 = wxc.wxID_FILE4
+wxID_FILE5 = wxc.wxID_FILE5
+wxID_FILE6 = wxc.wxID_FILE6
+wxID_FILE7 = wxc.wxID_FILE7
+wxID_FILE8 = wxc.wxID_FILE8
+wxID_FILE9 = wxc.wxID_FILE9
+wxID_OK = wxc.wxID_OK
+wxID_CANCEL = wxc.wxID_CANCEL
+wxID_APPLY = wxc.wxID_APPLY
+wxID_YES = wxc.wxID_YES
+wxID_NO = wxc.wxID_NO
+wxBITMAP_TYPE_BMP = wxc.wxBITMAP_TYPE_BMP
+wxBITMAP_TYPE_BMP_RESOURCE = wxc.wxBITMAP_TYPE_BMP_RESOURCE
+wxBITMAP_TYPE_ICO = wxc.wxBITMAP_TYPE_ICO
+wxBITMAP_TYPE_ICO_RESOURCE = wxc.wxBITMAP_TYPE_ICO_RESOURCE
+wxBITMAP_TYPE_CUR = wxc.wxBITMAP_TYPE_CUR
+wxBITMAP_TYPE_CUR_RESOURCE = wxc.wxBITMAP_TYPE_CUR_RESOURCE
+wxBITMAP_TYPE_XBM = wxc.wxBITMAP_TYPE_XBM
+wxBITMAP_TYPE_XBM_DATA = wxc.wxBITMAP_TYPE_XBM_DATA
+wxBITMAP_TYPE_XPM = wxc.wxBITMAP_TYPE_XPM
+wxBITMAP_TYPE_XPM_DATA = wxc.wxBITMAP_TYPE_XPM_DATA
+wxBITMAP_TYPE_TIF = wxc.wxBITMAP_TYPE_TIF
+wxBITMAP_TYPE_TIF_RESOURCE = wxc.wxBITMAP_TYPE_TIF_RESOURCE
+wxBITMAP_TYPE_GIF = wxc.wxBITMAP_TYPE_GIF
+wxBITMAP_TYPE_GIF_RESOURCE = wxc.wxBITMAP_TYPE_GIF_RESOURCE
+wxBITMAP_TYPE_PNG = wxc.wxBITMAP_TYPE_PNG
+wxBITMAP_TYPE_PNG_RESOURCE = wxc.wxBITMAP_TYPE_PNG_RESOURCE
+wxBITMAP_TYPE_ANY = wxc.wxBITMAP_TYPE_ANY
+wxBITMAP_TYPE_RESOURCE = wxc.wxBITMAP_TYPE_RESOURCE
+wxOPEN = wxc.wxOPEN
+wxSAVE = wxc.wxSAVE
+wxHIDE_READONLY = wxc.wxHIDE_READONLY
+wxOVERWRITE_PROMPT = wxc.wxOVERWRITE_PROMPT
+wxACCEL_ALT = wxc.wxACCEL_ALT
+wxACCEL_CTRL = wxc.wxACCEL_CTRL
+wxACCEL_SHIFT = wxc.wxACCEL_SHIFT
+ERR_PARAM = wxc.ERR_PARAM
+ERR_NODATA = wxc.ERR_NODATA
+ERR_CANCEL = wxc.ERR_CANCEL
+ERR_SUCCESS = wxc.ERR_SUCCESS
+wxDEFAULT = wxc.wxDEFAULT
+wxDECORATIVE = wxc.wxDECORATIVE
+wxROMAN = wxc.wxROMAN
+wxSCRIPT = wxc.wxSCRIPT
+wxSWISS = wxc.wxSWISS
+wxMODERN = wxc.wxMODERN
+wxTELETYPE = wxc.wxTELETYPE
+wxVARIABLE = wxc.wxVARIABLE
+wxFIXED = wxc.wxFIXED
+wxNORMAL = wxc.wxNORMAL
+wxLIGHT = wxc.wxLIGHT
+wxBOLD = wxc.wxBOLD
+wxITALIC = wxc.wxITALIC
+wxSLANT = wxc.wxSLANT
+wxSOLID = wxc.wxSOLID
+wxDOT = wxc.wxDOT
+wxLONG_DASH = wxc.wxLONG_DASH
+wxSHORT_DASH = wxc.wxSHORT_DASH
+wxDOT_DASH = wxc.wxDOT_DASH
+wxUSER_DASH = wxc.wxUSER_DASH
+wxTRANSPARENT = wxc.wxTRANSPARENT
+wxSTIPPLE = wxc.wxSTIPPLE
+wxBDIAGONAL_HATCH = wxc.wxBDIAGONAL_HATCH
+wxCROSSDIAG_HATCH = wxc.wxCROSSDIAG_HATCH
+wxFDIAGONAL_HATCH = wxc.wxFDIAGONAL_HATCH
+wxCROSS_HATCH = wxc.wxCROSS_HATCH
+wxHORIZONTAL_HATCH = wxc.wxHORIZONTAL_HATCH
+wxVERTICAL_HATCH = wxc.wxVERTICAL_HATCH
+wxJOIN_BEVEL = wxc.wxJOIN_BEVEL
+wxJOIN_MITER = wxc.wxJOIN_MITER
+wxJOIN_ROUND = wxc.wxJOIN_ROUND
+wxCAP_ROUND = wxc.wxCAP_ROUND
+wxCAP_PROJECTING = wxc.wxCAP_PROJECTING
+wxCAP_BUTT = wxc.wxCAP_BUTT
+wxCLEAR = wxc.wxCLEAR
+wxXOR = wxc.wxXOR
+wxINVERT = wxc.wxINVERT
+wxOR_REVERSE = wxc.wxOR_REVERSE
+wxAND_REVERSE = wxc.wxAND_REVERSE
+wxCOPY = wxc.wxCOPY
+wxAND = wxc.wxAND
+wxAND_INVERT = wxc.wxAND_INVERT
+wxNO_OP = wxc.wxNO_OP
+wxNOR = wxc.wxNOR
+wxEQUIV = wxc.wxEQUIV
+wxSRC_INVERT = wxc.wxSRC_INVERT
+wxOR_INVERT = wxc.wxOR_INVERT
+wxNAND = wxc.wxNAND
+wxOR = wxc.wxOR
+wxSET = wxc.wxSET
+wxSRC_OR = wxc.wxSRC_OR
+wxSRC_AND = wxc.wxSRC_AND
+WXK_BACK = wxc.WXK_BACK
+WXK_TAB = wxc.WXK_TAB
+WXK_RETURN = wxc.WXK_RETURN
+WXK_ESCAPE = wxc.WXK_ESCAPE
+WXK_SPACE = wxc.WXK_SPACE
+WXK_DELETE = wxc.WXK_DELETE
+WXK_START = wxc.WXK_START
+WXK_LBUTTON = wxc.WXK_LBUTTON
+WXK_RBUTTON = wxc.WXK_RBUTTON
+WXK_CANCEL = wxc.WXK_CANCEL
+WXK_MBUTTON = wxc.WXK_MBUTTON
+WXK_CLEAR = wxc.WXK_CLEAR
+WXK_SHIFT = wxc.WXK_SHIFT
+WXK_CONTROL = wxc.WXK_CONTROL
+WXK_MENU = wxc.WXK_MENU
+WXK_PAUSE = wxc.WXK_PAUSE
+WXK_CAPITAL = wxc.WXK_CAPITAL
+WXK_PRIOR = wxc.WXK_PRIOR
+WXK_NEXT = wxc.WXK_NEXT
+WXK_END = wxc.WXK_END
+WXK_HOME = wxc.WXK_HOME
+WXK_LEFT = wxc.WXK_LEFT
+WXK_UP = wxc.WXK_UP
+WXK_RIGHT = wxc.WXK_RIGHT
+WXK_DOWN = wxc.WXK_DOWN
+WXK_SELECT = wxc.WXK_SELECT
+WXK_PRINT = wxc.WXK_PRINT
+WXK_EXECUTE = wxc.WXK_EXECUTE
+WXK_SNAPSHOT = wxc.WXK_SNAPSHOT
+WXK_INSERT = wxc.WXK_INSERT
+WXK_HELP = wxc.WXK_HELP
+WXK_NUMPAD0 = wxc.WXK_NUMPAD0
+WXK_NUMPAD1 = wxc.WXK_NUMPAD1
+WXK_NUMPAD2 = wxc.WXK_NUMPAD2
+WXK_NUMPAD3 = wxc.WXK_NUMPAD3
+WXK_NUMPAD4 = wxc.WXK_NUMPAD4
+WXK_NUMPAD5 = wxc.WXK_NUMPAD5
+WXK_NUMPAD6 = wxc.WXK_NUMPAD6
+WXK_NUMPAD7 = wxc.WXK_NUMPAD7
+WXK_NUMPAD8 = wxc.WXK_NUMPAD8
+WXK_NUMPAD9 = wxc.WXK_NUMPAD9
+WXK_MULTIPLY = wxc.WXK_MULTIPLY
+WXK_ADD = wxc.WXK_ADD
+WXK_SEPARATOR = wxc.WXK_SEPARATOR
+WXK_SUBTRACT = wxc.WXK_SUBTRACT
+WXK_DECIMAL = wxc.WXK_DECIMAL
+WXK_DIVIDE = wxc.WXK_DIVIDE
+WXK_F1 = wxc.WXK_F1
+WXK_F2 = wxc.WXK_F2
+WXK_F3 = wxc.WXK_F3
+WXK_F4 = wxc.WXK_F4
+WXK_F5 = wxc.WXK_F5
+WXK_F6 = wxc.WXK_F6
+WXK_F7 = wxc.WXK_F7
+WXK_F8 = wxc.WXK_F8
+WXK_F9 = wxc.WXK_F9
+WXK_F10 = wxc.WXK_F10
+WXK_F11 = wxc.WXK_F11
+WXK_F12 = wxc.WXK_F12
+WXK_F13 = wxc.WXK_F13
+WXK_F14 = wxc.WXK_F14
+WXK_F15 = wxc.WXK_F15
+WXK_F16 = wxc.WXK_F16
+WXK_F17 = wxc.WXK_F17
+WXK_F18 = wxc.WXK_F18
+WXK_F19 = wxc.WXK_F19
+WXK_F20 = wxc.WXK_F20
+WXK_F21 = wxc.WXK_F21
+WXK_F22 = wxc.WXK_F22
+WXK_F23 = wxc.WXK_F23
+WXK_F24 = wxc.WXK_F24
+WXK_NUMLOCK = wxc.WXK_NUMLOCK
+WXK_SCROLL = wxc.WXK_SCROLL
+WXK_PAGEUP = wxc.WXK_PAGEUP
+WXK_PAGEDOWN = wxc.WXK_PAGEDOWN
+wxCURSOR_NONE = wxc.wxCURSOR_NONE
+wxCURSOR_ARROW = wxc.wxCURSOR_ARROW
+wxCURSOR_BULLSEYE = wxc.wxCURSOR_BULLSEYE
+wxCURSOR_CHAR = wxc.wxCURSOR_CHAR
+wxCURSOR_CROSS = wxc.wxCURSOR_CROSS
+wxCURSOR_HAND = wxc.wxCURSOR_HAND
+wxCURSOR_IBEAM = wxc.wxCURSOR_IBEAM
+wxCURSOR_LEFT_BUTTON = wxc.wxCURSOR_LEFT_BUTTON
+wxCURSOR_MAGNIFIER = wxc.wxCURSOR_MAGNIFIER
+wxCURSOR_MIDDLE_BUTTON = wxc.wxCURSOR_MIDDLE_BUTTON
+wxCURSOR_NO_ENTRY = wxc.wxCURSOR_NO_ENTRY
+wxCURSOR_PAINT_BRUSH = wxc.wxCURSOR_PAINT_BRUSH
+wxCURSOR_PENCIL = wxc.wxCURSOR_PENCIL
+wxCURSOR_POINT_LEFT = wxc.wxCURSOR_POINT_LEFT
+wxCURSOR_POINT_RIGHT = wxc.wxCURSOR_POINT_RIGHT
+wxCURSOR_QUESTION_ARROW = wxc.wxCURSOR_QUESTION_ARROW
+wxCURSOR_RIGHT_BUTTON = wxc.wxCURSOR_RIGHT_BUTTON
+wxCURSOR_SIZENESW = wxc.wxCURSOR_SIZENESW
+wxCURSOR_SIZENS = wxc.wxCURSOR_SIZENS
+wxCURSOR_SIZENWSE = wxc.wxCURSOR_SIZENWSE
+wxCURSOR_SIZEWE = wxc.wxCURSOR_SIZEWE
+wxCURSOR_SIZING = wxc.wxCURSOR_SIZING
+wxCURSOR_SPRAYCAN = wxc.wxCURSOR_SPRAYCAN
+wxCURSOR_WAIT = wxc.wxCURSOR_WAIT
+wxCURSOR_WATCH = wxc.wxCURSOR_WATCH
+wxCURSOR_BLANK = wxc.wxCURSOR_BLANK
+FALSE = wxc.FALSE
+false = wxc.false
+TRUE = wxc.TRUE
+true = wxc.true
+wxEVT_NULL = wxc.wxEVT_NULL
+wxEVT_FIRST = wxc.wxEVT_FIRST
+wxEVT_COMMAND_BUTTON_CLICKED = wxc.wxEVT_COMMAND_BUTTON_CLICKED
+wxEVT_COMMAND_CHECKBOX_CLICKED = wxc.wxEVT_COMMAND_CHECKBOX_CLICKED
+wxEVT_COMMAND_CHOICE_SELECTED = wxc.wxEVT_COMMAND_CHOICE_SELECTED
+wxEVT_COMMAND_LISTBOX_SELECTED = wxc.wxEVT_COMMAND_LISTBOX_SELECTED
+wxEVT_COMMAND_LISTBOX_DOUBLECLICKED = wxc.wxEVT_COMMAND_LISTBOX_DOUBLECLICKED
+wxEVT_COMMAND_CHECKLISTBOX_TOGGLED = wxc.wxEVT_COMMAND_CHECKLISTBOX_TOGGLED
+wxEVT_COMMAND_TEXT_UPDATED = wxc.wxEVT_COMMAND_TEXT_UPDATED
+wxEVT_COMMAND_TEXT_ENTER = wxc.wxEVT_COMMAND_TEXT_ENTER
+wxEVT_COMMAND_MENU_SELECTED = wxc.wxEVT_COMMAND_MENU_SELECTED
+wxEVT_COMMAND_SLIDER_UPDATED = wxc.wxEVT_COMMAND_SLIDER_UPDATED
+wxEVT_COMMAND_RADIOBOX_SELECTED = wxc.wxEVT_COMMAND_RADIOBOX_SELECTED
+wxEVT_COMMAND_RADIOBUTTON_SELECTED = wxc.wxEVT_COMMAND_RADIOBUTTON_SELECTED
+wxEVT_COMMAND_SCROLLBAR_UPDATED = wxc.wxEVT_COMMAND_SCROLLBAR_UPDATED
+wxEVT_COMMAND_VLBOX_SELECTED = wxc.wxEVT_COMMAND_VLBOX_SELECTED
+wxEVT_COMMAND_COMBOBOX_SELECTED = wxc.wxEVT_COMMAND_COMBOBOX_SELECTED
+wxEVT_COMMAND_TOOL_CLICKED = wxc.wxEVT_COMMAND_TOOL_CLICKED
+wxEVT_COMMAND_TOOL_RCLICKED = wxc.wxEVT_COMMAND_TOOL_RCLICKED
+wxEVT_COMMAND_TOOL_ENTER = wxc.wxEVT_COMMAND_TOOL_ENTER
+wxEVT_SET_FOCUS = wxc.wxEVT_SET_FOCUS
+wxEVT_KILL_FOCUS = wxc.wxEVT_KILL_FOCUS
+wxEVT_LEFT_DOWN = wxc.wxEVT_LEFT_DOWN
+wxEVT_LEFT_UP = wxc.wxEVT_LEFT_UP
+wxEVT_MIDDLE_DOWN = wxc.wxEVT_MIDDLE_DOWN
+wxEVT_MIDDLE_UP = wxc.wxEVT_MIDDLE_UP
+wxEVT_RIGHT_DOWN = wxc.wxEVT_RIGHT_DOWN
+wxEVT_RIGHT_UP = wxc.wxEVT_RIGHT_UP
+wxEVT_MOTION = wxc.wxEVT_MOTION
+wxEVT_ENTER_WINDOW = wxc.wxEVT_ENTER_WINDOW
+wxEVT_LEAVE_WINDOW = wxc.wxEVT_LEAVE_WINDOW
+wxEVT_LEFT_DCLICK = wxc.wxEVT_LEFT_DCLICK
+wxEVT_MIDDLE_DCLICK = wxc.wxEVT_MIDDLE_DCLICK
+wxEVT_RIGHT_DCLICK = wxc.wxEVT_RIGHT_DCLICK
+wxEVT_NC_LEFT_DOWN = wxc.wxEVT_NC_LEFT_DOWN
+wxEVT_NC_LEFT_UP = wxc.wxEVT_NC_LEFT_UP
+wxEVT_NC_MIDDLE_DOWN = wxc.wxEVT_NC_MIDDLE_DOWN
+wxEVT_NC_MIDDLE_UP = wxc.wxEVT_NC_MIDDLE_UP
+wxEVT_NC_RIGHT_DOWN = wxc.wxEVT_NC_RIGHT_DOWN
+wxEVT_NC_RIGHT_UP = wxc.wxEVT_NC_RIGHT_UP
+wxEVT_NC_MOTION = wxc.wxEVT_NC_MOTION
+wxEVT_NC_ENTER_WINDOW = wxc.wxEVT_NC_ENTER_WINDOW
+wxEVT_NC_LEAVE_WINDOW = wxc.wxEVT_NC_LEAVE_WINDOW
+wxEVT_NC_LEFT_DCLICK = wxc.wxEVT_NC_LEFT_DCLICK
+wxEVT_NC_MIDDLE_DCLICK = wxc.wxEVT_NC_MIDDLE_DCLICK
+wxEVT_NC_RIGHT_DCLICK = wxc.wxEVT_NC_RIGHT_DCLICK
+wxEVT_CHAR = wxc.wxEVT_CHAR
+wxEVT_SCROLL_TOP = wxc.wxEVT_SCROLL_TOP
+wxEVT_SCROLL_BOTTOM = wxc.wxEVT_SCROLL_BOTTOM
+wxEVT_SCROLL_LINEUP = wxc.wxEVT_SCROLL_LINEUP
+wxEVT_SCROLL_LINEDOWN = wxc.wxEVT_SCROLL_LINEDOWN
+wxEVT_SCROLL_PAGEUP = wxc.wxEVT_SCROLL_PAGEUP
+wxEVT_SCROLL_PAGEDOWN = wxc.wxEVT_SCROLL_PAGEDOWN
+wxEVT_SCROLL_THUMBTRACK = wxc.wxEVT_SCROLL_THUMBTRACK
+wxEVT_SIZE = wxc.wxEVT_SIZE
+wxEVT_MOVE = wxc.wxEVT_MOVE
+wxEVT_CLOSE_WINDOW = wxc.wxEVT_CLOSE_WINDOW
+wxEVT_END_SESSION = wxc.wxEVT_END_SESSION
+wxEVT_QUERY_END_SESSION = wxc.wxEVT_QUERY_END_SESSION
+wxEVT_ACTIVATE_APP = wxc.wxEVT_ACTIVATE_APP
+wxEVT_POWER = wxc.wxEVT_POWER
+wxEVT_CHAR_HOOK = wxc.wxEVT_CHAR_HOOK
+wxEVT_KEY_UP = wxc.wxEVT_KEY_UP
+wxEVT_ACTIVATE = wxc.wxEVT_ACTIVATE
+wxEVT_CREATE = wxc.wxEVT_CREATE
+wxEVT_DESTROY = wxc.wxEVT_DESTROY
+wxEVT_SHOW = wxc.wxEVT_SHOW
+wxEVT_ICONIZE = wxc.wxEVT_ICONIZE
+wxEVT_MAXIMIZE = wxc.wxEVT_MAXIMIZE
+wxEVT_MOUSE_CAPTURE_CHANGED = wxc.wxEVT_MOUSE_CAPTURE_CHANGED
+wxEVT_PAINT = wxc.wxEVT_PAINT
+wxEVT_ERASE_BACKGROUND = wxc.wxEVT_ERASE_BACKGROUND
+wxEVT_NC_PAINT = wxc.wxEVT_NC_PAINT
+wxEVT_PAINT_ICON = wxc.wxEVT_PAINT_ICON
+wxEVT_MENU_CHAR = wxc.wxEVT_MENU_CHAR
+wxEVT_MENU_INIT = wxc.wxEVT_MENU_INIT
+wxEVT_MENU_HIGHLIGHT = wxc.wxEVT_MENU_HIGHLIGHT
+wxEVT_POPUP_MENU_INIT = wxc.wxEVT_POPUP_MENU_INIT
+wxEVT_CONTEXT_MENU = wxc.wxEVT_CONTEXT_MENU
+wxEVT_SYS_COLOUR_CHANGED = wxc.wxEVT_SYS_COLOUR_CHANGED
+wxEVT_SETTING_CHANGED = wxc.wxEVT_SETTING_CHANGED
+wxEVT_QUERY_NEW_PALETTE = wxc.wxEVT_QUERY_NEW_PALETTE
+wxEVT_PALETTE_CHANGED = wxc.wxEVT_PALETTE_CHANGED
+wxEVT_JOY_BUTTON_DOWN = wxc.wxEVT_JOY_BUTTON_DOWN
+wxEVT_JOY_BUTTON_UP = wxc.wxEVT_JOY_BUTTON_UP
+wxEVT_JOY_MOVE = wxc.wxEVT_JOY_MOVE
+wxEVT_JOY_ZMOVE = wxc.wxEVT_JOY_ZMOVE
+wxEVT_DROP_FILES = wxc.wxEVT_DROP_FILES
+wxEVT_DRAW_ITEM = wxc.wxEVT_DRAW_ITEM
+wxEVT_MEASURE_ITEM = wxc.wxEVT_MEASURE_ITEM
+wxEVT_COMPARE_ITEM = wxc.wxEVT_COMPARE_ITEM
+wxEVT_INIT_DIALOG = wxc.wxEVT_INIT_DIALOG
+wxEVT_IDLE = wxc.wxEVT_IDLE
+wxEVT_UPDATE_UI = wxc.wxEVT_UPDATE_UI
+wxEVT_COMMAND_LEFT_CLICK = wxc.wxEVT_COMMAND_LEFT_CLICK
+wxEVT_COMMAND_LEFT_DCLICK = wxc.wxEVT_COMMAND_LEFT_DCLICK
+wxEVT_COMMAND_RIGHT_CLICK = wxc.wxEVT_COMMAND_RIGHT_CLICK
+wxEVT_COMMAND_RIGHT_DCLICK = wxc.wxEVT_COMMAND_RIGHT_DCLICK
+wxEVT_COMMAND_SET_FOCUS = wxc.wxEVT_COMMAND_SET_FOCUS
+wxEVT_COMMAND_KILL_FOCUS = wxc.wxEVT_COMMAND_KILL_FOCUS
+wxEVT_COMMAND_ENTER = wxc.wxEVT_COMMAND_ENTER
+wxEVT_COMMAND_TREE_BEGIN_DRAG = wxc.wxEVT_COMMAND_TREE_BEGIN_DRAG
+wxEVT_COMMAND_TREE_BEGIN_RDRAG = wxc.wxEVT_COMMAND_TREE_BEGIN_RDRAG
+wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT = wxc.wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT
+wxEVT_COMMAND_TREE_END_LABEL_EDIT = wxc.wxEVT_COMMAND_TREE_END_LABEL_EDIT
+wxEVT_COMMAND_TREE_DELETE_ITEM = wxc.wxEVT_COMMAND_TREE_DELETE_ITEM
+wxEVT_COMMAND_TREE_GET_INFO = wxc.wxEVT_COMMAND_TREE_GET_INFO
+wxEVT_COMMAND_TREE_SET_INFO = wxc.wxEVT_COMMAND_TREE_SET_INFO
+wxEVT_COMMAND_TREE_ITEM_EXPANDED = wxc.wxEVT_COMMAND_TREE_ITEM_EXPANDED
+wxEVT_COMMAND_TREE_ITEM_EXPANDING = wxc.wxEVT_COMMAND_TREE_ITEM_EXPANDING
+wxEVT_COMMAND_TREE_ITEM_COLLAPSED = wxc.wxEVT_COMMAND_TREE_ITEM_COLLAPSED
+wxEVT_COMMAND_TREE_ITEM_COLLAPSING = wxc.wxEVT_COMMAND_TREE_ITEM_COLLAPSING
+wxEVT_COMMAND_TREE_SEL_CHANGED = wxc.wxEVT_COMMAND_TREE_SEL_CHANGED
+wxEVT_COMMAND_TREE_SEL_CHANGING = wxc.wxEVT_COMMAND_TREE_SEL_CHANGING
+wxEVT_COMMAND_TREE_KEY_DOWN = wxc.wxEVT_COMMAND_TREE_KEY_DOWN
+wxEVT_COMMAND_LIST_BEGIN_DRAG = wxc.wxEVT_COMMAND_LIST_BEGIN_DRAG
+wxEVT_COMMAND_LIST_BEGIN_RDRAG = wxc.wxEVT_COMMAND_LIST_BEGIN_RDRAG
+wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = wxc.wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT
+wxEVT_COMMAND_LIST_END_LABEL_EDIT = wxc.wxEVT_COMMAND_LIST_END_LABEL_EDIT
+wxEVT_COMMAND_LIST_DELETE_ITEM = wxc.wxEVT_COMMAND_LIST_DELETE_ITEM
+wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS = wxc.wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS
+wxEVT_COMMAND_LIST_GET_INFO = wxc.wxEVT_COMMAND_LIST_GET_INFO
+wxEVT_COMMAND_LIST_SET_INFO = wxc.wxEVT_COMMAND_LIST_SET_INFO
+wxEVT_COMMAND_LIST_ITEM_SELECTED = wxc.wxEVT_COMMAND_LIST_ITEM_SELECTED
+wxEVT_COMMAND_LIST_ITEM_DESELECTED = wxc.wxEVT_COMMAND_LIST_ITEM_DESELECTED
+wxEVT_COMMAND_LIST_KEY_DOWN = wxc.wxEVT_COMMAND_LIST_KEY_DOWN
+wxEVT_COMMAND_LIST_INSERT_ITEM = wxc.wxEVT_COMMAND_LIST_INSERT_ITEM
+wxEVT_COMMAND_LIST_COL_CLICK = wxc.wxEVT_COMMAND_LIST_COL_CLICK
+wxEVT_COMMAND_TAB_SEL_CHANGED = wxc.wxEVT_COMMAND_TAB_SEL_CHANGED
+wxEVT_COMMAND_TAB_SEL_CHANGING = wxc.wxEVT_COMMAND_TAB_SEL_CHANGING
+wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wxc.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
+wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = wxc.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
+__version__ = wxc.__version__
+cvar = wxc.cvar
+wxPyDefaultPosition = wxPointPtr(wxc.cvar.wxPyDefaultPosition)
+wxPyDefaultSize = wxSizePtr(wxc.cvar.wxPyDefaultSize)
 
 
 #-------------- USER INCLUDE -----------------------
@@ -969,7 +972,7 @@ def EVT_NOTEBOOK_PAGE_CHANGING(win, id, func):
     win.Connect(id, -1, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, func)
 
 
-#wxTreeCtrl events
+# wxTreeCtrl events
 def EVT_TREE_BEGIN_DRAG(win, id, func):
     win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_DRAG, func)
 
@@ -1013,7 +1016,7 @@ def EVT_TREE_DELETE_ITEM(win, id, func):
     win.Connect(id, -1, wxEVT_COMMAND_TREE_DELETE_ITEM, func)
 
 
-
+# wxSpinButton
 def EVT_SPIN_UP(win, id, func):
     win.Connect(id, -1, wxEVT_SCROLL_LINEUP, func)
 
@@ -1031,6 +1034,61 @@ def EVT_SPIN(win, id, func):
 
 
 
+
+# wxTaskBarIcon
+def EVT_TASKBAR_MOVE(win, func):
+    win.Connect(-1, -1, wxEVT_TASKBAR_MOVE, func)
+
+def EVT_TASKBAR_LEFT_DOWN(win, func):
+    win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DOWN, func)
+
+def EVT_TASKBAR_LEFT_UP(win, func):
+    win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_UP, func)
+
+def EVT_TASKBAR_RIGHT_DOWN(win, func):
+    win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DOWN, func)
+
+def EVT_TASKBAR_RIGHT_UP(win, func):
+    win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_UP, func)
+
+def EVT_TASKBAR_LEFT_DCLICK(win, func):
+    win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DCLICK, func)
+
+def EVT_TASKBAR_RIGHT_DCLICK(win, func):
+    win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DCLICK, func)
+
+
+# wxGrid
+def EVT_GRID_SELECT_CELL(win, fn):
+    win.Connect(-1, -1, wxEVT_GRID_SELECT_CELL, fn)
+
+def EVT_GRID_CREATE_CELL(win, fn):
+    win.Connect(-1, -1, wxEVT_GRID_CREATE_CELL, fn)
+
+def EVT_GRID_CHANGE_LABELS(win, fn):
+    win.Connect(-1, -1, wxEVT_GRID_CHANGE_LABELS, fn)
+
+def EVT_GRID_CHANGE_SEL_LABEL(win, fn):
+    win.Connect(-1, -1, wxEVT_GRID_CHANGE_SEL_LABEL, fn)
+
+def EVT_GRID_CELL_CHANGE(win, fn):
+    win.Connect(-1, -1, wxEVT_GRID_CELL_CHANGE, fn)
+
+def EVT_GRID_CELL_LCLICK(win, fn):
+    win.Connect(-1, -1, wxEVT_GRID_CELL_LCLICK, fn)
+
+def EVT_GRID_CELL_RCLICK(win, fn):
+    win.Connect(-1, -1, wxEVT_GRID_CELL_RCLICK, fn)
+
+def EVT_GRID_LABEL_LCLICK(win, fn):
+    win.Connect(-1, -1, wxEVT_GRID_LABEL_LCLICK, fn)
+
+def EVT_GRID_LABEL_RCLICK(win, fn):
+    win.Connect(-1, -1, wxEVT_GRID_LABEL_RCLICK, fn)
+
+
+
+
 #----------------------------------------------------------------------
 
 class wxTimer(wxPyTimer):
@@ -1052,7 +1110,7 @@ NULL = NullObj()
 #----------------------------------------------------------------------
 # aliases
 
-wxColor = wxColour
+wxColor      = wxColour
 wxNamedColor = wxNamedColour
 
 wxPyDefaultPosition.Set(-1,-1)
@@ -1125,26 +1183,16 @@ class wxApp(wxPyApp):
 #----------------------------------------------------------------------------
 #
 # $Log$
-# Revision 1.1  1998/12/15 20:42:01  RD
-# Changed the import semantics from "from wxPython import *" to "from
-# wxPython.wx import *"  This is for people who are worried about
-# namespace pollution, they can use "from wxPython import wx" and then
-# prefix all the wxPython identifiers with "wx."
-#
-# Added wxTaskbarIcon for wxMSW.
-#
-# Made the events work for wxGrid.
-#
-# Added wxConfig.
-#
-# Added wxMiniFrame for wxGTK, (untested.)
+# Revision 1.2  1998/12/16 22:12:22  RD
+# Tweaks needed to be able to build wxPython with wxGTK.
 #
-# Changed many of the args and return values that were pointers to gdi
-# objects to references to reflect changes in the wxWindows API.
+# Revision 1.7  1998/11/25 08:45:21  RD
 #
-# Other assorted fixes and additions.
+# Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
+# Added events for wxGrid
+# Other various fixes and additions
 #
-# Revision 1.9  1998/11/16 00:01:43  RD
+# Revision 1.6  1998/11/16 00:00:52  RD
 # Generic treectrl for wxPython/GTK compiles...
 #
 # Revision 1.5  1998/10/20 07:38:02  RD
index 6d11cacacb7cfbb9e4e0413c43ab558646b5da92..652fe6deac5f6ab96a7470fcd57f363488a70492 100644 (file)
@@ -299,7 +299,9 @@ public:
 
     wxRect GetBox();
     bool Intersect(const wxRect& rect);
+#ifdef __WXMSW__
     bool IsEmpty();
+#endif
     bool Subtract(const wxRect& rect);
     bool Union(const wxRect& rect);
     bool Xor(const wxRect& rect);
@@ -358,6 +360,9 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.9  1998/12/16 22:10:55  RD
+// Tweaks needed to be able to build wxPython with wxGTK.
+//
 // Revision 1.8  1998/12/15 20:41:22  RD
 // Changed the import semantics from "from wxPython import *" to "from
 // wxPython.wx import *"  This is for people who are worried about
index 362e2b1dde8c5b964104fa567282b21e3ea69f72..9b095fb0792f8b7ef85d12b27078b96d343b9a60 100644 (file)
@@ -87,13 +87,28 @@ public:
     int  GetCharHeight();
     int  GetCharWidth();
     %name(GetClientSizeTuple) void GetClientSize(int *OUTPUT, int *OUTPUT);
+#ifdef __WXMSW__
     wxSize GetClientSize();
+#else
+    %addmethods {
+        wxSize GetClientSize() {
+            int w, h;
+            self->GetClientSize(&w, &h);
+            return wxSize(w, h);
+        }
+    }
+#endif
     wxLayoutConstraints * GetConstraints();
 #ifdef __WXMSW__
     wxButton* GetDefaultItem();
 #endif
     //wxEvtHandler* GetEventHandler();
+
+#ifdef __WXMSW__
     wxFont& GetFont();
+#else
+    wxFont GetFont();
+#endif
     wxColour GetForegroundColour();
     wxWindow * GetGrandParent();
     int GetId();
@@ -101,14 +116,18 @@ public:
     wxString GetName();
     wxWindow * GetParent();
     %name(GetPositionTuple) void GetPosition(int *OUTPUT, int *OUTPUT);
+#ifdef __WXMSW__
     wxPoint GetPosition();
     wxRect GetRect();
+#endif
     int  GetReturnCode();
     int GetScrollThumb(int orientation);
     int GetScrollPos(int orientation);
     int GetScrollRange(int orientation);
     %name(GetSizeTuple) void GetSize(int *OUTPUT, int *OUTPUT);
+#ifdef __WXMSW__
     wxSize GetSize();
+#endif
     void GetTextExtent(const wxString& string, int *OUTPUT, int *OUTPUT); // int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL, bool use16 = FALSE)
     wxString GetTitle();
     long GetWindowStyleFlag();
@@ -364,6 +383,9 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.8  1998/12/16 22:10:56  RD
+// Tweaks needed to be able to build wxPython with wxGTK.
+//
 // Revision 1.7  1998/12/15 20:41:25  RD
 // Changed the import semantics from "from wxPython import *" to "from
 // wxPython.wx import *"  This is for people who are worried about
index 5570148adac29d2d72c4d764b140b67ac7efba2a..aeb3c9b49cdb24b950b07cd0035d817c008ece87 100644 (file)
@@ -46,7 +46,7 @@
 
 //---------------------------------------------------------------------------
 
-#define __version__ "0.5.0"
+#define __version__ "0.5.1"
 
 wxPoint     wxPyDefaultPosition;
 wxSize      wxPyDefaultSize;
@@ -152,6 +152,9 @@ extern "C" SWIGEXPORT(void,initutilsc)();
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.2  1998/12/16 22:10:57  RD
+// Tweaks needed to be able to build wxPython with wxGTK.
+//
 // Revision 1.1  1998/12/15 20:41:27  RD
 // Changed the import semantics from "from wxPython import *" to "from
 // wxPython.wx import *"  This is for people who are worried about
index 1fe3bf2a45fee0db18ddade1e637160974b1e41b..7da376bc5b154463f2ead412c78211e1ec8d7176 100644 (file)
@@ -35,21 +35,21 @@ class MyCanvas(wxWindow):
 
 #---------------------------------------------------------------------------
 
-if wxPlatform == '__WXMSW__':
-    class MyMiniFrame(wxMiniFrame):
-        def __init__(self, parent, ID, title, pos, size, style):
-            wxMiniFrame.__init__(self, parent, ID, title, pos, size, style)
-            panel = wxPanel(self, -1)
-            ID = NewId()
-            button = wxButton(panel, ID, "Close Me")
-            button.SetPosition(wxPoint(15, 15))
-            self.Connect(ID, -1, wxEVT_COMMAND_BUTTON_CLICKED, self.OnCloseMe)
-
-        def OnCloseMe(self, event):
-            self.Close(true)
-
-        def OnCloseWindow(self, event):
-            self.Destroy()
+#if wxPlatform == '__WXMSW__':
+class MyMiniFrame(wxMiniFrame):
+    def __init__(self, parent, ID, title, pos, size, style):
+        wxMiniFrame.__init__(self, parent, ID, title, pos, size, style)
+        panel = wxPanel(self, -1)
+        ID = NewId()
+        button = wxButton(panel, ID, "Close Me")
+        button.SetPosition(wxPoint(15, 15))
+        self.Connect(ID, -1, wxEVT_COMMAND_BUTTON_CLICKED, self.OnCloseMe)
+
+    def OnCloseMe(self, event):
+        self.Close(true)
+
+    def OnCloseWindow(self, event):
+        self.Destroy()
 
 #---------------------------------------------------------------------------
 
@@ -99,7 +99,7 @@ class MyFrame(wxFrame):
         if event.GetInt() == 200:
             self.Close()
         elif event.GetInt() == 101:
-            if wxPlatform == '__WXMSW__':
+            #if wxPlatform == '__WXMSW__':
                 win = MyMiniFrame(self, -1, "This is a Mini...",
                               wxPoint(-1, -1), #wxPyDefaultPosition,
                               wxSize(150, 150),
@@ -107,8 +107,8 @@ class MyFrame(wxFrame):
                               wxTHICK_FRAME | wxSYSTEM_MENU |
                               wxTINY_CAPTION_HORIZ)
                 win.Show(true)
-            else:
-                print 'Sorry, can\'t do mini\'s...'
+            #else:
+            #    print 'Sorry, can\'t do mini\'s...'
 
 
 
@@ -147,6 +147,9 @@ if __name__ == '__main__':
 #----------------------------------------------------------------------------
 #
 # $Log$
+# Revision 1.4  1998/12/16 22:12:46  RD
+# Tweaks needed to be able to build wxPython with wxGTK.
+#
 # Revision 1.3  1998/12/15 20:44:35  RD
 # Changed the import semantics from "from wxPython import *" to "from
 # wxPython.wx import *"  This is for people who are worried about
index ae177835ec20584fa1453fd27ede30d9c0a67e2b..564edb31595b8d3916439c671da489f6341818cc 100644 (file)
@@ -365,6 +365,7 @@ class CustomStatusBar(wxStatusBar):
     # reposition the checkbox
     def OnSize(self, event):
         rect = self.GetFieldRect(1)
+        print "%s, %s" % (rect.x, rect.y)
         self.cb.SetPosition(wxPoint(rect.x+2, rect.y+2))
         self.cb.SetSize(wxSize(rect.width-4, rect.height-4))
 
@@ -803,6 +804,9 @@ if __name__ == '__main__':
 #----------------------------------------------------------------------------
 #
 # $Log$
+# Revision 1.10  1998/12/16 22:12:47  RD
+# Tweaks needed to be able to build wxPython with wxGTK.
+#
 # Revision 1.9  1998/12/15 20:44:35  RD
 # Changed the import semantics from "from wxPython import *" to "from
 # wxPython.wx import *"  This is for people who are worried about