Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some fixes for some bad wxRTTI names

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-06-07 00:49:01 +00:00
parent 35089a8a57
commit 9ec1cc00f2
5 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/src/_extras.py
View File

@@ -610,6 +610,8 @@ wxSystemSettings_GetSystemMetric = wxSystemSettings_GetMetric
# workarounds for bad wxRTTI names # workarounds for bad wxRTTI names
__wxPyPtrTypeMap['wxGauge95'] = 'wxGauge' __wxPyPtrTypeMap['wxGauge95'] = 'wxGauge'
__wxPyPtrTypeMap['wxSlider95'] = 'wxSlider'
__wxPyPtrTypeMap['wxStatusBar95'] = 'wxStatusBar'

7
wxPython/src/msw/printfw.cpp
View File

@@ -178,7 +178,14 @@ public:
PYPRIVATE; PYPRIVATE;
}; };
// Stupid renamed classes... Fix this in 2.5...
#if defined(__WXMSW__)
IMPLEMENT_CLASS( wxPyPrintPreview, wxWindowsPrintPreview );
#elif defined(__WXMAC__)
IMPLEMENT_CLASS( wxPyPrintPreview, wxMacPrintPreview );
#else
IMPLEMENT_CLASS( wxPyPrintPreview, wxPrintPreview ); IMPLEMENT_CLASS( wxPyPrintPreview, wxPrintPreview );
#endif
IMP_PYCALLBACK_BOOL_INT (wxPyPrintPreview, wxPrintPreview, SetCurrentPage); IMP_PYCALLBACK_BOOL_INT (wxPyPrintPreview, wxPrintPreview, SetCurrentPage);
IMP_PYCALLBACK_BOOL_WXWINDC(wxPyPrintPreview, wxPrintPreview, PaintPage); IMP_PYCALLBACK_BOOL_WXWINDC(wxPyPrintPreview, wxPrintPreview, PaintPage);

1
wxPython/src/msw/wx.cpp
View File

@@ -2546,6 +2546,7 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxGROW", PyInt_FromLong((long) wxGROW)); PyDict_SetItemString(d,"wxGROW", PyInt_FromLong((long) wxGROW));
PyDict_SetItemString(d,"wxEXPAND", PyInt_FromLong((long) wxEXPAND)); PyDict_SetItemString(d,"wxEXPAND", PyInt_FromLong((long) wxEXPAND));
PyDict_SetItemString(d,"wxNB_FIXEDWIDTH", PyInt_FromLong((long) wxNB_FIXEDWIDTH)); PyDict_SetItemString(d,"wxNB_FIXEDWIDTH", PyInt_FromLong((long) wxNB_FIXEDWIDTH));
PyDict_SetItemString(d,"wxNB_TOP", PyInt_FromLong((long) wxNB_TOP));
PyDict_SetItemString(d,"wxNB_LEFT", PyInt_FromLong((long) wxNB_LEFT)); PyDict_SetItemString(d,"wxNB_LEFT", PyInt_FromLong((long) wxNB_LEFT));
PyDict_SetItemString(d,"wxNB_RIGHT", PyInt_FromLong((long) wxNB_RIGHT)); PyDict_SetItemString(d,"wxNB_RIGHT", PyInt_FromLong((long) wxNB_RIGHT));
PyDict_SetItemString(d,"wxNB_BOTTOM", PyInt_FromLong((long) wxNB_BOTTOM)); PyDict_SetItemString(d,"wxNB_BOTTOM", PyInt_FromLong((long) wxNB_BOTTOM));

3
wxPython/src/msw/wx.py
View File

@@ -489,6 +489,7 @@ wxSHRINK = wxc.wxSHRINK
wxGROW = wxc.wxGROW wxGROW = wxc.wxGROW
wxEXPAND = wxc.wxEXPAND wxEXPAND = wxc.wxEXPAND
wxNB_FIXEDWIDTH = wxc.wxNB_FIXEDWIDTH wxNB_FIXEDWIDTH = wxc.wxNB_FIXEDWIDTH
wxNB_TOP = wxc.wxNB_TOP
wxNB_LEFT = wxc.wxNB_LEFT wxNB_LEFT = wxc.wxNB_LEFT
wxNB_RIGHT = wxc.wxNB_RIGHT wxNB_RIGHT = wxc.wxNB_RIGHT
wxNB_BOTTOM = wxc.wxNB_BOTTOM wxNB_BOTTOM = wxc.wxNB_BOTTOM
@@ -1580,6 +1581,8 @@ wxSystemSettings_GetSystemMetric = wxSystemSettings_GetMetric
# workarounds for bad wxRTTI names # workarounds for bad wxRTTI names
__wxPyPtrTypeMap['wxGauge95'] = 'wxGauge' __wxPyPtrTypeMap['wxGauge95'] = 'wxGauge'
__wxPyPtrTypeMap['wxSlider95'] = 'wxSlider'
__wxPyPtrTypeMap['wxStatusBar95'] = 'wxStatusBar'

7
wxPython/src/printfw.i
View File

@@ -545,7 +545,14 @@ public:
PYPRIVATE; PYPRIVATE;
}; };
// Stupid renamed classes... Fix this in 2.5...
#if defined(__WXMSW__)
IMPLEMENT_CLASS( wxPyPrintPreview, wxWindowsPrintPreview );
#elif defined(__WXMAC__)
IMPLEMENT_CLASS( wxPyPrintPreview, wxMacPrintPreview );
#else
IMPLEMENT_CLASS( wxPyPrintPreview, wxPrintPreview ); IMPLEMENT_CLASS( wxPyPrintPreview, wxPrintPreview );
#endif
IMP_PYCALLBACK_BOOL_INT (wxPyPrintPreview, wxPrintPreview, SetCurrentPage); IMP_PYCALLBACK_BOOL_INT (wxPyPrintPreview, wxPrintPreview, SetCurrentPage);
IMP_PYCALLBACK_BOOL_WXWINDC(wxPyPrintPreview, wxPrintPreview, PaintPage); IMP_PYCALLBACK_BOOL_WXWINDC(wxPyPrintPreview, wxPrintPreview, PaintPage);