Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-20 12:59:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added the wxClassInfo stuff back in to the modules that are

Browse Source 
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
This commit is contained in:
Robin Dunn
2000-12-22 22:32:26 +00:00
parent 35d60de221
commit e508a2b616
29 changed files with 183 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wxPython/src/calendar.i
+6
View File
@@ -223,6 +223,12 @@ public:
//---------------------------------------------------------------------------
%init %{
wxClassInfo::CleanUpClasses();
wxClassInfo::InitializeClasses();
%}
//---------------------------------------------------------------------------
%pragma(python) include="_calextras.py";
wxPython/src/grid.i
+7
View File
@@ -1733,6 +1733,13 @@ def EVT_GRID_EDITOR_HIDDEN(win, fn):
//---------------------------------------------------------------------------
%init %{
wxClassInfo::CleanUpClasses();
wxClassInfo::InitializeClasses();
%}
//---------------------------------------------------------------------------
%pragma(python) include="_gridextras.py";
//---------------------------------------------------------------------------
wxPython/src/html.i
+2 -3
View File
@@ -572,9 +572,8 @@ public:
inithtmlhelpc();
//wxClassInfo::CleanUpClasses();
//wxClassInfo::InitializeClasses();
wxClassInfo::CleanUpClasses();
wxClassInfo::InitializeClasses();
%}
//----------------------------------------------------------------------
wxPython/src/msw/calendar.cpp
+3
View File
@@ -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));
wxClassInfo::CleanUpClasses();
wxClassInfo::InitializeClasses();
{
int i;
for (i = 0; _swig_mapping[i].n1; i++)
wxPython/src/msw/cmndlgs.cpp
+5 -5
View File
@@ -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;
wxPoint * _arg4 = (wxPoint *) &wxPyDefaultPosition;
wxPoint * _arg4 = (wxPoint *) &wxDefaultPosition;
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;
wxPoint * _arg6 = (wxPoint *) &wxPyDefaultPosition;
wxPoint * _arg6 = (wxPoint *) &wxDefaultPosition;
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;
wxPoint * _arg6 = (wxPoint *) &wxPyDefaultPosition;
wxPoint * _arg6 = (wxPoint *) &wxDefaultPosition;
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;
wxPoint * _arg5 = (wxPoint *) &wxPyDefaultPosition;
wxPoint * _arg5 = (wxPoint *) &wxDefaultPosition;
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;
wxPoint * _arg4 = (wxPoint *) &wxPyDefaultPosition;
wxPoint * _arg4 = (wxPoint *) &wxDefaultPosition;
PyObject * _argo0 = 0;
wxPoint temp;
PyObject * _obj4 = 0;
wxPython/src/msw/controls.cpp
+54 -56
View File
@@ -122,8 +122,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
static char* wxStringErrorMsg = "string type is required for parameter";
wxValidator wxPyDefaultValidator; // Non-const default because of SWIG
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;
wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
wxSize * _arg3 = (wxSize *) &wxDefaultSize;
long _arg4 = (long ) 0;
wxValidator * _arg5 = (wxValidator *) &wxPyDefaultValidator;
wxValidator * _arg5 = (wxValidator *) &wxDefaultValidator;
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;
wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
wxSize * _arg4 = (wxSize *) &wxDefaultSize;
long _arg5 = (long ) 0;
wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
wxValidator * _arg6 = (wxValidator *) &wxDefaultValidator;
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;
wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
wxSize * _arg4 = (wxSize *) &wxDefaultSize;
long _arg5 = (long ) wxBU_AUTODRAW;
wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
wxValidator * _arg6 = (wxValidator *) &wxDefaultValidator;
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;
wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
wxSize * _arg4 = (wxSize *) &wxDefaultSize;
long _arg5 = (long ) 0;
wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
wxValidator * _arg6 = (wxValidator *) &wxDefaultValidator;
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;
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;
wxValidator * _arg7 = (wxValidator *) &wxPyDefaultValidator;
wxValidator * _arg7 = (wxValidator *) &wxDefaultValidator;
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 *) "";
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;
wxValidator * _arg8 = (wxValidator *) &wxPyDefaultValidator;
wxValidator * _arg8 = (wxValidator *) &wxDefaultValidator;
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;
wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
wxSize * _arg4 = (wxSize *) &wxDefaultSize;
long _arg5 = (long ) wxGA_HORIZONTAL;
wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
wxValidator * _arg6 = (wxValidator *) &wxDefaultValidator;
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;
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;
@@ -2952,8 +2950,8 @@ static PyObject *_wrap_new_wxStaticLine(PyObject *self, PyObject *args, PyObject
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;
@@ -3032,8 +3030,8 @@ static PyObject *_wrap_new_wxStaticText(PyObject *self, PyObject *args, PyObject
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;
@@ -3217,12 +3215,12 @@ static PyObject *_wrap_new_wxListBox(PyObject *self, PyObject *args, PyObject *k
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;
wxValidator * _arg7 = (wxValidator *) &wxPyDefaultValidator;
wxValidator * _arg7 = (wxValidator *) &wxDefaultValidator;
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;
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;
wxValidator * _arg7 = (wxValidator *) &wxPyDefaultValidator;
wxValidator * _arg7 = (wxValidator *) &wxDefaultValidator;
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 *) "";
wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
wxSize * _arg4 = (wxSize *) &wxDefaultSize;
long _arg5 = (long ) 0;
wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
wxValidator * _arg6 = (wxValidator *) &wxDefaultValidator;
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;
wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
wxSize * _arg3 = (wxSize *) &wxDefaultSize;
long _arg4 = (long ) wxSB_HORIZONTAL;
wxValidator * _arg5 = (wxValidator *) &wxPyDefaultValidator;
wxValidator * _arg5 = (wxValidator *) &wxDefaultValidator;
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;
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;
@@ -6029,8 +6027,8 @@ static PyObject *_wrap_new_wxStaticBitmap(PyObject *self, PyObject *args, PyObje
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;
@@ -6224,13 +6222,13 @@ static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args, PyObject *
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;
wxValidator * _arg9 = (wxValidator *) &wxPyDefaultValidator;
wxValidator * _arg9 = (wxValidator *) &wxDefaultValidator;
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;
wxPoint * _arg3 = (wxPoint *) &wxPyDefaultPosition;
wxSize * _arg4 = (wxSize *) &wxPyDefaultSize;
wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
wxSize * _arg4 = (wxSize *) &wxDefaultSize;
long _arg5 = (long ) 0;
wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator;
wxValidator * _arg6 = (wxValidator *) &wxDefaultValidator;
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;
wxPoint * _arg5 = (wxPoint *) &wxPyDefaultPosition;
wxSize * _arg6 = (wxSize *) &wxPyDefaultSize;
wxPoint * _arg5 = (wxPoint *) &wxDefaultPosition;
wxSize * _arg6 = (wxSize *) &wxDefaultSize;
long _arg7 = (long ) wxSL_HORIZONTAL;
wxValidator * _arg8 = (wxValidator *) &wxPyDefaultValidator;
wxValidator * _arg8 = (wxValidator *) &wxDefaultValidator;
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 *) "";
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;
wxPython/src/msw/controls2.cpp
+6 -8
View File
@@ -110,8 +110,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
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;
@@ -2846,10 +2844,10 @@ static PyObject *_wrap_new_wxListCtrl(PyObject *self, PyObject *args, PyObject *
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;
wxValidator * _arg5 = (wxValidator *) &wxPyDefaultValidator;
wxValidator * _arg5 = (wxValidator *) &wxDefaultValidator;
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;
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;
wxValidator * _arg5 = (wxValidator *) &wxPyDefaultValidator;
wxValidator * _arg5 = (wxValidator *) &wxDefaultValidator;
char * _arg6 = (char *) "wxTreeCtrl";
PyObject * _argo0 = 0;
wxPoint temp;
wxPython/src/msw/frames.cpp
+4 -4
View File
@@ -131,8 +131,8 @@ static PyObject *_wrap_new_wxFrame(PyObject *self, PyObject *args, PyObject *kwa
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;
@@ -1124,8 +1124,8 @@ static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args, PyObject
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;
wxPython/src/msw/gdi.cpp
+2
View File
@@ -109,6 +109,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
}
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);
wxPython/src/msw/grid.cpp
+3
View File
@@ -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));
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));
wxPython/src/msw/html.cpp
+2 -3
View File
@@ -6559,9 +6559,8 @@ SWIGEXPORT(void) inithtmlc() {
inithtmlhelpc();
//wxClassInfo::CleanUpClasses();
//wxClassInfo::InitializeClasses();
wxClassInfo::CleanUpClasses();
wxClassInfo::InitializeClasses();
{
int i;
for (i = 0; _swig_mapping[i].n1; i++)
wxPython/src/msw/mdi.cpp
+4 -4
View File
@@ -138,8 +138,8 @@ static PyObject *_wrap_new_wxMDIParentFrame(PyObject *self, PyObject *args, PyOb
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;
@@ -584,8 +584,8 @@ static PyObject *_wrap_new_wxMDIChildFrame(PyObject *self, PyObject *args, PyObj
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;
wxPython/src/msw/misc.cpp
+2
View File
@@ -108,6 +108,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
static char* wxStringErrorMsg = "string type is required for parameter";
static wxString wxPyEmptyStr("");
PyObject* wxIntersectRect(wxRect* r1, wxRect* r2) {
wxRegion reg1(*r1);
wxRegion reg2(*r2);
wxPython/src/msw/misc2.cpp
+3 -1
View File
@@ -112,6 +112,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
static char* wxStringErrorMsg = "string type is required for parameter";
static wxString wxPyEmptyStr("");
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;
wxPoint * _arg7 = (wxPoint *) &wxPyDefaultPosition;
wxPoint * _arg7 = (wxPoint *) &wxDefaultPosition;
PyObject * _obj0 = 0;
PyObject * _obj1 = 0;
PyObject * _obj2 = 0;
wxPython/src/msw/printfw.cpp
+2 -2
View File
@@ -4123,8 +4123,8 @@ static PyObject *_wrap_new_wxPreviewFrame(PyObject *self, PyObject *args, PyObje
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;
wxPython/src/msw/stattool.cpp
+8 -6
View File
@@ -106,6 +106,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
}
static char* wxStringErrorMsg = "string type is required for parameter";
static wxString wxPyEmptyStr("");
#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;
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;
@@ -2961,8 +2963,8 @@ static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args, PyObject *k
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;
@@ -3084,8 +3086,8 @@ static PyObject *_wrap_new_wxToolBarSimple(PyObject *self, PyObject *args, PyObj
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;
wxPython/src/msw/utils.cpp
+2 -4
View File
@@ -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));
// 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));
wxPython/src/msw/windows.cpp
+10 -8
View File
@@ -106,6 +106,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
static char* wxStringErrorMsg = "string type is required for parameter";
static wxString wxPyEmptyStr("");
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;
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;
@@ -5182,8 +5184,8 @@ static PyObject *_wrap_new_wxPanel(PyObject *self, PyObject *args, PyObject *kwa
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;
@@ -5359,8 +5361,8 @@ static PyObject *_wrap_new_wxDialog(PyObject *self, PyObject *args, PyObject *kw
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;
@@ -5826,8 +5828,8 @@ static PyObject *_wrap_new_wxScrolledWindow(PyObject *self, PyObject *args, PyOb
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;
wxPython/src/msw/windows2.cpp
+4 -4
View File
@@ -279,8 +279,8 @@ static PyObject *_wrap_new_wxNotebook(PyObject *self, PyObject *args, PyObject *
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;
@@ -1205,8 +1205,8 @@ static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args, PyOb
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;
wxPython/src/msw/windows3.cpp
+4 -4
View File
@@ -321,8 +321,8 @@ static PyObject *_wrap_new_wxSashWindow(PyObject *self, PyObject *args, PyObject
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;
@@ -1295,8 +1295,8 @@ static PyObject *_wrap_new_wxSashLayoutWindow(PyObject *self, PyObject *args, Py
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;
wxPython/src/msw/wx.cpp
+12 -28
View File
@@ -865,48 +865,32 @@ static PyObject *_wrap_ptrmap(PyObject *self, PyObject *args, PyObject *kwargs)
return _resultobj;
}
static int _wrap_wxPyDefaultPosition_set(PyObject *val) {
wxPoint * temp;
static int _wrap_wxDefaultPosition_set(PyObject *val) {
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;
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];
SWIG_MakePtr(ptemp,(char *) &wxPyDefaultPosition,"_wxPoint_p");
SWIG_MakePtr(ptemp,(char *) &wxDefaultPosition,"_wxPoint_p");
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];
SWIG_MakePtr(ptemp,(char *) &wxPyDefaultSize,"_wxSize_p");
SWIG_MakePtr(ptemp,(char *) &wxDefaultSize,"_wxSize_p");
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);
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.
wxPython/src/msw/wx.py
+8 -8
View File
@@ -845,8 +845,8 @@ wxEVT_TIMER = wxc.wxEVT_TIMER
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 -----------------------
@@ -1578,15 +1578,15 @@ NULL = _NullObj()
wxColor = wxColour
wxNamedColor = wxNamedColour
wxPyDefaultPosition.Set(-1,-1)
wxPyDefaultSize.Set(-1,-1)
# aliases so that C++ documentation applies:
wxDefaultPosition = wxPyDefaultPosition
wxDefaultSize = wxPyDefaultSize
#wxDefaultPosition = wxPyDefaultPosition
#wxDefaultSize = wxPyDefaultSize
# backwards compatibility
wxNoRefBitmap = wxBitmap
wxNoRefBitmap = wxBitmap
wxPyDefaultPosition = wxDefaultPosition
wxPyDefaultSize = wxDefaultSize
#----------------------------------------------------------------------
# This helper function will take a wxPython object and convert it to
wxPython/src/utils.i
+2 -4
View File
@@ -1032,10 +1032,8 @@ wxLongLong wxGetLocalTimeMillis();
//---------------------------------------------------------------------------
%init %{
// wxClassInfo::CleanUpClasses();
// wxClassInfo::InitializeClasses();
wxClassInfo::CleanUpClasses();
wxClassInfo::InitializeClasses();
%}
//---------------------------------------------------------------------------