X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/196addbfe0f00b96fdeff1f6f29dae33cf95d071..cc6eca35090e1735e2dde009185476dc80726b97:/wxPython/src/gtk/misc_wrap.cpp?ds=sidebyside diff --git a/wxPython/src/gtk/misc_wrap.cpp b/wxPython/src/gtk/misc_wrap.cpp index 76811cd207..9b2812fd05 100644 --- a/wxPython/src/gtk/misc_wrap.cpp +++ b/wxPython/src/gtk/misc_wrap.cpp @@ -307,16 +307,13 @@ static swig_type_info *swig_types[83]; #include "wx/wxPython/pyclasses.h" #include "wx/wxPython/pyistream.h" - DECLARE_DEF_STRING(EmptyString); - - - + static const wxString wxPyEmptyString(wxEmptyString); - DECLARE_DEF_STRING(FileSelectorPromptStr); - DECLARE_DEF_STRING(FileSelectorDefaultWildcardStr); - DECLARE_DEF_STRING(DirSelectorPromptStr); + static const wxString wxPyFileSelectorPromptStr(wxFileSelectorPromptStr); + static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr); + static const wxString wxPyDirSelectorPromptStr(wxDirSelectorPromptStr); static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; @@ -346,7 +343,11 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { long wxGetFreeMemory() - { PyErr_SetNone(PyExc_NotImplementedError); return 0; } + { wxPyRaiseNotImplemented(); return 0; } + + + bool wxGetKeyState(wxKeyCode key) + { wxPyRaiseNotImplemented(); return False; } void wxWakeUpMainThread() {} @@ -530,7 +531,8 @@ class wxJoystick : public wxObject { public: wxJoystick(int joystick = wxJOYSTICK1) { wxPyBeginBlockThreads(); - PyErr_SetString(PyExc_NotImplementedError, "wxJoystick is not available on this platform."); + PyErr_SetString(PyExc_NotImplementedError, + "wxJoystick is not available on this platform."); wxPyEndBlockThreads(); } wxPoint GetPosition() { return wxPoint(-1,-1); } @@ -592,12 +594,14 @@ class wxWave : public wxObject public: wxWave(const wxString& fileName, bool isResource = False) { wxPyBeginBlockThreads(); - PyErr_SetString(PyExc_NotImplementedError, "wxWave is not available on this platform."); + PyErr_SetString(PyExc_NotImplementedError, + "wxWave is not available on this platform."); wxPyEndBlockThreads(); } wxWave(int size, const wxByte* data) { wxPyBeginBlockThreads(); - PyErr_SetString(PyExc_NotImplementedError, "wxWave is not available on this platform."); + PyErr_SetString(PyExc_NotImplementedError, + "wxWave is not available on this platform."); wxPyEndBlockThreads(); } @@ -845,10 +849,9 @@ bool wxConfigBase_ReadBool(wxConfigBase *self,wxString const &key,bool defaultVa #include - DECLARE_DEF_STRING2(DateFormatStr, wxT("%c")); - DECLARE_DEF_STRING2(TimeSpanFormatStr, wxT("%H:%M:%S")); - + static const wxString wxPyDateFormatStr(wxT(wxT("%c"))); + static const wxString wxPyTimeSpanFormatStr(wxT(wxT("%H:%M:%S"))); #define LOCAL_TZ wxDateTime::Local @@ -1049,7 +1052,7 @@ PyObject *wxCustomDataObject_GetData(wxCustomDataObject *self){ class wxMetafileDataObject : public wxDataObjectSimple { public: - wxMetafileDataObject() { PyErr_SetNone(PyExc_NotImplementedError); } + wxMetafileDataObject() { wxPyRaiseNotImplemented(); } }; @@ -1523,6 +1526,66 @@ static PyObject * SystemOptions_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } +static int _wrap_FileSelectorPromptStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable FileSelectorPromptStr is read-only."); + return 1; +} + + +static PyObject *_wrap_FileSelectorPromptStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyFileSelectorPromptStr)->c_str(), (&wxPyFileSelectorPromptStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyFileSelectorPromptStr)->c_str(), (&wxPyFileSelectorPromptStr)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_FileSelectorDefaultWildcardStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable FileSelectorDefaultWildcardStr is read-only."); + return 1; +} + + +static PyObject *_wrap_FileSelectorDefaultWildcardStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyFileSelectorDefaultWildcardStr)->c_str(), (&wxPyFileSelectorDefaultWildcardStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyFileSelectorDefaultWildcardStr)->c_str(), (&wxPyFileSelectorDefaultWildcardStr)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_DirSelectorPromptStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable DirSelectorPromptStr is read-only."); + return 1; +} + + +static PyObject *_wrap_DirSelectorPromptStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyDirSelectorPromptStr)->c_str(), (&wxPyDirSelectorPromptStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyDirSelectorPromptStr)->c_str(), (&wxPyDirSelectorPromptStr)->Len()); +#endif + } + return pyobj; +} + + static PyObject *_wrap_NewId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; long result; @@ -3606,6 +3669,29 @@ static PyObject *_wrap_GetTopLevelParent(PyObject *self, PyObject *args, PyObjec } +static PyObject *_wrap_GetKeyState(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 ; + bool result; + char *kwnames[] = { + (char *) "key", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:GetKeyState",kwnames,&arg1)) goto fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)wxGetKeyState((wxKeyCode )arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = PyInt_FromLong((long)result); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_WakeUpMainThread(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; char *kwnames[] = { @@ -15158,6 +15244,46 @@ static PyObject *_wrap_ExpandEnvVars(PyObject *self, PyObject *args, PyObject *k } +static int _wrap_DateFormatStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable DateFormatStr is read-only."); + return 1; +} + + +static PyObject *_wrap_DateFormatStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyDateFormatStr)->c_str(), (&wxPyDateFormatStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyDateFormatStr)->c_str(), (&wxPyDateFormatStr)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_TimeSpanFormatStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable TimeSpanFormatStr is read-only."); + return 1; +} + + +static PyObject *_wrap_TimeSpanFormatStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyTimeSpanFormatStr)->c_str(), (&wxPyTimeSpanFormatStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyTimeSpanFormatStr)->c_str(), (&wxPyTimeSpanFormatStr)->Len()); +#endif + } + return pyobj; +} + + static PyObject *_wrap_DateTime_SetCountry(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; @@ -15454,6 +15580,8 @@ static PyObject *_wrap_DateTime_GetAmPmStrings(PyObject *self, PyObject *args, P PyObject *resultobj; wxString *arg1 = (wxString *) 0 ; wxString *arg2 = (wxString *) 0 ; + bool temp1 = False ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -15461,8 +15589,16 @@ static PyObject *_wrap_DateTime_GetAmPmStrings(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_GetAmPmStrings",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = True; + } + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxDateTime::GetAmPmStrings(arg1,arg2); @@ -15471,8 +15607,24 @@ static PyObject *_wrap_DateTime_GetAmPmStrings(PyObject *self, PyObject *args, P if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp1) + delete arg1; + } + { + if (temp2) + delete arg2; + } return resultobj; fail: + { + if (temp1) + delete arg1; + } + { + if (temp2) + delete arg2; + } return NULL; } @@ -24501,6 +24653,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GenericFindWindowAtPoint", (PyCFunction) _wrap_GenericFindWindowAtPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"FindWindowAtPoint", (PyCFunction) _wrap_FindWindowAtPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"GetTopLevelParent", (PyCFunction) _wrap_GetTopLevelParent, METH_VARARGS | METH_KEYWORDS }, + { (char *)"GetKeyState", (PyCFunction) _wrap_GetKeyState, METH_VARARGS | METH_KEYWORDS }, { (char *)"WakeUpMainThread", (PyCFunction) _wrap_WakeUpMainThread, METH_VARARGS | METH_KEYWORDS }, { (char *)"MutexGuiEnter", (PyCFunction) _wrap_MutexGuiEnter, METH_VARARGS | METH_KEYWORDS }, { (char *)"MutexGuiLeave", (PyCFunction) _wrap_MutexGuiLeave, METH_VARARGS | METH_KEYWORDS }, @@ -26249,6 +26402,10 @@ SWIGEXPORT(void) SWIG_init(void) { } SWIG_InstallConstants(d,swig_const_table); + PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); + SWIG_addvarlink(SWIG_globals,(char*)"FileSelectorPromptStr",_wrap_FileSelectorPromptStr_get, _wrap_FileSelectorPromptStr_set); + SWIG_addvarlink(SWIG_globals,(char*)"FileSelectorDefaultWildcardStr",_wrap_FileSelectorDefaultWildcardStr_get, _wrap_FileSelectorDefaultWildcardStr_set); + SWIG_addvarlink(SWIG_globals,(char*)"DirSelectorPromptStr",_wrap_DirSelectorPromptStr_get, _wrap_DirSelectorPromptStr_set); PyDict_SetItemString(d, "wxEVT_TIMER", PyInt_FromLong(wxEVT_TIMER)); PyDict_SetItemString(d, "wxEVT_END_PROCESS", PyInt_FromLong(wxEVT_END_PROCESS)); @@ -26258,7 +26415,6 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d, "wxEVT_JOY_BUTTON_UP", PyInt_FromLong(wxEVT_JOY_BUTTON_UP)); PyDict_SetItemString(d, "wxEVT_JOY_MOVE", PyInt_FromLong(wxEVT_JOY_MOVE)); PyDict_SetItemString(d, "wxEVT_JOY_ZMOVE", PyInt_FromLong(wxEVT_JOY_ZMOVE)); - PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,(char*)"TheMimeTypesManager",_wrap_TheMimeTypesManager_get, _wrap_TheMimeTypesManager_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_TOOLBAR",_wrap_ART_TOOLBAR_get, _wrap_ART_TOOLBAR_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_MENU",_wrap_ART_MENU_get, _wrap_ART_MENU_set); @@ -26301,6 +26457,8 @@ SWIGEXPORT(void) SWIG_init(void) { wxPyPtrTypeMap_Add("wxArtProvider", "wxPyArtProvider"); + SWIG_addvarlink(SWIG_globals,(char*)"DateFormatStr",_wrap_DateFormatStr_get, _wrap_DateFormatStr_set); + SWIG_addvarlink(SWIG_globals,(char*)"TimeSpanFormatStr",_wrap_TimeSpanFormatStr_get, _wrap_TimeSpanFormatStr_set); SWIG_addvarlink(SWIG_globals,(char*)"FormatInvalid",_wrap_FormatInvalid_get, _wrap_FormatInvalid_set); wxPyPtrTypeMap_Add("wxDropSource", "wxPyDropSource");