X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be4d9c1faf22d57098d17a578d218514598c9ce5..9f06bcb3b8aea7aa709754a217c26e94fe2d5954:/utils/wxPython/src/msw/wx.cpp?ds=sidebyside diff --git a/utils/wxPython/src/msw/wx.cpp b/utils/wxPython/src/msw/wx.cpp index 99687defe9..16e5518bd7 100644 --- a/utils/wxPython/src/msw/wx.cpp +++ b/utils/wxPython/src/msw/wx.cpp @@ -33,10 +33,8 @@ * and things like that. * * $Log$ - * Revision 1.2 1998/12/17 18:07:12 RD - * wxPython 0.5.2 - * Minor fixes and SWIG code generation for RR's changes. MSW and GTK - * versions are much closer now! + * Revision 1.8 1999/03/05 07:23:03 RD + * Minor wxPython changes for wxWin 2.0 * ************************************************************************/ @@ -630,12 +628,27 @@ extern "C" SWIGEXPORT(void,initcontrols2c)(); extern "C" SWIGEXPORT(void,initcmndlgsc)(); extern "C" SWIGEXPORT(void,initstattoolc)(); extern "C" SWIGEXPORT(void,initframesc)(); +extern "C" SWIGEXPORT(void,initwindows3c)(); +#ifndef SEPARATE extern "C" SWIGEXPORT(void,initutilsc)(); - +#endif static int _wrap_wxPyDefaultPosition_set(PyObject *val) { + char * tval; + wxPoint * temp; - PyErr_SetString(PyExc_TypeError,"Variable wxPyDefaultPosition is read-only."); - return 1; + tval = (char *) PyString_AsString(val); + if (PyErr_Occurred()) { + PyErr_SetString(PyExc_TypeError,"C variable 'wxPyDefaultPosition'(wxPoint *)"); + return 1; + } + if (tval) { + if (SWIG_GetPtr(tval,(void **) &temp,"_wxPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in value of wxPyDefaultPosition. Expected _wxPoint_p."); + return 1; + } + } + wxPyDefaultPosition = *temp; + return 0; } static PyObject *_wrap_wxPyDefaultPosition_get() { @@ -648,9 +661,22 @@ static PyObject *_wrap_wxPyDefaultPosition_get() { } static int _wrap_wxPyDefaultSize_set(PyObject *val) { + char * tval; + wxSize * temp; - PyErr_SetString(PyExc_TypeError,"Variable wxPyDefaultSize is read-only."); - return 1; + tval = (char *) PyString_AsString(val); + if (PyErr_Occurred()) { + PyErr_SetString(PyExc_TypeError,"C variable 'wxPyDefaultSize'(wxSize *)"); + return 1; + } + if (tval) { + if (SWIG_GetPtr(tval,(void **) &temp,"_wxSize_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in value of wxPyDefaultSize. Expected _wxSize_p."); + return 1; + } + } + wxPyDefaultSize = *temp; + return 0; } static PyObject *_wrap_wxPyDefaultSize_get() { @@ -1218,7 +1244,7 @@ SWIGEXPORT(void,initwxc)() { PyDict_SetItemString(d,"wxMAJOR_VERSION", PyInt_FromLong((long) wxMAJOR_VERSION)); PyDict_SetItemString(d,"wxMINOR_VERSION", PyInt_FromLong((long) wxMINOR_VERSION)); PyDict_SetItemString(d,"wxRELEASE_NUMBER", PyInt_FromLong((long) wxRELEASE_NUMBER)); - PyDict_SetItemString(d,"NOT_FOUND", PyInt_FromLong((long) NOT_FOUND)); + PyDict_SetItemString(d,"wxNOT_FOUND", PyInt_FromLong((long) wxNOT_FOUND)); PyDict_SetItemString(d,"wxVSCROLL", PyInt_FromLong((long) wxVSCROLL)); PyDict_SetItemString(d,"wxHSCROLL", PyInt_FromLong((long) wxHSCROLL)); PyDict_SetItemString(d,"wxCAPTION", PyInt_FromLong((long) wxCAPTION)); @@ -1254,6 +1280,7 @@ SWIGEXPORT(void,initwxc)() { PyDict_SetItemString(d,"wxDEFAULT_FRAME_STYLE", PyInt_FromLong((long) wxDEFAULT_FRAME_STYLE)); PyDict_SetItemString(d,"wxDEFAULT_DIALOG_STYLE", PyInt_FromLong((long) wxDEFAULT_DIALOG_STYLE)); PyDict_SetItemString(d,"wxFRAME_TOOL_WINDOW", PyInt_FromLong((long) wxFRAME_TOOL_WINDOW)); + PyDict_SetItemString(d,"wxCLIP_CHILDREN", PyInt_FromLong((long) wxCLIP_CHILDREN)); PyDict_SetItemString(d,"wxRETAINED", PyInt_FromLong((long) wxRETAINED)); PyDict_SetItemString(d,"wxBACKINGSTORE", PyInt_FromLong((long) wxBACKINGSTORE)); PyDict_SetItemString(d,"wxTB_3DBUTTONS", PyInt_FromLong((long) wxTB_3DBUTTONS)); @@ -1286,6 +1313,8 @@ SWIGEXPORT(void,initwxc)() { PyDict_SetItemString(d,"wxCB_READONLY", PyInt_FromLong((long) wxCB_READONLY)); PyDict_SetItemString(d,"wxRA_HORIZONTAL", PyInt_FromLong((long) wxRA_HORIZONTAL)); PyDict_SetItemString(d,"wxRA_VERTICAL", PyInt_FromLong((long) wxRA_VERTICAL)); + PyDict_SetItemString(d,"wxRA_SPECIFY_ROWS", PyInt_FromLong((long) wxRA_SPECIFY_ROWS)); + PyDict_SetItemString(d,"wxRA_SPECIFY_COLS", PyInt_FromLong((long) wxRA_SPECIFY_COLS)); PyDict_SetItemString(d,"wxRB_GROUP", PyInt_FromLong((long) wxRB_GROUP)); PyDict_SetItemString(d,"wxGA_PROGRESSBAR", PyInt_FromLong((long) wxGA_PROGRESSBAR)); PyDict_SetItemString(d,"wxGA_HORIZONTAL", PyInt_FromLong((long) wxGA_HORIZONTAL)); @@ -1593,6 +1622,7 @@ SWIGEXPORT(void,initwxc)() { PyDict_SetItemString(d,"false", PyInt_FromLong((long) 0)); PyDict_SetItemString(d,"TRUE", PyInt_FromLong((long) 1)); PyDict_SetItemString(d,"true", PyInt_FromLong((long) 1)); + PyDict_SetItemString(d,"wxVERSION_STRING", PyString_FromString("wxVERSION_STRING")); PyDict_SetItemString(d,"wxEVT_NULL", PyInt_FromLong((long) wxEVT_NULL)); PyDict_SetItemString(d,"wxEVT_FIRST", PyInt_FromLong((long) wxEVT_FIRST)); PyDict_SetItemString(d,"wxEVT_COMMAND_BUTTON_CLICKED", PyInt_FromLong((long) wxEVT_COMMAND_BUTTON_CLICKED)); @@ -1725,7 +1755,7 @@ SWIGEXPORT(void,initwxc)() { PyDict_SetItemString(d,"wxEVT_COMMAND_TAB_SEL_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_TAB_SEL_CHANGING)); PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)); PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)); - PyDict_SetItemString(d,"__version__", PyString_FromString("0.5.2")); + PyDict_SetItemString(d,"__version__", PyString_FromString("2.0b6")); 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); @@ -1749,6 +1779,7 @@ SWIGEXPORT(void,initwxc)() { initcmndlgsc(); initstattoolc(); initframesc(); + initwindows3c(); #ifndef SEPARATE initutilsc(); #endif @@ -1771,6 +1802,7 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); SWIG_RegisterMapping("_class_wxTreeCtrl","_wxTreeCtrl",0); + SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0); SWIG_RegisterMapping("_wxPageSetupData","_class_wxPageSetupData",0); @@ -1786,25 +1818,29 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_long","_wxDash",0); SWIG_RegisterMapping("_long","_unsigned_long",0); SWIG_RegisterMapping("_long","_signed_long",0); + SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0); SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0); SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0); + SWIG_RegisterMapping("_wxSashWindow","_class_wxSashWindow",0); SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0); + SWIG_RegisterMapping("_class_wxSashEvent","_wxSashEvent",0); SWIG_RegisterMapping("_wxDC","_class_wxDC",0); SWIG_RegisterMapping("_wxListEvent","_class_wxListEvent",0); SWIG_RegisterMapping("_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0); SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0); + SWIG_RegisterMapping("_wxSashLayoutWindow","_class_wxSashLayoutWindow",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0); SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0); - SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0); SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0); SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0); SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0); SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0); + SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0); SWIG_RegisterMapping("_class_wxMask","_wxMask",0); SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0); SWIG_RegisterMapping("_class_wxGrid","_wxGrid",0); @@ -1815,9 +1851,11 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0); SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0); SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0); + SWIG_RegisterMapping("_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0); SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0); SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0); SWIG_RegisterMapping("_class_wxNotebookEvent","_wxNotebookEvent",0); + SWIG_RegisterMapping("_class_wxSashWindow","_wxSashWindow",0); SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0); SWIG_RegisterMapping("_uint","_unsigned_int",0); SWIG_RegisterMapping("_uint","_int",0); @@ -1829,6 +1867,7 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0); SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0); SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0); + SWIG_RegisterMapping("_class_wxSashLayoutWindow","_wxSashLayoutWindow",0); SWIG_RegisterMapping("_class_wxButton","_wxButton",0); SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0); SWIG_RegisterMapping("_wxTreeItemData","_class_wxTreeItemData",0); @@ -1853,6 +1892,7 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_wxListItem","_class_wxListItem",0); SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0); SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0); + SWIG_RegisterMapping("_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0); SWIG_RegisterMapping("_EBool","_signed_int",0); SWIG_RegisterMapping("_EBool","_int",0); SWIG_RegisterMapping("_EBool","_wxWindowID",0); @@ -1904,6 +1944,7 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0); SWIG_RegisterMapping("_class_wxFont","_wxFont",0); SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0); + SWIG_RegisterMapping("_wxSashEvent","_class_wxSashEvent",0); SWIG_RegisterMapping("_class_wxMenuEvent","_wxMenuEvent",0); SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0); SWIG_RegisterMapping("_wxMouseEvent","_class_wxMouseEvent",0); @@ -1926,7 +1967,6 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0); SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0); - SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0); SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0); SWIG_RegisterMapping("_wxTreeItemId","_class_wxTreeItemId",0); SWIG_RegisterMapping("_unsigned_char","_byte",0); @@ -1943,14 +1983,18 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_class_wxListItem","_wxListItem",0); SWIG_RegisterMapping("_class_wxPen","_wxPen",0); SWIG_RegisterMapping("_class_wxFileDialog","_wxFileDialog",0); + SWIG_RegisterMapping("_wxQueryLayoutInfoEvent","_class_wxQueryLayoutInfoEvent",0); SWIG_RegisterMapping("_short","_WXTYPE",0); SWIG_RegisterMapping("_short","_unsigned_short",0); SWIG_RegisterMapping("_short","_signed_short",0); SWIG_RegisterMapping("_class_wxStaticBox","_wxStaticBox",0); + SWIG_RegisterMapping("_wxLayoutAlgorithm","_class_wxLayoutAlgorithm",0); SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0); SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0); SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0); SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0); + SWIG_RegisterMapping("_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0); + SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0); SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0); SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0); @@ -2029,6 +2073,7 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0); SWIG_RegisterMapping("_wxColourData","_class_wxColourData",0); SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0); + SWIG_RegisterMapping("_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0); SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0); SWIG_RegisterMapping("_wxMDIClientWindow","_class_wxMDIClientWindow",0); SWIG_RegisterMapping("_class_wxFontDialog","_wxFontDialog",0);