X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/242b7b46ad32ddf0a0730e18c4d88781a2a5c663..47e87446864dd44f43d9237c9dfd328d4a629804:/wxPython/src/gtk/core_wrap.cpp diff --git a/wxPython/src/gtk/core_wrap.cpp b/wxPython/src/gtk/core_wrap.cpp index 359ef56e97..88785eac97 100644 --- a/wxPython/src/gtk/core_wrap.cpp +++ b/wxPython/src/gtk/core_wrap.cpp @@ -45,6 +45,8 @@ private: #define SWIG_TypeName SWIG_Python_TypeName #define SWIG_TypeQuery SWIG_Python_TypeQuery #define SWIG_TypeClientData SWIG_Python_TypeClientData +#define SWIG_PackData SWIG_Python_PackData +#define SWIG_UnpackData SWIG_Python_UnpackData /*********************************************************************** @@ -59,36 +61,35 @@ private: #include -#if defined(_WIN32) || defined(__WIN32__) -# if defined(_MSC_VER) -# if defined(STATIC_LINKED) -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) extern a -# else -# define SWIGEXPORT(a) __declspec(dllexport) a -# define SWIGIMPORT(a) extern a -# endif -# else -# if defined(__BORLANDC__) -# define SWIGEXPORT(a) a _export -# define SWIGIMPORT(a) a _export -# else -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) a -# endif -# endif +#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(_MSC_VER) || defined(__GNUC__) +# if defined(STATIC_LINKED) +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) extern a +# else +# define SWIGEXPORT(a) __declspec(dllexport) a +# define SWIGIMPORT(a) extern a +# endif +# else +# if defined(__BORLANDC__) +# define SWIGEXPORT(a) a _export +# define SWIGIMPORT(a) a _export +# else +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) a +# endif +# endif #else -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) a +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) a #endif #ifdef SWIG_GLOBAL -#define SWIGRUNTIME(a) SWIGEXPORT(a) +# define SWIGRUNTIME(a) SWIGEXPORT(a) #else -#define SWIGRUNTIME(a) static a +# define SWIGRUNTIME(a) static a #endif - #ifdef __cplusplus extern "C" { #endif @@ -97,10 +98,10 @@ typedef void *(*swig_converter_func)(void *); typedef struct swig_type_info *(*swig_dycast_func)(void **); typedef struct swig_type_info { - const char *name; + const char *name; swig_converter_func converter; const char *str; - void *clientdata; + void *clientdata; swig_dycast_func dcast; struct swig_type_info *next; struct swig_type_info *prev; @@ -114,6 +115,8 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **); SWIGIMPORT(const char *) SWIG_TypeName(const swig_type_info *); SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *); SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); +SWIGIMPORT(char *) SWIG_PackData(char *, void *, int); +SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus @@ -121,6 +124,7 @@ SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); #endif + /*********************************************************************** * pyrun.swg for wxPython * @@ -131,7 +135,6 @@ SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); * ************************************************************************/ - #include "Python.h" #ifdef __cplusplus @@ -162,8 +165,6 @@ typedef struct swig_const_info { swig_type_info **ptype; } swig_const_info; - - /* Common SWIG API */ #define SWIG_ConvertPtr(obj, pp, type, flags) \ SWIG_Python_ConvertPtr(obj, pp, type, flags) @@ -179,34 +180,27 @@ typedef struct swig_const_info { SWIG_Python_addvarlink(p, name, get_attr, set_attr) #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) \ SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) -#define SWIG_PackData(c, ptr, sz) \ - SWIG_Python_PackData(c, ptr, sz) -#define SWIG_UnpackData(c, ptr, sz) \ - SWIG_Python_UnpackData(c, ptr, sz) #define SWIG_NewPackedObj(ptr, sz, type) \ SWIG_Python_NewPackedObj(ptr, sz, type) #define SWIG_InstallConstants(d, constants) \ SWIG_Python_InstallConstants(d, constants) -SWIGEXPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); -SWIGEXPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); -SWIGEXPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int); +SWIGIMPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); +SWIGIMPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); +SWIGIMPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int); +SWIGIMPORT(PyObject *) SWIG_Python_newvarlink(void); +SWIGIMPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *)); +SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int); +SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); +SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); -SWIGEXPORT(PyObject *) SWIG_Python_newvarlink(void); -SWIGEXPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *)); -SWIGEXPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int); -SWIGEXPORT(char *) SWIG_Python_PackData(char *c, void *, int); -SWIGEXPORT(char *) SWIG_Python_UnpackData(char *c, void *, int); -SWIGEXPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); -SWIGEXPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); /* Contract support */ #define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else - #ifdef __cplusplus } #endif @@ -543,10 +537,6 @@ static wxPyCoreAPI API = { #endif - DECLARE_DEF_STRING(EmptyString); -// DECLARE_DEF_STRING(PanelNameStr); - - #if ! wxUSE_HOTKEY enum wxHotkeyModifier { @@ -559,6 +549,7 @@ enum wxHotkeyModifier #define wxEVT_HOTKEY 9999 #endif + static const wxString wxPyEmptyString(wxEmptyString); wxString wxObject_GetClassName(wxObject *self){ return self->GetClassInfo()->GetClassName(); } @@ -962,7 +953,7 @@ wxPyApp *new_wxPyApp(){ wxPythonApp = new wxPyApp(); return wxPythonApp; } -int PyApp_GetComCtl32Version(){ PyErr_SetNone(PyExc_NotImplementedError); return 0; } +int PyApp_GetComCtl32Version(){ wxPyRaiseNotImplemented(); return 0; } void wxApp_CleanUp() { __wxPyCleanup(); @@ -1020,7 +1011,7 @@ wxWindow* wxFindWindowByLabel( const wxString& label, win->SubclassWin(hWnd); return win; #else - PyErr_SetNone(PyExc_NotImplementedError); + wxPyRaiseNotImplemented(); return NULL; #endif } @@ -1038,9 +1029,7 @@ PyObject *wxMenu_GetMenuItems(wxMenu *self){ return wxPy_ConvertList(&list); } int MenuItem_GetDefaultMarginWidth(){ return 0; } - - DECLARE_DEF_STRING(ControlNameStr); - + static const wxString wxPyControlNameStr(wxControlNameStr); int wxItemContainer_Append(wxItemContainer *self,wxString const &item,PyObject *clientData){ if (clientData) { wxPyClientData* data = new wxPyClientData(clientData); @@ -1321,6 +1310,26 @@ bool wxGridBagSizer_Add(wxGridBagSizer *self,PyObject *item,wxGBPosition const & #ifdef __cplusplus extern "C" { #endif +static int _wrap_EmptyString_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable EmptyString is read-only."); + return 1; +} + + +static PyObject *_wrap_EmptyString_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyEmptyString)->c_str(), (&wxPyEmptyString)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyEmptyString)->c_str(), (&wxPyEmptyString)->Len()); +#endif + } + return pyobj; +} + + static PyObject *_wrap_Object_GetClassName(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxObject *arg1 = (wxObject *) 0 ; @@ -3023,6 +3032,126 @@ static PyObject *_wrap_Rect_SetSize(PyObject *self, PyObject *args, PyObject *kw } +static PyObject *_wrap_Rect_GetTopLeft(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxRect *arg1 = (wxRect *) 0 ; + wxPoint result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetTopLeft",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxRect const *)arg1)->GetTopLeft(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxPoint * resultptr; + resultptr = new wxPoint((wxPoint &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Rect_SetTopLeft(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxRect *arg1 = (wxRect *) 0 ; + wxPoint *arg2 = 0 ; + wxPoint temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "p", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetTopLeft",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetTopLeft((wxPoint const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Rect_GetBottomRight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxRect *arg1 = (wxRect *) 0 ; + wxPoint result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_GetBottomRight",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxRect const *)arg1)->GetBottomRight(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxPoint * resultptr; + resultptr = new wxPoint((wxPoint &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Rect_SetBottomRight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxRect *arg1 = (wxRect *) 0 ; + wxPoint *arg2 = 0 ; + wxPoint temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "p", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetBottomRight",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetBottomRight((wxPoint const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Rect_GetLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRect *arg1 = (wxRect *) 0 ; @@ -5285,7 +5414,13 @@ static PyObject *_wrap_FSFile_GetMimeType(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -5313,7 +5448,13 @@ static PyObject *_wrap_FSFile_GetLocation(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -5341,7 +5482,13 @@ static PyObject *_wrap_FSFile_GetAnchor(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -17403,7 +17550,13 @@ static PyObject *_wrap_PyApp_GetVendorName(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -27943,7 +28096,13 @@ static PyObject *_wrap_MenuItem_GetText(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -28346,7 +28505,13 @@ static PyObject *_wrap_MenuItem_GetHelp(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -28492,6 +28657,26 @@ static PyObject * MenuItem_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } +static int _wrap_ControlNameStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable ControlNameStr is read-only."); + return 1; +} + + +static PyObject *_wrap_ControlNameStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyControlNameStr)->c_str(), (&wxPyControlNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyControlNameStr)->c_str(), (&wxPyControlNameStr)->Len()); +#endif + } + return pyobj; +} + + static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -35318,6 +35503,7 @@ static PyObject * LayoutConstraints_swigregister(PyObject *self, PyObject *args) } static PyMethodDef SwigMethods[] = { { (char *)"_wxPySetDictionary", __wxPySetDictionary, METH_VARARGS }, + { (char *)"_wxPyFixStockObjects", __wxPyFixStockObjects, METH_VARARGS }, { (char *)"Object_GetClassName", (PyCFunction) _wrap_Object_GetClassName, METH_VARARGS | METH_KEYWORDS }, { (char *)"Object_Destroy", (PyCFunction) _wrap_Object_Destroy, METH_VARARGS | METH_KEYWORDS }, { (char *)"Object_swigregister", Object_swigregister, METH_VARARGS }, @@ -35384,6 +35570,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"Rect_SetPosition", (PyCFunction) _wrap_Rect_SetPosition, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_GetSize", (PyCFunction) _wrap_Rect_GetSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_SetSize", (PyCFunction) _wrap_Rect_SetSize, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Rect_GetTopLeft", (PyCFunction) _wrap_Rect_GetTopLeft, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Rect_SetTopLeft", (PyCFunction) _wrap_Rect_SetTopLeft, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Rect_GetBottomRight", (PyCFunction) _wrap_Rect_GetBottomRight, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Rect_SetBottomRight", (PyCFunction) _wrap_Rect_SetBottomRight, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_GetLeft", (PyCFunction) _wrap_Rect_GetLeft, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_GetTop", (PyCFunction) _wrap_Rect_GetTop, METH_VARARGS | METH_KEYWORDS }, { (char *)"Rect_GetBottom", (PyCFunction) _wrap_Rect_GetBottom, METH_VARARGS | METH_KEYWORDS }, @@ -37473,6 +37663,7 @@ static swig_const_info swig_const_table[] = { { SWIG_PY_INT, (char *)"MENU_TEAROFF", (long) wxMENU_TEAROFF, 0, 0, 0}, { SWIG_PY_INT, (char *)"MB_DOCKABLE", (long) wxMB_DOCKABLE, 0, 0, 0}, { SWIG_PY_INT, (char *)"NO_FULL_REPAINT_ON_RESIZE", (long) wxNO_FULL_REPAINT_ON_RESIZE, 0, 0, 0}, +{ SWIG_PY_INT, (char *)"FULL_REPAINT_ON_RESIZE", (long) wxFULL_REPAINT_ON_RESIZE, 0, 0, 0}, { SWIG_PY_INT, (char *)"LI_HORIZONTAL", (long) wxLI_HORIZONTAL, 0, 0, 0}, { SWIG_PY_INT, (char *)"LI_VERTICAL", (long) wxLI_VERTICAL, 0, 0, 0}, { SWIG_PY_INT, (char *)"WS_EX_VALIDATE_RECURSIVELY", (long) wxWS_EX_VALIDATE_RECURSIVELY, 0, 0, 0}, @@ -37791,36 +37982,23 @@ static swig_const_info swig_const_table[] = { { SWIG_PY_INT, (char *)"UPDATE_UI_FROMIDLE", (long) wxUPDATE_UI_FROMIDLE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_INVALID", (long) wxBITMAP_TYPE_INVALID, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_BMP", (long) wxBITMAP_TYPE_BMP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_BMP_RESOURCE", (long) wxBITMAP_TYPE_BMP_RESOURCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_RESOURCE", (long) wxBITMAP_TYPE_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_ICO", (long) wxBITMAP_TYPE_ICO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ICO_RESOURCE", (long) wxBITMAP_TYPE_ICO_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_CUR", (long) wxBITMAP_TYPE_CUR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_CUR_RESOURCE", (long) wxBITMAP_TYPE_CUR_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_XBM", (long) wxBITMAP_TYPE_XBM, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_XBM_DATA", (long) wxBITMAP_TYPE_XBM_DATA, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_XPM", (long) wxBITMAP_TYPE_XPM, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_XPM_DATA", (long) wxBITMAP_TYPE_XPM_DATA, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_TIF", (long) wxBITMAP_TYPE_TIF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_TIF_RESOURCE", (long) wxBITMAP_TYPE_TIF_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_GIF", (long) wxBITMAP_TYPE_GIF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_GIF_RESOURCE", (long) wxBITMAP_TYPE_GIF_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_PNG", (long) wxBITMAP_TYPE_PNG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PNG_RESOURCE", (long) wxBITMAP_TYPE_PNG_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_JPEG", (long) wxBITMAP_TYPE_JPEG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_JPEG_RESOURCE", (long) wxBITMAP_TYPE_JPEG_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_PNM", (long) wxBITMAP_TYPE_PNM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PNM_RESOURCE", (long) wxBITMAP_TYPE_PNM_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_PCX", (long) wxBITMAP_TYPE_PCX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PCX_RESOURCE", (long) wxBITMAP_TYPE_PCX_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_PICT", (long) wxBITMAP_TYPE_PICT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PICT_RESOURCE", (long) wxBITMAP_TYPE_PICT_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_ICON", (long) wxBITMAP_TYPE_ICON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ICON_RESOURCE", (long) wxBITMAP_TYPE_ICON_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_ANI", (long) wxBITMAP_TYPE_ANI, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_IFF", (long) wxBITMAP_TYPE_IFF, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_MACCURSOR", (long) wxBITMAP_TYPE_MACCURSOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"BITMAP_TYPE_MACCURSOR_RESOURCE", (long) wxBITMAP_TYPE_MACCURSOR_RESOURCE, 0, 0, 0}, { SWIG_PY_INT, (char *)"BITMAP_TYPE_ANY", (long) wxBITMAP_TYPE_ANY, 0, 0, 0}, { SWIG_PY_INT, (char *)"CURSOR_NONE", (long) wxCURSOR_NONE, 0, 0, 0}, { SWIG_PY_INT, (char *)"CURSOR_ARROW", (long) wxCURSOR_ARROW, 0, 0, 0}, @@ -38056,6 +38234,7 @@ SWIGEXPORT(void) SWIG_init(void) { #endif PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); + SWIG_addvarlink(SWIG_globals,(char*)"EmptyString",_wrap_EmptyString_get, _wrap_EmptyString_set); SWIG_addvarlink(SWIG_globals,(char*)"DefaultPosition",_wrap_DefaultPosition_get, _wrap_DefaultPosition_set); SWIG_addvarlink(SWIG_globals,(char*)"DefaultSize",_wrap_DefaultSize_get, _wrap_DefaultSize_set); @@ -38187,6 +38366,7 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"NullAcceleratorTable",_wrap_NullAcceleratorTable_get, _wrap_NullAcceleratorTable_set); SWIG_addvarlink(SWIG_globals,(char*)"PanelNameStr",_wrap_PanelNameStr_get, _wrap_PanelNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"DefaultValidator",_wrap_DefaultValidator_get, _wrap_DefaultValidator_set); + SWIG_addvarlink(SWIG_globals,(char*)"ControlNameStr",_wrap_ControlNameStr_get, _wrap_ControlNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"DefaultSpan",_wrap_DefaultSpan_get, _wrap_DefaultSpan_set); // Initialize threading, some globals and such