X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f098326325690eb3cb77af3a4c1133cb4d711062..a41e16b6369fe36743aea3273460362bb503f092:/wxPython/src/msw/gdi_wrap.cpp?ds=sidebyside diff --git a/wxPython/src/msw/gdi_wrap.cpp b/wxPython/src/msw/gdi_wrap.cpp index 3f69ae19c3..a6ba9574be 100644 --- a/wxPython/src/msw/gdi_wrap.cpp +++ b/wxPython/src/msw/gdi_wrap.cpp @@ -45,8 +45,9 @@ 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 +#define SWIG_PackData SWIG_Python_PackData +#define SWIG_UnpackData SWIG_Python_UnpackData + /*********************************************************************** * common.swg for wxPython @@ -278,8 +279,8 @@ static swig_type_info *swig_types[56]; #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" - DECLARE_DEF_STRING(EmptyString); + static const wxString wxPyEmptyString(wxEmptyString); PyObject *wxColour_Get(wxColour *self){ PyObject* rv = PyTuple_New(3); int red = -1; @@ -468,10 +469,10 @@ wxString wxNativeFontInfo___str__(wxNativeFontInfo *self){ } wxNativeEncodingInfo* wxGetNativeFontEncoding(wxFontEncoding encoding) - { PyErr_SetNone(PyExc_NotImplementedError); return NULL; } + { wxPyRaiseNotImplemented(); return NULL; } bool wxTestFontEncoding(const wxNativeEncodingInfo& info) - { PyErr_SetNone(PyExc_NotImplementedError); return False; } + { wxPyRaiseNotImplemented(); return False; } PyObject *wxFontMapper_GetAltForEncoding(wxFontMapper *self,wxFontEncoding encoding,wxString const &facename,bool interactive){ wxFontEncoding alt_enc; @@ -977,7 +978,7 @@ static PyObject *_wrap_Colour_Set(PyObject *self, PyObject *args, PyObject *kwar } -static PyObject *_wrap_Colour_SetRBG(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Colour_SetRGB(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxColour *arg1 = (wxColour *) 0 ; unsigned long arg2 ; @@ -987,7 +988,7 @@ static PyObject *_wrap_Colour_SetRBG(PyObject *self, PyObject *args, PyObject *k (char *) "self",(char *) "colRGB", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour_SetRBG",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour_SetRGB",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (unsigned long) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; @@ -1069,6 +1070,46 @@ static PyObject *_wrap_Colour___ne__(PyObject *self, PyObject *args, PyObject *k } +static PyObject *_wrap_Colour_InitFromName(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxColour *arg1 = (wxColour *) 0 ; + wxString *arg2 = 0 ; + bool temp2 = False ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "colourName", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour_InitFromName",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->InitFromName((wxString const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp2) + delete arg2; + } + return resultobj; + fail: + { + if (temp2) + delete arg2; + } + return NULL; +} + + static PyObject *_wrap_Colour_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxColour *arg1 = (wxColour *) 0 ; @@ -1676,6 +1717,31 @@ static PyObject *_wrap_Pen_GetDashes(PyObject *self, PyObject *args, PyObject *k } +static PyObject *_wrap_Pen_GetDashCount(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPen *arg1 = (wxPen *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Pen_GetDashCount",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxPen const *)arg1)->GetDashCount(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = PyInt_FromLong((long)result); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Pen_GetStipple(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPen *arg1 = (wxPen *) 0 ; @@ -2971,17 +3037,17 @@ static PyObject * Mask_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - long arg2 ; + int arg2 ; int arg3 = (int) -1 ; int arg4 = (int) -1 ; wxIcon *result; bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "name",(char *) "flags",(char *) "desiredWidth",(char *) "desiredHeight", NULL + (char *) "name",(char *) "type",(char *) "desiredWidth",(char *) "desiredHeight", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|ii:new_Icon",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:new_Icon",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -2989,7 +3055,7 @@ static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxIcon *)new wxIcon((wxString const &)*arg1,arg2,arg3,arg4); + result = (wxIcon *)new wxIcon((wxString const &)*arg1,(wxBitmapType )arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -3140,16 +3206,16 @@ static PyObject *_wrap_Icon_LoadFile(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; wxIcon *arg1 = (wxIcon *) 0 ; wxString *arg2 = 0 ; - long arg3 ; + int arg3 ; bool result; bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "name",(char *) "flags", NULL + (char *) "self",(char *) "name",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:Icon_LoadFile",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:Icon_LoadFile",kwnames,&obj0,&obj1,&arg3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); @@ -3158,7 +3224,7 @@ static PyObject *_wrap_Icon_LoadFile(PyObject *self, PyObject *args, PyObject *k } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->LoadFile((wxString const &)*arg2,arg3); + result = (bool)(arg1)->LoadFile((wxString const &)*arg2,(wxBitmapType )arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -3476,6 +3542,7 @@ static PyObject *_wrap_new_IconLocation(PyObject *self, PyObject *args, PyObject wxString *arg1 = (wxString *) &wxPyEmptyString ; int arg2 = (int) 0 ; wxIconLocation *result; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "filename",(char *) "num", NULL @@ -3483,7 +3550,11 @@ static PyObject *_wrap_new_IconLocation(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|Oi:new_IconLocation",kwnames,&obj0,&arg2)) goto fail; if (obj0) { - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = True; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3493,8 +3564,16 @@ static PyObject *_wrap_new_IconLocation(PyObject *self, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIconLocation, 1); + { + if (temp1) + delete arg1; + } return resultobj; fail: + { + if (temp1) + delete arg1; + } return NULL; } @@ -3912,13 +3991,18 @@ static PyObject *_wrap_new_Cursor(PyObject *self, PyObject *args, PyObject *kwar int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxCursor *result; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "cursorName",(char *) "flags",(char *) "hotSpotX",(char *) "hotSpotY", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|ii:new_Cursor",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = True; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCursor *)new_wxCursor((wxString const *)arg1,arg2,arg3,arg4); @@ -3927,8 +4011,16 @@ static PyObject *_wrap_new_Cursor(PyObject *self, PyObject *args, PyObject *kwar if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxCursor, 1); + { + if (temp1) + delete arg1; + } return resultobj; fail: + { + if (temp1) + delete arg1; + } return NULL; } @@ -6088,7 +6180,8 @@ static PyObject * NativeFontInfo_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ; - wxString arg2 ; + wxString *arg2 = (wxString *) 0 ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6098,16 +6191,23 @@ static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeEncodingInfo_facename_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - wxString* sptr = wxString_in_helper(obj1); - if (sptr == NULL) SWIG_fail; - arg2 = *sptr; - delete sptr; + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; } - if (arg1) (arg1)->facename = arg2; + if (arg1) (arg1)->facename = *arg2; Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp2) + delete arg2; + } return resultobj; fail: + { + if (temp2) + delete arg2; + } return NULL; } @@ -6115,7 +6215,7 @@ static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject static PyObject *_wrap_NativeEncodingInfo_facename_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ; - wxString result; + wxString *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -6123,13 +6223,13 @@ static PyObject *_wrap_NativeEncodingInfo_facename_get(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeEncodingInfo_facename_get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = ((arg1)->facename); + result = (wxString *)& ((arg1)->facename); { #if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); #else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); #endif } return resultobj; @@ -8190,7 +8290,8 @@ static PyObject *_wrap_LanguageInfo_Language_get(PyObject *self, PyObject *args, static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ; - wxString arg2 ; + wxString *arg2 = (wxString *) 0 ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8200,16 +8301,23 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_CanonicalName_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - wxString* sptr = wxString_in_helper(obj1); - if (sptr == NULL) SWIG_fail; - arg2 = *sptr; - delete sptr; + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; } - if (arg1) (arg1)->CanonicalName = arg2; + if (arg1) (arg1)->CanonicalName = *arg2; Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp2) + delete arg2; + } return resultobj; fail: + { + if (temp2) + delete arg2; + } return NULL; } @@ -8217,7 +8325,7 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject * static PyObject *_wrap_LanguageInfo_CanonicalName_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ; - wxString result; + wxString *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -8225,13 +8333,13 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_get(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LanguageInfo_CanonicalName_get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = ((arg1)->CanonicalName); + result = (wxString *)& ((arg1)->CanonicalName); { #if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); #else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); #endif } return resultobj; @@ -8243,7 +8351,8 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_get(PyObject *self, PyObject * static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ; - wxString arg2 ; + wxString *arg2 = (wxString *) 0 ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8253,16 +8362,23 @@ static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_Description_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - wxString* sptr = wxString_in_helper(obj1); - if (sptr == NULL) SWIG_fail; - arg2 = *sptr; - delete sptr; + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; } - if (arg1) (arg1)->Description = arg2; + if (arg1) (arg1)->Description = *arg2; Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp2) + delete arg2; + } return resultobj; fail: + { + if (temp2) + delete arg2; + } return NULL; } @@ -8270,7 +8386,7 @@ static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *ar static PyObject *_wrap_LanguageInfo_Description_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ; - wxString result; + wxString *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -8278,13 +8394,13 @@ static PyObject *_wrap_LanguageInfo_Description_get(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LanguageInfo_Description_get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = ((arg1)->Description); + result = (wxString *)& ((arg1)->Description); { #if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); #else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); #endif } return resultobj; @@ -16535,9 +16651,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"Colour_Blue", (PyCFunction) _wrap_Colour_Blue, METH_VARARGS | METH_KEYWORDS }, { (char *)"Colour_Ok", (PyCFunction) _wrap_Colour_Ok, METH_VARARGS | METH_KEYWORDS }, { (char *)"Colour_Set", (PyCFunction) _wrap_Colour_Set, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Colour_SetRBG", (PyCFunction) _wrap_Colour_SetRBG, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Colour_SetRGB", (PyCFunction) _wrap_Colour_SetRGB, METH_VARARGS | METH_KEYWORDS }, { (char *)"Colour___eq__", (PyCFunction) _wrap_Colour___eq__, METH_VARARGS | METH_KEYWORDS }, { (char *)"Colour___ne__", (PyCFunction) _wrap_Colour___ne__, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Colour_InitFromName", (PyCFunction) _wrap_Colour_InitFromName, METH_VARARGS | METH_KEYWORDS }, { (char *)"Colour_Get", (PyCFunction) _wrap_Colour_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Colour_swigregister", Colour_swigregister, METH_VARARGS }, { (char *)"new_Palette", (PyCFunction) _wrap_new_Palette, METH_VARARGS | METH_KEYWORDS }, @@ -16561,6 +16678,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Pen_SetWidth", (PyCFunction) _wrap_Pen_SetWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_SetDashes", (PyCFunction) _wrap_Pen_SetDashes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_GetDashes", (PyCFunction) _wrap_Pen_GetDashes, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Pen_GetDashCount", (PyCFunction) _wrap_Pen_GetDashCount, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_GetStipple", (PyCFunction) _wrap_Pen_GetStipple, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_SetStipple", (PyCFunction) _wrap_Pen_SetStipple, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_swigregister", Pen_swigregister, METH_VARARGS },