Added the wxClassInfo stuff back in to the modules that are

standalone.  This is needed so any classes defined in the module will
get hooked up with their parents and assertions like "is wxWindow"
will work.

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

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index 96f19eb0655a209b13bb84d862ef5294712f782e..dfd9ed4c8da039f7c06d480f2f339d1320b3fd30 100644 (file)
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -111,8 +111,8 @@ public:
 
 %init %{
 
 
 %init %{
 

-//    wxClassInfo::CleanUpClasses();
-//    wxClassInfo::InitializeClasses();
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();

 
 %}
 
 
 %}
 

diff --git a/wxPython/contrib/glcanvas/msw/glcanvas.cpp b/wxPython/contrib/glcanvas/msw/glcanvas.cpp
index 8d38980275e7eee21483cc6a135ef7f250b596b0..0caf44c85291b8300bfbd1a9354a22df79806cf4 100644 (file)
--- a/wxPython/contrib/glcanvas/msw/glcanvas.cpp
+++ b/wxPython/contrib/glcanvas/msw/glcanvas.cpp
@@ -1096,8 +1096,8 @@ SWIGEXPORT(void) initglcanvasc() {
         d = PyModule_GetDict(m);
 
 
         d = PyModule_GetDict(m);
 
 

-//    wxClassInfo::CleanUpClasses();
-//    wxClassInfo::InitializeClasses();
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();

 
 {
    int i;
 
 {
    int i;

diff --git a/wxPython/contrib/ogl/ogl.cpp b/wxPython/contrib/ogl/ogl.cpp
index 03398c7d16bafcaaa92c69fb2e3aca883d030dbf..03318ad84f5c06663d3649c0e054a836a1b550a4 100644 (file)
--- a/wxPython/contrib/ogl/ogl.cpp
+++ b/wxPython/contrib/ogl/ogl.cpp
@@ -349,6 +349,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxRealPoint","_wxRealPoint",0},
     { "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0},
     { "_wxPNMHandler","_class_wxPNMHandler",0},
     { "_class_wxRealPoint","_wxRealPoint",0},
     { "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0},
     { "_wxPNMHandler","_class_wxPNMHandler",0},

+    { "_wxPrinterDC","_class_wxPrinterDC",0},

     { "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
     { "_wxLogGui","_class_wxLogGui",0},
     { "_class_wxPyShapeEvtHandler","_wxPyShapeEvtHandler",0},
     { "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
     { "_wxLogGui","_class_wxLogGui",0},
     { "_class_wxPyShapeEvtHandler","_wxPyShapeEvtHandler",0},


@@ -360,7 +361,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxPySizer","_wxPySizer",0},
     { "_class_wxPyCompositeShape","_wxPyCompositeShape",0},
     { "_wxPyPolygonShape","_class_wxPyPolygonShape",0},
     { "_class_wxPySizer","_wxPySizer",0},
     { "_class_wxPyCompositeShape","_wxPyCompositeShape",0},
     { "_wxPyPolygonShape","_class_wxPyPolygonShape",0},

-    { "_class_wxPostScriptDC","_wxPostScriptDC",0},

     { "_wxPanel","_class_wxPanel",0},
     { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
     { "_wxCheckBox","_class_wxCheckBox",0},
     { "_wxPanel","_class_wxPanel",0},
     { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
     { "_wxCheckBox","_class_wxCheckBox",0},


@@ -426,6 +426,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxZipFSHandler","_wxZipFSHandler",0},
     { "_char","_wxChar",0},
     { "_wxBitmap","_class_wxBitmap",0},
     { "_class_wxZipFSHandler","_wxZipFSHandler",0},
     { "_char","_wxChar",0},
     { "_wxBitmap","_class_wxBitmap",0},

+    { "_wxTaskBarIcon","_class_wxTaskBarIcon",0},

     { "_wxPrintDialog","_class_wxPrintDialog",0},
     { "_wxPyControlPoint","_class_wxPyControlPoint",0},
     { "_wxWindowDC","_class_wxWindowDC",0},
     { "_wxPrintDialog","_class_wxPrintDialog",0},
     { "_wxPyControlPoint","_class_wxPyControlPoint",0},
     { "_wxWindowDC","_class_wxWindowDC",0},


@@ -517,6 +518,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxTextCtrl","_wxTextCtrl",0},
     { "_class_wxListItemAttr","_wxListItemAttr",0},
     { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
     { "_class_wxTextCtrl","_wxTextCtrl",0},
     { "_class_wxListItemAttr","_wxListItemAttr",0},
     { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},

+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},

     { "_class_wxTextDataObject","_wxTextDataObject",0},
     { "_wxMenu","_class_wxMenu",0},
     { "_class_wxMoveEvent","_wxMoveEvent",0},
     { "_class_wxTextDataObject","_wxTextDataObject",0},
     { "_wxMenu","_class_wxMenu",0},
     { "_class_wxMoveEvent","_wxMoveEvent",0},


@@ -552,6 +554,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxBusyInfo","_class_wxBusyInfo",0},
     { "_class_wxMenuEvent","_wxMenuEvent",0},
     { "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0},
     { "_wxBusyInfo","_class_wxBusyInfo",0},
     { "_class_wxMenuEvent","_wxMenuEvent",0},
     { "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0},

+    { "_wxJoystick","_class_wxJoystick",0},

     { "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
     { "_class_wxPyCircleShape","_wxPyCircleShape",0},
     { "_wxClientDC","_class_wxClientDC",0},
     { "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
     { "_class_wxPyCircleShape","_wxPyCircleShape",0},
     { "_wxClientDC","_class_wxClientDC",0},


@@ -569,6 +572,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_signed_short","_short",0},
     { "_wxMemoryDC","_class_wxMemoryDC",0},
     { "_wxPyTextDataObject","_class_wxPyTextDataObject",0},
     { "_signed_short","_short",0},
     { "_wxMemoryDC","_class_wxMemoryDC",0},
     { "_wxPyTextDataObject","_class_wxPyTextDataObject",0},

+    { "_class_wxTaskBarIcon","_wxTaskBarIcon",0},

     { "_class_wxPrintDialog","_wxPrintDialog",0},
     { "_wxPyFileSystemHandler","_class_wxPyFileSystemHandler",0},
     { "_class_wxPyControlPoint","_wxPyControlPoint",0},
     { "_class_wxPrintDialog","_wxPrintDialog",0},
     { "_wxPyFileSystemHandler","_class_wxPyFileSystemHandler",0},
     { "_class_wxPyControlPoint","_wxPyControlPoint",0},


@@ -579,7 +583,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxStatusBar","_class_wxStatusBar",0},
     { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
     { "_class_wxCursor","_wxCursor",0},
     { "_wxStatusBar","_class_wxStatusBar",0},
     { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
     { "_class_wxCursor","_wxCursor",0},

-    { "_wxPostScriptDC","_class_wxPostScriptDC",0},

     { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},
     { "_class_wxPyProcess","_wxPyProcess",0},
     { "_class_wxImageHandler","_wxImageHandler",0},
     { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},
     { "_class_wxPyProcess","_wxPyProcess",0},
     { "_class_wxImageHandler","_wxImageHandler",0},


@@ -588,6 +591,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxLog","_wxLog",0},
     { "_wxTreeItemId","_class_wxTreeItemId",0},
     { "_unsigned_char","_byte",0},
     { "_class_wxLog","_wxLog",0},
     { "_wxTreeItemId","_class_wxTreeItemId",0},
     { "_unsigned_char","_byte",0},

+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},

     { "_class_wxMenu","_wxMenu",0},
     { "_wxControl","_class_wxControl",0},
     { "_class_wxListBox","_wxListBox",0},
     { "_class_wxMenu","_wxMenu",0},
     { "_wxControl","_class_wxControl",0},
     { "_class_wxListBox","_wxListBox",0},


@@ -675,6 +679,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxPyApp","_wxPyApp",0},
     { "_wxSize","_class_wxSize",0},
     { "_wxRegionIterator","_class_wxRegionIterator",0},
     { "_class_wxPyApp","_wxPyApp",0},
     { "_wxSize","_class_wxSize",0},
     { "_wxRegionIterator","_class_wxRegionIterator",0},

+    { "_class_wxPrinterDC","_wxPrinterDC",0},

     { "_class_wxPyTextDataObject","_wxPyTextDataObject",0},
     { "_class_wxLogTextCtrl","_wxLogTextCtrl",0},
     { "_class_wxLogGui","_wxLogGui",0},
     { "_class_wxPyTextDataObject","_wxPyTextDataObject",0},
     { "_class_wxLogTextCtrl","_wxLogTextCtrl",0},
     { "_class_wxLogGui","_wxLogGui",0},


@@ -738,6 +743,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxGauge","_class_wxGauge",0},
     { "_class_wxCheckListBox","_wxCheckListBox",0},
     { "_class_wxBusyInfo","_wxBusyInfo",0},
     { "_wxGauge","_class_wxGauge",0},
     { "_class_wxCheckListBox","_wxCheckListBox",0},
     { "_class_wxBusyInfo","_wxBusyInfo",0},

+    { "_class_wxJoystick","_wxJoystick",0},

     { "_class_wxCommandEvent","_wxCommandEvent",0},
     { "_class_wxClientDC","_wxClientDC",0},
     { "_class_wxSizeEvent","_wxSizeEvent",0},
     { "_class_wxCommandEvent","_wxCommandEvent",0},
     { "_class_wxClientDC","_wxClientDC",0},
     { "_class_wxSizeEvent","_wxSizeEvent",0},


@@ -869,8 +875,8 @@ SWIGEXPORT(void) initoglc() {
     initoglcanvasc();
 
 
     initoglcanvasc();
 
 

-//    wxClassInfo::CleanUpClasses();
-//    wxClassInfo::InitializeClasses();
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();

 
 {
    int i;
 
 {
    int i;

diff --git a/wxPython/contrib/ogl/ogl.i b/wxPython/contrib/ogl/ogl.i
index ed49855716b71bb4dfe42abbdbe8d63d9bb2641d..a679aed93ec50cba1550903af3da1997a52f1aa1 100644 (file)
--- a/wxPython/contrib/ogl/ogl.i
+++ b/wxPython/contrib/ogl/ogl.i
@@ -230,8 +230,8 @@ extern "C" SWIGEXPORT(void) initoglcanvasc();
     initoglcanvasc();
 
 
     initoglcanvasc();
 
 

-//    wxClassInfo::CleanUpClasses();
-//    wxClassInfo::InitializeClasses();
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();

 
 %}
 
 
 %}
 

diff --git a/wxPython/contrib/stc/stc_.cpp b/wxPython/contrib/stc/stc_.cpp
index ff3ab6b5d2f508fb856951a2cdbabcb436cf6e83..6bfbdf90b4d000dcccf7839c43e14d9fa96bde4d 100644 (file)
--- a/wxPython/contrib/stc/stc_.cpp
+++ b/wxPython/contrib/stc/stc_.cpp
@@ -8626,6 +8626,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxRealPoint","_wxRealPoint",0},
     { "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0},
     { "_wxPNMHandler","_class_wxPNMHandler",0},
     { "_class_wxRealPoint","_wxRealPoint",0},
     { "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0},
     { "_wxPNMHandler","_class_wxPNMHandler",0},

+    { "_wxPrinterDC","_class_wxPrinterDC",0},

     { "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
     { "_wxLogGui","_class_wxLogGui",0},
     { "_class_wxMenuItem","_wxMenuItem",0},
     { "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
     { "_wxLogGui","_class_wxLogGui",0},
     { "_class_wxMenuItem","_wxMenuItem",0},


@@ -8634,7 +8635,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxStatusBar","_wxStatusBar",0},
     { "_class_wxGIFHandler","_wxGIFHandler",0},
     { "_class_wxPySizer","_wxPySizer",0},
     { "_class_wxStatusBar","_wxStatusBar",0},
     { "_class_wxGIFHandler","_wxGIFHandler",0},
     { "_class_wxPySizer","_wxPySizer",0},

-    { "_class_wxPostScriptDC","_wxPostScriptDC",0},

     { "_wxPanel","_class_wxPanel",0},
     { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
     { "_wxCheckBox","_class_wxCheckBox",0},
     { "_wxPanel","_class_wxPanel",0},
     { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
     { "_wxCheckBox","_class_wxCheckBox",0},


@@ -8701,6 +8701,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxZipFSHandler","_wxZipFSHandler",0},
     { "_char","_wxChar",0},
     { "_wxBitmap","_class_wxBitmap",0},
     { "_class_wxZipFSHandler","_wxZipFSHandler",0},
     { "_char","_wxChar",0},
     { "_wxBitmap","_class_wxBitmap",0},

+    { "_wxTaskBarIcon","_class_wxTaskBarIcon",0},

     { "_wxPrintDialog","_class_wxPrintDialog",0},
     { "_wxWindowDC","_class_wxWindowDC",0},
     { "_wxTimerEvent","_class_wxTimerEvent",0},
     { "_wxPrintDialog","_class_wxPrintDialog",0},
     { "_wxWindowDC","_class_wxWindowDC",0},
     { "_wxTimerEvent","_class_wxTimerEvent",0},


@@ -8784,6 +8785,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxTextCtrl","_wxTextCtrl",0},
     { "_class_wxListItemAttr","_wxListItemAttr",0},
     { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
     { "_class_wxTextCtrl","_wxTextCtrl",0},
     { "_class_wxListItemAttr","_wxListItemAttr",0},
     { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},

+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},

     { "_class_wxTextDataObject","_wxTextDataObject",0},
     { "_wxMenu","_class_wxMenu",0},
     { "_class_wxMoveEvent","_wxMoveEvent",0},
     { "_class_wxTextDataObject","_wxTextDataObject",0},
     { "_wxMenu","_class_wxMenu",0},
     { "_class_wxMoveEvent","_wxMoveEvent",0},


@@ -8821,6 +8823,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxBusyInfo","_class_wxBusyInfo",0},
     { "_class_wxMenuEvent","_wxMenuEvent",0},
     { "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0},
     { "_wxBusyInfo","_class_wxBusyInfo",0},
     { "_class_wxMenuEvent","_wxMenuEvent",0},
     { "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0},

+    { "_wxJoystick","_class_wxJoystick",0},

     { "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
     { "_wxClientDC","_class_wxClientDC",0},
     { "_wxMouseEvent","_class_wxMouseEvent",0},
     { "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
     { "_wxClientDC","_class_wxClientDC",0},
     { "_wxMouseEvent","_class_wxMouseEvent",0},


@@ -8836,6 +8839,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_signed_short","_short",0},
     { "_wxMemoryDC","_class_wxMemoryDC",0},
     { "_wxPyTextDataObject","_class_wxPyTextDataObject",0},
     { "_signed_short","_short",0},
     { "_wxMemoryDC","_class_wxMemoryDC",0},
     { "_wxPyTextDataObject","_class_wxPyTextDataObject",0},

+    { "_class_wxTaskBarIcon","_wxTaskBarIcon",0},

     { "_class_wxPrintDialog","_wxPrintDialog",0},
     { "_wxPyFileSystemHandler","_class_wxPyFileSystemHandler",0},
     { "_wxPaintDC","_class_wxPaintDC",0},
     { "_class_wxPrintDialog","_wxPrintDialog",0},
     { "_wxPyFileSystemHandler","_class_wxPyFileSystemHandler",0},
     { "_wxPaintDC","_class_wxPaintDC",0},


@@ -8845,7 +8849,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxStatusBar","_class_wxStatusBar",0},
     { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
     { "_class_wxCursor","_wxCursor",0},
     { "_wxStatusBar","_class_wxStatusBar",0},
     { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
     { "_class_wxCursor","_wxCursor",0},

-    { "_wxPostScriptDC","_class_wxPostScriptDC",0},

     { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},
     { "_class_wxPyProcess","_wxPyProcess",0},
     { "_class_wxImageHandler","_wxImageHandler",0},
     { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},
     { "_class_wxPyProcess","_wxPyProcess",0},
     { "_class_wxImageHandler","_wxImageHandler",0},


@@ -8853,6 +8856,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxLog","_wxLog",0},
     { "_wxTreeItemId","_class_wxTreeItemId",0},
     { "_unsigned_char","_byte",0},
     { "_class_wxLog","_wxLog",0},
     { "_wxTreeItemId","_class_wxTreeItemId",0},
     { "_unsigned_char","_byte",0},

+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},

     { "_class_wxMenu","_wxMenu",0},
     { "_wxControl","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl},
     { "_wxControl","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl},
     { "_class_wxMenu","_wxMenu",0},
     { "_wxControl","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl},
     { "_wxControl","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl},


@@ -8940,6 +8944,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxPyApp","_wxPyApp",0},
     { "_wxSize","_class_wxSize",0},
     { "_wxRegionIterator","_class_wxRegionIterator",0},
     { "_class_wxPyApp","_wxPyApp",0},
     { "_wxSize","_class_wxSize",0},
     { "_wxRegionIterator","_class_wxRegionIterator",0},

+    { "_class_wxPrinterDC","_wxPrinterDC",0},

     { "_class_wxPyTextDataObject","_wxPyTextDataObject",0},
     { "_class_wxLogTextCtrl","_wxLogTextCtrl",0},
     { "_class_wxLogGui","_wxLogGui",0},
     { "_class_wxPyTextDataObject","_wxPyTextDataObject",0},
     { "_class_wxLogTextCtrl","_wxLogTextCtrl",0},
     { "_class_wxLogGui","_wxLogGui",0},


@@ -9002,6 +9007,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxGauge","_class_wxGauge",0},
     { "_class_wxCheckListBox","_wxCheckListBox",0},
     { "_class_wxBusyInfo","_wxBusyInfo",0},
     { "_wxGauge","_class_wxGauge",0},
     { "_class_wxCheckListBox","_wxCheckListBox",0},
     { "_class_wxBusyInfo","_wxBusyInfo",0},

+    { "_class_wxJoystick","_wxJoystick",0},

     { "_class_wxCommandEvent","_class_wxStyledTextEvent",SwigwxStyledTextEventTowxCommandEvent},
     { "_class_wxCommandEvent","_wxStyledTextEvent",SwigwxStyledTextEventTowxCommandEvent},
     { "_class_wxCommandEvent","_wxCommandEvent",0},
     { "_class_wxCommandEvent","_class_wxStyledTextEvent",SwigwxStyledTextEventTowxCommandEvent},
     { "_class_wxCommandEvent","_wxStyledTextEvent",SwigwxStyledTextEventTowxCommandEvent},
     { "_class_wxCommandEvent","_wxCommandEvent",0},


@@ -9429,8 +9435,8 @@ SWIGEXPORT(void) initstc_c() {
         PyDict_SetItemString(d,"wxEVT_STC_POSCHANGED", PyInt_FromLong((long) wxEVT_STC_POSCHANGED));
 
 
         PyDict_SetItemString(d,"wxEVT_STC_POSCHANGED", PyInt_FromLong((long) wxEVT_STC_POSCHANGED));
 
 

-//    wxClassInfo::CleanUpClasses();
-//    wxClassInfo::InitializeClasses();
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();

 
 {
    int i;
 
 {
    int i;

diff --git a/wxPython/contrib/stc/stc_.i b/wxPython/contrib/stc/stc_.i
index 62ce47e23df3b2ad6ae331064372593fecfc8577..f3e877f24a79a7d3b005f7161d8f9d2ac75262bf 100644 (file)
--- a/wxPython/contrib/stc/stc_.i
+++ b/wxPython/contrib/stc/stc_.i
@@ -88,8 +88,8 @@ def EVT_STC_POSCHANGED(win, id, fn):
 
 %init %{
 
 
 %init %{
 

-//    wxClassInfo::CleanUpClasses();
-//    wxClassInfo::InitializeClasses();
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();

 
 %}
 
 
 %}
 

diff --git a/wxPython/src/calendar.i b/wxPython/src/calendar.i
index 120e372b07ffcecd844aec2e46833cbd3f44b4e6..ee24ecbe022ae755960b4ab7626541848bb004e4 100644 (file)
--- a/wxPython/src/calendar.i
+++ b/wxPython/src/calendar.i
@@ -223,6 +223,12 @@ public:
 
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------

+
+%init %{
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();
+%}
+

 //---------------------------------------------------------------------------
 
 %pragma(python) include="_calextras.py";
 //---------------------------------------------------------------------------
 
 %pragma(python) include="_calextras.py";

diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i
index 31c6c7338781cd73fd011466ebbf5c8433723afd..09a02568f8947d491625c06769856f25a847fce4 100644 (file)
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -1733,6 +1733,13 @@ def EVT_GRID_EDITOR_HIDDEN(win, fn):
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+%init %{
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();
+%}
+
+//---------------------------------------------------------------------------
+

 %pragma(python) include="_gridextras.py";
 
 //---------------------------------------------------------------------------
 %pragma(python) include="_gridextras.py";
 
 //---------------------------------------------------------------------------

diff --git a/wxPython/src/html.i b/wxPython/src/html.i
index 12ece75e6d9f5eedd54186abe43b0a2456c387d2..d87eff32a2c71cb0920be94afd977e0afb128988 100644 (file)
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -572,9 +572,8 @@ public:
 
     inithtmlhelpc();
 
 
     inithtmlhelpc();
 

-    //wxClassInfo::CleanUpClasses();
-    //wxClassInfo::InitializeClasses();
-
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();

 %}
 
 //----------------------------------------------------------------------
 %}
 
 //----------------------------------------------------------------------

diff --git a/wxPython/src/msw/calendar.cpp b/wxPython/src/msw/calendar.cpp
index 6ffbca6e3a6d91dfed0f2089f4e9799c95bedba2..242c2ca34bff966f41125ac6e38953266c4d017c 100644 (file)
--- a/wxPython/src/msw/calendar.cpp
+++ b/wxPython/src/msw/calendar.cpp
@@ -2048,6 +2048,9 @@ SWIGEXPORT(void) initcalendarc() {
         PyDict_SetItemString(d,"wxEVT_CALENDAR_MONTH_CHANGED", PyInt_FromLong((long) wxEVT_CALENDAR_MONTH_CHANGED));
         PyDict_SetItemString(d,"wxEVT_CALENDAR_YEAR_CHANGED", PyInt_FromLong((long) wxEVT_CALENDAR_YEAR_CHANGED));
         PyDict_SetItemString(d,"wxEVT_CALENDAR_WEEKDAY_CLICKED", PyInt_FromLong((long) wxEVT_CALENDAR_WEEKDAY_CLICKED));
         PyDict_SetItemString(d,"wxEVT_CALENDAR_MONTH_CHANGED", PyInt_FromLong((long) wxEVT_CALENDAR_MONTH_CHANGED));
         PyDict_SetItemString(d,"wxEVT_CALENDAR_YEAR_CHANGED", PyInt_FromLong((long) wxEVT_CALENDAR_YEAR_CHANGED));
         PyDict_SetItemString(d,"wxEVT_CALENDAR_WEEKDAY_CLICKED", PyInt_FromLong((long) wxEVT_CALENDAR_WEEKDAY_CLICKED));

+
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();

 {
    int i;
    for (i = 0; _swig_mapping[i].n1; i++)
 {
    int i;
    for (i = 0; _swig_mapping[i].n1; i++)

diff --git a/wxPython/src/msw/cmndlgs.cpp b/wxPython/src/msw/cmndlgs.cpp
index e9406abd03d654a0a0af3ffc64f9a6e9a1084ee5..c4645576f102286c12edc90b57bf0519678cf273 100644 (file)
--- a/wxPython/src/msw/cmndlgs.cpp
+++ b/wxPython/src/msw/cmndlgs.cpp
@@ -531,7 +531,7 @@ static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args, PyObject
     char * _arg1 = (char *) "Choose a directory";
     char * _arg2 = (char *) "";
     long  _arg3 = (long ) 0;
     char * _arg1 = (char *) "Choose a directory";
     char * _arg2 = (char *) "";
     long  _arg3 = (long ) 0;

-    wxPoint * _arg4 = (wxPoint *) &wxPyDefaultPosition;
+    wxPoint * _arg4 = (wxPoint *) &wxDefaultPosition;

     PyObject * _argo0 = 0;
     wxPoint  temp;
     PyObject * _obj4 = 0;
     PyObject * _argo0 = 0;
     wxPoint  temp;
     PyObject * _obj4 = 0;


@@ -831,7 +831,7 @@ static PyObject *_wrap_new_wxFileDialog(PyObject *self, PyObject *args, PyObject
     char * _arg3 = (char *) "";
     char * _arg4 = (char *) "*.*";
     long  _arg5 = (long ) 0;
     char * _arg3 = (char *) "";
     char * _arg4 = (char *) "*.*";
     long  _arg5 = (long ) 0;

-    wxPoint * _arg6 = (wxPoint *) &wxPyDefaultPosition;
+    wxPoint * _arg6 = (wxPoint *) &wxDefaultPosition;

     PyObject * _argo0 = 0;
     wxPoint  temp;
     PyObject * _obj6 = 0;
     PyObject * _argo0 = 0;
     wxPoint  temp;
     PyObject * _obj6 = 0;


@@ -1545,7 +1545,7 @@ static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args,
     int  _arg3;
     wxString * _arg4;
     long  _arg5 = (long ) wxOK|wxCANCEL|wxCENTRE;
     int  _arg3;
     wxString * _arg4;
     long  _arg5 = (long ) wxOK|wxCANCEL|wxCENTRE;

-    wxPoint * _arg6 = (wxPoint *) &wxPyDefaultPosition;
+    wxPoint * _arg6 = (wxPoint *) &wxDefaultPosition;

     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;


@@ -1803,7 +1803,7 @@ static PyObject *_wrap_new_wxTextEntryDialog(PyObject *self, PyObject *args, PyO
     char * _arg2 = (char *) "Input Text";
     char * _arg3 = (char *) "";
     long  _arg4 = (long ) wxOK|wxCANCEL|wxCENTRE;
     char * _arg2 = (char *) "Input Text";
     char * _arg3 = (char *) "";
     long  _arg4 = (long ) wxOK|wxCANCEL|wxCENTRE;

-    wxPoint * _arg5 = (wxPoint *) &wxPyDefaultPosition;
+    wxPoint * _arg5 = (wxPoint *) &wxDefaultPosition;

     PyObject * _argo0 = 0;
     wxPoint  temp;
     PyObject * _obj5 = 0;
     PyObject * _argo0 = 0;
     wxPoint  temp;
     PyObject * _obj5 = 0;


@@ -2580,7 +2580,7 @@ static PyObject *_wrap_new_wxMessageDialog(PyObject *self, PyObject *args, PyObj
     char * _arg1;
     char * _arg2 = (char *) "Message box";
     long  _arg3 = (long ) wxOK|wxCANCEL|wxCENTRE;
     char * _arg1;
     char * _arg2 = (char *) "Message box";
     long  _arg3 = (long ) wxOK|wxCANCEL|wxCENTRE;

-    wxPoint * _arg4 = (wxPoint *) &wxPyDefaultPosition;
+    wxPoint * _arg4 = (wxPoint *) &wxDefaultPosition;

     PyObject * _argo0 = 0;
     wxPoint  temp;
     PyObject * _obj4 = 0;
     PyObject * _argo0 = 0;
     wxPoint  temp;
     PyObject * _obj4 = 0;

diff --git a/wxPython/src/msw/controls.cpp b/wxPython/src/msw/controls.cpp
index 6c0d847e04f92026519e2c502a55d6c6cf6f3e97..ca3e1931f8f4584a3097cc2ae57a6c9c7ee39f25 100644 (file)
--- a/wxPython/src/msw/controls.cpp
+++ b/wxPython/src/msw/controls.cpp
@@ -122,8 +122,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 

-wxValidator wxPyDefaultValidator;       // Non-const default because of SWIG
-

     wxSize wxButton_GetDefaultSize() {
         return wxButton::GetDefaultSize();
     }
     wxSize wxButton_GetDefaultSize() {
         return wxButton::GetDefaultSize();
     }


@@ -186,10 +184,10 @@ static PyObject *_wrap_new_wxControl(PyObject *self, PyObject *args, PyObject *k
     wxControl * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxControl * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxDefaultSize;

     long  _arg4 = (long ) 0;
     long  _arg4 = (long ) 0;

-    wxValidator * _arg5 = (wxValidator *) &wxPyDefaultValidator;
+    wxValidator * _arg5 = (wxValidator *) &wxDefaultValidator;

     char * _arg6 = (char *) "control";
     PyObject * _argo0 = 0;
     wxPoint  temp;
     char * _arg6 = (char *) "control";
     PyObject * _argo0 = 0;
     wxPoint  temp;


@@ -394,10 +392,10 @@ static PyObject *_wrap_new_wxButton(PyObject *self, PyObject *args, PyObject *kw
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxDefaultSize;

     long  _arg5 = (long ) 0;
     long  _arg5 = (long ) 0;

-    wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
+    wxValidator * _arg6 = (wxValidator *) &wxDefaultValidator;

     char * _arg7 = (char *) "button";
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
     char * _arg7 = (char *) "button";
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;


@@ -611,10 +609,10 @@ static PyObject *_wrap_new_wxBitmapButton(PyObject *self, PyObject *args, PyObje
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxBitmap * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxBitmap * _arg2;

-    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxDefaultSize;

     long  _arg5 = (long ) wxBU_AUTODRAW;
     long  _arg5 = (long ) wxBU_AUTODRAW;

-    wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
+    wxValidator * _arg6 = (wxValidator *) &wxDefaultValidator;

     char * _arg7 = (char *) "button";
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
     char * _arg7 = (char *) "button";
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;


@@ -1075,10 +1073,10 @@ static PyObject *_wrap_new_wxCheckBox(PyObject *self, PyObject *args, PyObject *
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxDefaultSize;

     long  _arg5 = (long ) 0;
     long  _arg5 = (long ) 0;

-    wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
+    wxValidator * _arg6 = (wxValidator *) &wxDefaultValidator;

     char * _arg7 = (char *) "checkBox";
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
     char * _arg7 = (char *) "checkBox";
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;


@@ -1243,12 +1241,12 @@ static PyObject *_wrap_new_wxChoice(PyObject *self, PyObject *args, PyObject *kw
     wxChoice * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxChoice * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxDefaultSize;

     int  _arg4 = (int ) 0;
     wxString * _arg5 = (wxString *) NULL;
     long  _arg6 = (long ) 0;
     int  _arg4 = (int ) 0;
     wxString * _arg5 = (wxString *) NULL;
     long  _arg6 = (long ) 0;

-    wxValidator * _arg7 = (wxValidator *) &wxPyDefaultValidator;
+    wxValidator * _arg7 = (wxValidator *) &wxDefaultValidator;

     char * _arg8 = (char *) "choice";
     PyObject * _argo0 = 0;
     wxPoint  temp;
     char * _arg8 = (char *) "choice";
     PyObject * _argo0 = 0;
     wxPoint  temp;


@@ -1743,12 +1741,12 @@ static PyObject *_wrap_new_wxComboBox(PyObject *self, PyObject *args, PyObject *
     wxWindow * _arg0;
     wxWindowID  _arg1;
     char * _arg2 = (char *) "";
     wxWindow * _arg0;
     wxWindowID  _arg1;
     char * _arg2 = (char *) "";

-    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxDefaultSize;

     int  _arg5 = (int ) 0;
     wxString * _arg6 = (wxString *) NULL;
     long  _arg7 = (long ) 0;
     int  _arg5 = (int ) 0;
     wxString * _arg6 = (wxString *) NULL;
     long  _arg7 = (long ) 0;

-    wxValidator * _arg8 = (wxValidator *) &wxPyDefaultValidator;
+    wxValidator * _arg8 = (wxValidator *) &wxDefaultValidator;

     char * _arg9 = (char *) "comboBox";
     PyObject * _argo0 = 0;
     wxPoint  temp;
     char * _arg9 = (char *) "comboBox";
     PyObject * _argo0 = 0;
     wxPoint  temp;


@@ -2541,10 +2539,10 @@ static PyObject *_wrap_new_wxGauge(PyObject *self, PyObject *args, PyObject *kwa
     wxWindow * _arg0;
     wxWindowID  _arg1;
     int  _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     int  _arg2;

-    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxDefaultSize;

     long  _arg5 = (long ) wxGA_HORIZONTAL;
     long  _arg5 = (long ) wxGA_HORIZONTAL;

-    wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
+    wxValidator * _arg6 = (wxValidator *) &wxDefaultValidator;

     char * _arg7 = (char *) "gauge";
     PyObject * _argo0 = 0;
     wxPoint  temp;
     char * _arg7 = (char *) "gauge";
     PyObject * _argo0 = 0;
     wxPoint  temp;


@@ -2850,8 +2848,8 @@ static PyObject *_wrap_new_wxStaticBox(PyObject *self, PyObject *args, PyObject
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxDefaultSize;

     long  _arg5 = (long ) 0;
     char * _arg6 = (char *) "staticBox";
     PyObject * _argo0 = 0;
     long  _arg5 = (long ) 0;
     char * _arg6 = (char *) "staticBox";
     PyObject * _argo0 = 0;


@@ -2952,8 +2950,8 @@ static PyObject *_wrap_new_wxStaticLine(PyObject *self, PyObject *args, PyObject
     wxStaticLine * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxStaticLine * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxDefaultSize;

     long  _arg4 = (long ) wxLI_HORIZONTAL;
     char * _arg5 = (char *) "staticLine";
     PyObject * _argo0 = 0;
     long  _arg4 = (long ) wxLI_HORIZONTAL;
     char * _arg5 = (char *) "staticLine";
     PyObject * _argo0 = 0;


@@ -3032,8 +3030,8 @@ static PyObject *_wrap_new_wxStaticText(PyObject *self, PyObject *args, PyObject
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxDefaultSize;

     long  _arg5 = (long ) 0;
     char * _arg6 = (char *) "staticText";
     PyObject * _argo0 = 0;
     long  _arg5 = (long ) 0;
     char * _arg6 = (char *) "staticText";
     PyObject * _argo0 = 0;


@@ -3217,12 +3215,12 @@ static PyObject *_wrap_new_wxListBox(PyObject *self, PyObject *args, PyObject *k
     wxListBox * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxListBox * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxDefaultSize;

     int  _arg4;
     wxString * _arg5 = (wxString *) NULL;
     long  _arg6 = (long ) 0;
     int  _arg4;
     wxString * _arg5 = (wxString *) NULL;
     long  _arg6 = (long ) 0;

-    wxValidator * _arg7 = (wxValidator *) &wxPyDefaultValidator;
+    wxValidator * _arg7 = (wxValidator *) &wxDefaultValidator;

     char * _arg8 = (char *) "listBox";
     PyObject * _argo0 = 0;
     wxPoint  temp;
     char * _arg8 = (char *) "listBox";
     PyObject * _argo0 = 0;
     wxPoint  temp;


@@ -4015,12 +4013,12 @@ static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args, PyObje
     wxCheckListBox * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxCheckListBox * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxDefaultSize;

     int  _arg4 = (int ) 0;
     wxString * _arg5 = (wxString *) NULL;
     long  _arg6 = (long ) 0;
     int  _arg4 = (int ) 0;
     wxString * _arg5 = (wxString *) NULL;
     long  _arg6 = (long ) 0;

-    wxValidator * _arg7 = (wxValidator *) &wxPyDefaultValidator;
+    wxValidator * _arg7 = (wxValidator *) &wxDefaultValidator;

     char * _arg8 = (char *) "listBox";
     PyObject * _argo0 = 0;
     wxPoint  temp;
     char * _arg8 = (char *) "listBox";
     PyObject * _argo0 = 0;
     wxPoint  temp;


@@ -4257,10 +4255,10 @@ static PyObject *_wrap_new_wxTextCtrl(PyObject *self, PyObject *args, PyObject *
     wxWindow * _arg0;
     wxWindowID  _arg1;
     char * _arg2 = (char *) "";
     wxWindow * _arg0;
     wxWindowID  _arg1;
     char * _arg2 = (char *) "";

-    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxDefaultSize;

     long  _arg5 = (long ) 0;
     long  _arg5 = (long ) 0;

-    wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
+    wxValidator * _arg6 = (wxValidator *) &wxDefaultValidator;

     char * _arg7 = (char *) "text";
     PyObject * _argo0 = 0;
     wxPoint  temp;
     char * _arg7 = (char *) "text";
     PyObject * _argo0 = 0;
     wxPoint  temp;


@@ -5553,10 +5551,10 @@ static PyObject *_wrap_new_wxScrollBar(PyObject *self, PyObject *args, PyObject
     wxScrollBar * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1 = (wxWindowID ) -1;
     wxScrollBar * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1 = (wxWindowID ) -1;

-    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxDefaultSize;

     long  _arg4 = (long ) wxSB_HORIZONTAL;
     long  _arg4 = (long ) wxSB_HORIZONTAL;

-    wxValidator * _arg5 = (wxValidator *) &wxPyDefaultValidator;
+    wxValidator * _arg5 = (wxValidator *) &wxDefaultValidator;

     char * _arg6 = (char *) "scrollBar";
     PyObject * _argo0 = 0;
     wxPoint  temp;
     char * _arg6 = (char *) "scrollBar";
     PyObject * _argo0 = 0;
     wxPoint  temp;


@@ -5811,8 +5809,8 @@ static PyObject *_wrap_new_wxSpinButton(PyObject *self, PyObject *args, PyObject
     wxSpinButton * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1 = (wxWindowID ) -1;
     wxSpinButton * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1 = (wxWindowID ) -1;

-    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxDefaultSize;

     long  _arg4 = (long ) wxSP_HORIZONTAL;
     char * _arg5 = (char *) "spinButton";
     PyObject * _argo0 = 0;
     long  _arg4 = (long ) wxSP_HORIZONTAL;
     char * _arg5 = (char *) "spinButton";
     PyObject * _argo0 = 0;


@@ -6029,8 +6027,8 @@ static PyObject *_wrap_new_wxStaticBitmap(PyObject *self, PyObject *args, PyObje
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxBitmap * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxBitmap * _arg2;

-    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxDefaultSize;

     long  _arg5 = (long ) 0;
     char * _arg6 = (char *) "staticBitmap";
     PyObject * _argo0 = 0;
     long  _arg5 = (long ) 0;
     char * _arg6 = (char *) "staticBitmap";
     PyObject * _argo0 = 0;


@@ -6224,13 +6222,13 @@ static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args, PyObject *
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxDefaultSize;

     int  _arg5 = (int ) 0;
     wxString * _arg6 = (wxString *) NULL;
     int  _arg7 = (int ) 0;
     long  _arg8 = (long ) wxRA_HORIZONTAL;
     int  _arg5 = (int ) 0;
     wxString * _arg6 = (wxString *) NULL;
     int  _arg7 = (int ) 0;
     long  _arg8 = (long ) wxRA_HORIZONTAL;

-    wxValidator * _arg9 = (wxValidator *) &wxPyDefaultValidator;
+    wxValidator * _arg9 = (wxValidator *) &wxDefaultValidator;

     char * _arg10 = (char *) "radioBox";
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
     char * _arg10 = (char *) "radioBox";
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;


@@ -6814,10 +6812,10 @@ static PyObject *_wrap_new_wxRadioButton(PyObject *self, PyObject *args, PyObjec
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxDefaultSize;

     long  _arg5 = (long ) 0;
     long  _arg5 = (long ) 0;

-    wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
+    wxValidator * _arg6 = (wxValidator *) &wxDefaultValidator;

     char * _arg7 = (char *) "radioButton";
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
     char * _arg7 = (char *) "radioButton";
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;


@@ -6985,10 +6983,10 @@ static PyObject *_wrap_new_wxSlider(PyObject *self, PyObject *args, PyObject *kw
     int  _arg2;
     int  _arg3;
     int  _arg4;
     int  _arg2;
     int  _arg3;
     int  _arg4;

-    wxPoint * _arg5 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg6 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg5 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg6 = (wxSize *) &wxDefaultSize;

     long  _arg7 = (long ) wxSL_HORIZONTAL;
     long  _arg7 = (long ) wxSL_HORIZONTAL;

-    wxValidator * _arg8 = (wxValidator *) &wxPyDefaultValidator;
+    wxValidator * _arg8 = (wxValidator *) &wxDefaultValidator;

     char * _arg9 = (char *) "slider";
     PyObject * _argo0 = 0;
     wxPoint  temp;
     char * _arg9 = (char *) "slider";
     PyObject * _argo0 = 0;
     wxPoint  temp;


@@ -7606,8 +7604,8 @@ static PyObject *_wrap_new_wxSpinCtrl(PyObject *self, PyObject *args, PyObject *
     wxWindow * _arg0;
     wxWindowID  _arg1 = (wxWindowID ) -1;
     char * _arg2 = (char *) "";
     wxWindow * _arg0;
     wxWindowID  _arg1 = (wxWindowID ) -1;
     char * _arg2 = (char *) "";

-    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxDefaultSize;

     long  _arg5 = (long ) wxSP_ARROW_KEYS;
     int  _arg6 = (int ) 0;
     int  _arg7 = (int ) 100;
     long  _arg5 = (long ) wxSP_ARROW_KEYS;
     int  _arg6 = (int ) 0;
     int  _arg7 = (int ) 100;

diff --git a/wxPython/src/msw/controls2.cpp b/wxPython/src/msw/controls2.cpp
index 79a41c0a694ac20bff4cc0be9b6bfd456010fa04..e6084cd765eb68d8382a282ed6d7c5d80b126cd3 100644 (file)
--- a/wxPython/src/msw/controls2.cpp
+++ b/wxPython/src/msw/controls2.cpp
@@ -110,8 +110,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 

-extern wxValidator wxPyDefaultValidator;
-

     int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) {
         int retval = 0;
         PyObject* func = (PyObject*)funcPtr;
     int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) {
         int retval = 0;
         PyObject* func = (PyObject*)funcPtr;


@@ -2846,10 +2844,10 @@ static PyObject *_wrap_new_wxListCtrl(PyObject *self, PyObject *args, PyObject *
     wxListCtrl * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxListCtrl * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxDefaultSize;

     long  _arg4 = (long ) wxLC_ICON;
     long  _arg4 = (long ) wxLC_ICON;

-    wxValidator * _arg5 = (wxValidator *) &wxPyDefaultValidator;
+    wxValidator * _arg5 = (wxValidator *) &wxDefaultValidator;

     char * _arg6 = (char *) "listCtrl";
     PyObject * _argo0 = 0;
     wxPoint  temp;
     char * _arg6 = (char *) "listCtrl";
     PyObject * _argo0 = 0;
     wxPoint  temp;


@@ -5176,10 +5174,10 @@ static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args, PyObject *
     wxPyTreeCtrl * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1 = (wxWindowID ) -1;
     wxPyTreeCtrl * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1 = (wxWindowID ) -1;

-    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxDefaultSize;

     long  _arg4 = (long ) wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT;
     long  _arg4 = (long ) wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT;

-    wxValidator * _arg5 = (wxValidator *) &wxPyDefaultValidator;
+    wxValidator * _arg5 = (wxValidator *) &wxDefaultValidator;

     char * _arg6 = (char *) "wxTreeCtrl";
     PyObject * _argo0 = 0;
     wxPoint  temp;
     char * _arg6 = (char *) "wxTreeCtrl";
     PyObject * _argo0 = 0;
     wxPoint  temp;

diff --git a/wxPython/src/msw/frames.cpp b/wxPython/src/msw/frames.cpp
index 149049f23c3b97d82f121f91c667f4ce589890c0..2dc5a219296b2f4ecd3d9f72340118aebb7e16f3 100644 (file)
--- a/wxPython/src/msw/frames.cpp
+++ b/wxPython/src/msw/frames.cpp
@@ -131,8 +131,8 @@ static PyObject *_wrap_new_wxFrame(PyObject *self, PyObject *args, PyObject *kwa
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxDefaultSize;

     long  _arg5 = (long ) wxDEFAULT_FRAME_STYLE;
     char * _arg6 = (char *) "frame";
     PyObject * _argo0 = 0;
     long  _arg5 = (long ) wxDEFAULT_FRAME_STYLE;
     char * _arg6 = (char *) "frame";
     PyObject * _argo0 = 0;


@@ -1124,8 +1124,8 @@ static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args, PyObject
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxDefaultSize;

     long  _arg5 = (long ) wxDEFAULT_FRAME_STYLE;
     char * _arg6 = (char *) "frame";
     PyObject * _argo0 = 0;
     long  _arg5 = (long ) wxDEFAULT_FRAME_STYLE;
     char * _arg6 = (char *) "frame";
     PyObject * _argo0 = 0;

diff --git a/wxPython/src/msw/gdi.cpp b/wxPython/src/msw/gdi.cpp
index 3b52cc38491f1be3062078366ee5dd18b19f4d87..a11115c7041c157f9e0564d781f677d395c9014b 100644 (file)
--- a/wxPython/src/msw/gdi.cpp
+++ b/wxPython/src/msw/gdi.cpp
@@ -109,6 +109,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 }
 
 static char* wxStringErrorMsg = "string type is required for parameter";

+
+    static wxString wxPyEmptyStr("");

                               // Alternate 'constructor'
     wxBitmap* wxEmptyBitmap(int width, int height, int depth=-1) {
         return new wxBitmap(width, height, depth);
                               // Alternate 'constructor'
     wxBitmap* wxEmptyBitmap(int width, int height, int depth=-1) {
         return new wxBitmap(width, height, depth);

diff --git a/wxPython/src/msw/grid.cpp b/wxPython/src/msw/grid.cpp
index d5e0a2105ede32b15b18d4676f57204aaec2ae10..6aa73ff324fcc08303b0ad6618416a56c11c02da 100644 (file)
--- a/wxPython/src/msw/grid.cpp
+++ b/wxPython/src/msw/grid.cpp
@@ -13626,6 +13626,9 @@ SWIGEXPORT(void) initgridc() {
         PyDict_SetItemString(d,"wxEVT_GRID_SELECT_CELL", PyInt_FromLong((long) wxEVT_GRID_SELECT_CELL));
         PyDict_SetItemString(d,"wxEVT_GRID_EDITOR_SHOWN", PyInt_FromLong((long) wxEVT_GRID_EDITOR_SHOWN));
         PyDict_SetItemString(d,"wxEVT_GRID_EDITOR_HIDDEN", PyInt_FromLong((long) wxEVT_GRID_EDITOR_HIDDEN));
         PyDict_SetItemString(d,"wxEVT_GRID_SELECT_CELL", PyInt_FromLong((long) wxEVT_GRID_SELECT_CELL));
         PyDict_SetItemString(d,"wxEVT_GRID_EDITOR_SHOWN", PyInt_FromLong((long) wxEVT_GRID_EDITOR_SHOWN));
         PyDict_SetItemString(d,"wxEVT_GRID_EDITOR_HIDDEN", PyInt_FromLong((long) wxEVT_GRID_EDITOR_HIDDEN));

+
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();

         PyDict_SetItemString(d,"wxGrid_wxGridSelectCells", PyInt_FromLong((long) wxGrid::wxGridSelectCells));
         PyDict_SetItemString(d,"wxGrid_wxGridSelectRows", PyInt_FromLong((long) wxGrid::wxGridSelectRows));
         PyDict_SetItemString(d,"wxGrid_wxGridSelectColumns", PyInt_FromLong((long) wxGrid::wxGridSelectColumns));
         PyDict_SetItemString(d,"wxGrid_wxGridSelectCells", PyInt_FromLong((long) wxGrid::wxGridSelectCells));
         PyDict_SetItemString(d,"wxGrid_wxGridSelectRows", PyInt_FromLong((long) wxGrid::wxGridSelectRows));
         PyDict_SetItemString(d,"wxGrid_wxGridSelectColumns", PyInt_FromLong((long) wxGrid::wxGridSelectColumns));

diff --git a/wxPython/src/msw/html.cpp b/wxPython/src/msw/html.cpp
index e19ad698ea860e0ef7c227653b8e4e9c989b4d06..f8ed7ce9c98369ebae57a652d662842aa2185429 100644 (file)
--- a/wxPython/src/msw/html.cpp
+++ b/wxPython/src/msw/html.cpp
@@ -6559,9 +6559,8 @@ SWIGEXPORT(void) inithtmlc() {
 
     inithtmlhelpc();
 
 
     inithtmlhelpc();
 

-    //wxClassInfo::CleanUpClasses();
-    //wxClassInfo::InitializeClasses();
-
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();

 {
    int i;
    for (i = 0; _swig_mapping[i].n1; i++)
 {
    int i;
    for (i = 0; _swig_mapping[i].n1; i++)

diff --git a/wxPython/src/msw/mdi.cpp b/wxPython/src/msw/mdi.cpp
index dd0c5dfdeeb5ef0a252d2ae149c8bd4353cf6306..cfce9eae48e94468e6661f3f57c1240acb6e4884 100644 (file)
--- a/wxPython/src/msw/mdi.cpp
+++ b/wxPython/src/msw/mdi.cpp
@@ -138,8 +138,8 @@ static PyObject *_wrap_new_wxMDIParentFrame(PyObject *self, PyObject *args, PyOb
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxDefaultSize;

     long  _arg5 = (long ) wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL;
     char * _arg6 = (char *) "frame";
     PyObject * _argo0 = 0;
     long  _arg5 = (long ) wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL;
     char * _arg6 = (char *) "frame";
     PyObject * _argo0 = 0;


@@ -584,8 +584,8 @@ static PyObject *_wrap_new_wxMDIChildFrame(PyObject *self, PyObject *args, PyObj
     wxMDIParentFrame * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxMDIParentFrame * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxDefaultSize;

     long  _arg5 = (long ) wxDEFAULT_FRAME_STYLE;
     char * _arg6 = (char *) "frame";
     PyObject * _argo0 = 0;
     long  _arg5 = (long ) wxDEFAULT_FRAME_STYLE;
     char * _arg6 = (char *) "frame";
     PyObject * _argo0 = 0;

diff --git a/wxPython/src/msw/misc.cpp b/wxPython/src/msw/misc.cpp
index 55c69c96149cbe29cb8b116ee4bd8dba8fbeccdf..4d738c1e6f406ecb9b933ae9e9cd348c7a7cb949 100644 (file)
--- a/wxPython/src/msw/misc.cpp
+++ b/wxPython/src/msw/misc.cpp
@@ -108,6 +108,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 

+    static wxString wxPyEmptyStr("");
+

     PyObject* wxIntersectRect(wxRect* r1, wxRect* r2) {
         wxRegion  reg1(*r1);
         wxRegion  reg2(*r2);
     PyObject* wxIntersectRect(wxRect* r1, wxRect* r2) {
         wxRegion  reg1(*r1);
         wxRegion  reg2(*r2);

diff --git a/wxPython/src/msw/misc2.cpp b/wxPython/src/msw/misc2.cpp
index f20e09cbc5b2657106d7d0fda8a29ca83d44d328..bd406390a327c38572fa1ade2be54033448b3a9e 100644 (file)
--- a/wxPython/src/msw/misc2.cpp
+++ b/wxPython/src/msw/misc2.cpp
@@ -112,6 +112,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 

+    static wxString wxPyEmptyStr("");
+

 
     wxColour wxSystemSettings_GetSystemColour(int index) {
         return wxSystemSettings::GetSystemColour(index);
 
     wxColour wxSystemSettings_GetSystemColour(int index) {
         return wxSystemSettings::GetSystemColour(index);


@@ -656,7 +658,7 @@ static PyObject *_wrap_wxGetNumberFromUser(PyObject *self, PyObject *args, PyObj
     long  _arg4 = (long ) 0;
     long  _arg5 = (long ) 100;
     wxWindow * _arg6 = (wxWindow *) NULL;
     long  _arg4 = (long ) 0;
     long  _arg5 = (long ) 100;
     wxWindow * _arg6 = (wxWindow *) NULL;

-    wxPoint * _arg7 = (wxPoint *) &wxPyDefaultPosition;
+    wxPoint * _arg7 = (wxPoint *) &wxDefaultPosition;

     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;

diff --git a/wxPython/src/msw/printfw.cpp b/wxPython/src/msw/printfw.cpp
index faba8817cae24703c311c7cd3cff3f288e9bdd79..b13dbf8765c3c9a4fd32c5cae011dc41071cdd10 100644 (file)
--- a/wxPython/src/msw/printfw.cpp
+++ b/wxPython/src/msw/printfw.cpp
@@ -4123,8 +4123,8 @@ static PyObject *_wrap_new_wxPreviewFrame(PyObject *self, PyObject *args, PyObje
     wxPrintPreview * _arg0;
     wxFrame * _arg1;
     wxString * _arg2;
     wxPrintPreview * _arg0;
     wxFrame * _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxDefaultSize;

     long  _arg5 = (long ) wxDEFAULT_FRAME_STYLE;
     char * _arg6 = (char *) "frame";
     PyObject * _argo0 = 0;
     long  _arg5 = (long ) wxDEFAULT_FRAME_STYLE;
     char * _arg6 = (char *) "frame";
     PyObject * _argo0 = 0;

diff --git a/wxPython/src/msw/stattool.cpp b/wxPython/src/msw/stattool.cpp
index bd837ca79996920492d84515d2a26c19ae02dbc9..dbc9a36d088a0cc6eaf4fd97429d6de77ce6e6f2 100644 (file)
--- a/wxPython/src/msw/stattool.cpp
+++ b/wxPython/src/msw/stattool.cpp
@@ -106,6 +106,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 }
 
 static char* wxStringErrorMsg = "string type is required for parameter";

+
+    static wxString wxPyEmptyStr("");

 #ifdef __cplusplus
 extern "C" {
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif


@@ -131,8 +133,8 @@ static PyObject *_wrap_new_wxStatusBar(PyObject *self, PyObject *args, PyObject
     wxStatusBar * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxStatusBar * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxDefaultSize;

     long  _arg4 = (long ) wxST_SIZEGRIP;
     char * _arg5 = (char *) "statusBar";
     PyObject * _argo0 = 0;
     long  _arg4 = (long ) wxST_SIZEGRIP;
     char * _arg5 = (char *) "statusBar";
     PyObject * _argo0 = 0;


@@ -2961,8 +2963,8 @@ static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args, PyObject *k
     wxToolBar * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxToolBar * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxDefaultSize;

     long  _arg4 = (long ) wxNO_BORDER|wxTB_HORIZONTAL;
     char * _arg5 = (char *) wxToolBarNameStr;
     PyObject * _argo0 = 0;
     long  _arg4 = (long ) wxNO_BORDER|wxTB_HORIZONTAL;
     char * _arg5 = (char *) wxToolBarNameStr;
     PyObject * _argo0 = 0;


@@ -3084,8 +3086,8 @@ static PyObject *_wrap_new_wxToolBarSimple(PyObject *self, PyObject *args, PyObj
     wxToolBarSimple * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxToolBarSimple * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxDefaultSize;

     long  _arg4 = (long ) wxNO_BORDER|wxTB_HORIZONTAL;
     char * _arg5 = (char *) wxToolBarNameStr;
     PyObject * _argo0 = 0;
     long  _arg4 = (long ) wxNO_BORDER|wxTB_HORIZONTAL;
     char * _arg5 = (char *) wxToolBarNameStr;
     PyObject * _argo0 = 0;

diff --git a/wxPython/src/msw/utils.cpp b/wxPython/src/msw/utils.cpp
index c869ce2ebf2cc324b02a1b910094e8ee1c163cdc..4f677d45b608853eb85d1cd9fc20e2b872b080c6 100644 (file)
--- a/wxPython/src/msw/utils.cpp
+++ b/wxPython/src/msw/utils.cpp
@@ -7831,10 +7831,8 @@ SWIGEXPORT(void) initutilsc() {
         PyDict_SetItemString(d,"wxCONFIG_USE_GLOBAL_FILE", PyInt_FromLong((long) wxCONFIG_USE_GLOBAL_FILE));
         PyDict_SetItemString(d,"wxCONFIG_USE_RELATIVE_PATH", PyInt_FromLong((long) wxCONFIG_USE_RELATIVE_PATH));
 
         PyDict_SetItemString(d,"wxCONFIG_USE_GLOBAL_FILE", PyInt_FromLong((long) wxCONFIG_USE_GLOBAL_FILE));
         PyDict_SetItemString(d,"wxCONFIG_USE_RELATIVE_PATH", PyInt_FromLong((long) wxCONFIG_USE_RELATIVE_PATH));
 

-
-//    wxClassInfo::CleanUpClasses();
-//    wxClassInfo::InitializeClasses();
-
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();

         PyDict_SetItemString(d,"wxConfigBase_Type_Unknown", PyInt_FromLong((long) wxConfigBase::Type_Unknown));
         PyDict_SetItemString(d,"wxConfigBase_Type_String", PyInt_FromLong((long) wxConfigBase::Type_String));
         PyDict_SetItemString(d,"wxConfigBase_Type_Boolean", PyInt_FromLong((long) wxConfigBase::Type_Boolean));
         PyDict_SetItemString(d,"wxConfigBase_Type_Unknown", PyInt_FromLong((long) wxConfigBase::Type_Unknown));
         PyDict_SetItemString(d,"wxConfigBase_Type_String", PyInt_FromLong((long) wxConfigBase::Type_String));
         PyDict_SetItemString(d,"wxConfigBase_Type_Boolean", PyInt_FromLong((long) wxConfigBase::Type_Boolean));

diff --git a/wxPython/src/msw/windows.cpp b/wxPython/src/msw/windows.cpp
index 878f002f01b22d6d1fe0a2bebe775b0a87c490f6..b0ac818a7079e52df8821f7160ce6eff996d94d3 100644 (file)
--- a/wxPython/src/msw/windows.cpp
+++ b/wxPython/src/msw/windows.cpp
@@ -106,6 +106,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 

+    static wxString wxPyEmptyStr("");
+

     bool wxValidator_IsSilent() {
         return wxValidator::IsSilent();
     }
     bool wxValidator_IsSilent() {
         return wxValidator::IsSilent();
     }


@@ -948,8 +950,8 @@ static PyObject *_wrap_new_wxWindow(PyObject *self, PyObject *args, PyObject *kw
     wxWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxDefaultSize;

     long  _arg4 = (long ) 0;
     char * _arg5 = (char *) "panel";
     PyObject * _argo0 = 0;
     long  _arg4 = (long ) 0;
     char * _arg5 = (char *) "panel";
     PyObject * _argo0 = 0;


@@ -5182,8 +5184,8 @@ static PyObject *_wrap_new_wxPanel(PyObject *self, PyObject *args, PyObject *kwa
     wxPanel * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxPanel * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxDefaultSize;

     long  _arg4 = (long ) wxTAB_TRAVERSAL;
     char * _arg5 = (char *) "panel";
     PyObject * _argo0 = 0;
     long  _arg4 = (long ) wxTAB_TRAVERSAL;
     char * _arg5 = (char *) "panel";
     PyObject * _argo0 = 0;


@@ -5359,8 +5361,8 @@ static PyObject *_wrap_new_wxDialog(PyObject *self, PyObject *args, PyObject *kw
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxString * _arg2;

-    wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxDefaultSize;

     long  _arg5 = (long ) wxDEFAULT_DIALOG_STYLE;
     char * _arg6 = (char *) "dialogBox";
     PyObject * _argo0 = 0;
     long  _arg5 = (long ) wxDEFAULT_DIALOG_STYLE;
     char * _arg6 = (char *) "dialogBox";
     PyObject * _argo0 = 0;


@@ -5826,8 +5828,8 @@ static PyObject *_wrap_new_wxScrolledWindow(PyObject *self, PyObject *args, PyOb
     wxScrolledWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1 = (wxWindowID ) -1;
     wxScrolledWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1 = (wxWindowID ) -1;

-    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxDefaultSize;

     long  _arg4 = (long ) wxHSCROLL|wxVSCROLL;
     char * _arg5 = (char *) "scrolledWindow";
     PyObject * _argo0 = 0;
     long  _arg4 = (long ) wxHSCROLL|wxVSCROLL;
     char * _arg5 = (char *) "scrolledWindow";
     PyObject * _argo0 = 0;

diff --git a/wxPython/src/msw/windows2.cpp b/wxPython/src/msw/windows2.cpp
index 7f74455f7a929f54bf5ece1c468be1caf25a8c7f..fb7972c1276cb3b0e785170774a604f241de7e9a 100644 (file)
--- a/wxPython/src/msw/windows2.cpp
+++ b/wxPython/src/msw/windows2.cpp
@@ -279,8 +279,8 @@ static PyObject *_wrap_new_wxNotebook(PyObject *self, PyObject *args, PyObject *
     wxNotebook * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxNotebook * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxDefaultSize;

     long  _arg4 = (long ) 0;
     char * _arg5 = (char *) "notebook";
     PyObject * _argo0 = 0;
     long  _arg4 = (long ) 0;
     char * _arg5 = (char *) "notebook";
     PyObject * _argo0 = 0;


@@ -1205,8 +1205,8 @@ static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args, PyOb
     wxSplitterWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxSplitterWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxDefaultSize;

     long  _arg4 = (long ) wxSP_3D|wxCLIP_CHILDREN;
     char * _arg5 = (char *) "splitterWindow";
     PyObject * _argo0 = 0;
     long  _arg4 = (long ) wxSP_3D|wxCLIP_CHILDREN;
     char * _arg5 = (char *) "splitterWindow";
     PyObject * _argo0 = 0;

diff --git a/wxPython/src/msw/windows3.cpp b/wxPython/src/msw/windows3.cpp
index 4a668a6f810fb504b7dafe1bd322929b5425701e..82cd1f7d2d37e5dfbe06d29f816c63eb04e1e59f 100644 (file)
--- a/wxPython/src/msw/windows3.cpp
+++ b/wxPython/src/msw/windows3.cpp
@@ -321,8 +321,8 @@ static PyObject *_wrap_new_wxSashWindow(PyObject *self, PyObject *args, PyObject
     wxSashWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxSashWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxDefaultSize;

     long  _arg4 = (long ) wxCLIP_CHILDREN|(wxSW_3D);
     char * _arg5 = (char *) "sashWindow";
     PyObject * _argo0 = 0;
     long  _arg4 = (long ) wxCLIP_CHILDREN|(wxSW_3D);
     char * _arg5 = (char *) "sashWindow";
     PyObject * _argo0 = 0;


@@ -1295,8 +1295,8 @@ static PyObject *_wrap_new_wxSashLayoutWindow(PyObject *self, PyObject *args, Py
     wxSashLayoutWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;
     wxSashLayoutWindow * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1;

-    wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
-    wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
+    wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg3 = (wxSize *) &wxDefaultSize;

     long  _arg4 = (long ) wxCLIP_CHILDREN|(wxSW_3D);
     char * _arg5 = (char *) "layoutWindow";
     PyObject * _argo0 = 0;
     long  _arg4 = (long ) wxCLIP_CHILDREN|(wxSW_3D);
     char * _arg5 = (char *) "layoutWindow";
     PyObject * _argo0 = 0;

diff --git a/wxPython/src/msw/wx.cpp b/wxPython/src/msw/wx.cpp
index cabfca1b1db9f94ed900b4073c1d23164a61758b..71e5f430a94202128c62ab93bb689d30c05038b4 100644 (file)
--- a/wxPython/src/msw/wx.cpp
+++ b/wxPython/src/msw/wx.cpp
@@ -865,48 +865,32 @@ static PyObject *_wrap_ptrmap(PyObject *self, PyObject *args, PyObject *kwargs)
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-static int _wrap_wxPyDefaultPosition_set(PyObject *val) {
-    wxPoint * temp;
-
-    if (val) {
-        if (val == Py_None) { temp = NULL; }
-        else if (SWIG_GetPtrObj(val,(void **) &temp,"_wxPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in value of wxPyDefaultPosition. Expected _wxPoint_p.");
-        return 1;
-        }
-    }
-    wxPyDefaultPosition = *temp;
-    return 0;
+static int _wrap_wxDefaultPosition_set(PyObject *val) {
+
+    PyErr_SetString(PyExc_TypeError,"Variable wxDefaultPosition is read-only.");
+    return 1;

 }
 
 }
 

-static PyObject *_wrap_wxPyDefaultPosition_get() {
+static PyObject *_wrap_wxDefaultPosition_get() {

     PyObject * pyobj;
     char ptemp[128];
 
     PyObject * pyobj;
     char ptemp[128];
 

-    SWIG_MakePtr(ptemp,(char *) &wxPyDefaultPosition,"_wxPoint_p");
+    SWIG_MakePtr(ptemp,(char *) &wxDefaultPosition,"_wxPoint_p");

     pyobj = PyString_FromString(ptemp);
     return pyobj;
 }
 
     pyobj = PyString_FromString(ptemp);
     return pyobj;
 }
 

-static int _wrap_wxPyDefaultSize_set(PyObject *val) {
-    wxSize * temp;
+static int _wrap_wxDefaultSize_set(PyObject *val) {

 
 

-    if (val) {
-        if (val == Py_None) { temp = NULL; }
-        else if (SWIG_GetPtrObj(val,(void **) &temp,"_wxSize_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in value of wxPyDefaultSize. Expected _wxSize_p.");
-        return 1;
-        }
-    }
-    wxPyDefaultSize = *temp;
-    return 0;
+    PyErr_SetString(PyExc_TypeError,"Variable wxDefaultSize is read-only.");
+    return 1;

 }
 
 }
 

-static PyObject *_wrap_wxPyDefaultSize_get() {
+static PyObject *_wrap_wxDefaultSize_get() {

     PyObject * pyobj;
     char ptemp[128];
 
     PyObject * pyobj;
     char ptemp[128];
 

-    SWIG_MakePtr(ptemp,(char *) &wxPyDefaultSize,"_wxSize_p");
+    SWIG_MakePtr(ptemp,(char *) &wxDefaultSize,"_wxSize_p");

     pyobj = PyString_FromString(ptemp);
     return pyobj;
 }
     pyobj = PyString_FromString(ptemp);
     return pyobj;
 }


@@ -3012,8 +2996,8 @@ SWIGEXPORT(void) initwxc() {
         PyDict_SetItemString(d,"wxEVT_END_PROCESS", PyInt_FromLong((long) wxEVT_END_PROCESS));
         PyDict_SetItemString(d,"__version__", PyString_FromString("0.0.0"));
         PyDict_SetItemString(d,"cvar", SWIG_globals);
         PyDict_SetItemString(d,"wxEVT_END_PROCESS", PyInt_FromLong((long) wxEVT_END_PROCESS));
         PyDict_SetItemString(d,"__version__", PyString_FromString("0.0.0"));
         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);
+        SWIG_addvarlink(SWIG_globals,"wxDefaultPosition",_wrap_wxDefaultPosition_get, _wrap_wxDefaultPosition_set);
+        SWIG_addvarlink(SWIG_globals,"wxDefaultSize",_wrap_wxDefaultSize_get, _wrap_wxDefaultSize_set);

 
     // Make our API structure a CObject so other modules can import it
     // from this module.
 
     // Make our API structure a CObject so other modules can import it
     // from this module.

diff --git a/wxPython/src/msw/wx.py b/wxPython/src/msw/wx.py
index 1f385d3112604167125018fa5e46888be5da1810..2d15bf9e408a05af5124f6fd081100795726c2df 100644 (file)
--- a/wxPython/src/msw/wx.py
+++ b/wxPython/src/msw/wx.py
@@ -845,8 +845,8 @@ wxEVT_TIMER = wxc.wxEVT_TIMER
 wxEVT_END_PROCESS = wxc.wxEVT_END_PROCESS
 __version__ = wxc.__version__
 cvar = wxc.cvar
 wxEVT_END_PROCESS = wxc.wxEVT_END_PROCESS
 __version__ = wxc.__version__
 cvar = wxc.cvar

-wxPyDefaultPosition = wxPointPtr(wxc.cvar.wxPyDefaultPosition)
-wxPyDefaultSize = wxSizePtr(wxc.cvar.wxPyDefaultSize)
+wxDefaultPosition = wxPointPtr(wxc.cvar.wxDefaultPosition)
+wxDefaultSize = wxSizePtr(wxc.cvar.wxDefaultSize)

 
 
 #-------------- USER INCLUDE -----------------------
 
 
 #-------------- USER INCLUDE -----------------------


@@ -1578,15 +1578,15 @@ NULL = _NullObj()
 wxColor      = wxColour
 wxNamedColor = wxNamedColour
 
 wxColor      = wxColour
 wxNamedColor = wxNamedColour
 

-wxPyDefaultPosition.Set(-1,-1)
-wxPyDefaultSize.Set(-1,-1)
-

 # aliases so that C++ documentation applies:
 # aliases so that C++ documentation applies:

-wxDefaultPosition  = wxPyDefaultPosition
-wxDefaultSize      = wxPyDefaultSize
+#wxDefaultPosition  = wxPyDefaultPosition
+#wxDefaultSize      = wxPyDefaultSize
+

 
 # backwards compatibility
 
 # backwards compatibility

-wxNoRefBitmap      = wxBitmap
+wxNoRefBitmap       = wxBitmap
+wxPyDefaultPosition = wxDefaultPosition
+wxPyDefaultSize     = wxDefaultSize

 
 #----------------------------------------------------------------------
 # This helper function will take a wxPython object and convert it to
 
 #----------------------------------------------------------------------
 # This helper function will take a wxPython object and convert it to

diff --git a/wxPython/src/utils.i b/wxPython/src/utils.i
index a7646992a49d741177479d841c21fe208edf3cd0..100f7a116004d5f9763bf31c7d4411a07895d442 100644 (file)
--- a/wxPython/src/utils.i
+++ b/wxPython/src/utils.i
@@ -1032,10 +1032,8 @@ wxLongLong wxGetLocalTimeMillis();
 //---------------------------------------------------------------------------
 
 %init %{
 //---------------------------------------------------------------------------
 
 %init %{

-
-//    wxClassInfo::CleanUpClasses();
-//    wxClassInfo::InitializeClasses();
-
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();

 %}
 
 //---------------------------------------------------------------------------
 %}
 
 //---------------------------------------------------------------------------