diff --git a/utils/wxPython/src/cmndlgs.cpp b/utils/wxPython/src/cmndlgs.cpp index c3bdde4ca3..33bafd9420 100644 --- a/utils/wxPython/src/cmndlgs.cpp +++ b/utils/wxPython/src/cmndlgs.cpp @@ -53,19 +53,6 @@ extern PyObject *SWIG_newvarlink(void); #define SWIG_name "cmndlgsc" -///////////////////////////////////////////////////////////////////////////// -// Name: cmndlgs.i -// Purpose: SWIG definitions for the Common Dialog Classes -// -// Author: Robin Dunn -// -// Created: 7/25/98 -// RCS-ID: $Id$ -// Copyright: (c) 1998 by Total Control Software -// Licence: wxWindows license -///////////////////////////////////////////////////////////////////////////// - - #include "helpers.h" #include #include @@ -125,7 +112,9 @@ 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"; diff --git a/utils/wxPython/src/cmndlgs.i b/utils/wxPython/src/cmndlgs.i index 06ca87ef77..ed5ec6bf65 100644 --- a/utils/wxPython/src/cmndlgs.i +++ b/utils/wxPython/src/cmndlgs.i @@ -1,5 +1,3 @@ -%module cmndlgs -%{ ///////////////////////////////////////////////////////////////////////////// // Name: cmndlgs.i // Purpose: SWIG definitions for the Common Dialog Classes @@ -12,7 +10,9 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +%module cmndlgs +%{ #include "helpers.h" #include #include @@ -286,6 +286,13 @@ public: ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.2 1998/08/15 07:36:25 RD +// - Moved the header in the .i files out of the code that gets put into +// the .cpp files. It caused CVS conflicts because of the RCS ID being +// different each time. +// +// - A few minor fixes. +// // Revision 1.1 1998/08/09 08:25:49 RD // Initial version // diff --git a/utils/wxPython/src/controls.cpp b/utils/wxPython/src/controls.cpp index dabb4ac59f..f2d6a1ecc0 100644 --- a/utils/wxPython/src/controls.cpp +++ b/utils/wxPython/src/controls.cpp @@ -53,19 +53,6 @@ extern PyObject *SWIG_newvarlink(void); #define SWIG_name "controlsc" -///////////////////////////////////////////////////////////////////////////// -// Name: controls.i -// Purpose: Control (widget) classes for wxPython -// -// Author: Robin Dunn -// -// Created: 6/10/98 -// RCS-ID: $Id$ -// Copyright: (c) 1998 by Total Control Software -// Licence: wxWindows license -///////////////////////////////////////////////////////////////////////////// - - #include "helpers.h" #include #include @@ -123,7 +110,9 @@ 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"; diff --git a/utils/wxPython/src/controls.i b/utils/wxPython/src/controls.i index 925459c540..1d6c728b27 100644 --- a/utils/wxPython/src/controls.i +++ b/utils/wxPython/src/controls.i @@ -1,5 +1,3 @@ -%module controls -%{ ///////////////////////////////////////////////////////////////////////////// // Name: controls.i // Purpose: Control (widget) classes for wxPython @@ -12,7 +10,9 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +%module controls +%{ #include "helpers.h" #include #include @@ -419,6 +419,13 @@ public: ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.2 1998/08/15 07:36:28 RD +// - Moved the header in the .i files out of the code that gets put into +// the .cpp files. It caused CVS conflicts because of the RCS ID being +// different each time. +// +// - A few minor fixes. +// // Revision 1.1 1998/08/09 08:25:49 RD // Initial version // diff --git a/utils/wxPython/src/controls2.cpp b/utils/wxPython/src/controls2.cpp index ca6a73be53..c463ce756e 100644 --- a/utils/wxPython/src/controls2.cpp +++ b/utils/wxPython/src/controls2.cpp @@ -53,19 +53,6 @@ extern PyObject *SWIG_newvarlink(void); #define SWIG_name "controls2c" -///////////////////////////////////////////////////////////////////////////// -// Name: controls2.i -// Purpose: More control (widget) classes for wxPython -// -// Author: Robin Dunn -// -// Created: 6/10/98 -// RCS-ID: $Id$ -// Copyright: (c) 1998 by Total Control Software -// Licence: wxWindows license -///////////////////////////////////////////////////////////////////////////// - - #include "helpers.h" #include #include @@ -124,7 +111,9 @@ 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"; diff --git a/utils/wxPython/src/controls2.i b/utils/wxPython/src/controls2.i index 979130677a..185592d1d4 100644 --- a/utils/wxPython/src/controls2.i +++ b/utils/wxPython/src/controls2.i @@ -1,5 +1,3 @@ -%module controls2 -%{ ///////////////////////////////////////////////////////////////////////////// // Name: controls2.i // Purpose: More control (widget) classes for wxPython @@ -12,7 +10,9 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +%module controls2 +%{ #include "helpers.h" #include #include @@ -375,6 +375,13 @@ public: ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.2 1998/08/15 07:36:30 RD +// - Moved the header in the .i files out of the code that gets put into +// the .cpp files. It caused CVS conflicts because of the RCS ID being +// different each time. +// +// - A few minor fixes. +// // Revision 1.1 1998/08/09 08:25:49 RD // Initial version // diff --git a/utils/wxPython/src/events.cpp b/utils/wxPython/src/events.cpp index 9ab8457fe5..87dd811e99 100644 --- a/utils/wxPython/src/events.cpp +++ b/utils/wxPython/src/events.cpp @@ -53,30 +53,16 @@ extern PyObject *SWIG_newvarlink(void); #define SWIG_name "eventsc" -///////////////////////////////////////////////////////////////////////////// -// Name: events.i -// Purpose: SWIGgable Event classes for wxPython -// -// Author: Robin Dunn -// -// Created: 5/24/98 -// RCS-ID: $Id$ -// Copyright: (c) 1998 by Total Control Software -// Licence: wxWindows license -///////////////////////////////////////////////////////////////////////////// - - #include "helpers.h" static PyObject* l_output_helper(PyObject* target, PyObject* o) { PyObject* o2; - PyObject* o3; - if (!target) { + if (!target) { target = o; - } else if (target == Py_None) { + } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { + } else { if (!PyList_Check(target)) { o2 = target; target = PyList_New(0); @@ -93,23 +79,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; - if (!target) { + if (!target) { target = o; - } else if (target == Py_None) { + } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { + } else { if (!PyTuple_Check(target)) { o2 = target; target = PyTuple_New(1); PyTuple_SetItem(target, 0, o2); } - o3 = PyTuple_New(1); - PyTuple_SetItem(o3, 0, o); + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, o); o2 = target; - target = PySequence_Concat(o2, o3); - Py_DECREF(o2); + target = PySequence_Concat(o2, o3); + Py_DECREF(o2); Py_DECREF(o3); } return target; diff --git a/utils/wxPython/src/events.i b/utils/wxPython/src/events.i index f2ae9c056a..39f7e4417c 100644 --- a/utils/wxPython/src/events.i +++ b/utils/wxPython/src/events.i @@ -1,5 +1,3 @@ -%module events -%{ ///////////////////////////////////////////////////////////////////////////// // Name: events.i // Purpose: SWIGgable Event classes for wxPython @@ -13,6 +11,9 @@ ///////////////////////////////////////////////////////////////////////////// +%module events + +%{ #include "helpers.h" %} @@ -288,6 +289,13 @@ public: ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.2 1998/08/15 07:36:33 RD +// - Moved the header in the .i files out of the code that gets put into +// the .cpp files. It caused CVS conflicts because of the RCS ID being +// different each time. +// +// - A few minor fixes. +// // Revision 1.1 1998/08/09 08:25:50 RD // Initial version // diff --git a/utils/wxPython/src/gdi.cpp b/utils/wxPython/src/gdi.cpp index 890318642a..9fc4074037 100644 --- a/utils/wxPython/src/gdi.cpp +++ b/utils/wxPython/src/gdi.cpp @@ -53,19 +53,6 @@ extern PyObject *SWIG_newvarlink(void); #define SWIG_name "gdic" -///////////////////////////////////////////////////////////////////////////// -// Name: gdi.i -// Purpose: SWIG interface file for wxDC, wxBrush, wxPen, wxFont, etc. -// -// Author: Robin Dunn -// -// Created: 7/7/97 -// RCS-ID: $Id$ -// Copyright: (c) 1998 by Total Control Software -// Licence: wxWindows license -///////////////////////////////////////////////////////////////////////////// - - #include "helpers.h" #include @@ -123,7 +110,9 @@ 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"; diff --git a/utils/wxPython/src/gdi.i b/utils/wxPython/src/gdi.i index b8fe77a1cb..93c43a5e7e 100644 --- a/utils/wxPython/src/gdi.i +++ b/utils/wxPython/src/gdi.i @@ -1,5 +1,3 @@ -%module gdi -%{ ///////////////////////////////////////////////////////////////////////////// // Name: gdi.i // Purpose: SWIG interface file for wxDC, wxBrush, wxPen, wxFont, etc. @@ -13,6 +11,9 @@ ///////////////////////////////////////////////////////////////////////////// +%module gdi + +%{ #include "helpers.h" #include @@ -460,6 +461,13 @@ extern wxColour wxNullColour; ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.2 1998/08/15 07:36:35 RD +// - Moved the header in the .i files out of the code that gets put into +// the .cpp files. It caused CVS conflicts because of the RCS ID being +// different each time. +// +// - A few minor fixes. +// // Revision 1.1 1998/08/09 08:25:50 RD // Initial version // diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp index 04eba9feb3..508ad137c5 100644 --- a/utils/wxPython/src/helpers.cpp +++ b/utils/wxPython/src/helpers.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: helpers.cpp -// Purpose: Helper functions/classes for the wxPython extenaion module +// Purpose: Helper functions/classes for the wxPython extension module // // Author: Robin Dunn // @@ -1060,6 +1060,13 @@ wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) { ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.3 1998/08/15 07:36:36 RD +// - Moved the header in the .i files out of the code that gets put into +// the .cpp files. It caused CVS conflicts because of the RCS ID being +// different each time. +// +// - A few minor fixes. +// // Revision 1.2 1998/08/14 23:36:36 RD // Beginings of wxGTK compatibility // diff --git a/utils/wxPython/src/makefile.nt b/utils/wxPython/src/makefile.nt index 58e085bc9d..884cdebe62 100644 --- a/utils/wxPython/src/makefile.nt +++ b/utils/wxPython/src/makefile.nt @@ -38,7 +38,7 @@ EXTRALIBS=$(PYTHONDIR)\libs\python15.lib EXTRAINC=-I$(PYTHONDIR)\include EXTRAFLAGS=/Fpwxp.pch /YXhelpers.h -DSWIG_GLOBAL -DHAVE_CONFIG_H -SWIGFLAGS=-c++ -shadow -python -dnone +SWIGFLAGS=-c++ -shadow -python -dnone -D__WXMSW__ !include $(WXDIR)\src\ntwxwin.mak @@ -185,6 +185,13 @@ $(TARGETDIR)\cmndlgs.py : cmndlgs.py #------------------------------------------------------------------------ # # $Log$ +# Revision 1.3 1998/08/15 07:36:37 RD +# - Moved the header in the .i files out of the code that gets put into +# the .cpp files. It caused CVS conflicts because of the RCS ID being +# different each time. +# +# - A few minor fixes. +# # Revision 1.2 1998/08/14 03:34:23 RD # made pre-compiling the python files optional # diff --git a/utils/wxPython/src/mdi.cpp b/utils/wxPython/src/mdi.cpp index 93c951a61a..fb01e2afde 100644 --- a/utils/wxPython/src/mdi.cpp +++ b/utils/wxPython/src/mdi.cpp @@ -53,19 +53,6 @@ extern PyObject *SWIG_newvarlink(void); #define SWIG_name "mdic" -///////////////////////////////////////////////////////////////////////////// -// Name: mdi.i -// Purpose: MDI related class definitions for wxPython -// -// Author: Robin Dunn -// -// Created: 5/26/98 -// RCS-ID: $Id$ -// Copyright: (c) 1998 by Total Control Software -// Licence: wxWindows license -///////////////////////////////////////////////////////////////////////////// - - #include "helpers.h" static PyObject* l_output_helper(PyObject* target, PyObject* o) { @@ -121,7 +108,9 @@ 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"; diff --git a/utils/wxPython/src/mdi.i b/utils/wxPython/src/mdi.i index cdcacdf9b2..1eb539eb83 100644 --- a/utils/wxPython/src/mdi.i +++ b/utils/wxPython/src/mdi.i @@ -1,5 +1,3 @@ -%module mdi -%{ ///////////////////////////////////////////////////////////////////////////// // Name: mdi.i // Purpose: MDI related class definitions for wxPython @@ -13,6 +11,9 @@ ///////////////////////////////////////////////////////////////////////////// +%module mdi + +%{ #include "helpers.h" %} @@ -83,6 +84,13 @@ public: ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.2 1998/08/15 07:36:39 RD +// - Moved the header in the .i files out of the code that gets put into +// the .cpp files. It caused CVS conflicts because of the RCS ID being +// different each time. +// +// - A few minor fixes. +// // Revision 1.1 1998/08/09 08:25:51 RD // Initial version // diff --git a/utils/wxPython/src/misc.cpp b/utils/wxPython/src/misc.cpp index fd95bad790..990b369dc1 100644 --- a/utils/wxPython/src/misc.cpp +++ b/utils/wxPython/src/misc.cpp @@ -53,31 +53,17 @@ extern PyObject *SWIG_newvarlink(void); #define SWIG_name "miscc" -///////////////////////////////////////////////////////////////////////////// -// Name: misc.i -// Purpose: Definitions of miscelaneous functions and classes -// -// Author: Robin Dunn -// -// Created: 7/3/97 -// RCS-ID: $Id$ -// Copyright: (c) 1998 by Total Control Software -// Licence: wxWindows license -///////////////////////////////////////////////////////////////////////////// - - #include "helpers.h" #include static PyObject* l_output_helper(PyObject* target, PyObject* o) { PyObject* o2; - PyObject* o3; - if (!target) { + if (!target) { target = o; - } else if (target == Py_None) { + } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { + } else { if (!PyList_Check(target)) { o2 = target; target = PyList_New(0); @@ -94,23 +80,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; - if (!target) { + if (!target) { target = o; - } else if (target == Py_None) { + } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { + } else { if (!PyTuple_Check(target)) { o2 = target; target = PyTuple_New(1); PyTuple_SetItem(target, 0, o2); } - o3 = PyTuple_New(1); - PyTuple_SetItem(o3, 0, o); + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, o); o2 = target; - target = PySequence_Concat(o2, o3); - Py_DECREF(o2); + target = PySequence_Concat(o2, o3); + Py_DECREF(o2); Py_DECREF(o3); } return target; diff --git a/utils/wxPython/src/misc.i b/utils/wxPython/src/misc.i index 8f32ad8800..f8d7ed4b85 100644 --- a/utils/wxPython/src/misc.i +++ b/utils/wxPython/src/misc.i @@ -1,5 +1,3 @@ -%module misc -%{ ///////////////////////////////////////////////////////////////////////////// // Name: misc.i // Purpose: Definitions of miscelaneous functions and classes @@ -12,7 +10,9 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +%module misc +%{ #include "helpers.h" #include %} @@ -301,6 +301,13 @@ public: ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.2 1998/08/15 07:36:41 RD +// - Moved the header in the .i files out of the code that gets put into +// the .cpp files. It caused CVS conflicts because of the RCS ID being +// different each time. +// +// - A few minor fixes. +// // Revision 1.1 1998/08/09 08:25:51 RD // Initial version // diff --git a/utils/wxPython/src/windows.cpp b/utils/wxPython/src/windows.cpp index 11287db4fd..012a95a5ee 100644 --- a/utils/wxPython/src/windows.cpp +++ b/utils/wxPython/src/windows.cpp @@ -53,19 +53,6 @@ extern PyObject *SWIG_newvarlink(void); #define SWIG_name "windowsc" -///////////////////////////////////////////////////////////////////////////// -// Name: windows.i -// Purpose: SWIG definitions of various window classes -// -// Author: Robin Dunn -// -// Created: 6/24/97 -// RCS-ID: $Id$ -// Copyright: (c) 1998 by Total Control Software -// Licence: wxWindows license -///////////////////////////////////////////////////////////////////////////// - - #include "helpers.h" #ifdef __WXMSW__ @@ -79,13 +66,12 @@ extern PyObject *SWIG_newvarlink(void); static PyObject* l_output_helper(PyObject* target, PyObject* o) { PyObject* o2; - PyObject* o3; - if (!target) { + if (!target) { target = o; - } else if (target == Py_None) { + } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { + } else { if (!PyList_Check(target)) { o2 = target; target = PyList_New(0); @@ -102,23 +88,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; - if (!target) { + if (!target) { target = o; - } else if (target == Py_None) { + } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { + } else { if (!PyTuple_Check(target)) { o2 = target; target = PyTuple_New(1); PyTuple_SetItem(target, 0, o2); } - o3 = PyTuple_New(1); - PyTuple_SetItem(o3, 0, o); + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, o); o2 = target; - target = PySequence_Concat(o2, o3); - Py_DECREF(o2); + target = PySequence_Concat(o2, o3); + Py_DECREF(o2); Py_DECREF(o3); } return target; @@ -137,6 +123,24 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); static char* wxStringErrorMsg = "string type is required for parameter"; + + wxWindow* wxWindow_FindFocus() { + return wxWindow::FindFocus(); + } +static PyObject *_wrap_wxWindow_FindFocus(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxWindow * _result; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,":wxWindow_FindFocus")) + return NULL; + _result = (wxWindow *)wxWindow_FindFocus(); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + static void wxEvtHandler_Connect(wxEvtHandler *self,int id,int lastId,int eventType,PyObject * func) { if (PyCallable_Check(func)) { self->Connect(id, lastId, eventType, @@ -374,6 +378,30 @@ static PyObject *_wrap_wxWindow_DestroyChildren(PyObject *self, PyObject *args) return _resultobj; } +#define wxWindow_DragAcceptFiles(_swigobj,_swigarg0) (_swigobj->DragAcceptFiles(_swigarg0)) +static PyObject *_wrap_wxWindow_DragAcceptFiles(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxWindow * _arg0; + bool _arg1; + char * _argc0 = 0; + int tempbool1; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxWindow_DragAcceptFiles",&_argc0,&tempbool1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_DragAcceptFiles. Expected _wxWindow_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; + wxWindow_DragAcceptFiles(_arg0,_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxWindow_Enable(_swigobj,_swigarg0) (_swigobj->Enable(_swigarg0)) static PyObject *_wrap_wxWindow_Enable(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -442,6 +470,48 @@ static PyObject *_wrap_wxWindow_GetBackgroundColour(PyObject *self, PyObject *ar return _resultobj; } +#define wxWindow_GetCharHeight(_swigobj) (_swigobj->GetCharHeight()) +static PyObject *_wrap_wxWindow_GetCharHeight(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxWindow * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxWindow_GetCharHeight",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetCharHeight. Expected _wxWindow_p."); + return NULL; + } + } + _result = (int )wxWindow_GetCharHeight(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxWindow_GetCharWidth(_swigobj) (_swigobj->GetCharWidth()) +static PyObject *_wrap_wxWindow_GetCharWidth(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxWindow * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxWindow_GetCharWidth",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetCharWidth. Expected _wxWindow_p."); + return NULL; + } + } + _result = (int )wxWindow_GetCharWidth(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxWindow_GetClientSize(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetClientSize(_swigarg0,_swigarg1)) static PyObject *_wrap_wxWindow_GetClientSize(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -506,6 +576,29 @@ static PyObject *_wrap_wxWindow_GetConstraints(PyObject *self, PyObject *args) { return _resultobj; } +#define wxWindow_GetDefaultItem(_swigobj) (_swigobj->GetDefaultItem()) +static PyObject *_wrap_wxWindow_GetDefaultItem(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxButton * _result; + wxWindow * _arg0; + char * _argc0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxWindow_GetDefaultItem",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetDefaultItem. Expected _wxWindow_p."); + return NULL; + } + } + _result = (wxButton *)wxWindow_GetDefaultItem(_arg0); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxButton_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + #define wxWindow_GetFont(_swigobj) (_swigobj->GetFont()) static PyObject *_wrap_wxWindow_GetFont(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -529,6 +622,52 @@ static PyObject *_wrap_wxWindow_GetFont(PyObject *self, PyObject *args) { return _resultobj; } +#define wxWindow_GetForegroundColour(_swigobj) (_swigobj->GetForegroundColour()) +static PyObject *_wrap_wxWindow_GetForegroundColour(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxColour * _result; + wxWindow * _arg0; + char * _argc0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxWindow_GetForegroundColour",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetForegroundColour. Expected _wxWindow_p."); + return NULL; + } + } + _result = new wxColour (wxWindow_GetForegroundColour(_arg0)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxWindow_GetGrandParent(_swigobj) (_swigobj->GetGrandParent()) +static PyObject *_wrap_wxWindow_GetGrandParent(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxWindow * _result; + wxWindow * _arg0; + char * _argc0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxWindow_GetGrandParent",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetGrandParent. Expected _wxWindow_p."); + return NULL; + } + } + _result = (wxWindow *)wxWindow_GetGrandParent(_arg0); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + #define wxWindow_GetId(_swigobj) (_swigobj->GetId()) static PyObject *_wrap_wxWindow_GetId(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -607,12 +746,10 @@ static PyObject *_wrap_wxWindow_GetLabel(PyObject *self, PyObject *args) { return NULL; } } - _result = new wxString (wxWindow_GetLabel(_arg0)); + wxString & _result_ref = wxWindow_GetLabel(_arg0); + _result = (wxString *) &_result_ref; { - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); -} -{ - delete _result; + _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); } return _resultobj; } @@ -633,12 +770,10 @@ static PyObject *_wrap_wxWindow_GetName(PyObject *self, PyObject *args) { return NULL; } } - _result = new wxString (wxWindow_GetName(_arg0)); + wxString & _result_ref = wxWindow_GetName(_arg0); + _result = (wxString *) &_result_ref; { - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); -} -{ - delete _result; + _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); } return _resultobj; } @@ -794,6 +929,60 @@ static PyObject *_wrap_wxWindow_GetSize(PyObject *self, PyObject *args) { return _resultobj; } +#define wxWindow_GetTextExtent(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->GetTextExtent(_swigarg0,_swigarg1,_swigarg2)) +static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxWindow * _arg0; + wxString * _arg1; + int * _arg2; + int temp; + int * _arg3; + int temp0; + char * _argc0 = 0; + PyObject * _obj1 = 0; + + self = self; +{ + _arg2 = &temp; +} +{ + _arg3 = &temp0; +} + if(!PyArg_ParseTuple(args,"sO:wxWindow_GetTextExtent",&_argc0,&_obj1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetTextExtent. Expected _wxWindow_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1)); +} + wxWindow_GetTextExtent(_arg0,*_arg1,_arg2,_arg3); + Py_INCREF(Py_None); + _resultobj = Py_None; +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg3)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + #define wxWindow_GetTitle(_swigobj) (_swigobj->GetTitle()) static PyObject *_wrap_wxWindow_GetTitle(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -810,12 +999,10 @@ static PyObject *_wrap_wxWindow_GetTitle(PyObject *self, PyObject *args) { return NULL; } } - _result = new wxString (wxWindow_GetTitle(_arg0)); + wxString & _result_ref = wxWindow_GetTitle(_arg0); + _result = (wxString *) &_result_ref; { - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); -} -{ - delete _result; + _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); } return _resultobj; } @@ -946,6 +1133,56 @@ static PyObject *_wrap_wxWindow_Layout(PyObject *self, PyObject *args) { return _resultobj; } +#define wxWindow_LoadFromResource(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->LoadFromResource(_swigarg0,_swigarg1,_swigarg2)) +static PyObject *_wrap_wxWindow_LoadFromResource(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxWindow * _arg0; + wxWindow * _arg1; + wxString * _arg2; + wxResourceTable * _arg3 = NULL; + char * _argc0 = 0; + char * _argc1 = 0; + PyObject * _obj2 = 0; + char * _argc3 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ssO|s:wxWindow_LoadFromResource",&_argc0,&_argc1,&_obj2,&_argc3)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_LoadFromResource. Expected _wxWindow_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_LoadFromResource. Expected _wxWindow_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj2)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg2 = new wxString(PyString_AsString(_obj2)); +} + if (_argc3) { + if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxResourceTable_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxWindow_LoadFromResource. Expected _wxResourceTable_p."); + return NULL; + } + } + _result = (bool )wxWindow_LoadFromResource(_arg0,_arg1,*_arg2,_arg3); + _resultobj = Py_BuildValue("i",_result); +{ + if (_obj2) + delete _arg2; +} + return _resultobj; +} + #define wxWindow_Lower(_swigobj) (_swigobj->Lower()) static PyObject *_wrap_wxWindow_Lower(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -1351,6 +1588,35 @@ static PyObject *_wrap_wxWindow_SetFont(PyObject *self, PyObject *args) { return _resultobj; } +#define wxWindow_SetForegroundColour(_swigobj,_swigarg0) (_swigobj->SetForegroundColour(_swigarg0)) +static PyObject *_wrap_wxWindow_SetForegroundColour(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxWindow * _arg0; + wxColour * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxWindow_SetForegroundColour",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetForegroundColour. Expected _wxWindow_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetForegroundColour. Expected _wxColour_p."); + return NULL; + } + } + wxWindow_SetForegroundColour(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxWindow_SetId(_swigobj,_swigarg0) (_swigobj->SetId(_swigarg0)) static PyObject *_wrap_wxWindow_SetId(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -1571,6 +1837,33 @@ static PyObject *_wrap_wxWindow_SetPosition(PyObject *self, PyObject *args) { return _resultobj; } +#define wxWindow_SetSizeHints(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->SetSizeHints(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_wxWindow_SetSizeHints(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxWindow * _arg0; + int _arg1 = -1; + int _arg2 = -1; + int _arg3 = -1; + int _arg4 = -1; + int _arg5 = -1; + int _arg6 = -1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s|iiiiii:wxWindow_SetSizeHints",&_argc0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetSizeHints. Expected _wxWindow_p."); + return NULL; + } + } + wxWindow_SetSizeHints(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxWindow_SetClientSize(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetClientSize(_swigarg0,_swigarg1)) static PyObject *_wrap_wxWindow_SetClientSize(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -1744,6 +2037,29 @@ static PyObject *_wrap_wxWindow_Validate(PyObject *self, PyObject *args) { return _resultobj; } +#define wxWindow_WarpPointer(_swigobj,_swigarg0,_swigarg1) (_swigobj->WarpPointer(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxWindow_WarpPointer(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxWindow * _arg0; + int _arg1; + int _arg2; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sii:wxWindow_WarpPointer",&_argc0,&_arg1,&_arg2)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_WarpPointer. Expected _wxWindow_p."); + return NULL; + } + } + wxWindow_WarpPointer(_arg0,_arg1,_arg2); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void *SwigwxFrameTowxWindow(void *ptr) { wxFrame *src; wxWindow *dest; @@ -1837,6 +2153,28 @@ static PyObject *_wrap_wxFrame_Centre(PyObject *self, PyObject *args) { return _resultobj; } +#define wxFrame_Command(_swigobj,_swigarg0) (_swigobj->Command(_swigarg0)) +static PyObject *_wrap_wxFrame_Command(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxFrame * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxFrame_Command",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_Command. Expected _wxFrame_p."); + return NULL; + } + } + wxFrame_Command(_arg0,_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxFrame_CreateStatusBar(_swigobj,_swigarg0) (_swigobj->CreateStatusBar(_swigarg0)) static PyObject *_wrap_wxFrame_CreateStatusBar(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -1921,13 +2259,109 @@ static PyObject *_wrap_wxFrame_GetTitle(PyObject *self, PyObject *args) { return NULL; } } - _result = new wxString (wxFrame_GetTitle(_arg0)); + wxString & _result_ref = wxFrame_GetTitle(_arg0); + _result = (wxString *) &_result_ref; { - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); } -{ - delete _result; + return _resultobj; } + +#define wxFrame_Iconize(_swigobj,_swigarg0) (_swigobj->Iconize(_swigarg0)) +static PyObject *_wrap_wxFrame_Iconize(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxFrame * _arg0; + bool _arg1; + char * _argc0 = 0; + int tempbool1; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxFrame_Iconize",&_argc0,&tempbool1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_Iconize. Expected _wxFrame_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; + wxFrame_Iconize(_arg0,_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxFrame_IsIconized(_swigobj) (_swigobj->IsIconized()) +static PyObject *_wrap_wxFrame_IsIconized(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxFrame * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxFrame_IsIconized",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_IsIconized. Expected _wxFrame_p."); + return NULL; + } + } + _result = (bool )wxFrame_IsIconized(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxFrame_SetAcceleratorTable(_swigobj,_swigarg0) (_swigobj->SetAcceleratorTable(_swigarg0)) +static PyObject *_wrap_wxFrame_SetAcceleratorTable(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxFrame * _arg0; + wxAcceleratorTable * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxFrame_SetAcceleratorTable",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SetAcceleratorTable. Expected _wxFrame_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxAcceleratorTable_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFrame_SetAcceleratorTable. Expected _wxAcceleratorTable_p."); + return NULL; + } + } + wxFrame_SetAcceleratorTable(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxFrame_Maximize(_swigobj,_swigarg0) (_swigobj->Maximize(_swigarg0)) +static PyObject *_wrap_wxFrame_Maximize(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxFrame * _arg0; + bool _arg1; + char * _argc0 = 0; + int tempbool1; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxFrame_Maximize",&_argc0,&tempbool1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_Maximize. Expected _wxFrame_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; + wxFrame_Maximize(_arg0,_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } @@ -2095,6 +2529,85 @@ static PyObject *_wrap_wxFrame_SetTitle(PyObject *self, PyObject *args) { return _resultobj; } +static void *SwigwxMiniFrameTowxFrame(void *ptr) { + wxMiniFrame *src; + wxFrame *dest; + src = (wxMiniFrame *) ptr; + dest = (wxFrame *) src; + return (void *) dest; +} + +static void *SwigwxMiniFrameTowxWindow(void *ptr) { + wxMiniFrame *src; + wxWindow *dest; + src = (wxMiniFrame *) ptr; + dest = (wxWindow *) src; + return (void *) dest; +} + +static void *SwigwxMiniFrameTowxEvtHandler(void *ptr) { + wxMiniFrame *src; + wxEvtHandler *dest; + src = (wxMiniFrame *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; +} + +#define new_wxMiniFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxMiniFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6)) +static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxMiniFrame * _result; + wxWindow * _arg0; + wxWindowID _arg1; + wxString * _arg2; + wxPoint * _arg3 = &wxPyDefaultPosition; + wxSize * _arg4 = &wxPyDefaultSize; + long _arg5 = (wxDEFAULT_FRAME_STYLE); + char * _arg6 = "frame"; + char * _argc0 = 0; + PyObject * _obj2 = 0; + char * _argc3 = 0; + char * _argc4 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"siO|ssls:new_wxMiniFrame",&_argc0,&_arg1,&_obj2,&_argc3,&_argc4,&_arg5,&_arg6)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMiniFrame. Expected _wxWindow_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj2)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg2 = new wxString(PyString_AsString(_obj2)); +} + if (_argc3) { + if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxMiniFrame. Expected _wxPoint_p."); + return NULL; + } + } + if (_argc4) { + if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxSize_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxMiniFrame. Expected _wxSize_p."); + return NULL; + } + } + _result = (wxMiniFrame *)new_wxMiniFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxMiniFrame_p"); + _resultobj = Py_BuildValue("s",_ptemp); +{ + if (_obj2) + delete _arg2; +} + return _resultobj; +} + static void *SwigwxPanelTowxWindow(void *ptr) { wxPanel *src; wxWindow *dest; @@ -2323,6 +2836,75 @@ static PyObject *_wrap_wxDialog_GetTitle(PyObject *self, PyObject *args) { return _resultobj; } +#define wxDialog_Iconize(_swigobj,_swigarg0) (_swigobj->Iconize(_swigarg0)) +static PyObject *_wrap_wxDialog_Iconize(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxDialog * _arg0; + bool _arg1; + char * _argc0 = 0; + int tempbool1; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxDialog_Iconize",&_argc0,&tempbool1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_Iconize. Expected _wxDialog_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; + wxDialog_Iconize(_arg0,_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxDialog_IsIconized(_swigobj) (_swigobj->IsIconized()) +static PyObject *_wrap_wxDialog_IsIconized(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxDialog * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxDialog_IsIconized",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_IsIconized. Expected _wxDialog_p."); + return NULL; + } + } + _result = (bool )wxDialog_IsIconized(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxDialog_SetModal(_swigobj,_swigarg0) (_swigobj->SetModal(_swigarg0)) +static PyObject *_wrap_wxDialog_SetModal(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxDialog * _arg0; + bool _arg1; + char * _argc0 = 0; + int tempbool1; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxDialog_SetModal",&_argc0,&tempbool1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDialog_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_SetModal. Expected _wxDialog_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; + wxDialog_SetModal(_arg0,_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxDialog_IsModal(_swigobj) (_swigobj->IsModal()) static PyObject *_wrap_wxDialog_IsModal(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -3001,6 +3583,177 @@ static PyObject *_wrap_wxMenu_FindItem(PyObject *self, PyObject *args) { return _resultobj; } +#define wxMenu_FindItemForId(_swigobj,_swigarg0) (_swigobj->FindItemForId(_swigarg0)) +static PyObject *_wrap_wxMenu_FindItemForId(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxMenuItem * _result; + wxMenu * _arg0; + int _arg1; + char * _argc0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxMenu_FindItemForId",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_FindItemForId. Expected _wxMenu_p."); + return NULL; + } + } + _result = (wxMenuItem *)wxMenu_FindItemForId(_arg0,_arg1); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuItem_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxMenu_GetHelpString(_swigobj,_swigarg0) (_swigobj->GetHelpString(_swigarg0)) +static PyObject *_wrap_wxMenu_GetHelpString(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxString * _result; + wxMenu * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxMenu_GetHelpString",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_GetHelpString. Expected _wxMenu_p."); + return NULL; + } + } + wxString & _result_ref = wxMenu_GetHelpString(_arg0,_arg1); + _result = (wxString *) &_result_ref; +{ + _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); +} + return _resultobj; +} + +#define wxMenu_GetLabel(_swigobj,_swigarg0) (_swigobj->GetLabel(_swigarg0)) +static PyObject *_wrap_wxMenu_GetLabel(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxString * _result; + wxMenu * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxMenu_GetLabel",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_GetLabel. Expected _wxMenu_p."); + return NULL; + } + } + _result = new wxString (wxMenu_GetLabel(_arg0,_arg1)); +{ + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); +} +{ + delete _result; +} + return _resultobj; +} + +#define wxMenu_GetTitle(_swigobj) (_swigobj->GetTitle()) +static PyObject *_wrap_wxMenu_GetTitle(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxString * _result; + wxMenu * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxMenu_GetTitle",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_GetTitle. Expected _wxMenu_p."); + return NULL; + } + } + _result = new wxString (wxMenu_GetTitle(_arg0)); +{ + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); +} +{ + delete _result; +} + return _resultobj; +} + +#define wxMenu_SetHelpString(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetHelpString(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxMenu_SetHelpString(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxMenu * _arg0; + int _arg1; + wxString * _arg2; + char * _argc0 = 0; + PyObject * _obj2 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"siO:wxMenu_SetHelpString",&_argc0,&_arg1,&_obj2)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_SetHelpString. Expected _wxMenu_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj2)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg2 = new wxString(PyString_AsString(_obj2)); +} + wxMenu_SetHelpString(_arg0,_arg1,*_arg2); + Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj2) + delete _arg2; +} + return _resultobj; +} + +#define wxMenu_SetTitle(_swigobj,_swigarg0) (_swigobj->SetTitle(_swigarg0)) +static PyObject *_wrap_wxMenu_SetTitle(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxMenu * _arg0; + wxString * _arg1; + char * _argc0 = 0; + PyObject * _obj1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sO:wxMenu_SetTitle",&_argc0,&_obj1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_SetTitle. Expected _wxMenu_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1)); +} + wxMenu_SetTitle(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + #define wxMenu_IsChecked(_swigobj,_swigarg0) (_swigobj->IsChecked(_swigarg0)) static PyObject *_wrap_wxMenu_IsChecked(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -3080,6 +3833,78 @@ static PyObject *_wrap_wxMenu_SetLabel(PyObject *self, PyObject *args) { return _resultobj; } +static void *SwigwxPyMenuTowxMenu(void *ptr) { + wxPyMenu *src; + wxMenu *dest; + src = (wxPyMenu *) ptr; + dest = (wxMenu *) src; + return (void *) dest; +} + +static void *SwigwxPyMenuTowxEvtHandler(void *ptr) { + wxPyMenu *src; + wxEvtHandler *dest; + src = (wxPyMenu *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; +} + +#define new_wxPyMenu(_swigarg0,_swigarg1) (new wxPyMenu(_swigarg0,_swigarg1)) +static PyObject *_wrap_new_wxPyMenu(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxPyMenu * _result; + wxString * _arg0 = &wxPyEmptyStr; + PyObject * _arg1 = NULL; + PyObject * _obj0 = 0; + PyObject * _obj1 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"|OO:new_wxPyMenu",&_obj0,&_obj1)) + return NULL; + if (_obj0) +{ + if (!PyString_Check(_obj0)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg0 = new wxString(PyString_AsString(_obj0)); +} + if (_obj1) +{ + _arg1 = _obj1; +} + _result = (wxPyMenu *)new_wxPyMenu(*_arg0,_arg1); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyMenu_p"); + _resultobj = Py_BuildValue("s",_ptemp); +{ + if (_obj0) + delete _arg0; +} + return _resultobj; +} + +#define delete_wxPyMenu(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxPyMenu(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxPyMenu * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:delete_wxPyMenu",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyMenu_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPyMenu. Expected _wxPyMenu_p."); + return NULL; + } + } + delete_wxPyMenu(_arg0); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void *SwigwxMenuBarTowxEvtHandler(void *ptr) { wxMenuBar *src; wxEvtHandler *dest; @@ -3264,6 +4089,241 @@ static PyObject *_wrap_wxMenuBar_FindMenuItem(PyObject *self, PyObject *args) { return _resultobj; } +#define wxMenuBar_EnableTop(_swigobj,_swigarg0,_swigarg1) (_swigobj->EnableTop(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxMenuBar_EnableTop(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxMenuBar * _arg0; + int _arg1; + bool _arg2; + char * _argc0 = 0; + int tempbool2; + + self = self; + if(!PyArg_ParseTuple(args,"sii:wxMenuBar_EnableTop",&_argc0,&_arg1,&tempbool2)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_EnableTop. Expected _wxMenuBar_p."); + return NULL; + } + } + _arg2 = (bool ) tempbool2; + wxMenuBar_EnableTop(_arg0,_arg1,_arg2); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxMenuBar_FindItemForId(_swigobj,_swigarg0) (_swigobj->FindItemForId(_swigarg0)) +static PyObject *_wrap_wxMenuBar_FindItemForId(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxMenuItem * _result; + wxMenuBar * _arg0; + int _arg1; + char * _argc0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxMenuBar_FindItemForId",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_FindItemForId. Expected _wxMenuBar_p."); + return NULL; + } + } + _result = (wxMenuItem *)wxMenuBar_FindItemForId(_arg0,_arg1); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuItem_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxMenuBar_GetHelpString(_swigobj,_swigarg0) (_swigobj->GetHelpString(_swigarg0)) +static PyObject *_wrap_wxMenuBar_GetHelpString(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxString * _result; + wxMenuBar * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxMenuBar_GetHelpString",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetHelpString. Expected _wxMenuBar_p."); + return NULL; + } + } + _result = new wxString (wxMenuBar_GetHelpString(_arg0,_arg1)); +{ + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); +} +{ + delete _result; +} + return _resultobj; +} + +#define wxMenuBar_GetLabel(_swigobj,_swigarg0) (_swigobj->GetLabel(_swigarg0)) +static PyObject *_wrap_wxMenuBar_GetLabel(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxString * _result; + wxMenuBar * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxMenuBar_GetLabel",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetLabel. Expected _wxMenuBar_p."); + return NULL; + } + } + _result = new wxString (wxMenuBar_GetLabel(_arg0,_arg1)); +{ + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); +} +{ + delete _result; +} + return _resultobj; +} + +#define wxMenuBar_SetHelpString(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetHelpString(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxMenuBar_SetHelpString(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxMenuBar * _arg0; + int _arg1; + wxString * _arg2; + char * _argc0 = 0; + PyObject * _obj2 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"siO:wxMenuBar_SetHelpString",&_argc0,&_arg1,&_obj2)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_SetHelpString. Expected _wxMenuBar_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj2)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg2 = new wxString(PyString_AsString(_obj2)); +} + wxMenuBar_SetHelpString(_arg0,_arg1,*_arg2); + Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj2) + delete _arg2; +} + return _resultobj; +} + +#define wxMenuBar_SetLabel(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetLabel(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxMenuBar_SetLabel(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxMenuBar * _arg0; + int _arg1; + wxString * _arg2; + char * _argc0 = 0; + PyObject * _obj2 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"siO:wxMenuBar_SetLabel",&_argc0,&_arg1,&_obj2)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_SetLabel. Expected _wxMenuBar_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj2)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg2 = new wxString(PyString_AsString(_obj2)); +} + wxMenuBar_SetLabel(_arg0,_arg1,*_arg2); + Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj2) + delete _arg2; +} + return _resultobj; +} + +#define wxMenuBar_GetLabelTop(_swigobj,_swigarg0) (_swigobj->GetLabelTop(_swigarg0)) +static PyObject *_wrap_wxMenuBar_GetLabelTop(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxString * _result; + wxMenuBar * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxMenuBar_GetLabelTop",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_GetLabelTop. Expected _wxMenuBar_p."); + return NULL; + } + } + _result = new wxString (wxMenuBar_GetLabelTop(_arg0,_arg1)); +{ + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); +} +{ + delete _result; +} + return _resultobj; +} + +#define wxMenuBar_SetLabelTop(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetLabelTop(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxMenuBar_SetLabelTop(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxMenuBar * _arg0; + int _arg1; + wxString * _arg2; + char * _argc0 = 0; + PyObject * _obj2 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"siO:wxMenuBar_SetLabelTop",&_argc0,&_arg1,&_obj2)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_SetLabelTop. Expected _wxMenuBar_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj2)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg2 = new wxString(PyString_AsString(_obj2)); +} + wxMenuBar_SetLabelTop(_arg0,_arg1,*_arg2); + Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj2) + delete _arg2; +} + return _resultobj; +} + #define wxMenuItem_IsSeparator(_swigobj) (_swigobj->IsSeparator()) static PyObject *_wrap_wxMenuItem_IsSeparator(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -3371,6 +4431,98 @@ static PyObject *_wrap_wxMenuItem_GetSubMenu(PyObject *self, PyObject *args) { return _resultobj; } +#define wxMenuItem_GetHelp(_swigobj) (_swigobj->GetHelp()) +static PyObject *_wrap_wxMenuItem_GetHelp(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxString * _result; + wxMenuItem * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxMenuItem_GetHelp",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetHelp. Expected _wxMenuItem_p."); + return NULL; + } + } + const wxString & _result_ref = wxMenuItem_GetHelp(_arg0); + _result = (wxString *) &_result_ref; +{ + _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); +} + return _resultobj; +} + +#define wxMenuItem_SetName(_swigobj,_swigarg0) (_swigobj->SetName(_swigarg0)) +static PyObject *_wrap_wxMenuItem_SetName(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxMenuItem * _arg0; + wxString * _arg1; + char * _argc0 = 0; + PyObject * _obj1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sO:wxMenuItem_SetName",&_argc0,&_obj1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetName. Expected _wxMenuItem_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1)); +} + wxMenuItem_SetName(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + +#define wxMenuItem_SetHelp(_swigobj,_swigarg0) (_swigobj->SetHelp(_swigarg0)) +static PyObject *_wrap_wxMenuItem_SetHelp(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxMenuItem * _arg0; + wxString * _arg1; + char * _argc0 = 0; + PyObject * _obj1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sO:wxMenuItem_SetHelp",&_argc0,&_obj1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetHelp. Expected _wxMenuItem_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1)); +} + wxMenuItem_SetHelp(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + #define wxMenuItem_Enable(_swigobj,_swigarg0) (_swigobj->Enable(_swigarg0)) static PyObject *_wrap_wxMenuItem_Enable(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -3419,6 +4571,51 @@ static PyObject *_wrap_wxMenuItem_Check(PyObject *self, PyObject *args) { return _resultobj; } +#define wxMenuItem_DeleteSubMenu(_swigobj) (_swigobj->DeleteSubMenu()) +static PyObject *_wrap_wxMenuItem_DeleteSubMenu(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxMenuItem * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxMenuItem_DeleteSubMenu",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_DeleteSubMenu. Expected _wxMenuItem_p."); + return NULL; + } + } + wxMenuItem_DeleteSubMenu(_arg0); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxMenuItem_GetName(_swigobj) (_swigobj->GetName()) +static PyObject *_wrap_wxMenuItem_GetName(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxString * _result; + wxMenuItem * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxMenuItem_GetName",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetName. Expected _wxMenuItem_p."); + return NULL; + } + } + const wxString & _result_ref = wxMenuItem_GetName(_arg0); + _result = (wxString *) &_result_ref; +{ + _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); +} + return _resultobj; +} + #define wxMenuItem_IsCheckable(_swigobj) (_swigobj->IsCheckable()) static PyObject *_wrap_wxMenuItem_IsCheckable(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -3442,22 +4639,43 @@ static PyObject *_wrap_wxMenuItem_IsCheckable(PyObject *self, PyObject *args) { static PyMethodDef windowscMethods[] = { { "wxMenuItem_IsCheckable", _wrap_wxMenuItem_IsCheckable, 1 }, + { "wxMenuItem_GetName", _wrap_wxMenuItem_GetName, 1 }, + { "wxMenuItem_DeleteSubMenu", _wrap_wxMenuItem_DeleteSubMenu, 1 }, { "wxMenuItem_Check", _wrap_wxMenuItem_Check, 1 }, { "wxMenuItem_Enable", _wrap_wxMenuItem_Enable, 1 }, + { "wxMenuItem_SetHelp", _wrap_wxMenuItem_SetHelp, 1 }, + { "wxMenuItem_SetName", _wrap_wxMenuItem_SetName, 1 }, + { "wxMenuItem_GetHelp", _wrap_wxMenuItem_GetHelp, 1 }, { "wxMenuItem_GetSubMenu", _wrap_wxMenuItem_GetSubMenu, 1 }, { "wxMenuItem_GetId", _wrap_wxMenuItem_GetId, 1 }, { "wxMenuItem_IsChecked", _wrap_wxMenuItem_IsChecked, 1 }, { "wxMenuItem_IsEnabled", _wrap_wxMenuItem_IsEnabled, 1 }, { "wxMenuItem_IsSeparator", _wrap_wxMenuItem_IsSeparator, 1 }, + { "wxMenuBar_SetLabelTop", _wrap_wxMenuBar_SetLabelTop, 1 }, + { "wxMenuBar_GetLabelTop", _wrap_wxMenuBar_GetLabelTop, 1 }, + { "wxMenuBar_SetLabel", _wrap_wxMenuBar_SetLabel, 1 }, + { "wxMenuBar_SetHelpString", _wrap_wxMenuBar_SetHelpString, 1 }, + { "wxMenuBar_GetLabel", _wrap_wxMenuBar_GetLabel, 1 }, + { "wxMenuBar_GetHelpString", _wrap_wxMenuBar_GetHelpString, 1 }, + { "wxMenuBar_FindItemForId", _wrap_wxMenuBar_FindItemForId, 1 }, + { "wxMenuBar_EnableTop", _wrap_wxMenuBar_EnableTop, 1 }, { "wxMenuBar_FindMenuItem", _wrap_wxMenuBar_FindMenuItem, 1 }, { "wxMenuBar_Enable", _wrap_wxMenuBar_Enable, 1 }, { "wxMenuBar_Checked", _wrap_wxMenuBar_Checked, 1 }, { "wxMenuBar_Check", _wrap_wxMenuBar_Check, 1 }, { "wxMenuBar_Append", _wrap_wxMenuBar_Append, 1 }, { "new_wxMenuBar", _wrap_new_wxMenuBar, 1 }, + { "delete_wxPyMenu", _wrap_delete_wxPyMenu, 1 }, + { "new_wxPyMenu", _wrap_new_wxPyMenu, 1 }, { "wxMenu_SetLabel", _wrap_wxMenu_SetLabel, 1 }, { "wxMenu_IsEnabled", _wrap_wxMenu_IsEnabled, 1 }, { "wxMenu_IsChecked", _wrap_wxMenu_IsChecked, 1 }, + { "wxMenu_SetTitle", _wrap_wxMenu_SetTitle, 1 }, + { "wxMenu_SetHelpString", _wrap_wxMenu_SetHelpString, 1 }, + { "wxMenu_GetTitle", _wrap_wxMenu_GetTitle, 1 }, + { "wxMenu_GetLabel", _wrap_wxMenu_GetLabel, 1 }, + { "wxMenu_GetHelpString", _wrap_wxMenu_GetHelpString, 1 }, + { "wxMenu_FindItemForId", _wrap_wxMenu_FindItemForId, 1 }, { "wxMenu_FindItem", _wrap_wxMenu_FindItem, 1 }, { "wxMenu_Enable", _wrap_wxMenu_Enable, 1 }, { "wxMenu_Check", _wrap_wxMenu_Check, 1 }, @@ -3479,23 +4697,33 @@ static PyMethodDef windowscMethods[] = { { "wxDialog_Show", _wrap_wxDialog_Show, 1 }, { "wxDialog_SetTitle", _wrap_wxDialog_SetTitle, 1 }, { "wxDialog_IsModal", _wrap_wxDialog_IsModal, 1 }, + { "wxDialog_SetModal", _wrap_wxDialog_SetModal, 1 }, + { "wxDialog_IsIconized", _wrap_wxDialog_IsIconized, 1 }, + { "wxDialog_Iconize", _wrap_wxDialog_Iconize, 1 }, { "wxDialog_GetTitle", _wrap_wxDialog_GetTitle, 1 }, { "wxDialog_EndModal", _wrap_wxDialog_EndModal, 1 }, { "wxDialog_Centre", _wrap_wxDialog_Centre, 1 }, { "new_wxDialog", _wrap_new_wxDialog, 1 }, { "wxPanel_InitDialog", _wrap_wxPanel_InitDialog, 1 }, { "new_wxPanel", _wrap_new_wxPanel, 1 }, + { "new_wxMiniFrame", _wrap_new_wxMiniFrame, 1 }, { "wxFrame_SetTitle", _wrap_wxFrame_SetTitle, 1 }, { "wxFrame_SetStatusWidths", _wrap_wxFrame_SetStatusWidths, 1 }, { "wxFrame_SetStatusText", _wrap_wxFrame_SetStatusText, 1 }, { "wxFrame_SetMenuBar", _wrap_wxFrame_SetMenuBar, 1 }, { "wxFrame_SetIcon", _wrap_wxFrame_SetIcon, 1 }, + { "wxFrame_Maximize", _wrap_wxFrame_Maximize, 1 }, + { "wxFrame_SetAcceleratorTable", _wrap_wxFrame_SetAcceleratorTable, 1 }, + { "wxFrame_IsIconized", _wrap_wxFrame_IsIconized, 1 }, + { "wxFrame_Iconize", _wrap_wxFrame_Iconize, 1 }, { "wxFrame_GetTitle", _wrap_wxFrame_GetTitle, 1 }, { "wxFrame_GetStatusBar", _wrap_wxFrame_GetStatusBar, 1 }, { "wxFrame_GetMenuBar", _wrap_wxFrame_GetMenuBar, 1 }, { "wxFrame_CreateStatusBar", _wrap_wxFrame_CreateStatusBar, 1 }, + { "wxFrame_Command", _wrap_wxFrame_Command, 1 }, { "wxFrame_Centre", _wrap_wxFrame_Centre, 1 }, { "new_wxFrame", _wrap_new_wxFrame, 1 }, + { "wxWindow_WarpPointer", _wrap_wxWindow_WarpPointer, 1 }, { "wxWindow_Validate", _wrap_wxWindow_Validate, 1 }, { "wxWindow_TransferDataToWindow", _wrap_wxWindow_TransferDataToWindow, 1 }, { "wxWindow_TransferDataFromWindow", _wrap_wxWindow_TransferDataFromWindow, 1 }, @@ -3503,6 +4731,7 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_SetTitle", _wrap_wxWindow_SetTitle, 1 }, { "wxWindow_SetCursor", _wrap_wxWindow_SetCursor, 1 }, { "wxWindow_SetClientSize", _wrap_wxWindow_SetClientSize, 1 }, + { "wxWindow_SetSizeHints", _wrap_wxWindow_SetSizeHints, 1 }, { "wxWindow_SetPosition", _wrap_wxWindow_SetPosition, 1 }, { "wxWindow_SetSize", _wrap_wxWindow_SetSize, 1 }, { "wxWindow_SetDimensions", _wrap_wxWindow_SetDimensions, 1 }, @@ -3511,6 +4740,7 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_SetReturnCode", _wrap_wxWindow_SetReturnCode, 1 }, { "wxWindow_SetName", _wrap_wxWindow_SetName, 1 }, { "wxWindow_SetId", _wrap_wxWindow_SetId, 1 }, + { "wxWindow_SetForegroundColour", _wrap_wxWindow_SetForegroundColour, 1 }, { "wxWindow_SetFont", _wrap_wxWindow_SetFont, 1 }, { "wxWindow_SetFocus", _wrap_wxWindow_SetFocus, 1 }, { "wxWindow_SetDoubleClick", _wrap_wxWindow_SetDoubleClick, 1 }, @@ -3526,6 +4756,7 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_Move", _wrap_wxWindow_Move, 1 }, { "wxWindow_MakeModal", _wrap_wxWindow_MakeModal, 1 }, { "wxWindow_Lower", _wrap_wxWindow_Lower, 1 }, + { "wxWindow_LoadFromResource", _wrap_wxWindow_LoadFromResource, 1 }, { "wxWindow_Layout", _wrap_wxWindow_Layout, 1 }, { "wxWindow_IsShown", _wrap_wxWindow_IsShown, 1 }, { "wxWindow_IsRetained", _wrap_wxWindow_IsRetained, 1 }, @@ -3533,6 +4764,7 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_InitDialog", _wrap_wxWindow_InitDialog, 1 }, { "wxWindow_GetWindowStyleFlag", _wrap_wxWindow_GetWindowStyleFlag, 1 }, { "wxWindow_GetTitle", _wrap_wxWindow_GetTitle, 1 }, + { "wxWindow_GetTextExtent", _wrap_wxWindow_GetTextExtent, 1 }, { "wxWindow_GetSize", _wrap_wxWindow_GetSize, 1 }, { "wxWindow_GetScrollRange", _wrap_wxWindow_GetScrollRange, 1 }, { "wxWindow_GetScrollPos", _wrap_wxWindow_GetScrollPos, 1 }, @@ -3543,12 +4775,18 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_GetLabel", _wrap_wxWindow_GetLabel, 1 }, { "wxWindow_GetPosition", _wrap_wxWindow_GetPosition, 1 }, { "wxWindow_GetId", _wrap_wxWindow_GetId, 1 }, + { "wxWindow_GetGrandParent", _wrap_wxWindow_GetGrandParent, 1 }, + { "wxWindow_GetForegroundColour", _wrap_wxWindow_GetForegroundColour, 1 }, { "wxWindow_GetFont", _wrap_wxWindow_GetFont, 1 }, + { "wxWindow_GetDefaultItem", _wrap_wxWindow_GetDefaultItem, 1 }, { "wxWindow_GetConstraints", _wrap_wxWindow_GetConstraints, 1 }, { "wxWindow_GetClientSize", _wrap_wxWindow_GetClientSize, 1 }, + { "wxWindow_GetCharWidth", _wrap_wxWindow_GetCharWidth, 1 }, + { "wxWindow_GetCharHeight", _wrap_wxWindow_GetCharHeight, 1 }, { "wxWindow_GetBackgroundColour", _wrap_wxWindow_GetBackgroundColour, 1 }, { "wxWindow_Fit", _wrap_wxWindow_Fit, 1 }, { "wxWindow_Enable", _wrap_wxWindow_Enable, 1 }, + { "wxWindow_DragAcceptFiles", _wrap_wxWindow_DragAcceptFiles, 1 }, { "wxWindow_DestroyChildren", _wrap_wxWindow_DestroyChildren, 1 }, { "wxWindow_Destroy", _wrap_wxWindow_Destroy, 1 }, { "wxWindow_Close", _wrap_wxWindow_Close, 1 }, @@ -3557,6 +4795,7 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_CaptureMouse", _wrap_wxWindow_CaptureMouse, 1 }, { "new_wxWindow", _wrap_new_wxWindow, 1 }, { "wxEvtHandler_Connect", _wrap_wxEvtHandler_Connect, 1 }, + { "wxWindow_FindFocus", _wrap_wxWindow_FindFocus, 1 }, { NULL, NULL } }; static PyObject *SWIG_globals; @@ -3577,6 +4816,8 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMenuBar",SwigwxMenuBarTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_wxMenuBar",SwigwxMenuBarTowxEvtHandler); + SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxPyMenu",SwigwxPyMenuTowxEvtHandler); + SWIG_RegisterMapping("_class_wxEvtHandler","_wxPyMenu",SwigwxPyMenuTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMenu",SwigwxMenuTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_wxMenu",SwigwxMenuTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler); @@ -3585,6 +4826,8 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_class_wxEvtHandler","_wxDialog",SwigwxDialogTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxPanel",SwigwxPanelTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_wxPanel",SwigwxPanelTowxEvtHandler); + SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler); + SWIG_RegisterMapping("_class_wxEvtHandler","_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxFrame",SwigwxFrameTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_wxFrame",SwigwxFrameTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxWindow",SwigwxWindowTowxEvtHandler); @@ -3593,6 +4836,7 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); + SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0); SWIG_RegisterMapping("_wxPen","_class_wxPen",0); SWIG_RegisterMapping("_byte","_unsigned_char",0); SWIG_RegisterMapping("_long","_wxDash",0); @@ -3611,6 +4855,7 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_wxColour","_class_wxColour",0); SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0); SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0); + SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0); SWIG_RegisterMapping("_uint","_unsigned_int",0); SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); @@ -3637,6 +4882,8 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_signed_int","_int",0); SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0); SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0); + SWIG_RegisterMapping("_wxMenu","_class_wxPyMenu",SwigwxPyMenuTowxMenu); + SWIG_RegisterMapping("_wxMenu","_wxPyMenu",SwigwxPyMenuTowxMenu); SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0); SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0); SWIG_RegisterMapping("_WXTYPE","_short",0); @@ -3651,6 +4898,8 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_class_wxWindow","_wxDialog",SwigwxDialogTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_class_wxPanel",SwigwxPanelTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_wxPanel",SwigwxPanelTowxWindow); + SWIG_RegisterMapping("_class_wxWindow","_class_wxMiniFrame",SwigwxMiniFrameTowxWindow); + SWIG_RegisterMapping("_class_wxWindow","_wxMiniFrame",SwigwxMiniFrameTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_class_wxFrame",SwigwxFrameTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_wxFrame",SwigwxFrameTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0); @@ -3668,16 +4917,21 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0); SWIG_RegisterMapping("_unsigned_char","_byte",0); SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0); + SWIG_RegisterMapping("_class_wxMenu","_class_wxPyMenu",SwigwxPyMenuTowxMenu); + SWIG_RegisterMapping("_class_wxMenu","_wxPyMenu",SwigwxPyMenuTowxMenu); SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0); SWIG_RegisterMapping("_unsigned_int","_int",0); SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0); SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0); + SWIG_RegisterMapping("_class_wxPyMenu","_wxPyMenu",0); SWIG_RegisterMapping("_class_wxPen","_wxPen",0); SWIG_RegisterMapping("_short","_WXTYPE",0); SWIG_RegisterMapping("_short","_unsigned_short",0); SWIG_RegisterMapping("_short","_signed_short",0); + SWIG_RegisterMapping("_wxFrame","_class_wxMiniFrame",SwigwxMiniFrameTowxFrame); + SWIG_RegisterMapping("_wxFrame","_wxMiniFrame",SwigwxMiniFrameTowxFrame); SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); @@ -3696,6 +4950,7 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0); SWIG_RegisterMapping("_class_wxColour","_wxColour",0); SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0); + SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0); SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0); SWIG_RegisterMapping("_class_wxSize","_wxSize",0); SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0); @@ -3703,6 +4958,8 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0); SWIG_RegisterMapping("_wxEvtHandler","_class_wxMenuBar",SwigwxMenuBarTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_wxMenuBar",SwigwxMenuBarTowxEvtHandler); + SWIG_RegisterMapping("_wxEvtHandler","_class_wxPyMenu",SwigwxPyMenuTowxEvtHandler); + SWIG_RegisterMapping("_wxEvtHandler","_wxPyMenu",SwigwxPyMenuTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxMenu",SwigwxMenuTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_wxMenu",SwigwxMenuTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler); @@ -3711,6 +4968,8 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_wxEvtHandler","_wxDialog",SwigwxDialogTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxPanel",SwigwxPanelTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_wxPanel",SwigwxPanelTowxEvtHandler); + SWIG_RegisterMapping("_wxEvtHandler","_class_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler); + SWIG_RegisterMapping("_wxEvtHandler","_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxFrame",SwigwxFrameTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_wxFrame",SwigwxFrameTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxWindow",SwigwxWindowTowxEvtHandler); @@ -3726,8 +4985,12 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_wxWindow","_wxDialog",SwigwxDialogTowxWindow); SWIG_RegisterMapping("_wxWindow","_class_wxPanel",SwigwxPanelTowxWindow); SWIG_RegisterMapping("_wxWindow","_wxPanel",SwigwxPanelTowxWindow); + SWIG_RegisterMapping("_wxWindow","_class_wxMiniFrame",SwigwxMiniFrameTowxWindow); + SWIG_RegisterMapping("_wxWindow","_wxMiniFrame",SwigwxMiniFrameTowxWindow); SWIG_RegisterMapping("_wxWindow","_class_wxFrame",SwigwxFrameTowxWindow); SWIG_RegisterMapping("_wxWindow","_wxFrame",SwigwxFrameTowxWindow); SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0); + SWIG_RegisterMapping("_class_wxFrame","_class_wxMiniFrame",SwigwxMiniFrameTowxFrame); + SWIG_RegisterMapping("_class_wxFrame","_wxMiniFrame",SwigwxMiniFrameTowxFrame); SWIG_RegisterMapping("_class_wxFrame","_wxFrame",0); } diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i index 592bdeb551..08e6ab1bb1 100644 --- a/utils/wxPython/src/windows.i +++ b/utils/wxPython/src/windows.i @@ -1,5 +1,3 @@ -%module windows -%{ ///////////////////////////////////////////////////////////////////////////// // Name: windows.i // Purpose: SWIG definitions of various window classes @@ -13,6 +11,9 @@ ///////////////////////////////////////////////////////////////////////////// +%module windows + +%{ #include "helpers.h" #ifdef __WXMSW__ @@ -404,6 +405,13 @@ public: ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.3 1998/08/15 07:36:47 RD +// - Moved the header in the .i files out of the code that gets put into +// the .cpp files. It caused CVS conflicts because of the RCS ID being +// different each time. +// +// - A few minor fixes. +// // Revision 1.2 1998/08/14 23:36:46 RD // Beginings of wxGTK compatibility // diff --git a/utils/wxPython/src/windows.py b/utils/wxPython/src/windows.py index 58723f94af..ca59ad1551 100644 --- a/utils/wxPython/src/windows.py +++ b/utils/wxPython/src/windows.py @@ -42,6 +42,9 @@ class wxWindowPtr(wxEvtHandlerPtr): def DestroyChildren(self): val = windowsc.wxWindow_DestroyChildren(self.this) return val + def DragAcceptFiles(self,arg0): + val = windowsc.wxWindow_DragAcceptFiles(self.this,arg0) + return val def Enable(self,arg0): val = windowsc.wxWindow_Enable(self.this,arg0) return val @@ -53,6 +56,12 @@ class wxWindowPtr(wxEvtHandlerPtr): val = wxColourPtr(val) val.thisown = 1 return val + def GetCharHeight(self): + val = windowsc.wxWindow_GetCharHeight(self.this) + return val + def GetCharWidth(self): + val = windowsc.wxWindow_GetCharWidth(self.this) + return val def GetClientSize(self): val = windowsc.wxWindow_GetClientSize(self.this) return val @@ -60,10 +69,23 @@ class wxWindowPtr(wxEvtHandlerPtr): val = windowsc.wxWindow_GetConstraints(self.this) val = wxLayoutConstraintsPtr(val) return val + def GetDefaultItem(self): + val = windowsc.wxWindow_GetDefaultItem(self.this) + val = wxButtonPtr(val) + return val def GetFont(self): val = windowsc.wxWindow_GetFont(self.this) val = wxFontPtr(val) return val + def GetForegroundColour(self): + val = windowsc.wxWindow_GetForegroundColour(self.this) + val = wxColourPtr(val) + val.thisown = 1 + return val + def GetGrandParent(self): + val = windowsc.wxWindow_GetGrandParent(self.this) + val = wxWindowPtr(val) + return val def GetId(self): val = windowsc.wxWindow_GetId(self.this) return val @@ -95,6 +117,9 @@ class wxWindowPtr(wxEvtHandlerPtr): def GetSize(self): val = windowsc.wxWindow_GetSize(self.this) return val + def GetTextExtent(self,arg0): + val = windowsc.wxWindow_GetTextExtent(self.this,arg0) + return val def GetTitle(self): val = windowsc.wxWindow_GetTitle(self.this) return val @@ -116,6 +141,9 @@ class wxWindowPtr(wxEvtHandlerPtr): def Layout(self): val = windowsc.wxWindow_Layout(self.this) return val + def LoadFromResource(self,arg0,arg1,*args): + val = apply(windowsc.wxWindow_LoadFromResource,(self.this,arg0.this,arg1,)+args) + return val def Lower(self): val = windowsc.wxWindow_Lower(self.this) return val @@ -169,6 +197,9 @@ class wxWindowPtr(wxEvtHandlerPtr): def SetFont(self,arg0): val = windowsc.wxWindow_SetFont(self.this,arg0.this) return val + def SetForegroundColour(self,arg0): + val = windowsc.wxWindow_SetForegroundColour(self.this,arg0.this) + return val def SetId(self,arg0): val = windowsc.wxWindow_SetId(self.this,arg0) return val @@ -193,6 +224,9 @@ class wxWindowPtr(wxEvtHandlerPtr): def SetPosition(self,arg0): val = windowsc.wxWindow_SetPosition(self.this,arg0.this) return val + def SetSizeHints(self,*args): + val = apply(windowsc.wxWindow_SetSizeHints,(self.this,)+args) + return val def SetClientSize(self,arg0,arg1): val = windowsc.wxWindow_SetClientSize(self.this,arg0,arg1) return val @@ -214,6 +248,9 @@ class wxWindowPtr(wxEvtHandlerPtr): def Validate(self): val = windowsc.wxWindow_Validate(self.this) return val + def WarpPointer(self,arg0,arg1): + val = windowsc.wxWindow_WarpPointer(self.this,arg0,arg1) + return val def __repr__(self): return "" class wxWindow(wxWindowPtr): @@ -237,6 +274,9 @@ class wxFramePtr(wxWindowPtr): def Centre(self,*args): val = apply(windowsc.wxFrame_Centre,(self.this,)+args) return val + def Command(self,arg0): + val = windowsc.wxFrame_Command(self.this,arg0) + return val def CreateStatusBar(self,*args): val = apply(windowsc.wxFrame_CreateStatusBar,(self.this,)+args) return val @@ -250,6 +290,18 @@ class wxFramePtr(wxWindowPtr): def GetTitle(self): val = windowsc.wxFrame_GetTitle(self.this) return val + def Iconize(self,arg0): + val = windowsc.wxFrame_Iconize(self.this,arg0) + return val + def IsIconized(self): + val = windowsc.wxFrame_IsIconized(self.this) + return val + def SetAcceleratorTable(self,arg0): + val = windowsc.wxFrame_SetAcceleratorTable(self.this,arg0.this) + return val + def Maximize(self,arg0): + val = windowsc.wxFrame_Maximize(self.this,arg0) + return val def SetIcon(self,arg0): val = windowsc.wxFrame_SetIcon(self.this,arg0.this) return val @@ -281,6 +333,26 @@ class wxFrame(wxFramePtr): +class wxMiniFramePtr(wxFramePtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __repr__(self): + return "" +class wxMiniFrame(wxMiniFramePtr): + def __init__(self,arg0,arg1,arg2,*args) : + argl = map(None,args) + try: argl[0] = argl[0].this + except: pass + try: argl[1] = argl[1].this + except: pass + args = tuple(argl) + self.this = apply(windowsc.new_wxMiniFrame,(arg0.this,arg1,arg2,)+args) + self.thisown = 1 + + + + class wxPanelPtr(wxWindowPtr): def __init__(self,this): self.this = this @@ -317,6 +389,15 @@ class wxDialogPtr(wxPanelPtr): def GetTitle(self): val = windowsc.wxDialog_GetTitle(self.this) return val + def Iconize(self,arg0): + val = windowsc.wxDialog_Iconize(self.this,arg0) + return val + def IsIconized(self): + val = windowsc.wxDialog_IsIconized(self.this) + return val + def SetModal(self,arg0): + val = windowsc.wxDialog_SetModal(self.this,arg0) + return val def IsModal(self): val = windowsc.wxDialog_IsModal(self.this) return val @@ -414,6 +495,25 @@ class wxMenuPtr(wxEvtHandlerPtr): def FindItem(self,arg0): val = windowsc.wxMenu_FindItem(self.this,arg0) return val + def FindItemForId(self,arg0): + val = windowsc.wxMenu_FindItemForId(self.this,arg0) + val = wxMenuItemPtr(val) + return val + def GetHelpString(self,arg0): + val = windowsc.wxMenu_GetHelpString(self.this,arg0) + return val + def GetLabel(self,arg0): + val = windowsc.wxMenu_GetLabel(self.this,arg0) + return val + def GetTitle(self): + val = windowsc.wxMenu_GetTitle(self.this) + return val + def SetHelpString(self,arg0,arg1): + val = windowsc.wxMenu_SetHelpString(self.this,arg0,arg1) + return val + def SetTitle(self,arg0): + val = windowsc.wxMenu_SetTitle(self.this,arg0) + return val def IsChecked(self,arg0): val = windowsc.wxMenu_IsChecked(self.this,arg0) return val @@ -433,6 +533,23 @@ class wxMenu(wxMenuPtr): +class wxPyMenuPtr(wxMenuPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self): + if self.thisown == 1 : + windowsc.delete_wxPyMenu(self.this) + def __repr__(self): + return "" +class wxPyMenu(wxPyMenuPtr): + def __init__(self,*args) : + self.this = apply(windowsc.new_wxPyMenu,()+args) + self.thisown = 1 + + + + class wxMenuBarPtr(wxEvtHandlerPtr): def __init__(self,this): self.this = this @@ -452,6 +569,31 @@ class wxMenuBarPtr(wxEvtHandlerPtr): def FindMenuItem(self,arg0,arg1): val = windowsc.wxMenuBar_FindMenuItem(self.this,arg0,arg1) return val + def EnableTop(self,arg0,arg1): + val = windowsc.wxMenuBar_EnableTop(self.this,arg0,arg1) + return val + def FindItemForId(self,arg0): + val = windowsc.wxMenuBar_FindItemForId(self.this,arg0) + val = wxMenuItemPtr(val) + return val + def GetHelpString(self,arg0): + val = windowsc.wxMenuBar_GetHelpString(self.this,arg0) + return val + def GetLabel(self,arg0): + val = windowsc.wxMenuBar_GetLabel(self.this,arg0) + return val + def SetHelpString(self,arg0,arg1): + val = windowsc.wxMenuBar_SetHelpString(self.this,arg0,arg1) + return val + def SetLabel(self,arg0,arg1): + val = windowsc.wxMenuBar_SetLabel(self.this,arg0,arg1) + return val + def GetLabelTop(self,arg0): + val = windowsc.wxMenuBar_GetLabelTop(self.this,arg0) + return val + def SetLabelTop(self,arg0,arg1): + val = windowsc.wxMenuBar_SetLabelTop(self.this,arg0,arg1) + return val def __repr__(self): return "" class wxMenuBar(wxMenuBarPtr): @@ -482,12 +624,27 @@ class wxMenuItemPtr : val = windowsc.wxMenuItem_GetSubMenu(self.this) val = wxMenuPtr(val) return val + def GetHelp(self): + val = windowsc.wxMenuItem_GetHelp(self.this) + return val + def SetName(self,arg0): + val = windowsc.wxMenuItem_SetName(self.this,arg0) + return val + def SetHelp(self,arg0): + val = windowsc.wxMenuItem_SetHelp(self.this,arg0) + return val def Enable(self,*args): val = apply(windowsc.wxMenuItem_Enable,(self.this,)+args) return val def Check(self,*args): val = apply(windowsc.wxMenuItem_Check,(self.this,)+args) return val + def DeleteSubMenu(self): + val = windowsc.wxMenuItem_DeleteSubMenu(self.this) + return val + def GetName(self): + val = windowsc.wxMenuItem_GetName(self.this) + return val def IsCheckable(self): val = windowsc.wxMenuItem_IsCheckable(self.this) return val @@ -504,6 +661,11 @@ class wxMenuItem(wxMenuItemPtr): #-------------- FUNCTION WRAPPERS ------------------ +def wxWindow_FindFocus(): + val = windowsc.wxWindow_FindFocus() + val = wxWindowPtr(val) + return val + #-------------- VARIABLE WRAPPERS ------------------ diff --git a/utils/wxPython/src/windows2.cpp b/utils/wxPython/src/windows2.cpp index e054b0af9b..8fd4037e83 100644 --- a/utils/wxPython/src/windows2.cpp +++ b/utils/wxPython/src/windows2.cpp @@ -53,19 +53,6 @@ extern PyObject *SWIG_newvarlink(void); #define SWIG_name "windows2c" -///////////////////////////////////////////////////////////////////////////// -// Name: windows2.i -// Purpose: SWIG definitions of MORE window classes -// -// Author: Robin Dunn -// -// Created: 6/2/98 -// RCS-ID: $Id$ -// Copyright: (c) 1998 by Total Control Software -// Licence: wxWindows license -///////////////////////////////////////////////////////////////////////////// - - #include "helpers.h" #include #include @@ -123,7 +110,9 @@ 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"; diff --git a/utils/wxPython/src/windows2.i b/utils/wxPython/src/windows2.i index 19d0f013e9..c3826b6265 100644 --- a/utils/wxPython/src/windows2.i +++ b/utils/wxPython/src/windows2.i @@ -1,5 +1,3 @@ -%module windows2 -%{ ///////////////////////////////////////////////////////////////////////////// // Name: windows2.i // Purpose: SWIG definitions of MORE window classes @@ -12,7 +10,9 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +%module windows2 +%{ #include "helpers.h" #include #include @@ -222,6 +222,13 @@ public: ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.2 1998/08/15 07:36:50 RD +// - Moved the header in the .i files out of the code that gets put into +// the .cpp files. It caused CVS conflicts because of the RCS ID being +// different each time. +// +// - A few minor fixes. +// // Revision 1.1 1998/08/09 08:25:52 RD // Initial version // diff --git a/utils/wxPython/src/wxp.cpp b/utils/wxPython/src/wxp.cpp index 93c1b3a09f..59bf61d2b7 100644 --- a/utils/wxPython/src/wxp.cpp +++ b/utils/wxPython/src/wxp.cpp @@ -33,8 +33,12 @@ * and things like that. * * $Log$ - * Revision 1.3 1998/08/14 23:36:47 RD - * Beginings of wxGTK compatibility + * Revision 1.4 1998/08/15 07:36:51 RD + * - Moved the header in the .i files out of the code that gets put into + * the .cpp files. It caused CVS conflicts because of the RCS ID being + * different each time. + * + * - A few minor fixes. * ************************************************************************/ @@ -556,18 +560,6 @@ char *SWIG_GetPtr(char *_c, void **ptr, char *_t) #define SWIG_name "wxpc" -///////////////////////////////////////////////////////////////////////////// -// Name: wxp.i -// Purpose: SWIG interface file for a python wxWindows module -// -// Author: Robin Dunn -// -// Created: 5/22/98 -// RCS-ID: $Id$ -// Copyright: (c) 1998 by Total Control Software -// Licence: wxWindows license -///////////////////////////////////////////////////////////////////////////// - #ifdef __WXMSW__ #include @@ -581,13 +573,12 @@ char *SWIG_GetPtr(char *_c, void **ptr, char *_t) static PyObject* l_output_helper(PyObject* target, PyObject* o) { PyObject* o2; - PyObject* o3; - if (!target) { + if (!target) { target = o; - } else if (target == Py_None) { + } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { + } else { if (!PyList_Check(target)) { o2 = target; target = PyList_New(0); @@ -604,23 +595,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; - if (!target) { + if (!target) { target = o; - } else if (target == Py_None) { + } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { + } else { if (!PyTuple_Check(target)) { o2 = target; target = PyTuple_New(1); PyTuple_SetItem(target, 0, o2); } - o3 = PyTuple_New(1); - PyTuple_SetItem(o3, 0, o); + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, o); o2 = target; - target = PySequence_Concat(o2, o3); - Py_DECREF(o2); + target = PySequence_Concat(o2, o3); + Py_DECREF(o2); Py_DECREF(o3); } return target; @@ -748,6 +739,27 @@ static PyObject *_wrap_wxPyApp_GetAppName(PyObject *self, PyObject *args) { return _resultobj; } +#define wxPyApp_GetAuto3D(_swigobj) (_swigobj->GetAuto3D()) +static PyObject *_wrap_wxPyApp_GetAuto3D(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxPyApp * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxPyApp_GetAuto3D",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetAuto3D. Expected _wxPyApp_p."); + return NULL; + } + } + _result = (bool )wxPyApp_GetAuto3D(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxPyApp_GetClassName(_swigobj) (_swigobj->GetClassName()) static PyObject *_wrap_wxPyApp_GetClassName(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -1004,6 +1016,30 @@ static PyObject *_wrap_wxPyApp_SetAppName(PyObject *self, PyObject *args) { return _resultobj; } +#define wxPyApp_SetAuto3D(_swigobj,_swigarg0) (_swigobj->SetAuto3D(_swigarg0)) +static PyObject *_wrap_wxPyApp_SetAuto3D(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxPyApp * _arg0; + bool _arg1; + char * _argc0 = 0; + int tempbool1; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxPyApp_SetAuto3D",&_argc0,&tempbool1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_SetAuto3D. Expected _wxPyApp_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; + wxPyApp_SetAuto3D(_arg0,_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxPyApp_SetClassName(_swigobj,_swigarg0) (_swigobj->SetClassName(_swigarg0)) static PyObject *_wrap_wxPyApp_SetClassName(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -1175,6 +1211,7 @@ static PyMethodDef wxpcMethods[] = { { "wxPyApp_SetPrintMode", _wrap_wxPyApp_SetPrintMode, 1 }, { "wxPyApp_SetExitOnFrameDelete", _wrap_wxPyApp_SetExitOnFrameDelete, 1 }, { "wxPyApp_SetClassName", _wrap_wxPyApp_SetClassName, 1 }, + { "wxPyApp_SetAuto3D", _wrap_wxPyApp_SetAuto3D, 1 }, { "wxPyApp_SetAppName", _wrap_wxPyApp_SetAppName, 1 }, { "wxPyApp_Pending", _wrap_wxPyApp_Pending, 1 }, { "wxPyApp_MainLoop", _wrap_wxPyApp_MainLoop, 1 }, @@ -1186,6 +1223,7 @@ static PyMethodDef wxpcMethods[] = { { "wxPyApp_GetPrintMode", _wrap_wxPyApp_GetPrintMode, 1 }, { "wxPyApp_GetExitOnFrameDelete", _wrap_wxPyApp_GetExitOnFrameDelete, 1 }, { "wxPyApp_GetClassName", _wrap_wxPyApp_GetClassName, 1 }, + { "wxPyApp_GetAuto3D", _wrap_wxPyApp_GetAuto3D, 1 }, { "wxPyApp_GetAppName", _wrap_wxPyApp_GetAppName, 1 }, { "new_wxPyApp", _wrap_new_wxPyApp, 1 }, { "_wxSetDictionary", __wxSetDictionary, 1 }, @@ -1413,6 +1451,9 @@ SWIGEXPORT(void,initwxpc)() { PyDict_SetItemString(d,"wxSAVE", PyInt_FromLong((long) wxSAVE)); PyDict_SetItemString(d,"wxHIDE_READONLY", PyInt_FromLong((long) wxHIDE_READONLY)); PyDict_SetItemString(d,"wxOVERWRITE_PROMPT", PyInt_FromLong((long) wxOVERWRITE_PROMPT)); + PyDict_SetItemString(d,"wxACCEL_ALT", PyInt_FromLong((long) wxACCEL_ALT)); + PyDict_SetItemString(d,"wxACCEL_CTRL", PyInt_FromLong((long) wxACCEL_CTRL)); + PyDict_SetItemString(d,"wxACCEL_SHIFT", PyInt_FromLong((long) wxACCEL_SHIFT)); PyDict_SetItemString(d,"ERR_PARAM", PyInt_FromLong((long) ERR_PARAM)); PyDict_SetItemString(d,"ERR_NODATA", PyInt_FromLong((long) ERR_NODATA)); PyDict_SetItemString(d,"ERR_CANCEL", PyInt_FromLong((long) ERR_CANCEL)); @@ -1703,7 +1744,7 @@ SWIGEXPORT(void,initwxpc)() { 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.3.0")); + PyDict_SetItemString(d,"__version__", PyString_FromString("0.3.1")); 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); diff --git a/utils/wxPython/src/wxp.i b/utils/wxPython/src/wxp.i index d7ea870517..48ed93cbdf 100644 --- a/utils/wxPython/src/wxp.i +++ b/utils/wxPython/src/wxp.i @@ -1,5 +1,3 @@ -%module wxp -%{ ///////////////////////////////////////////////////////////////////////////// // Name: wxp.i // Purpose: SWIG interface file for a python wxWindows module @@ -12,6 +10,10 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +%module wxp + + +%{ #ifdef __WXMSW__ #include @@ -178,6 +180,13 @@ extern "C" SWIGEXPORT(void,initcmndlgsc)(); ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.3 1998/08/15 07:36:53 RD +// - Moved the header in the .i files out of the code that gets put into +// the .cpp files. It caused CVS conflicts because of the RCS ID being +// different each time. +// +// - A few minor fixes. +// // Revision 1.2 1998/08/14 23:36:49 RD // Beginings of wxGTK compatibility // diff --git a/utils/wxPython/src/wxp.py b/utils/wxPython/src/wxp.py index 42b824eaf2..04621ae9f4 100644 --- a/utils/wxPython/src/wxp.py +++ b/utils/wxPython/src/wxp.py @@ -25,6 +25,9 @@ class wxPyAppPtr(wxEvtHandlerPtr): def GetAppName(self): val = wxpc.wxPyApp_GetAppName(self.this) return val + def GetAuto3D(self): + val = wxpc.wxPyApp_GetAuto3D(self.this) + return val def GetClassName(self): val = wxpc.wxPyApp_GetClassName(self.this) return val @@ -59,6 +62,9 @@ class wxPyAppPtr(wxEvtHandlerPtr): def SetAppName(self,arg0): val = wxpc.wxPyApp_SetAppName(self.this,arg0) return val + def SetAuto3D(self,arg0): + val = wxpc.wxPyApp_SetAuto3D(self.this,arg0) + return val def SetClassName(self,arg0): val = wxpc.wxPyApp_SetClassName(self.this,arg0) return val @@ -311,6 +317,9 @@ wxOPEN = wxpc.wxOPEN wxSAVE = wxpc.wxSAVE wxHIDE_READONLY = wxpc.wxHIDE_READONLY wxOVERWRITE_PROMPT = wxpc.wxOVERWRITE_PROMPT +wxACCEL_ALT = wxpc.wxACCEL_ALT +wxACCEL_CTRL = wxpc.wxACCEL_CTRL +wxACCEL_SHIFT = wxpc.wxACCEL_SHIFT ERR_PARAM = wxpc.ERR_PARAM ERR_NODATA = wxpc.ERR_NODATA ERR_CANCEL = wxpc.ERR_CANCEL @@ -1371,8 +1380,12 @@ class wxApp(wxPyApp): #---------------------------------------------------------------------------- # # $Log$ -# Revision 1.3 1998/08/14 23:36:49 RD -# Beginings of wxGTK compatibility +# Revision 1.4 1998/08/15 07:36:54 RD +# - Moved the header in the .i files out of the code that gets put into +# the .cpp files. It caused CVS conflicts because of the RCS ID being +# different each time. +# +# - A few minor fixes. # # Revision 1.1 1998/08/09 08:25:49 RD # Initial version