X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c039d08bfbb59c0abcbc705fb49f9b2cb321edf..9f06bcb3b8aea7aa709754a217c26e94fe2d5954:/utils/wxPython/src/msw/mdi.cpp diff --git a/utils/wxPython/src/msw/mdi.cpp b/utils/wxPython/src/msw/mdi.cpp index 4d461d1b5c..15f6f1c872 100644 --- a/utils/wxPython/src/msw/mdi.cpp +++ b/utils/wxPython/src/msw/mdi.cpp @@ -102,15 +102,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } +extern byte* byte_LIST_helper(PyObject* source); extern int* int_LIST_helper(PyObject* source); extern long* long_LIST_helper(PyObject* source); extern char** string_LIST_helper(PyObject* source); extern wxPoint* wxPoint_LIST_helper(PyObject* source); extern wxBitmap** wxBitmap_LIST_helper(PyObject* source); extern wxString* wxString_LIST_helper(PyObject* source); -#ifdef __WXMSW__ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); -#endif static char* wxStringErrorMsg = "string type is required for parameter"; @@ -277,47 +276,6 @@ static PyObject *_wrap_wxMDIParentFrame_Cascade(PyObject *self, PyObject *args) return _resultobj; } -#define wxMDIParentFrame_GetClientSize(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetClientSize(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxMDIParentFrame_GetClientSize(PyObject *self, PyObject *args) { - PyObject * _resultobj; - wxMDIParentFrame * _arg0; - int * _arg1; - int temp; - int * _arg2; - int temp0; - char * _argc0 = 0; - - self = self; -{ - _arg1 = &temp; -} -{ - _arg2 = &temp0; -} - if(!PyArg_ParseTuple(args,"s:wxMDIParentFrame_GetClientSize",&_argc0)) - return NULL; - if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIParentFrame_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIParentFrame_GetClientSize. Expected _wxMDIParentFrame_p."); - return NULL; - } - } - wxMDIParentFrame_GetClientSize(_arg0,_arg1,_arg2); - Py_INCREF(Py_None); - _resultobj = Py_None; -{ - PyObject *o; - o = PyInt_FromLong((long) (*_arg1)); - _resultobj = t_output_helper(_resultobj, o); -} -{ - PyObject *o; - o = PyInt_FromLong((long) (*_arg2)); - _resultobj = t_output_helper(_resultobj, o); -} - return _resultobj; -} - #define wxMDIParentFrame_GetActiveChild(_swigobj) (_swigobj->GetActiveChild()) static PyObject *_wrap_wxMDIParentFrame_GetActiveChild(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -579,99 +537,6 @@ static PyObject *_wrap_wxMDIChildFrame_Restore(PyObject *self, PyObject *args) { return _resultobj; } -#define wxMDIChildFrame_SetMenuBar(_swigobj,_swigarg0) (_swigobj->SetMenuBar(_swigarg0)) -static PyObject *_wrap_wxMDIChildFrame_SetMenuBar(PyObject *self, PyObject *args) { - PyObject * _resultobj; - wxMDIChildFrame * _arg0; - wxMenuBar * _arg1; - char * _argc0 = 0; - char * _argc1 = 0; - - self = self; - if(!PyArg_ParseTuple(args,"ss:wxMDIChildFrame_SetMenuBar",&_argc0,&_argc1)) - return NULL; - if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIChildFrame_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIChildFrame_SetMenuBar. Expected _wxMDIChildFrame_p."); - return NULL; - } - } - if (_argc1) { - if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxMenuBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMDIChildFrame_SetMenuBar. Expected _wxMenuBar_p."); - return NULL; - } - } - wxMDIChildFrame_SetMenuBar(_arg0,_arg1); - Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxMDIChildFrame_SetClientSize(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetClientSize(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxMDIChildFrame_SetClientSize(PyObject *self, PyObject *args) { - PyObject * _resultobj; - wxMDIChildFrame * _arg0; - int _arg1; - int _arg2; - char * _argc0 = 0; - - self = self; - if(!PyArg_ParseTuple(args,"sii:wxMDIChildFrame_SetClientSize",&_argc0,&_arg1,&_arg2)) - return NULL; - if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIChildFrame_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIChildFrame_SetClientSize. Expected _wxMDIChildFrame_p."); - return NULL; - } - } - wxMDIChildFrame_SetClientSize(_arg0,_arg1,_arg2); - Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxMDIChildFrame_GetPosition(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetPosition(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxMDIChildFrame_GetPosition(PyObject *self, PyObject *args) { - PyObject * _resultobj; - wxMDIChildFrame * _arg0; - int * _arg1; - int temp; - int * _arg2; - int temp0; - char * _argc0 = 0; - - self = self; -{ - _arg1 = &temp; -} -{ - _arg2 = &temp0; -} - if(!PyArg_ParseTuple(args,"s:wxMDIChildFrame_GetPosition",&_argc0)) - return NULL; - if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIChildFrame_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMDIChildFrame_GetPosition. Expected _wxMDIChildFrame_p."); - return NULL; - } - } - wxMDIChildFrame_GetPosition(_arg0,_arg1,_arg2); - Py_INCREF(Py_None); - _resultobj = Py_None; -{ - PyObject *o; - o = PyInt_FromLong((long) (*_arg1)); - _resultobj = t_output_helper(_resultobj, o); -} -{ - PyObject *o; - o = PyInt_FromLong((long) (*_arg2)); - _resultobj = t_output_helper(_resultobj, o); -} - return _resultobj; -} - static void *SwigwxMDIClientWindowTowxWindow(void *ptr) { wxMDIClientWindow *src; wxWindow *dest; @@ -714,9 +579,6 @@ static PyObject *_wrap_new_wxMDIClientWindow(PyObject *self, PyObject *args) { static PyMethodDef mdicMethods[] = { { "new_wxMDIClientWindow", _wrap_new_wxMDIClientWindow, 1 }, - { "wxMDIChildFrame_GetPosition", _wrap_wxMDIChildFrame_GetPosition, 1 }, - { "wxMDIChildFrame_SetClientSize", _wrap_wxMDIChildFrame_SetClientSize, 1 }, - { "wxMDIChildFrame_SetMenuBar", _wrap_wxMDIChildFrame_SetMenuBar, 1 }, { "wxMDIChildFrame_Restore", _wrap_wxMDIChildFrame_Restore, 1 }, { "wxMDIChildFrame_Maximize", _wrap_wxMDIChildFrame_Maximize, 1 }, { "wxMDIChildFrame_Activate", _wrap_wxMDIChildFrame_Activate, 1 }, @@ -726,7 +588,6 @@ static PyMethodDef mdicMethods[] = { { "wxMDIParentFrame_GetToolBar", _wrap_wxMDIParentFrame_GetToolBar, 1 }, { "wxMDIParentFrame_GetClientWindow", _wrap_wxMDIParentFrame_GetClientWindow, 1 }, { "wxMDIParentFrame_GetActiveChild", _wrap_wxMDIParentFrame_GetActiveChild, 1 }, - { "wxMDIParentFrame_GetClientSize", _wrap_wxMDIParentFrame_GetClientSize, 1 }, { "wxMDIParentFrame_Cascade", _wrap_wxMDIParentFrame_Cascade, 1 }, { "wxMDIParentFrame_ArrangeIcons", _wrap_wxMDIParentFrame_ArrangeIcons, 1 }, { "wxMDIParentFrame_ActivatePrevious", _wrap_wxMDIParentFrame_ActivatePrevious, 1 }, @@ -752,6 +613,7 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0); SWIG_RegisterMapping("_signed_long","_long",0); SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0); + SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0); SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler); @@ -763,7 +625,7 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0); SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); - SWIG_RegisterMapping("_class_wxToolBarBase","_wxToolBarBase",0); + SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0); SWIG_RegisterMapping("_wxPen","_class_wxPen",0); @@ -775,22 +637,24 @@ SWIGEXPORT(void,initmdic)() { 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("_class_wxAcceleratorTable","_wxAcceleratorTable",0); SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0); SWIG_RegisterMapping("_wxDC","_class_wxDC",0); + SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",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("_wxColour","_class_wxColour",0); @@ -814,19 +678,20 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0); SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0); SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0); + SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0); SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0); SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0); SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0); SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0); SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0); - SWIG_RegisterMapping("_wxToolBarSimple","_class_wxToolBarSimple",0); SWIG_RegisterMapping("_wxMDIChildFrame","_class_wxMDIChildFrame",0); SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0); SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0); SWIG_RegisterMapping("_EBool","_signed_int",0); SWIG_RegisterMapping("_EBool","_int",0); SWIG_RegisterMapping("_EBool","_wxWindowID",0); + SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0); SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0); SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0); SWIG_RegisterMapping("_wxFont","_class_wxFont",0); @@ -855,7 +720,6 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0); SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0); SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0); - SWIG_RegisterMapping("_class_wxToolBarSimple","_wxToolBarSimple",0); SWIG_RegisterMapping("_class_wxMDIChildFrame","_wxMDIChildFrame",0); SWIG_RegisterMapping("_WXTYPE","_short",0); SWIG_RegisterMapping("_WXTYPE","_signed_short",0); @@ -884,13 +748,13 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_signed_short","_short",0); SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0); SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0); + SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0); SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0); SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0); SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0); 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("_unsigned_char","_byte",0); SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0); @@ -912,6 +776,7 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0); SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0); SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0); + SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0); SWIG_RegisterMapping("_wxFrame","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame); SWIG_RegisterMapping("_wxFrame","_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame); @@ -929,8 +794,10 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_int","_unsigned_int",0); SWIG_RegisterMapping("_int","_signed_int",0); SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0); + SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0); SWIG_RegisterMapping("_wxButton","_class_wxButton",0); SWIG_RegisterMapping("_wxSize","_class_wxSize",0); + SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0); SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0); SWIG_RegisterMapping("_class_wxMDIParentFrame","_wxMDIParentFrame",0); SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0); @@ -938,7 +805,6 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0); SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0); SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0); - SWIG_RegisterMapping("_wxToolBarBase","_class_wxToolBarBase",0); SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0); SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0); SWIG_RegisterMapping("_class_wxControl","_wxControl",0); @@ -946,10 +812,12 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0); SWIG_RegisterMapping("_class_wxColour","_wxColour",0); SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0); + SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0); SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0); SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0); SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0); SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0); + SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0); SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0); SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0); SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0); @@ -975,6 +843,7 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0); SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0); SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0); + SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0); SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0); SWIG_RegisterMapping("_wxMDIClientWindow","_class_wxMDIClientWindow",0); SWIG_RegisterMapping("_wxWindow","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow);