PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
type, otype);
}
- Py_DECREF(str);
+ if (str)
+ Py_DECREF(str);
return;
}
}
static int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) {
int retval = 0;
PyObject* func = (PyObject*)funcPtr;
- bool blocked = wxPyBeginBlockThreads();
+ wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* args = Py_BuildValue("(ii)", item1, item2);
PyObject* result = PyEval_CallObject(func, args);
const wxTreeItemId& item2) {
int rval = 0;
bool found;
- bool blocked = wxPyBeginBlockThreads();
+ wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "OnCompareItems"))) {
PyObject *o1 = wxPyConstructObject((void*)&item1, wxT("wxTreeItemId"), false);
PyObject *o2 = wxPyConstructObject((void*)&item2, wxT("wxTreeItemId"), false);
data->SetData(obj);
}
static PyObject *wxPyTreeCtrl_GetSelections(wxPyTreeCtrl *self){
- bool blocked = wxPyBeginBlockThreads();
+ wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* rval = PyList_New(0);
wxArrayTreeItemIds array;
size_t num, x;
static PyObject *wxPyTreeCtrl_GetFirstChild(wxPyTreeCtrl *self,wxTreeItemId const &item){
void* cookie = 0;
wxTreeItemId* ritem = new wxTreeItemId(self->GetFirstChild(item, cookie));
- bool blocked = wxPyBeginBlockThreads();
+ wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true));
PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void")));
}
static PyObject *wxPyTreeCtrl_GetNextChild(wxPyTreeCtrl *self,wxTreeItemId const &item,void *cookie){
wxTreeItemId* ritem = new wxTreeItemId(self->GetNextChild(item, cookie));
- bool blocked = wxPyBeginBlockThreads();
+ wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true));
PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void")));
static PyObject *wxPyTreeCtrl_GetBoundingRect(wxPyTreeCtrl *self,wxTreeItemId const &item,bool textOnly=false){
wxRect rect;
if (self->GetBoundingRect(item, rect, textOnly)) {
- bool blocked = wxPyBeginBlockThreads();
+ wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxRect* r = new wxRect(rect);
PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"), true);
wxPyEndBlockThreads(blocked);
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);
DEC_PYCALLBACK_VOID_WXWINBASE(RemoveChild);
DEC_PYCALLBACK_BOOL_const(ShouldInheritColours);
- DEC_PYCALLBACK__COLOUR(ApplyParentThemeBackground);
DEC_PYCALLBACK_VIZATTR_(GetDefaultAttributes);
DEC_PYCALLBACK_BOOL_(HasTransparentBackground);
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);
int i, len=PySequence_Length(obj4);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj4, i);
-#if wxUSE_UNICODE
- PyObject* str = PyObject_Unicode(item);
-#else
- PyObject* str = PyObject_Str(item);
-#endif
+ wxString* s = wxString_in_helper(item);
if (PyErr_Occurred()) SWIG_fail;
- arg5->Add(Py2wxString(str));
+ arg5->Add(*s);
+ delete s;
Py_DECREF(item);
- Py_DECREF(str);
}
}
}
int i, len=PySequence_Length(obj5);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj5, i);
-#if wxUSE_UNICODE
- PyObject* str = PyObject_Unicode(item);
-#else
- PyObject* str = PyObject_Str(item);
-#endif
+ wxString* s = wxString_in_helper(item);
if (PyErr_Occurred()) SWIG_fail;
- arg6->Add(Py2wxString(str));
+ arg6->Add(*s);
+ delete s;
Py_DECREF(item);
- Py_DECREF(str);
}
}
}
int i, len=PySequence_Length(obj5);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj5, i);
-#if wxUSE_UNICODE
- PyObject* str = PyObject_Unicode(item);
-#else
- PyObject* str = PyObject_Str(item);
-#endif
+ wxString* s = wxString_in_helper(item);
if (PyErr_Occurred()) SWIG_fail;
- arg6->Add(Py2wxString(str));
+ arg6->Add(*s);
+ delete s;
Py_DECREF(item);
- Py_DECREF(str);
}
}
}
int i, len=PySequence_Length(obj6);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj6, i);
-#if wxUSE_UNICODE
- PyObject* str = PyObject_Unicode(item);
-#else
- PyObject* str = PyObject_Str(item);
-#endif
+ wxString* s = wxString_in_helper(item);
if (PyErr_Occurred()) SWIG_fail;
- arg7->Add(Py2wxString(str));
+ arg7->Add(*s);
+ delete s;
Py_DECREF(item);
- Py_DECREF(str);
}
}
}
int i, len=PySequence_Length(obj4);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj4, i);
-#if wxUSE_UNICODE
- PyObject* str = PyObject_Unicode(item);
-#else
- PyObject* str = PyObject_Str(item);
-#endif
+ wxString* s = wxString_in_helper(item);
if (PyErr_Occurred()) SWIG_fail;
- arg5->Add(Py2wxString(str));
+ arg5->Add(*s);
+ delete s;
Py_DECREF(item);
- Py_DECREF(str);
}
}
}
int i, len=PySequence_Length(obj5);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj5, i);
-#if wxUSE_UNICODE
- PyObject* str = PyObject_Unicode(item);
-#else
- PyObject* str = PyObject_Str(item);
-#endif
+ wxString* s = wxString_in_helper(item);
if (PyErr_Occurred()) SWIG_fail;
- arg6->Add(Py2wxString(str));
+ arg6->Add(*s);
+ delete s;
Py_DECREF(item);
- Py_DECREF(str);
}
}
}
int i, len=PySequence_Length(obj1);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj1, i);
-#if wxUSE_UNICODE
- PyObject* str = PyObject_Unicode(item);
-#else
- PyObject* str = PyObject_Str(item);
-#endif
+ wxString* s = wxString_in_helper(item);
if (PyErr_Occurred()) SWIG_fail;
- arg2->Add(Py2wxString(str));
+ arg2->Add(*s);
+ delete s;
Py_DECREF(item);
- Py_DECREF(str);
}
}
{
int i, len=PySequence_Length(obj1);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj1, i);
-#if wxUSE_UNICODE
- PyObject* str = PyObject_Unicode(item);
-#else
- PyObject* str = PyObject_Str(item);
-#endif
+ wxString* s = wxString_in_helper(item);
if (PyErr_Occurred()) SWIG_fail;
- arg2->Add(Py2wxString(str));
+ arg2->Add(*s);
+ delete s;
Py_DECREF(item);
- Py_DECREF(str);
}
}
{
int i, len=PySequence_Length(obj4);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj4, i);
-#if wxUSE_UNICODE
- PyObject* str = PyObject_Unicode(item);
-#else
- PyObject* str = PyObject_Str(item);
-#endif
+ wxString* s = wxString_in_helper(item);
if (PyErr_Occurred()) SWIG_fail;
- arg5->Add(Py2wxString(str));
+ arg5->Add(*s);
+ delete s;
Py_DECREF(item);
- Py_DECREF(str);
}
}
}
int i, len=PySequence_Length(obj5);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj5, i);
-#if wxUSE_UNICODE
- PyObject* str = PyObject_Unicode(item);
-#else
- PyObject* str = PyObject_Str(item);
-#endif
+ wxString* s = wxString_in_helper(item);
if (PyErr_Occurred()) SWIG_fail;
- arg6->Add(Py2wxString(str));
+ arg6->Add(*s);
+ delete s;
Py_DECREF(item);
- Py_DECREF(str);
}
}
}
int i, len=PySequence_Length(obj5);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj5, i);
-#if wxUSE_UNICODE
- PyObject* str = PyObject_Unicode(item);
-#else
- PyObject* str = PyObject_Str(item);
-#endif
+ wxString* s = wxString_in_helper(item);
if (PyErr_Occurred()) SWIG_fail;
- arg6->Add(Py2wxString(str));
+ arg6->Add(*s);
+ delete s;
Py_DECREF(item);
- Py_DECREF(str);
}
}
}
int i, len=PySequence_Length(obj6);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj6, i);
-#if wxUSE_UNICODE
- PyObject* str = PyObject_Unicode(item);
-#else
- PyObject* str = PyObject_Str(item);
-#endif
+ wxString* s = wxString_in_helper(item);
if (PyErr_Occurred()) SWIG_fail;
- arg7->Add(Py2wxString(str));
+ arg7->Add(*s);
+ delete s;
Py_DECREF(item);
- Py_DECREF(str);
}
}
}
}
+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 ;
}
-static PyObject *_wrap_ListCtrl_InsertColumnInfo(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_InsertColumnItem(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
long arg2 ;
(char *) "self",(char *) "col",(char *) "info", NULL
};
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_InsertColumnInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_InsertColumnItem",kwnames,&obj0,&obj1,&obj2)) goto fail;
SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyListCtrl, SWIG_POINTER_EXCEPTION | 0);
if (SWIG_arg_fail(1)) SWIG_fail;
{
}
+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 ;
}
-static PyObject *_wrap_PyControl_base_ApplyParentThemeBackground(PyObject *, PyObject *args, PyObject *kwargs) {
- PyObject *resultobj;
- wxPyControl *arg1 = (wxPyControl *) 0 ;
- wxColour *arg2 = 0 ;
- wxColour temp2 ;
- PyObject * obj0 = 0 ;
- PyObject * obj1 = 0 ;
- char *kwnames[] = {
- (char *) "self",(char *) "c", NULL
- };
-
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControl_base_ApplyParentThemeBackground",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;
- {
- arg2 = &temp2;
- if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
- }
- {
- PyThreadState* __tstate = wxPyBeginAllowThreads();
- (arg1)->base_ApplyParentThemeBackground((wxColour const &)*arg2);
-
- wxPyEndAllowThreads(__tstate);
- if (PyErr_Occurred()) SWIG_fail;
- }
- Py_INCREF(Py_None); resultobj = Py_None;
- return resultobj;
- fail:
- return NULL;
-}
-
-
static PyObject *_wrap_PyControl_base_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyControl *arg1 = (wxPyControl *) 0 ;
{ (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},
{ (char *)"ListCtrl_InsertStringItem", (PyCFunction) _wrap_ListCtrl_InsertStringItem, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ListCtrl_InsertImageItem", (PyCFunction) _wrap_ListCtrl_InsertImageItem, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ListCtrl_InsertImageStringItem", (PyCFunction) _wrap_ListCtrl_InsertImageStringItem, METH_VARARGS | METH_KEYWORDS, NULL},
- { (char *)"ListCtrl_InsertColumnInfo", (PyCFunction) _wrap_ListCtrl_InsertColumnInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+ { (char *)"ListCtrl_InsertColumnItem", (PyCFunction) _wrap_ListCtrl_InsertColumnItem, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ListCtrl_InsertColumn", (PyCFunction) _wrap_ListCtrl_InsertColumn, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ListCtrl_SetItemCount", (PyCFunction) _wrap_ListCtrl_SetItemCount, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ListCtrl_ScrollList", (PyCFunction) _wrap_ListCtrl_ScrollList, METH_VARARGS | METH_KEYWORDS, NULL},
{ (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},
{ (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_swigregister", PyControl_swigregister, METH_VARARGS, NULL},
{ (char *)"new_HelpEvent", (PyCFunction) _wrap_new_HelpEvent, METH_VARARGS | METH_KEYWORDS, NULL},
PyDict_SetItemString(d,"TE_DONTWRAP", SWIG_From_int((int)(wxTE_DONTWRAP)));
}
{
- PyDict_SetItemString(d,"TE_LINEWRAP", SWIG_From_int((int)(wxTE_LINEWRAP)));
+ PyDict_SetItemString(d,"TE_CHARWRAP", SWIG_From_int((int)(wxTE_CHARWRAP)));
}
{
PyDict_SetItemString(d,"TE_WORDWRAP", SWIG_From_int((int)(wxTE_WORDWRAP)));
}
+ {
+ PyDict_SetItemString(d,"TE_BESTWRAP", SWIG_From_int((int)(wxTE_BESTWRAP)));
+ }
+ {
+ PyDict_SetItemString(d,"TE_LINEWRAP", SWIG_From_int((int)(wxTE_LINEWRAP)));
+ }
{
PyDict_SetItemString(d,"TE_RICH2", SWIG_From_int((int)(wxTE_RICH2)));
}
+ {
+ PyDict_SetItemString(d,"TE_CAPITALIZE", SWIG_From_int((int)(wxTE_CAPITALIZE)));
+ }
{
PyDict_SetItemString(d,"TEXT_ALIGNMENT_DEFAULT", SWIG_From_int((int)(wxTEXT_ALIGNMENT_DEFAULT)));
}
{
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)));
}
projects / wxWidgets.git / blobdiff