X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3957d3d2c72ce975a1ac2a2ff80513d26333fb1..46ae103b9f08fc4e447d16a6a92b03cf55ee3189:/wxPython/src/mac/_controls_wrap.cpp diff --git a/wxPython/src/mac/_controls_wrap.cpp b/wxPython/src/mac/_controls_wrap.cpp index eb1d2e91c7..5b0831ea8c 100644 --- a/wxPython/src/mac/_controls_wrap.cpp +++ b/wxPython/src/mac/_controls_wrap.cpp @@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj) PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received", type, otype); } - Py_DECREF(str); + if (str) + Py_DECREF(str); return; } } @@ -2164,6 +2165,16 @@ public: void SetBestSize(const wxSize& size) { wxControl::SetBestSize(size); } + bool DoEraseBackground(wxDC* dc) { +#ifdef __WXMSW__ + return wxWindow::DoEraseBackground(dc->GetHDC()); +#else + dc->SetBackground(wxBrush(GetBackgroundColour())); + dc->Clear(); + return true; +#endif + } + DEC_PYCALLBACK_VOID_INT4(DoMoveWindow); DEC_PYCALLBACK_VOID_INT5(DoSetSize); DEC_PYCALLBACK_VOID_INTINT(DoSetClientSize); @@ -2189,11 +2200,12 @@ public: DEC_PYCALLBACK_VOID_WXWINBASE(RemoveChild); DEC_PYCALLBACK_BOOL_const(ShouldInheritColours); - DEC_PYCALLBACK__COLOUR(ApplyParentThemeBackground); DEC_PYCALLBACK_VIZATTR_(GetDefaultAttributes); DEC_PYCALLBACK_BOOL_(HasTransparentBackground); + DEC_PYCALLBACK_VOID_(OnInternalIdle); + PYPRIVATE; }; @@ -2224,11 +2236,12 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyControl, wxControl, AddChild); IMP_PYCALLBACK_VOID_WXWINBASE(wxPyControl, wxControl, RemoveChild); IMP_PYCALLBACK_BOOL_const(wxPyControl, wxControl, ShouldInheritColours); -IMP_PYCALLBACK__COLOUR(wxPyControl, wxControl, ApplyParentThemeBackground); IMP_PYCALLBACK_VIZATTR_(wxPyControl, wxControl, GetDefaultAttributes); IMP_PYCALLBACK_BOOL_(wxPyControl, wxControl, HasTransparentBackground); - + +IMP_PYCALLBACK_VOID_(wxPyControl, wxControl, OnInternalIdle); + static void wxHelpProvider_Destroy(wxHelpProvider *self){ delete self; } @@ -3824,15 +3837,11 @@ static PyObject *_wrap_new_Choice(PyObject *, PyObject *args, PyObject *kwargs) int i, len=PySequence_Length(obj4); for (i=0; iAdd(Py2wxString(str)); + arg5->Add(*s); + delete s; Py_DECREF(item); - Py_DECREF(str); } } } @@ -3979,15 +3988,11 @@ static PyObject *_wrap_Choice_Create(PyObject *, PyObject *args, PyObject *kwarg int i, len=PySequence_Length(obj5); for (i=0; iAdd(Py2wxString(str)); + arg6->Add(*s); + delete s; Py_DECREF(item); - Py_DECREF(str); } } } @@ -4181,15 +4186,11 @@ static PyObject *_wrap_new_ComboBox(PyObject *, PyObject *args, PyObject *kwargs int i, len=PySequence_Length(obj5); for (i=0; iAdd(Py2wxString(str)); + arg6->Add(*s); + delete s; Py_DECREF(item); - Py_DECREF(str); } } } @@ -4355,15 +4356,11 @@ static PyObject *_wrap_ComboBox_Create(PyObject *, PyObject *args, PyObject *kwa int i, len=PySequence_Length(obj6); for (i=0; iAdd(Py2wxString(str)); + arg7->Add(*s); + delete s; Py_DECREF(item); - Py_DECREF(str); } } } @@ -7147,15 +7144,11 @@ static PyObject *_wrap_new_ListBox(PyObject *, PyObject *args, PyObject *kwargs) int i, len=PySequence_Length(obj4); for (i=0; iAdd(Py2wxString(str)); + arg5->Add(*s); + delete s; Py_DECREF(item); - Py_DECREF(str); } } } @@ -7302,15 +7295,11 @@ static PyObject *_wrap_ListBox_Create(PyObject *, PyObject *args, PyObject *kwar int i, len=PySequence_Length(obj5); for (i=0; iAdd(Py2wxString(str)); + arg6->Add(*s); + delete s; Py_DECREF(item); - Py_DECREF(str); } } } @@ -7445,15 +7434,11 @@ static PyObject *_wrap_ListBox_InsertItems(PyObject *, PyObject *args, PyObject int i, len=PySequence_Length(obj1); for (i=0; iAdd(Py2wxString(str)); + arg2->Add(*s); + delete s; Py_DECREF(item); - Py_DECREF(str); } } { @@ -7504,15 +7489,11 @@ static PyObject *_wrap_ListBox_Set(PyObject *, PyObject *args, PyObject *kwargs) int i, len=PySequence_Length(obj1); for (i=0; iAdd(Py2wxString(str)); + arg2->Add(*s); + delete s; Py_DECREF(item); - Py_DECREF(str); } } { @@ -8176,15 +8157,11 @@ static PyObject *_wrap_new_CheckListBox(PyObject *, PyObject *args, PyObject *kw int i, len=PySequence_Length(obj4); for (i=0; iAdd(Py2wxString(str)); + arg5->Add(*s); + delete s; Py_DECREF(item); - Py_DECREF(str); } } } @@ -8331,15 +8308,11 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *, PyObject *args, PyObject int i, len=PySequence_Length(obj5); for (i=0; iAdd(Py2wxString(str)); + arg6->Add(*s); + delete s; Py_DECREF(item); - Py_DECREF(str); } } } @@ -13507,15 +13480,11 @@ static PyObject *_wrap_new_RadioBox(PyObject *, PyObject *args, PyObject *kwargs int i, len=PySequence_Length(obj5); for (i=0; iAdd(Py2wxString(str)); + arg6->Add(*s); + delete s; Py_DECREF(item); - Py_DECREF(str); } } } @@ -13689,15 +13658,11 @@ static PyObject *_wrap_RadioBox_Create(PyObject *, PyObject *args, PyObject *kwa int i, len=PySequence_Length(obj6); for (i=0; iAdd(Py2wxString(str)); + arg7->Add(*s); + delete s; Py_DECREF(item); - Py_DECREF(str); } } } @@ -18015,6 +17980,32 @@ static PyObject *_wrap_Choicebook_IsVertical(PyObject *, PyObject *args, PyObjec } +static PyObject *_wrap_Choicebook_GetChoiceCtrl(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxChoicebook *arg1 = (wxChoicebook *) 0 ; + wxChoice *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Choicebook_GetChoiceCtrl",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxChoice *)((wxChoicebook const *)arg1)->GetChoiceCtrl(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoice, 0); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Choicebook_DeleteAllPages(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxChoicebook *arg1 = (wxChoicebook *) 0 ; @@ -32213,6 +32204,38 @@ static PyObject *_wrap_PyControl_SetBestSize(PyObject *, PyObject *args, PyObjec } +static PyObject *_wrap_PyControl_DoEraseBackground(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyControl *arg1 = (wxPyControl *) 0 ; + wxDC *arg2 = (wxDC *) 0 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "dc", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControl_DoEraseBackground",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->DoEraseBackground(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_PyControl_base_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyControl *arg1 = (wxPyControl *) 0 ; @@ -32845,62 +32868,55 @@ static PyObject *_wrap_PyControl_base_ShouldInheritColours(PyObject *, PyObject } -static PyObject *_wrap_PyControl_base_ApplyParentThemeBackground(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_base_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyControl *arg1 = (wxPyControl *) 0 ; - wxColour *arg2 = 0 ; - wxColour temp2 ; + wxVisualAttributes result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "c", NULL + (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControl_base_ApplyParentThemeBackground",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_GetDefaultAttributes",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_ApplyParentThemeBackground((wxColour const &)*arg2); + result = (arg1)->base_GetDefaultAttributes(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + wxVisualAttributes * resultptr; + resultptr = new wxVisualAttributes((wxVisualAttributes &)(result)); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxVisualAttributes, 1); + } return resultobj; fail: return NULL; } -static PyObject *_wrap_PyControl_base_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_base_OnInternalIdle(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyControl *arg1 = (wxPyControl *) 0 ; - wxVisualAttributes result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_GetDefaultAttributes",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_OnInternalIdle",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->base_GetDefaultAttributes(); + (arg1)->base_OnInternalIdle(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - wxVisualAttributes * resultptr; - resultptr = new wxVisualAttributes((wxVisualAttributes &)(result)); - resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxVisualAttributes, 1); - } + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; @@ -35208,6 +35224,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_PreChoicebook", (PyCFunction) _wrap_new_PreChoicebook, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_Create", (PyCFunction) _wrap_Choicebook_Create, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_IsVertical", (PyCFunction) _wrap_Choicebook_IsVertical, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Choicebook_GetChoiceCtrl", (PyCFunction) _wrap_Choicebook_GetChoiceCtrl, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_DeleteAllPages", (PyCFunction) _wrap_Choicebook_DeleteAllPages, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_swigregister", Choicebook_swigregister, METH_VARARGS, NULL}, { (char *)"new_ChoicebookEvent", (PyCFunction) _wrap_new_ChoicebookEvent, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35616,6 +35633,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_PrePyControl", (PyCFunction) _wrap_new_PrePyControl, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyControl__setCallbackInfo", (PyCFunction) _wrap_PyControl__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyControl_SetBestSize", (PyCFunction) _wrap_PyControl_SetBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_DoEraseBackground", (PyCFunction) _wrap_PyControl_DoEraseBackground, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyControl_base_DoMoveWindow", (PyCFunction) _wrap_PyControl_base_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyControl_base_DoSetSize", (PyCFunction) _wrap_PyControl_base_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyControl_base_DoSetClientSize", (PyCFunction) _wrap_PyControl_base_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35635,8 +35653,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"PyControl_base_AddChild", (PyCFunction) _wrap_PyControl_base_AddChild, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyControl_base_RemoveChild", (PyCFunction) _wrap_PyControl_base_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyControl_base_ShouldInheritColours", (PyCFunction) _wrap_PyControl_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_ApplyParentThemeBackground", (PyCFunction) _wrap_PyControl_base_ApplyParentThemeBackground, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyControl_base_GetDefaultAttributes", (PyCFunction) _wrap_PyControl_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_base_OnInternalIdle", (PyCFunction) _wrap_PyControl_base_OnInternalIdle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyControl_swigregister", PyControl_swigregister, METH_VARARGS, NULL}, { (char *)"new_HelpEvent", (PyCFunction) _wrap_new_HelpEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HelpEvent_GetPosition", (PyCFunction) _wrap_HelpEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -37500,6 +37518,9 @@ SWIGEXPORT(void) SWIG_init(void) { { PyDict_SetItemString(d,"SL_VERTICAL", SWIG_From_int((int)(wxSL_VERTICAL))); } + { + PyDict_SetItemString(d,"SL_TICKS", SWIG_From_int((int)(wxSL_TICKS))); + } { PyDict_SetItemString(d,"SL_AUTOTICKS", SWIG_From_int((int)(wxSL_AUTOTICKS))); }