From 74a57fcda4c14d108284d35d742e9f27f0183e4a Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 7 Apr 2004 22:45:45 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp | 1 + wxPython/contrib/gizmos/msw/gizmos_wrap.cpp | 1 + wxPython/demo/run.py | 2 +- wxPython/src/gtk/controls.py | 99 ++ wxPython/src/gtk/controls_wrap.cpp | 236 +++-- wxPython/src/gtk/core.py | 226 ++++- wxPython/src/gtk/core_wrap.cpp | 976 +++++++++++++++++--- wxPython/src/gtk/grid_wrap.cpp | 1 + wxPython/src/gtk/misc_wrap.cpp | 1 + wxPython/src/gtk/windows.py | 23 +- wxPython/src/gtk/windows_wrap.cpp | 51 +- wxPython/src/msw/controls.py | 99 ++ wxPython/src/msw/controls_wrap.cpp | 236 +++-- wxPython/src/msw/core.py | 226 ++++- wxPython/src/msw/core_wrap.cpp | 976 +++++++++++++++++--- wxPython/src/msw/grid_wrap.cpp | 1 + wxPython/src/msw/misc_wrap.cpp | 1 + wxPython/src/msw/windows.py | 23 +- wxPython/src/msw/windows_wrap.cpp | 51 +- wxPython/wxPython/core.py | 3 +- 20 files changed, 2833 insertions(+), 400 deletions(-) diff --git a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp index 7d2870f862..f5022e0938 100644 --- a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp @@ -1189,6 +1189,7 @@ static PyObject *_wrap_EditableListBox_SetStrings(PyObject *self, PyObject *args #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg2->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); diff --git a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp index ad61943e04..ab15c8f5b1 100644 --- a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp @@ -1189,6 +1189,7 @@ static PyObject *_wrap_EditableListBox_SetStrings(PyObject *self, PyObject *args #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg2->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); diff --git a/wxPython/demo/run.py b/wxPython/demo/run.py index 39554173aa..9831c32c00 100755 --- a/wxPython/demo/run.py +++ b/wxPython/demo/run.py @@ -23,7 +23,7 @@ import sys, os # stuff for debugging print "wx.VERSION_STRING = ", wx.VERSION_STRING print "pid:", os.getpid() -##raw_input("Press a key...") +##raw_input("Press Enter...") assertMode = wx.PYAPP_ASSERT_DIALOG ##assertMode = wx.PYAPP_ASSERT_EXCEPTION diff --git a/wxPython/src/gtk/controls.py b/wxPython/src/gtk/controls.py index 92a7b95f87..c31dd7f45b 100644 --- a/wxPython/src/gtk/controls.py +++ b/wxPython/src/gtk/controls.py @@ -944,6 +944,23 @@ class ListBox(core.ControlWithItems): """SetItemFont(int item, Font f)""" return _controls.ListBox_SetItemFont(*args, **kwargs) + def GetClassDefaultAttributes(*args, **kwargs): + """ + GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _controls.ListBox_GetClassDefaultAttributes(*args, **kwargs) + + GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) class ListBoxPtr(ListBox): def __init__(self, this): @@ -959,6 +976,22 @@ def PreListBox(*args, **kwargs): val.thisown = 1 return val +def ListBox_GetClassDefaultAttributes(*args, **kwargs): + """ + ListBox_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _controls.ListBox_GetClassDefaultAttributes(*args, **kwargs) + #--------------------------------------------------------------------------- class CheckListBox(ListBox): @@ -3779,6 +3812,23 @@ class ListCtrl(core.Control): """GetMainWindow() -> Window""" return _controls.ListCtrl_GetMainWindow(*args, **kwargs) + def GetClassDefaultAttributes(*args, **kwargs): + """ + GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _controls.ListCtrl_GetClassDefaultAttributes(*args, **kwargs) + + GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) class ListCtrlPtr(ListCtrl): def __init__(self, this): @@ -3793,6 +3843,22 @@ def PreListCtrl(*args, **kwargs): val.thisown = 1 return val +def ListCtrl_GetClassDefaultAttributes(*args, **kwargs): + """ + ListCtrl_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _controls.ListCtrl_GetClassDefaultAttributes(*args, **kwargs) + #--------------------------------------------------------------------------- class ListView(ListCtrl): @@ -4428,6 +4494,23 @@ class TreeCtrl(core.Control): """GetBoundingRect(TreeItemId item, bool textOnly=False) -> PyObject""" return _controls.TreeCtrl_GetBoundingRect(*args, **kwargs) + def GetClassDefaultAttributes(*args, **kwargs): + """ + GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _controls.TreeCtrl_GetClassDefaultAttributes(*args, **kwargs) + + GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) class TreeCtrlPtr(TreeCtrl): def __init__(self, this): @@ -4442,6 +4525,22 @@ def PreTreeCtrl(*args, **kwargs): val.thisown = 1 return val +def TreeCtrl_GetClassDefaultAttributes(*args, **kwargs): + """ + TreeCtrl_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _controls.TreeCtrl_GetClassDefaultAttributes(*args, **kwargs) + #--------------------------------------------------------------------------- DIRCTRL_DIR_ONLY = _controls.DIRCTRL_DIR_ONLY diff --git a/wxPython/src/gtk/controls_wrap.cpp b/wxPython/src/gtk/controls_wrap.cpp index f4bc586518..bcbf85f5da 100644 --- a/wxPython/src/gtk/controls_wrap.cpp +++ b/wxPython/src/gtk/controls_wrap.cpp @@ -216,8 +216,8 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_bool swig_types[7] #define SWIGTYPE_p_wxPyTreeItemData swig_types[8] #define SWIGTYPE_p_wxItemContainer swig_types[9] -#define SWIGTYPE_p_wxDirFilterListCtrl swig_types[10] -#define SWIGTYPE_p_wxPyListCtrl swig_types[11] +#define SWIGTYPE_p_wxPyListCtrl swig_types[10] +#define SWIGTYPE_p_wxDirFilterListCtrl swig_types[11] #define SWIGTYPE_p_wxStaticLine swig_types[12] #define SWIGTYPE_p_wxControl swig_types[13] #define SWIGTYPE_p_wxPyControl swig_types[14] @@ -235,62 +235,63 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxDC swig_types[26] #define SWIGTYPE_p_wxListView swig_types[27] #define SWIGTYPE_p_wxIcon swig_types[28] -#define SWIGTYPE_p_wxTextCtrl swig_types[29] -#define SWIGTYPE_p_wxNotebook swig_types[30] -#define SWIGTYPE_p_wxNotifyEvent swig_types[31] -#define SWIGTYPE_p_wxArrayString swig_types[32] -#define SWIGTYPE_p_wxListbook swig_types[33] -#define SWIGTYPE_p_wxStaticBitmap swig_types[34] -#define SWIGTYPE_p_wxSlider swig_types[35] -#define SWIGTYPE_p_wxStaticBox swig_types[36] -#define SWIGTYPE_p_wxArrayInt swig_types[37] -#define SWIGTYPE_p_wxContextHelp swig_types[38] -#define SWIGTYPE_p_long swig_types[39] -#define SWIGTYPE_p_wxEvtHandler swig_types[40] -#define SWIGTYPE_p_wxListEvent swig_types[41] -#define SWIGTYPE_p_wxListBox swig_types[42] +#define SWIGTYPE_p_wxVisualAttributes swig_types[29] +#define SWIGTYPE_p_wxTextCtrl swig_types[30] +#define SWIGTYPE_p_wxNotebook swig_types[31] +#define SWIGTYPE_p_wxNotifyEvent swig_types[32] +#define SWIGTYPE_p_wxArrayString swig_types[33] +#define SWIGTYPE_p_wxListbook swig_types[34] +#define SWIGTYPE_p_wxStaticBitmap swig_types[35] +#define SWIGTYPE_p_wxSlider swig_types[36] +#define SWIGTYPE_p_wxStaticBox swig_types[37] +#define SWIGTYPE_p_wxArrayInt swig_types[38] +#define SWIGTYPE_p_wxContextHelp swig_types[39] +#define SWIGTYPE_p_long swig_types[40] +#define SWIGTYPE_p_wxEvtHandler swig_types[41] +#define SWIGTYPE_p_wxListEvent swig_types[42] #define SWIGTYPE_p_wxCheckListBox swig_types[43] -#define SWIGTYPE_p_wxBookCtrl swig_types[44] -#define SWIGTYPE_p_wxSpinButton swig_types[45] -#define SWIGTYPE_p_wxButton swig_types[46] -#define SWIGTYPE_p_wxBitmapButton swig_types[47] -#define SWIGTYPE_p_wxRect swig_types[48] -#define SWIGTYPE_p_wxContextHelpButton swig_types[49] -#define SWIGTYPE_p_wxRadioBox swig_types[50] -#define SWIGTYPE_p_wxScrollBar swig_types[51] -#define SWIGTYPE_p_char swig_types[52] -#define SWIGTYPE_p_wxTreeItemId swig_types[53] -#define SWIGTYPE_p_wxComboBox swig_types[54] -#define SWIGTYPE_p_wxHelpEvent swig_types[55] -#define SWIGTYPE_p_wxListItem swig_types[56] -#define SWIGTYPE_p_wxNotebookSizer swig_types[57] -#define SWIGTYPE_p_wxSpinEvent swig_types[58] -#define SWIGTYPE_p_wxGenericDragImage swig_types[59] -#define SWIGTYPE_p_wxSpinCtrl swig_types[60] -#define SWIGTYPE_p_wxImageList swig_types[61] -#define SWIGTYPE_p_wxHelpProvider swig_types[62] -#define SWIGTYPE_p_wxTextAttr swig_types[63] -#define SWIGTYPE_p_wxSimpleHelpProvider swig_types[64] -#define SWIGTYPE_p_wxPoint swig_types[65] -#define SWIGTYPE_p_wxListbookEvent swig_types[66] -#define SWIGTYPE_p_wxNotebookEvent swig_types[67] -#define SWIGTYPE_p_wxObject swig_types[68] -#define SWIGTYPE_p_wxCursor swig_types[69] -#define SWIGTYPE_p_wxKeyEvent swig_types[70] -#define SWIGTYPE_p_wxWindow swig_types[71] -#define SWIGTYPE_p_wxString swig_types[72] -#define SWIGTYPE_p_wxBitmap swig_types[73] -#define SWIGTYPE_p_wxTreeEvent swig_types[74] -#define SWIGTYPE_p_wxMouseEvent swig_types[75] -#define SWIGTYPE_p_wxCommandEvent swig_types[76] -#define SWIGTYPE_p_wxStaticText swig_types[77] -#define SWIGTYPE_p_wxControlWithItems swig_types[78] -#define SWIGTYPE_p_wxToolBarToolBase swig_types[79] -#define SWIGTYPE_p_wxColour swig_types[80] -#define SWIGTYPE_p_wxToolBar swig_types[81] -#define SWIGTYPE_p_wxBookCtrlSizer swig_types[82] -#define SWIGTYPE_p_wxValidator swig_types[83] -static swig_type_info *swig_types[85]; +#define SWIGTYPE_p_wxListBox swig_types[44] +#define SWIGTYPE_p_wxBookCtrl swig_types[45] +#define SWIGTYPE_p_wxSpinButton swig_types[46] +#define SWIGTYPE_p_wxButton swig_types[47] +#define SWIGTYPE_p_wxBitmapButton swig_types[48] +#define SWIGTYPE_p_wxRect swig_types[49] +#define SWIGTYPE_p_wxContextHelpButton swig_types[50] +#define SWIGTYPE_p_wxRadioBox swig_types[51] +#define SWIGTYPE_p_wxScrollBar swig_types[52] +#define SWIGTYPE_p_char swig_types[53] +#define SWIGTYPE_p_wxTreeItemId swig_types[54] +#define SWIGTYPE_p_wxComboBox swig_types[55] +#define SWIGTYPE_p_wxHelpEvent swig_types[56] +#define SWIGTYPE_p_wxListItem swig_types[57] +#define SWIGTYPE_p_wxNotebookSizer swig_types[58] +#define SWIGTYPE_p_wxSpinEvent swig_types[59] +#define SWIGTYPE_p_wxGenericDragImage swig_types[60] +#define SWIGTYPE_p_wxSpinCtrl swig_types[61] +#define SWIGTYPE_p_wxImageList swig_types[62] +#define SWIGTYPE_p_wxHelpProvider swig_types[63] +#define SWIGTYPE_p_wxTextAttr swig_types[64] +#define SWIGTYPE_p_wxSimpleHelpProvider swig_types[65] +#define SWIGTYPE_p_wxPoint swig_types[66] +#define SWIGTYPE_p_wxListbookEvent swig_types[67] +#define SWIGTYPE_p_wxNotebookEvent swig_types[68] +#define SWIGTYPE_p_wxObject swig_types[69] +#define SWIGTYPE_p_wxCursor swig_types[70] +#define SWIGTYPE_p_wxKeyEvent swig_types[71] +#define SWIGTYPE_p_wxWindow swig_types[72] +#define SWIGTYPE_p_wxString swig_types[73] +#define SWIGTYPE_p_wxBitmap swig_types[74] +#define SWIGTYPE_p_wxTreeEvent swig_types[75] +#define SWIGTYPE_p_wxMouseEvent swig_types[76] +#define SWIGTYPE_p_wxCommandEvent swig_types[77] +#define SWIGTYPE_p_wxStaticText swig_types[78] +#define SWIGTYPE_p_wxControlWithItems swig_types[79] +#define SWIGTYPE_p_wxToolBarToolBase swig_types[80] +#define SWIGTYPE_p_wxColour swig_types[81] +#define SWIGTYPE_p_wxToolBar swig_types[82] +#define SWIGTYPE_p_wxBookCtrlSizer swig_types[83] +#define SWIGTYPE_p_wxValidator swig_types[84] +static swig_type_info *swig_types[86]; /* -------- TYPES TABLE (END) -------- */ @@ -2446,6 +2447,7 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg5->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -2591,6 +2593,7 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg6->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -2865,6 +2868,7 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg6->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -3029,6 +3033,7 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg7->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -5131,6 +5136,7 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg5->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -5276,6 +5282,7 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject * #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg6->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -5413,6 +5420,7 @@ static PyObject *_wrap_ListBox_InsertItems(PyObject *self, PyObject *args, PyObj #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg2->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -5469,6 +5477,7 @@ static PyObject *_wrap_ListBox_Set(PyObject *self, PyObject *args, PyObject *kwa #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg2->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -6004,6 +6013,38 @@ static PyObject *_wrap_ListBox_SetItemFont(PyObject *self, PyObject *args, PyObj } +static PyObject *_wrap_ListBox_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 = (int) wxWINDOW_VARIANT_NORMAL ; + wxVisualAttributes result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "variant", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:ListBox_GetClassDefaultAttributes",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (wxWindowVariant) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxListBox::GetClassDefaultAttributes((wxWindowVariant )arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxVisualAttributes * resultptr; + resultptr = new wxVisualAttributes((wxVisualAttributes &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxVisualAttributes, 1); + } + return resultobj; + fail: + return NULL; +} + + static PyObject * ListBox_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -6076,6 +6117,7 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg5->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -6221,6 +6263,7 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg6->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -11048,6 +11091,7 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg6->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -11215,6 +11259,7 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg7->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -22598,6 +22643,38 @@ static PyObject *_wrap_ListCtrl_GetMainWindow(PyObject *self, PyObject *args, Py } +static PyObject *_wrap_ListCtrl_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 = (int) wxWINDOW_VARIANT_NORMAL ; + wxVisualAttributes result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "variant", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:ListCtrl_GetClassDefaultAttributes",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (wxWindowVariant) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxPyListCtrl::GetClassDefaultAttributes((wxWindowVariant )arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxVisualAttributes * resultptr; + resultptr = new wxVisualAttributes((wxVisualAttributes &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxVisualAttributes, 1); + } + return resultobj; + fail: + return NULL; +} + + static PyObject * ListCtrl_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -26784,6 +26861,38 @@ static PyObject *_wrap_TreeCtrl_GetBoundingRect(PyObject *self, PyObject *args, } +static PyObject *_wrap_TreeCtrl_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 = (int) wxWINDOW_VARIANT_NORMAL ; + wxVisualAttributes result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "variant", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:TreeCtrl_GetClassDefaultAttributes",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (wxWindowVariant) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxPyTreeCtrl::GetClassDefaultAttributes((wxWindowVariant )arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxVisualAttributes * resultptr; + resultptr = new wxVisualAttributes((wxVisualAttributes &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxVisualAttributes, 1); + } + return resultobj; + fail: + return NULL; +} + + static PyObject * TreeCtrl_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -30218,6 +30327,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ListBox_SetItemForegroundColour", (PyCFunction) _wrap_ListBox_SetItemForegroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"ListBox_SetItemBackgroundColour", (PyCFunction) _wrap_ListBox_SetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"ListBox_SetItemFont", (PyCFunction) _wrap_ListBox_SetItemFont, METH_VARARGS | METH_KEYWORDS }, + { (char *)"ListBox_GetClassDefaultAttributes", (PyCFunction) _wrap_ListBox_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"ListBox_swigregister", ListBox_swigregister, METH_VARARGS }, { (char *)"new_CheckListBox", (PyCFunction) _wrap_new_CheckListBox, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_PreCheckListBox", (PyCFunction) _wrap_new_PreCheckListBox, METH_VARARGS | METH_KEYWORDS }, @@ -30704,6 +30814,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ListCtrl_GetItemBackgroundColour", (PyCFunction) _wrap_ListCtrl_GetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"ListCtrl_SortItems", (PyCFunction) _wrap_ListCtrl_SortItems, METH_VARARGS | METH_KEYWORDS }, { (char *)"ListCtrl_GetMainWindow", (PyCFunction) _wrap_ListCtrl_GetMainWindow, METH_VARARGS | METH_KEYWORDS }, + { (char *)"ListCtrl_GetClassDefaultAttributes", (PyCFunction) _wrap_ListCtrl_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"ListCtrl_swigregister", ListCtrl_swigregister, METH_VARARGS }, { (char *)"new_ListView", (PyCFunction) _wrap_new_ListView, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_PreListView", (PyCFunction) _wrap_new_PreListView, METH_VARARGS | METH_KEYWORDS }, @@ -30821,6 +30932,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeCtrl_SortChildren", (PyCFunction) _wrap_TreeCtrl_SortChildren, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_HitTest", (PyCFunction) _wrap_TreeCtrl_HitTest, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_GetBoundingRect", (PyCFunction) _wrap_TreeCtrl_GetBoundingRect, METH_VARARGS | METH_KEYWORDS }, + { (char *)"TreeCtrl_GetClassDefaultAttributes", (PyCFunction) _wrap_TreeCtrl_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_swigregister", TreeCtrl_swigregister, METH_VARARGS }, { (char *)"new_GenericDirCtrl", (PyCFunction) _wrap_new_GenericDirCtrl, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_PreGenericDirCtrl", (PyCFunction) _wrap_new_PreGenericDirCtrl, METH_VARARGS | METH_KEYWORDS }, @@ -31902,8 +32014,8 @@ static swig_type_info _swigt__p_wxGenericDirCtrl[] = {{"_p_wxGenericDirCtrl", 0, static swig_type_info _swigt__p_bool[] = {{"_p_bool", 0, "bool *", 0, 0, 0, 0},{"_p_bool", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyTreeItemData[] = {{"_p_wxPyTreeItemData", 0, "wxPyTreeItemData *", 0, 0, 0, 0},{"_p_wxPyTreeItemData", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxItemContainer[] = {{"_p_wxItemContainer", 0, "wxItemContainer *", 0, 0, 0, 0},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxItemContainer, 0, 0, 0, 0, 0},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxItemContainer, 0, 0, 0, 0, 0},{"_p_wxChoice", _p_wxChoiceTo_p_wxItemContainer, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxItemContainer, 0, 0, 0, 0, 0},{"_p_wxListBox", _p_wxListBoxTo_p_wxItemContainer, 0, 0, 0, 0, 0},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxItemContainer, 0, 0, 0, 0, 0},{"_p_wxItemContainer", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxDirFilterListCtrl[] = {{"_p_wxDirFilterListCtrl", 0, "wxDirFilterListCtrl *", 0, 0, 0, 0},{"_p_wxDirFilterListCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyListCtrl[] = {{"_p_wxPyListCtrl", 0, "wxPyListCtrl *", 0, 0, 0, 0},{"_p_wxPyListCtrl", 0, 0, 0, 0, 0, 0},{"_p_wxListView", _p_wxListViewTo_p_wxPyListCtrl, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxDirFilterListCtrl[] = {{"_p_wxDirFilterListCtrl", 0, "wxDirFilterListCtrl *", 0, 0, 0, 0},{"_p_wxDirFilterListCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxStaticLine[] = {{"_p_wxStaticLine", 0, "wxStaticLine *", 0, 0, 0, 0},{"_p_wxStaticLine", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxControl[] = {{"_p_wxControl", 0, "wxControl *", 0, 0, 0, 0},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxToolBar", _p_wxToolBarTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxControl", 0, 0, 0, 0, 0, 0},{"_p_wxPyControl", _p_wxPyControlTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxGauge", _p_wxGaugeTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxListbook", _p_wxListbookTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxListBox", _p_wxListBoxTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxChoice", _p_wxChoiceTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxListView", _p_wxListViewTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxNotebook", _p_wxNotebookTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxSlider", _p_wxSliderTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxButton", _p_wxButtonTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxControl, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyControl[] = {{"_p_wxPyControl", 0, "wxPyControl *", 0, 0, 0, 0},{"_p_wxPyControl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -31921,6 +32033,7 @@ static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0, 0, 0 static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0, 0, 0, 0},{"_p_wxDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxListView[] = {{"_p_wxListView", 0, "wxListView *", 0, 0, 0, 0},{"_p_wxListView", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxIcon[] = {{"_p_wxIcon", 0, "wxIcon *", 0, 0, 0, 0},{"_p_wxIcon", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxVisualAttributes[] = {{"_p_wxVisualAttributes", 0, "wxVisualAttributes *", 0, 0, 0, 0},{"_p_wxVisualAttributes", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxTextCtrl[] = {{"_p_wxTextCtrl", 0, "wxTextCtrl *", 0, 0, 0, 0},{"_p_wxTextCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxNotebook[] = {{"_p_wxNotebook", 0, "wxNotebook *", 0, 0, 0, 0},{"_p_wxNotebook", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxNotifyEvent[] = {{"_p_wxNotifyEvent", 0, "wxNotifyEvent *", 0, 0, 0, 0},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxNotifyEvent, 0, 0, 0, 0, 0},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxNotifyEvent, 0, 0, 0, 0, 0},{"_p_wxListEvent", _p_wxListEventTo_p_wxNotifyEvent, 0, 0, 0, 0, 0},{"_p_wxSpinEvent", _p_wxSpinEventTo_p_wxNotifyEvent, 0, 0, 0, 0, 0},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxNotifyEvent, 0, 0, 0, 0, 0},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxNotifyEvent, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -31934,8 +32047,8 @@ static swig_type_info _swigt__p_wxContextHelp[] = {{"_p_wxContextHelp", 0, "wxCo static swig_type_info _swigt__p_long[] = {{"_p_long", 0, "long *", 0, 0, 0, 0},{"_p_long", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxToolBar", _p_wxToolBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyControl", _p_wxPyControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxGauge", _p_wxGaugeTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxListbook", _p_wxListbookTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxListBox", _p_wxListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxChoice", _p_wxChoiceTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxListView", _p_wxListViewTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxNotebook", _p_wxNotebookTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSlider", _p_wxSliderTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxButton", _p_wxButtonTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxListEvent[] = {{"_p_wxListEvent", 0, "wxListEvent *", 0, 0, 0, 0},{"_p_wxListEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxListBox[] = {{"_p_wxListBox", 0, "wxListBox *", 0, 0, 0, 0},{"_p_wxListBox", 0, 0, 0, 0, 0, 0},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxListBox, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxCheckListBox[] = {{"_p_wxCheckListBox", 0, "wxCheckListBox *", 0, 0, 0, 0},{"_p_wxCheckListBox", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxListBox[] = {{"_p_wxListBox", 0, "wxListBox *", 0, 0, 0, 0},{"_p_wxListBox", 0, 0, 0, 0, 0, 0},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxListBox, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxBookCtrl[] = {{"_p_wxBookCtrl", 0, "wxBookCtrl *", 0, 0, 0, 0},{"_p_wxListbook", _p_wxListbookTo_p_wxBookCtrl, 0, 0, 0, 0, 0},{"_p_wxBookCtrl", 0, 0, 0, 0, 0, 0},{"_p_wxNotebook", _p_wxNotebookTo_p_wxBookCtrl, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxSpinButton[] = {{"_p_wxSpinButton", 0, "wxSpinButton *", 0, 0, 0, 0},{"_p_wxSpinButton", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxButton[] = {{"_p_wxButton", 0, "wxButton *", 0, 0, 0, 0},{"_p_wxButton", 0, 0, 0, 0, 0, 0},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxButton, 0, 0, 0, 0, 0},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxButton, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -31988,8 +32101,8 @@ _swigt__p_wxGenericDirCtrl, _swigt__p_bool, _swigt__p_wxPyTreeItemData, _swigt__p_wxItemContainer, -_swigt__p_wxDirFilterListCtrl, _swigt__p_wxPyListCtrl, +_swigt__p_wxDirFilterListCtrl, _swigt__p_wxStaticLine, _swigt__p_wxControl, _swigt__p_wxPyControl, @@ -32007,6 +32120,7 @@ _swigt__p_wxSize, _swigt__p_wxDC, _swigt__p_wxListView, _swigt__p_wxIcon, +_swigt__p_wxVisualAttributes, _swigt__p_wxTextCtrl, _swigt__p_wxNotebook, _swigt__p_wxNotifyEvent, @@ -32020,8 +32134,8 @@ _swigt__p_wxContextHelp, _swigt__p_long, _swigt__p_wxEvtHandler, _swigt__p_wxListEvent, -_swigt__p_wxListBox, _swigt__p_wxCheckListBox, +_swigt__p_wxListBox, _swigt__p_wxBookCtrl, _swigt__p_wxSpinButton, _swigt__p_wxButton, diff --git a/wxPython/src/gtk/core.py b/wxPython/src/gtk/core.py index bc4641def5..d9fa992c28 100644 --- a/wxPython/src/gtk/core.py +++ b/wxPython/src/gtk/core.py @@ -285,8 +285,9 @@ SHRINK = _core.SHRINK GROW = _core.GROW EXPAND = _core.EXPAND SHAPED = _core.SHAPED -ADJUST_MINSIZE = _core.ADJUST_MINSIZE +FIXED_SIZE = _core.FIXED_SIZE TILE = _core.TILE +ADJUST_MINSIZE = _core.ADJUST_MINSIZE BORDER_DEFAULT = _core.BORDER_DEFAULT BORDER_NONE = _core.BORDER_NONE BORDER_STATIC = _core.BORDER_STATIC @@ -747,6 +748,24 @@ class Size(object): """GetHeight() -> int""" return _core.Size_GetHeight(*args, **kwargs) + def IsFullySpecified(*args, **kwargs): + """ + IsFullySpecified() -> bool + + Returns True if both components of the size are non-default values. + """ + return _core.Size_IsFullySpecified(*args, **kwargs) + + def SetDefaults(*args, **kwargs): + """ + SetDefaults(Size size) + + Combine this size with the other one replacing the default + components of this object (i.e. equal to -1) with those of the + other. + """ + return _core.Size_SetDefaults(*args, **kwargs) + def Get(*args, **kwargs): """ Get() -> (width,height) @@ -4794,8 +4813,9 @@ class PyApp(EvtHandler): """ GetComCtl32Version() -> int - Returns 400, 470, 471 for comctl32.dll 4.00, 4.70, 4.71 or 0 if it - wasn't found at all. Raises an exception on non-Windows platforms. + Returns 400, 470, 471, etc. for comctl32.dll 4.00, 4.70, 4.71 or + 0 if it wasn't found at all. Raises an exception on non-Windows + platforms. """ return _core.PyApp_GetComCtl32Version(*args, **kwargs) @@ -4852,8 +4872,9 @@ def PyApp_GetComCtl32Version(*args, **kwargs): """ PyApp_GetComCtl32Version() -> int - Returns 400, 470, 471 for comctl32.dll 4.00, 4.70, 4.71 or 0 if it - wasn't found at all. Raises an exception on non-Windows platforms. + Returns 400, 470, 471, etc. for comctl32.dll 4.00, 4.70, 4.71 or + 0 if it wasn't found at all. Raises an exception on non-Windows + platforms. """ return _core.PyApp_GetComCtl32Version(*args, **kwargs) @@ -5231,11 +5252,44 @@ def GetAccelFromString(*args, **kwargs): return _core.GetAccelFromString(*args, **kwargs) #--------------------------------------------------------------------------- -WINDOW_VARIANT_DEFAULT = _core.WINDOW_VARIANT_DEFAULT +class VisualAttributes(object): + """struct containing all the visual attributes of a control""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxVisualAttributes instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """ + __init__() -> VisualAttributes + + struct containing all the visual attributes of a control + """ + newobj = _core.new_VisualAttributes(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + def __del__(self, destroy=_core.delete_VisualAttributes): + """__del__()""" + try: + if self.thisown: destroy(self) + except: pass + + font = property(_core.VisualAttributes_font_get, _core.VisualAttributes_font_set) + colFg = property(_core.VisualAttributes_colFg_get, _core.VisualAttributes_colFg_set) + colBg = property(_core.VisualAttributes_colBg_get, _core.VisualAttributes_colBg_set) + +class VisualAttributesPtr(VisualAttributes): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = VisualAttributes +_core.VisualAttributes_swigregister(VisualAttributesPtr) +NullAcceleratorTable = cvar.NullAcceleratorTable +PanelNameStr = cvar.PanelNameStr + WINDOW_VARIANT_NORMAL = _core.WINDOW_VARIANT_NORMAL WINDOW_VARIANT_SMALL = _core.WINDOW_VARIANT_SMALL WINDOW_VARIANT_MINI = _core.WINDOW_VARIANT_MINI WINDOW_VARIANT_LARGE = _core.WINDOW_VARIANT_LARGE +WINDOW_VARIANT_MAX = _core.WINDOW_VARIANT_MAX class Window(EvtHandler): """ wx.Window is the base class for all windows and represents any visible @@ -5248,8 +5302,8 @@ class Window(EvtHandler): return "<%s.%s; proxy of C++ wxWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, - long style=0, String name=PanelNameStr) -> Window + __init__(Window parent, int id=-1, Point pos=DefaultPosition, + Size size=DefaultSize, long style=0, String name=PanelNameStr) -> Window Construct and show a generic Window. """ @@ -5261,8 +5315,8 @@ class Window(EvtHandler): def Create(*args, **kwargs): """ - Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, - long style=0, String name=PanelNameStr) -> bool + Create(Window parent, int id=-1, Point pos=DefaultPosition, + Size size=DefaultSize, long style=0, String name=PanelNameStr) -> bool Create the GUI part of the Window for 2-phase creation mode. """ @@ -5362,7 +5416,7 @@ class Window(EvtHandler): differs from class to class. For frames and dialogs, the value returned is the title. For buttons or static text controls, it is the button text. This function can be useful for meta-programs - (such as testing tools or special-needs access programs) which + such as testing tools or special-needs access programs)which need to identify windows by name. """ return _core.Window_GetLabel(*args, **kwargs) @@ -5380,7 +5434,7 @@ class Window(EvtHandler): """ GetName() -> String - Returns the window's name. This name is not guaranteed to be + Returns the windows name. This name is not guaranteed to be unique; it is up to the programmer to supply an appropriate name in the window constructor or via wx.Window.SetName. """ @@ -5391,7 +5445,13 @@ class Window(EvtHandler): SetWindowVariant(int variant) Sets the variant of the window/font size to use for this window, - if the platform supports variants, (for example, wxMac.) + if the platform supports variants, for example, wxMac. Variant values are: + + wx.WINDOW_VARIANT_NORMAL Normal size + wx.WINDOW_VARIANT_SMALL Smaller size (about 25 % smaller than normal) + wx.WINDOW_VARIANT_MINI Mini size (about 33 % smaller than normal) + wx.WINDOW_VARIANT_LARGE Large size (about 25 % larger than normal) + """ return _core.Window_SetWindowVariant(*args, **kwargs) @@ -5734,10 +5794,11 @@ class Window(EvtHandler): """ return _core.Window_FitInside(*args, **kwargs) - def SetSizeHints(*args, **kwargs): + def SetSizeHints(*args): """ SetSizeHints(int minW, int minH, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1) + SetSizeHints(Size minSize, Size maxSize=DefaultSize, Size incSize=DefaultSize) Allows specification of minimum and maximum window sizes, and window size increments. If a pair of values is not set (or set to -1), the @@ -5745,18 +5806,19 @@ class Window(EvtHandler): will not be able to size the window outside the given bounds. The resizing increments are only significant under Motif or Xt. """ - return _core.Window_SetSizeHints(*args, **kwargs) + return _core.Window_SetSizeHints(*args) - def SetVirtualSizeHints(*args, **kwargs): + def SetVirtualSizeHints(*args): """ SetVirtualSizeHints(int minW, int minH, int maxW=-1, int maxH=-1) + SetVirtualSizeHints(Size minSize, Size maxSize=DefaultSize) Allows specification of minimum and maximum virtual window sizes. If a pair of values is not set (or set to -1), the default values will be used. If this function is called, the user will not be able to size the virtual area of the window outside the given bounds. """ - return _core.Window_SetVirtualSizeHints(*args, **kwargs) + return _core.Window_SetVirtualSizeHints(*args) def GetMinWidth(*args, **kwargs): """GetMinWidth() -> int""" @@ -5778,6 +5840,10 @@ class Window(EvtHandler): """GetMaxSize() -> Size""" return _core.Window_GetMaxSize(*args, **kwargs) + def GetMinSize(*args, **kwargs): + """GetMinSize() -> Size""" + return _core.Window_GetMinSize(*args, **kwargs) + def SetVirtualSize(*args, **kwargs): """ SetVirtualSize(Size size) @@ -6210,6 +6276,49 @@ class Window(EvtHandler): """ return _core.Window_GetValidator(*args, **kwargs) + def Validate(*args, **kwargs): + """ + Validate() -> bool + + Validates the current values of the child controls using their + validators. If the window has wx.WS_EX_VALIDATE_RECURSIVELY + extra style flag set, the method will also call Validate() of all + child windows. Returns false if any of the validations failed. + """ + return _core.Window_Validate(*args, **kwargs) + + def TransferDataToWindow(*args, **kwargs): + """ + TransferDataToWindow() -> bool + + Transfers values to child controls from data areas specified by + their validators. If the window has wx.WS_EX_VALIDATE_RECURSIVELY + extra style flag set, the method will also call + TransferDataToWindow() of all child windows. + """ + return _core.Window_TransferDataToWindow(*args, **kwargs) + + def TransferDataFromWindow(*args, **kwargs): + """ + TransferDataFromWindow() -> bool + + Transfers values from child controls to data areas specified by + their validators. Returns false if a transfer failed. If the + window has wx.WS_EX_VALIDATE_RECURSIVELY extra style flag set, the + method will also call TransferDataFromWindow() of all child + windows. + """ + return _core.Window_TransferDataFromWindow(*args, **kwargs) + + def InitDialog(*args, **kwargs): + """ + InitDialog() + + Sends an EVT_INIT_DIALOG event, whose handler usually transfers + data to the dialog via validators. + """ + return _core.Window_InitDialog(*args, **kwargs) + def SetAcceleratorTable(*args, **kwargs): """ SetAcceleratorTable(AcceleratorTable accel) @@ -6488,6 +6597,36 @@ class Window(EvtHandler): """ return _core.Window_IsExposedRect(*args, **kwargs) + def GetDefaultAttributes(*args, **kwargs): + """ + GetDefaultAttributes() -> VisualAttributes + + Get the default attributes for an instance of this class. This + is useful if you want to use the same font or colour in your own + control as in a standard control -- which is a much better idea + than hard coding specific colours or fonts which might look + completely out of place on the users system, especially if it + uses themes. + """ + return _core.Window_GetDefaultAttributes(*args, **kwargs) + + def GetClassDefaultAttributes(*args, **kwargs): + """ + GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _core.Window_GetClassDefaultAttributes(*args, **kwargs) + + GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) def SetBackgroundColour(*args, **kwargs): """ SetBackgroundColour(Colour colour) -> bool @@ -7078,8 +7217,6 @@ class WindowPtr(Window): if not hasattr(self,"thisown"): self.thisown = 0 self.__class__ = Window _core.Window_swigregister(WindowPtr) -NullAcceleratorTable = cvar.NullAcceleratorTable -PanelNameStr = cvar.PanelNameStr def PreWindow(*args, **kwargs): """ @@ -7134,6 +7271,22 @@ def Window_GetCapture(*args, **kwargs): """ return _core.Window_GetCapture(*args, **kwargs) +def Window_GetClassDefaultAttributes(*args, **kwargs): + """ + Window_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _core.Window_GetClassDefaultAttributes(*args, **kwargs) + def DLG_PNT(win, point_or_x, y=None): """ Convenience function for converting a Point or (x,y) in @@ -7835,7 +7988,7 @@ class Control(Window): Command(CommandEvent event) Simulates the effect of the user issuing a command to the - item. See wxCommandEvent. + item. See wx.CommandEvent. """ return _core.Control_Command(*args, **kwargs) @@ -7855,6 +8008,23 @@ class Control(Window): """ return _core.Control_SetLabel(*args, **kwargs) + def GetClassDefaultAttributes(*args, **kwargs): + """ + GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _core.Control_GetClassDefaultAttributes(*args, **kwargs) + + GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) class ControlPtr(Control): def __init__(self, this): @@ -7874,6 +8044,22 @@ def PreControl(*args, **kwargs): val.thisown = 1 return val +def Control_GetClassDefaultAttributes(*args, **kwargs): + """ + Control_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _core.Control_GetClassDefaultAttributes(*args, **kwargs) + #--------------------------------------------------------------------------- class ItemContainer(object): diff --git a/wxPython/src/gtk/core_wrap.cpp b/wxPython/src/gtk/core_wrap.cpp index 5c9ee17593..264627c9f5 100644 --- a/wxPython/src/gtk/core_wrap.cpp +++ b/wxPython/src/gtk/core_wrap.cpp @@ -242,85 +242,86 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxSize swig_types[33] #define SWIGTYPE_p_wxDC swig_types[34] #define SWIGTYPE_p_wxPySizer swig_types[35] -#define SWIGTYPE_p_wxNotifyEvent swig_types[36] -#define SWIGTYPE_p_wxPyEvent swig_types[37] -#define SWIGTYPE_p_wxPropagationDisabler swig_types[38] -#define SWIGTYPE_p_wxAppTraits swig_types[39] -#define SWIGTYPE_p_wxArrayString swig_types[40] -#define SWIGTYPE_p_wxShowEvent swig_types[41] -#define SWIGTYPE_p_wxToolTip swig_types[42] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[43] -#define SWIGTYPE_p_wxIconizeEvent swig_types[44] -#define SWIGTYPE_p_wxActivateEvent swig_types[45] -#define SWIGTYPE_p_wxMoveEvent swig_types[46] -#define SWIGTYPE_p_wxSizeEvent swig_types[47] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[48] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[49] -#define SWIGTYPE_p_wxIdleEvent swig_types[50] -#define SWIGTYPE_p_wxMenuItem swig_types[51] -#define SWIGTYPE_p_wxStaticBox swig_types[52] -#define SWIGTYPE_p_long swig_types[53] -#define SWIGTYPE_p_wxTIFFHandler swig_types[54] -#define SWIGTYPE_p_wxXPMHandler swig_types[55] -#define SWIGTYPE_p_wxPNMHandler swig_types[56] -#define SWIGTYPE_p_wxJPEGHandler swig_types[57] -#define SWIGTYPE_p_wxPCXHandler swig_types[58] -#define SWIGTYPE_p_wxGIFHandler swig_types[59] -#define SWIGTYPE_p_wxPNGHandler swig_types[60] -#define SWIGTYPE_p_wxANIHandler swig_types[61] -#define SWIGTYPE_p_wxMemoryFSHandler swig_types[62] -#define SWIGTYPE_p_wxEvtHandler swig_types[63] -#define SWIGTYPE_p_wxCURHandler swig_types[64] -#define SWIGTYPE_p_wxICOHandler swig_types[65] -#define SWIGTYPE_p_wxBMPHandler swig_types[66] -#define SWIGTYPE_p_wxImageHandler swig_types[67] -#define SWIGTYPE_p_wxFileSystemHandler swig_types[68] -#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[69] -#define SWIGTYPE_p_wxInternetFSHandler swig_types[70] -#define SWIGTYPE_p_wxZipFSHandler swig_types[71] -#define SWIGTYPE_p_wxRect swig_types[72] -#define SWIGTYPE_p_wxGBSpan swig_types[73] -#define SWIGTYPE_p_wxPropagateOnce swig_types[74] -#define SWIGTYPE_p_wxAcceleratorTable swig_types[75] -#define SWIGTYPE_p_char swig_types[76] -#define SWIGTYPE_p_wxGBPosition swig_types[77] -#define SWIGTYPE_p_wxImage swig_types[78] -#define SWIGTYPE_p_wxFrame swig_types[79] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[80] -#define SWIGTYPE_p_wxImageHistogram swig_types[81] -#define SWIGTYPE_p_byte swig_types[82] -#define SWIGTYPE_p_wxPoint swig_types[83] -#define SWIGTYPE_p_wxCursor swig_types[84] -#define SWIGTYPE_p_wxObject swig_types[85] -#define SWIGTYPE_p_wxPyInputStream swig_types[86] -#define SWIGTYPE_p_wxOutputStream swig_types[87] -#define SWIGTYPE_p_wxInputStream swig_types[88] -#define SWIGTYPE_p_wxDateTime swig_types[89] -#define SWIGTYPE_p_wxKeyEvent swig_types[90] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[91] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[92] -#define SWIGTYPE_p_wxWindow swig_types[93] -#define SWIGTYPE_p_wxMenuBar swig_types[94] -#define SWIGTYPE_p_wxFileSystem swig_types[95] -#define SWIGTYPE_p_wxBitmap swig_types[96] -#define SWIGTYPE_p_wxMenuEvent swig_types[97] -#define SWIGTYPE_p_wxContextMenuEvent swig_types[98] -#define SWIGTYPE_p_unsigned_char swig_types[99] -#define SWIGTYPE_p_wxCloseEvent swig_types[100] -#define SWIGTYPE_p_wxEraseEvent swig_types[101] -#define SWIGTYPE_p_wxMouseEvent swig_types[102] -#define SWIGTYPE_p_wxPyApp swig_types[103] -#define SWIGTYPE_p_wxCommandEvent swig_types[104] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[105] -#define SWIGTYPE_p_wxPyDropTarget swig_types[106] -#define SWIGTYPE_p_wxChildFocusEvent swig_types[107] -#define SWIGTYPE_p_wxFocusEvent swig_types[108] -#define SWIGTYPE_p_wxDropFilesEvent swig_types[109] -#define SWIGTYPE_p_wxControlWithItems swig_types[110] -#define SWIGTYPE_p_wxColour swig_types[111] -#define SWIGTYPE_p_wxValidator swig_types[112] -#define SWIGTYPE_p_wxPyValidator swig_types[113] -static swig_type_info *swig_types[115]; +#define SWIGTYPE_p_wxVisualAttributes swig_types[36] +#define SWIGTYPE_p_wxNotifyEvent swig_types[37] +#define SWIGTYPE_p_wxPyEvent swig_types[38] +#define SWIGTYPE_p_wxPropagationDisabler swig_types[39] +#define SWIGTYPE_p_wxAppTraits swig_types[40] +#define SWIGTYPE_p_wxArrayString swig_types[41] +#define SWIGTYPE_p_wxShowEvent swig_types[42] +#define SWIGTYPE_p_wxToolTip swig_types[43] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[44] +#define SWIGTYPE_p_wxIconizeEvent swig_types[45] +#define SWIGTYPE_p_wxActivateEvent swig_types[46] +#define SWIGTYPE_p_wxMoveEvent swig_types[47] +#define SWIGTYPE_p_wxSizeEvent swig_types[48] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[49] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[50] +#define SWIGTYPE_p_wxIdleEvent swig_types[51] +#define SWIGTYPE_p_wxMenuItem swig_types[52] +#define SWIGTYPE_p_wxStaticBox swig_types[53] +#define SWIGTYPE_p_long swig_types[54] +#define SWIGTYPE_p_wxTIFFHandler swig_types[55] +#define SWIGTYPE_p_wxXPMHandler swig_types[56] +#define SWIGTYPE_p_wxPNMHandler swig_types[57] +#define SWIGTYPE_p_wxJPEGHandler swig_types[58] +#define SWIGTYPE_p_wxPCXHandler swig_types[59] +#define SWIGTYPE_p_wxGIFHandler swig_types[60] +#define SWIGTYPE_p_wxPNGHandler swig_types[61] +#define SWIGTYPE_p_wxANIHandler swig_types[62] +#define SWIGTYPE_p_wxMemoryFSHandler swig_types[63] +#define SWIGTYPE_p_wxEvtHandler swig_types[64] +#define SWIGTYPE_p_wxCURHandler swig_types[65] +#define SWIGTYPE_p_wxICOHandler swig_types[66] +#define SWIGTYPE_p_wxBMPHandler swig_types[67] +#define SWIGTYPE_p_wxImageHandler swig_types[68] +#define SWIGTYPE_p_wxFileSystemHandler swig_types[69] +#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[70] +#define SWIGTYPE_p_wxInternetFSHandler swig_types[71] +#define SWIGTYPE_p_wxZipFSHandler swig_types[72] +#define SWIGTYPE_p_wxRect swig_types[73] +#define SWIGTYPE_p_wxGBSpan swig_types[74] +#define SWIGTYPE_p_wxPropagateOnce swig_types[75] +#define SWIGTYPE_p_wxAcceleratorTable swig_types[76] +#define SWIGTYPE_p_char swig_types[77] +#define SWIGTYPE_p_wxGBPosition swig_types[78] +#define SWIGTYPE_p_wxImage swig_types[79] +#define SWIGTYPE_p_wxFrame swig_types[80] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[81] +#define SWIGTYPE_p_wxImageHistogram swig_types[82] +#define SWIGTYPE_p_byte swig_types[83] +#define SWIGTYPE_p_wxPoint swig_types[84] +#define SWIGTYPE_p_wxCursor swig_types[85] +#define SWIGTYPE_p_wxObject swig_types[86] +#define SWIGTYPE_p_wxPyInputStream swig_types[87] +#define SWIGTYPE_p_wxOutputStream swig_types[88] +#define SWIGTYPE_p_wxInputStream swig_types[89] +#define SWIGTYPE_p_wxDateTime swig_types[90] +#define SWIGTYPE_p_wxKeyEvent swig_types[91] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[92] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[93] +#define SWIGTYPE_p_wxWindow swig_types[94] +#define SWIGTYPE_p_wxMenuBar swig_types[95] +#define SWIGTYPE_p_wxFileSystem swig_types[96] +#define SWIGTYPE_p_wxBitmap swig_types[97] +#define SWIGTYPE_p_wxMenuEvent swig_types[98] +#define SWIGTYPE_p_wxContextMenuEvent swig_types[99] +#define SWIGTYPE_p_unsigned_char swig_types[100] +#define SWIGTYPE_p_wxCloseEvent swig_types[101] +#define SWIGTYPE_p_wxEraseEvent swig_types[102] +#define SWIGTYPE_p_wxMouseEvent swig_types[103] +#define SWIGTYPE_p_wxPyApp swig_types[104] +#define SWIGTYPE_p_wxCommandEvent swig_types[105] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[106] +#define SWIGTYPE_p_wxPyDropTarget swig_types[107] +#define SWIGTYPE_p_wxChildFocusEvent swig_types[108] +#define SWIGTYPE_p_wxFocusEvent swig_types[109] +#define SWIGTYPE_p_wxDropFilesEvent swig_types[110] +#define SWIGTYPE_p_wxControlWithItems swig_types[111] +#define SWIGTYPE_p_wxColour swig_types[112] +#define SWIGTYPE_p_wxValidator swig_types[113] +#define SWIGTYPE_p_wxPyValidator swig_types[114] +static swig_type_info *swig_types[116]; /* -------- TYPES TABLE (END) -------- */ @@ -1343,16 +1344,18 @@ int PyApp_GetComCtl32Version(){ wxPyRaiseNotImplemented(); return 0; } static const wxString wxPyPanelNameStr(wxPanelNameStr); +wxVisualAttributes *new_wxVisualAttributes(){ return new wxVisualAttributes; } +void delete_wxVisualAttributes(wxVisualAttributes *self){} PyObject *wxWindow_GetChildren(wxWindow *self){ wxWindowList& list = self->GetChildren(); return wxPy_ConvertList(&list); } bool wxWindow_RegisterHotKey(wxWindow *self,int hotkeyId,int modifiers,int keycode){ - - - + #if wxUSE_HOTKEY + return self->RegisterHotKey(hotkeyId, modifiers, keycode); + #else return False; - + #endif } bool wxWindow_UnregisterHotKey(wxWindow *self,int hotkeyId){ @@ -2337,6 +2340,66 @@ static PyObject *_wrap_Size_GetHeight(PyObject *self, PyObject *args, PyObject * } +static PyObject *_wrap_Size_IsFullySpecified(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxSize *arg1 = (wxSize *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_IsFullySpecified",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxSize const *)arg1)->IsFullySpecified(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Size_SetDefaults(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxSize *arg1 = (wxSize *) 0 ; + wxSize *arg2 = 0 ; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "size", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_SetDefaults",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetDefaults((wxSize const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Size_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxSize *arg1 = (wxSize *) 0 ; @@ -21098,10 +21161,199 @@ static PyObject *_wrap_PanelNameStr_get() { } +static PyObject *_wrap_new_VisualAttributes(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxVisualAttributes *result; + char *kwnames[] = { + NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_VisualAttributes",kwnames)) goto fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxVisualAttributes *)new_wxVisualAttributes(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxVisualAttributes, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_delete_VisualAttributes(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_VisualAttributes",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxVisualAttributes, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete_wxVisualAttributes(arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_VisualAttributes_font_set(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; + wxFont *arg2 = (wxFont *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "font", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VisualAttributes_font_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxVisualAttributes, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxFont, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (arg1) (arg1)->font = *arg2; + + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_VisualAttributes_font_get(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; + wxFont *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:VisualAttributes_font_get",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxVisualAttributes, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + result = (wxFont *)& ((arg1)->font); + + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 0); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_VisualAttributes_colFg_set(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; + wxColour *arg2 = (wxColour *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "colFg", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VisualAttributes_colFg_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxVisualAttributes, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxColour, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (arg1) (arg1)->colFg = *arg2; + + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_VisualAttributes_colFg_get(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; + wxColour *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:VisualAttributes_colFg_get",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxVisualAttributes, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + result = (wxColour *)& ((arg1)->colFg); + + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxColour, 0); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_VisualAttributes_colBg_set(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; + wxColour *arg2 = (wxColour *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "colBg", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VisualAttributes_colBg_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxVisualAttributes, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxColour, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (arg1) (arg1)->colBg = *arg2; + + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_VisualAttributes_colBg_get(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; + wxColour *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:VisualAttributes_colBg_get",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxVisualAttributes, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + result = (wxColour *)& ((arg1)->colBg); + + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxColour, 0); + return resultobj; + fail: + return NULL; +} + + +static PyObject * VisualAttributes_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxVisualAttributes, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - int arg2 ; + int arg2 = (int) (int)-1 ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; @@ -21123,11 +21375,13 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Window",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_Window",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int const) SWIG_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; + if (obj1) { + arg2 = (int const) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -21203,7 +21457,7 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - int arg3 ; + int arg3 = (int) (int)-1 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; @@ -21226,13 +21480,15 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Window_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:Window_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (int const) SWIG_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; + if (obj2) { + arg3 = (int const) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -22714,7 +22970,7 @@ static PyObject *_wrap_Window_FitInside(PyObject *self, PyObject *args, PyObject } -static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_SetSizeHints__SWIG_0(PyObject *self, PyObject *args) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; int arg2 ; @@ -22730,11 +22986,8 @@ static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args, PyObj PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "minW",(char *) "minH",(char *) "maxW",(char *) "maxH",(char *) "incW",(char *) "incH", NULL - }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Window_SetSizeHints",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OOO|OOOO:Window_SetSizeHints",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = (int) SWIG_AsInt(obj1); @@ -22771,7 +23024,152 @@ static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args, PyObj } -static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_SetSizeHints__SWIG_1(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize *arg2 = 0 ; + wxSize const &arg3_defvalue = wxDefaultSize ; + wxSize *arg3 = (wxSize *) &arg3_defvalue ; + wxSize const &arg4_defvalue = wxDefaultSize ; + wxSize *arg4 = (wxSize *) &arg4_defvalue ; + wxSize temp2 ; + wxSize temp3 ; + wxSize temp4 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"OO|OO:Window_SetSizeHints",&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + if (obj2) { + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + } + } + if (obj3) { + { + arg4 = &temp4; + if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetSizeHints((wxSize const &)*arg2,(wxSize const &)*arg3,(wxSize const &)*arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[8]; + int ii; + + argc = PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 7); ii++) { + argv[ii] = PyTuple_GetItem(args,ii); + } + if ((argc >= 2) && (argc <= 4)) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2); + } + if (_v) { + if (argc <= 2) { + return _wrap_Window_SetSizeHints__SWIG_1(self,args); + } + { + _v = wxPySimple_typecheck(argv[2], wxT("wxSize"), 2); + } + if (_v) { + if (argc <= 3) { + return _wrap_Window_SetSizeHints__SWIG_1(self,args); + } + { + _v = wxPySimple_typecheck(argv[3], wxT("wxSize"), 2); + } + if (_v) { + return _wrap_Window_SetSizeHints__SWIG_1(self,args); + } + } + } + } + } + if ((argc >= 3) && (argc <= 7)) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + _v = SWIG_CheckInt(argv[1]); + if (_v) { + _v = SWIG_CheckInt(argv[2]); + if (_v) { + if (argc <= 3) { + return _wrap_Window_SetSizeHints__SWIG_0(self,args); + } + _v = SWIG_CheckInt(argv[3]); + if (_v) { + if (argc <= 4) { + return _wrap_Window_SetSizeHints__SWIG_0(self,args); + } + _v = SWIG_CheckInt(argv[4]); + if (_v) { + if (argc <= 5) { + return _wrap_Window_SetSizeHints__SWIG_0(self,args); + } + _v = SWIG_CheckInt(argv[5]); + if (_v) { + if (argc <= 6) { + return _wrap_Window_SetSizeHints__SWIG_0(self,args); + } + _v = SWIG_CheckInt(argv[6]); + if (_v) { + return _wrap_Window_SetSizeHints__SWIG_0(self,args); + } + } + } + } + } + } + } + } + + PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'Window_SetSizeHints'"); + return NULL; +} + + +static PyObject *_wrap_Window_SetVirtualSizeHints__SWIG_0(PyObject *self, PyObject *args) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; int arg2 ; @@ -22783,11 +23181,8 @@ static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "minW",(char *) "minH",(char *) "maxW",(char *) "maxH", NULL - }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Window_SetVirtualSizeHints",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OOO|OO:Window_SetVirtualSizeHints",&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = (int) SWIG_AsInt(obj1); @@ -22816,6 +23211,121 @@ static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args } +static PyObject *_wrap_Window_SetVirtualSizeHints__SWIG_1(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize *arg2 = 0 ; + wxSize const &arg3_defvalue = wxDefaultSize ; + wxSize *arg3 = (wxSize *) &arg3_defvalue ; + wxSize temp2 ; + wxSize temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"OO|O:Window_SetVirtualSizeHints",&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + if (obj2) { + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetVirtualSizeHints((wxSize const &)*arg2,(wxSize const &)*arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[6]; + int ii; + + argc = PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 5); ii++) { + argv[ii] = PyTuple_GetItem(args,ii); + } + if ((argc >= 2) && (argc <= 3)) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2); + } + if (_v) { + if (argc <= 2) { + return _wrap_Window_SetVirtualSizeHints__SWIG_1(self,args); + } + { + _v = wxPySimple_typecheck(argv[2], wxT("wxSize"), 2); + } + if (_v) { + return _wrap_Window_SetVirtualSizeHints__SWIG_1(self,args); + } + } + } + } + if ((argc >= 3) && (argc <= 5)) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + _v = SWIG_CheckInt(argv[1]); + if (_v) { + _v = SWIG_CheckInt(argv[2]); + if (_v) { + if (argc <= 3) { + return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); + } + _v = SWIG_CheckInt(argv[3]); + if (_v) { + if (argc <= 4) { + return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); + } + _v = SWIG_CheckInt(argv[4]); + if (_v) { + return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); + } + } + } + } + } + } + + PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'Window_SetVirtualSizeHints'"); + return NULL; +} + + static PyObject *_wrap_Window_GetMinWidth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -22950,6 +23460,36 @@ static PyObject *_wrap_Window_GetMaxSize(PyObject *self, PyObject *args, PyObjec } +static PyObject *_wrap_Window_GetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMinSize",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxWindow const *)arg1)->GetMinSize(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxSize * resultptr; + resultptr = new wxSize((wxSize &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Window_SetVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -24261,6 +24801,115 @@ static PyObject *_wrap_Window_GetValidator(PyObject *self, PyObject *args, PyObj } +static PyObject *_wrap_Window_Validate(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Validate",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->Validate(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_TransferDataToWindow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_TransferDataToWindow",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->TransferDataToWindow(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_TransferDataFromWindow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_TransferDataFromWindow",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->TransferDataFromWindow(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_InitDialog(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_InitDialog",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->InitDialog(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Window_SetAcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -25130,6 +25779,68 @@ static PyObject *_wrap_Window_IsExposedRect(PyObject *self, PyObject *args, PyOb } +static PyObject *_wrap_Window_GetDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxVisualAttributes result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetDefaultAttributes",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxWindow const *)arg1)->GetDefaultAttributes(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxVisualAttributes * resultptr; + resultptr = new wxVisualAttributes((wxVisualAttributes &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxVisualAttributes, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 = (int) wxWINDOW_VARIANT_NORMAL ; + wxVisualAttributes result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "variant", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Window_GetClassDefaultAttributes",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (wxWindowVariant) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxWindow::GetClassDefaultAttributes((wxWindowVariant )arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxVisualAttributes * resultptr; + resultptr = new wxVisualAttributes((wxVisualAttributes &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxVisualAttributes, 1); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Window_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -31997,6 +32708,38 @@ static PyObject *_wrap_Control_SetLabel(PyObject *self, PyObject *args, PyObject } +static PyObject *_wrap_Control_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 = (int) wxWINDOW_VARIANT_NORMAL ; + wxVisualAttributes result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "variant", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Control_GetClassDefaultAttributes",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (wxWindowVariant) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxControl::GetClassDefaultAttributes((wxWindowVariant )arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxVisualAttributes * resultptr; + resultptr = new wxVisualAttributes((wxVisualAttributes &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxVisualAttributes, 1); + } + return resultobj; + fail: + return NULL; +} + + static PyObject * Control_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -32080,6 +32823,7 @@ static PyObject *_wrap_ItemContainer_AppendItems(PyObject *self, PyObject *args, #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg2->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -39252,6 +39996,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"Size_SetHeight", (PyCFunction) _wrap_Size_SetHeight, METH_VARARGS | METH_KEYWORDS }, { (char *)"Size_GetWidth", (PyCFunction) _wrap_Size_GetWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Size_GetHeight", (PyCFunction) _wrap_Size_GetHeight, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Size_IsFullySpecified", (PyCFunction) _wrap_Size_IsFullySpecified, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Size_SetDefaults", (PyCFunction) _wrap_Size_SetDefaults, METH_VARARGS | METH_KEYWORDS }, { (char *)"Size_Get", (PyCFunction) _wrap_Size_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Size_swigregister", Size_swigregister, METH_VARARGS }, { (char *)"RealPoint_x_set", (PyCFunction) _wrap_RealPoint_x_set, METH_VARARGS | METH_KEYWORDS }, @@ -39910,6 +40656,15 @@ static PyMethodDef SwigMethods[] = { { (char *)"AcceleratorTable_Ok", (PyCFunction) _wrap_AcceleratorTable_Ok, METH_VARARGS | METH_KEYWORDS }, { (char *)"AcceleratorTable_swigregister", AcceleratorTable_swigregister, METH_VARARGS }, { (char *)"GetAccelFromString", (PyCFunction) _wrap_GetAccelFromString, METH_VARARGS | METH_KEYWORDS }, + { (char *)"new_VisualAttributes", (PyCFunction) _wrap_new_VisualAttributes, METH_VARARGS | METH_KEYWORDS }, + { (char *)"delete_VisualAttributes", (PyCFunction) _wrap_delete_VisualAttributes, METH_VARARGS | METH_KEYWORDS }, + { (char *)"VisualAttributes_font_set", (PyCFunction) _wrap_VisualAttributes_font_set, METH_VARARGS | METH_KEYWORDS }, + { (char *)"VisualAttributes_font_get", (PyCFunction) _wrap_VisualAttributes_font_get, METH_VARARGS | METH_KEYWORDS }, + { (char *)"VisualAttributes_colFg_set", (PyCFunction) _wrap_VisualAttributes_colFg_set, METH_VARARGS | METH_KEYWORDS }, + { (char *)"VisualAttributes_colFg_get", (PyCFunction) _wrap_VisualAttributes_colFg_get, METH_VARARGS | METH_KEYWORDS }, + { (char *)"VisualAttributes_colBg_set", (PyCFunction) _wrap_VisualAttributes_colBg_set, METH_VARARGS | METH_KEYWORDS }, + { (char *)"VisualAttributes_colBg_get", (PyCFunction) _wrap_VisualAttributes_colBg_get, METH_VARARGS | METH_KEYWORDS }, + { (char *)"VisualAttributes_swigregister", VisualAttributes_swigregister, METH_VARARGS }, { (char *)"new_Window", (PyCFunction) _wrap_new_Window, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_PreWindow", (PyCFunction) _wrap_new_PreWindow, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_Create", (PyCFunction) _wrap_Window_Create, METH_VARARGS | METH_KEYWORDS }, @@ -39958,13 +40713,14 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_CenterOnParent", (PyCFunction) _wrap_Window_CenterOnParent, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_Fit", (PyCFunction) _wrap_Window_Fit, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_FitInside", (PyCFunction) _wrap_Window_FitInside, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_SetSizeHints", (PyCFunction) _wrap_Window_SetSizeHints, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_SetVirtualSizeHints", (PyCFunction) _wrap_Window_SetVirtualSizeHints, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetSizeHints", _wrap_Window_SetSizeHints, METH_VARARGS }, + { (char *)"Window_SetVirtualSizeHints", _wrap_Window_SetVirtualSizeHints, METH_VARARGS }, { (char *)"Window_GetMinWidth", (PyCFunction) _wrap_Window_GetMinWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMinHeight", (PyCFunction) _wrap_Window_GetMinHeight, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMaxWidth", (PyCFunction) _wrap_Window_GetMaxWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMaxHeight", (PyCFunction) _wrap_Window_GetMaxHeight, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMaxSize", (PyCFunction) _wrap_Window_GetMaxSize, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_GetMinSize", (PyCFunction) _wrap_Window_GetMinSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetVirtualSize", (PyCFunction) _wrap_Window_SetVirtualSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetVirtualSizeWH", (PyCFunction) _wrap_Window_SetVirtualSizeWH, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetVirtualSize", (PyCFunction) _wrap_Window_GetVirtualSize, METH_VARARGS | METH_KEYWORDS }, @@ -40009,6 +40765,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_RemoveEventHandler", (PyCFunction) _wrap_Window_RemoveEventHandler, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetValidator", (PyCFunction) _wrap_Window_SetValidator, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetValidator", (PyCFunction) _wrap_Window_GetValidator, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_Validate", (PyCFunction) _wrap_Window_Validate, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_TransferDataToWindow", (PyCFunction) _wrap_Window_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_TransferDataFromWindow", (PyCFunction) _wrap_Window_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_InitDialog", (PyCFunction) _wrap_Window_InitDialog, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetAcceleratorTable", (PyCFunction) _wrap_Window_SetAcceleratorTable, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetAcceleratorTable", (PyCFunction) _wrap_Window_GetAcceleratorTable, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_RegisterHotKey", (PyCFunction) _wrap_Window_RegisterHotKey, METH_VARARGS | METH_KEYWORDS }, @@ -40036,6 +40796,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_IsExposed", (PyCFunction) _wrap_Window_IsExposed, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_IsExposedPoint", (PyCFunction) _wrap_Window_IsExposedPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_IsExposedRect", (PyCFunction) _wrap_Window_IsExposedRect, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_GetDefaultAttributes", (PyCFunction) _wrap_Window_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_GetClassDefaultAttributes", (PyCFunction) _wrap_Window_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetBackgroundColour", (PyCFunction) _wrap_Window_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetForegroundColour", (PyCFunction) _wrap_Window_SetForegroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetBackgroundColour", (PyCFunction) _wrap_Window_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, @@ -40227,6 +40989,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Control_Command", (PyCFunction) _wrap_Control_Command, METH_VARARGS | METH_KEYWORDS }, { (char *)"Control_GetLabel", (PyCFunction) _wrap_Control_GetLabel, METH_VARARGS | METH_KEYWORDS }, { (char *)"Control_SetLabel", (PyCFunction) _wrap_Control_SetLabel, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Control_GetClassDefaultAttributes", (PyCFunction) _wrap_Control_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Control_swigregister", Control_swigregister, METH_VARARGS }, { (char *)"ItemContainer_Append", (PyCFunction) _wrap_ItemContainer_Append, METH_VARARGS | METH_KEYWORDS }, { (char *)"ItemContainer_AppendItems", (PyCFunction) _wrap_ItemContainer_AppendItems, METH_VARARGS | METH_KEYWORDS }, @@ -40967,6 +41730,7 @@ static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0, 0, 0, 0},{"_p static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0, 0, 0, 0},{"_p_wxSize", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0, 0, 0, 0},{"_p_wxDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPySizer[] = {{"_p_wxPySizer", 0, "wxPySizer *", 0, 0, 0, 0},{"_p_wxPySizer", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxVisualAttributes[] = {{"_p_wxVisualAttributes", 0, "wxVisualAttributes *", 0, 0, 0, 0},{"_p_wxVisualAttributes", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxNotifyEvent[] = {{"_p_wxNotifyEvent", 0, "wxNotifyEvent *", 0, 0, 0, 0},{"_p_wxNotifyEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyEvent[] = {{"_p_wxPyEvent", 0, "wxPyEvent *", 0, 0, 0, 0},{"_p_wxPyEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPropagationDisabler[] = {{"_p_wxPropagationDisabler", 0, "wxPropagationDisabler *", 0, 0, 0, 0},{"_p_wxPropagationDisabler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -41083,6 +41847,7 @@ _swigt__p_int, _swigt__p_wxSize, _swigt__p_wxDC, _swigt__p_wxPySizer, +_swigt__p_wxVisualAttributes, _swigt__p_wxNotifyEvent, _swigt__p_wxPyEvent, _swigt__p_wxPropagationDisabler, @@ -41476,8 +42241,9 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"GROW", SWIG_FromInt((int)wxGROW)); PyDict_SetItemString(d,"EXPAND", SWIG_FromInt((int)wxEXPAND)); PyDict_SetItemString(d,"SHAPED", SWIG_FromInt((int)wxSHAPED)); - PyDict_SetItemString(d,"ADJUST_MINSIZE", SWIG_FromInt((int)wxADJUST_MINSIZE)); + PyDict_SetItemString(d,"FIXED_SIZE", SWIG_FromInt((int)wxFIXED_SIZE)); PyDict_SetItemString(d,"TILE", SWIG_FromInt((int)wxTILE)); + PyDict_SetItemString(d,"ADJUST_MINSIZE", SWIG_FromInt((int)wxADJUST_MINSIZE)); PyDict_SetItemString(d,"BORDER_DEFAULT", SWIG_FromInt((int)wxBORDER_DEFAULT)); PyDict_SetItemString(d,"BORDER_NONE", SWIG_FromInt((int)wxBORDER_NONE)); PyDict_SetItemString(d,"BORDER_STATIC", SWIG_FromInt((int)wxBORDER_STATIC)); @@ -41955,11 +42721,11 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"PRINT_POSTSCRIPT", SWIG_FromInt((int)wxPRINT_POSTSCRIPT)); SWIG_addvarlink(SWIG_globals,(char*)"NullAcceleratorTable",_wrap_NullAcceleratorTable_get, _wrap_NullAcceleratorTable_set); SWIG_addvarlink(SWIG_globals,(char*)"PanelNameStr",_wrap_PanelNameStr_get, _wrap_PanelNameStr_set); - PyDict_SetItemString(d,"WINDOW_VARIANT_DEFAULT", SWIG_FromInt((int)wxWINDOW_VARIANT_DEFAULT)); PyDict_SetItemString(d,"WINDOW_VARIANT_NORMAL", SWIG_FromInt((int)wxWINDOW_VARIANT_NORMAL)); PyDict_SetItemString(d,"WINDOW_VARIANT_SMALL", SWIG_FromInt((int)wxWINDOW_VARIANT_SMALL)); PyDict_SetItemString(d,"WINDOW_VARIANT_MINI", SWIG_FromInt((int)wxWINDOW_VARIANT_MINI)); PyDict_SetItemString(d,"WINDOW_VARIANT_LARGE", SWIG_FromInt((int)wxWINDOW_VARIANT_LARGE)); + PyDict_SetItemString(d,"WINDOW_VARIANT_MAX", SWIG_FromInt((int)wxWINDOW_VARIANT_MAX)); SWIG_addvarlink(SWIG_globals,(char*)"DefaultValidator",_wrap_DefaultValidator_get, _wrap_DefaultValidator_set); SWIG_addvarlink(SWIG_globals,(char*)"ControlNameStr",_wrap_ControlNameStr_get, _wrap_ControlNameStr_set); PyDict_SetItemString(d,"FLEX_GROWMODE_NONE", SWIG_FromInt((int)wxFLEX_GROWMODE_NONE)); diff --git a/wxPython/src/gtk/grid_wrap.cpp b/wxPython/src/gtk/grid_wrap.cpp index dd60ceaddd..48f22d5dda 100644 --- a/wxPython/src/gtk/grid_wrap.cpp +++ b/wxPython/src/gtk/grid_wrap.cpp @@ -8782,6 +8782,7 @@ static PyObject *_wrap_Grid_GetTextBoxSize(PyObject *self, PyObject *args, PyObj #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg3->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); diff --git a/wxPython/src/gtk/misc_wrap.cpp b/wxPython/src/gtk/misc_wrap.cpp index 0bc15b6ef7..a311d64bac 100644 --- a/wxPython/src/gtk/misc_wrap.cpp +++ b/wxPython/src/gtk/misc_wrap.cpp @@ -11932,6 +11932,7 @@ static PyObject *_wrap_new_FileTypeInfoSequence(PyObject *self, PyObject *args, #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg1->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); diff --git a/wxPython/src/gtk/windows.py b/wxPython/src/gtk/windows.py index d0c85c2bb9..0441380434 100644 --- a/wxPython/src/gtk/windows.py +++ b/wxPython/src/gtk/windows.py @@ -33,7 +33,12 @@ class Panel(core.Window): return _windows.Panel_Create(*args, **kwargs) def InitDialog(*args, **kwargs): - """InitDialog()""" + """ + InitDialog() + + Sends an EVT_INIT_DIALOG event, whose handler usually transfers + data to the dialog via validators. + """ return _windows.Panel_InitDialog(*args, **kwargs) @@ -678,8 +683,8 @@ class SplitterWindow(core.Window): return "<%s.%s; proxy of C++ wxSplitterWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, - long style=SP_3D, String name=SplitterNameStr) -> SplitterWindow + __init__(Window parent, int id=-1, Point pos=DefaultPosition, + Size size=DefaultSize, long style=SP_3D, String name=SplitterNameStr) -> SplitterWindow Constructor. Creates and shows a SplitterWindow. """ @@ -692,8 +697,8 @@ class SplitterWindow(core.Window): def Create(*args, **kwargs): """ - Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, - long style=SP_3D, String name=SplitterNameStr) -> bool + Create(Window parent, int id=-1, Point pos=DefaultPosition, + Size size=DefaultSize, long style=SP_3D, String name=SplitterNameStr) -> bool Create the GUI part of the SplitterWindow for the 2-phase create. """ @@ -1838,6 +1843,14 @@ class TaskBarIcon(core.EvtHandler): if self.thisown: destroy(self) except: pass + def Destroy(*args, **kwargs): + """ + Destroy() + + Deletes the C++ object this Python object is a proxy for. + """ + return _windows.TaskBarIcon_Destroy(*args, **kwargs) + def IsOk(*args, **kwargs): """IsOk() -> bool""" return _windows.TaskBarIcon_IsOk(*args, **kwargs) diff --git a/wxPython/src/gtk/windows_wrap.cpp b/wxPython/src/gtk/windows_wrap.cpp index defc860398..04d7f53ec6 100644 --- a/wxPython/src/gtk/windows_wrap.cpp +++ b/wxPython/src/gtk/windows_wrap.cpp @@ -825,6 +825,11 @@ enum { }; #endif +void wxTaskBarIcon_Destroy(wxTaskBarIcon *self){ + + self->RemoveIcon(); + + } static const wxString wxPyFileSelectorPromptStr(wxFileSelectorPromptStr); static const wxString wxPyDirSelectorPromptStr(wxDirSelectorPromptStr); static const wxString wxPyDirDialogNameStr(wxDirDialogNameStr); @@ -5362,7 +5367,7 @@ static PyObject *_wrap_SplitterNameStr_get() { static PyObject *_wrap_new_SplitterWindow(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - int arg2 ; + int arg2 = (int) -1 ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; @@ -5384,11 +5389,13 @@ static PyObject *_wrap_new_SplitterWindow(PyObject *self, PyObject *args, PyObje (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_SplitterWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_SplitterWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -5460,7 +5467,7 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - int arg3 ; + int arg3 = (int) -1 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; @@ -5483,13 +5490,15 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:SplitterWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:SplitterWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSplitterWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (int) SWIG_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -10586,6 +10595,31 @@ static PyObject *_wrap_delete_TaskBarIcon(PyObject *self, PyObject *args, PyObje } +static PyObject *_wrap_TaskBarIcon_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TaskBarIcon_Destroy",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxTaskBarIcon_Destroy(arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_TaskBarIcon_IsOk(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; @@ -24508,6 +24542,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS }, { (char *)"new_TaskBarIcon", (PyCFunction) _wrap_new_TaskBarIcon, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_TaskBarIcon", (PyCFunction) _wrap_delete_TaskBarIcon, METH_VARARGS | METH_KEYWORDS }, + { (char *)"TaskBarIcon_Destroy", (PyCFunction) _wrap_TaskBarIcon_Destroy, METH_VARARGS | METH_KEYWORDS }, { (char *)"TaskBarIcon_IsOk", (PyCFunction) _wrap_TaskBarIcon_IsOk, METH_VARARGS | METH_KEYWORDS }, { (char *)"TaskBarIcon_IsIconInstalled", (PyCFunction) _wrap_TaskBarIcon_IsIconInstalled, METH_VARARGS | METH_KEYWORDS }, { (char *)"TaskBarIcon_SetIcon", (PyCFunction) _wrap_TaskBarIcon_SetIcon, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/controls.py b/wxPython/src/msw/controls.py index bd1f97dda6..d23cbb67bb 100644 --- a/wxPython/src/msw/controls.py +++ b/wxPython/src/msw/controls.py @@ -944,6 +944,23 @@ class ListBox(core.ControlWithItems): """SetItemFont(int item, Font f)""" return _controls.ListBox_SetItemFont(*args, **kwargs) + def GetClassDefaultAttributes(*args, **kwargs): + """ + GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _controls.ListBox_GetClassDefaultAttributes(*args, **kwargs) + + GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) class ListBoxPtr(ListBox): def __init__(self, this): @@ -959,6 +976,22 @@ def PreListBox(*args, **kwargs): val.thisown = 1 return val +def ListBox_GetClassDefaultAttributes(*args, **kwargs): + """ + ListBox_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _controls.ListBox_GetClassDefaultAttributes(*args, **kwargs) + #--------------------------------------------------------------------------- class CheckListBox(ListBox): @@ -3795,6 +3828,23 @@ class ListCtrl(core.Control): """GetMainWindow() -> Window""" return _controls.ListCtrl_GetMainWindow(*args, **kwargs) + def GetClassDefaultAttributes(*args, **kwargs): + """ + GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _controls.ListCtrl_GetClassDefaultAttributes(*args, **kwargs) + + GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) class ListCtrlPtr(ListCtrl): def __init__(self, this): @@ -3809,6 +3859,22 @@ def PreListCtrl(*args, **kwargs): val.thisown = 1 return val +def ListCtrl_GetClassDefaultAttributes(*args, **kwargs): + """ + ListCtrl_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _controls.ListCtrl_GetClassDefaultAttributes(*args, **kwargs) + #--------------------------------------------------------------------------- class ListView(ListCtrl): @@ -4452,6 +4518,23 @@ class TreeCtrl(core.Control): """GetBoundingRect(TreeItemId item, bool textOnly=False) -> PyObject""" return _controls.TreeCtrl_GetBoundingRect(*args, **kwargs) + def GetClassDefaultAttributes(*args, **kwargs): + """ + GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _controls.TreeCtrl_GetClassDefaultAttributes(*args, **kwargs) + + GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) class TreeCtrlPtr(TreeCtrl): def __init__(self, this): @@ -4466,6 +4549,22 @@ def PreTreeCtrl(*args, **kwargs): val.thisown = 1 return val +def TreeCtrl_GetClassDefaultAttributes(*args, **kwargs): + """ + TreeCtrl_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _controls.TreeCtrl_GetClassDefaultAttributes(*args, **kwargs) + #--------------------------------------------------------------------------- DIRCTRL_DIR_ONLY = _controls.DIRCTRL_DIR_ONLY diff --git a/wxPython/src/msw/controls_wrap.cpp b/wxPython/src/msw/controls_wrap.cpp index 5ee8dfc3c5..30fff0d5a9 100644 --- a/wxPython/src/msw/controls_wrap.cpp +++ b/wxPython/src/msw/controls_wrap.cpp @@ -216,8 +216,8 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_bool swig_types[7] #define SWIGTYPE_p_wxPyTreeItemData swig_types[8] #define SWIGTYPE_p_wxItemContainer swig_types[9] -#define SWIGTYPE_p_wxDirFilterListCtrl swig_types[10] -#define SWIGTYPE_p_wxPyListCtrl swig_types[11] +#define SWIGTYPE_p_wxPyListCtrl swig_types[10] +#define SWIGTYPE_p_wxDirFilterListCtrl swig_types[11] #define SWIGTYPE_p_wxStaticLine swig_types[12] #define SWIGTYPE_p_wxControl swig_types[13] #define SWIGTYPE_p_wxPyControl swig_types[14] @@ -235,62 +235,63 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxDC swig_types[26] #define SWIGTYPE_p_wxListView swig_types[27] #define SWIGTYPE_p_wxIcon swig_types[28] -#define SWIGTYPE_p_wxTextCtrl swig_types[29] -#define SWIGTYPE_p_wxNotebook swig_types[30] -#define SWIGTYPE_p_wxNotifyEvent swig_types[31] -#define SWIGTYPE_p_wxArrayString swig_types[32] -#define SWIGTYPE_p_wxListbook swig_types[33] -#define SWIGTYPE_p_wxStaticBitmap swig_types[34] -#define SWIGTYPE_p_wxSlider swig_types[35] -#define SWIGTYPE_p_wxStaticBox swig_types[36] -#define SWIGTYPE_p_wxArrayInt swig_types[37] -#define SWIGTYPE_p_wxContextHelp swig_types[38] -#define SWIGTYPE_p_long swig_types[39] -#define SWIGTYPE_p_wxEvtHandler swig_types[40] -#define SWIGTYPE_p_wxListEvent swig_types[41] -#define SWIGTYPE_p_wxListBox swig_types[42] +#define SWIGTYPE_p_wxVisualAttributes swig_types[29] +#define SWIGTYPE_p_wxTextCtrl swig_types[30] +#define SWIGTYPE_p_wxNotebook swig_types[31] +#define SWIGTYPE_p_wxNotifyEvent swig_types[32] +#define SWIGTYPE_p_wxArrayString swig_types[33] +#define SWIGTYPE_p_wxListbook swig_types[34] +#define SWIGTYPE_p_wxStaticBitmap swig_types[35] +#define SWIGTYPE_p_wxSlider swig_types[36] +#define SWIGTYPE_p_wxStaticBox swig_types[37] +#define SWIGTYPE_p_wxArrayInt swig_types[38] +#define SWIGTYPE_p_wxContextHelp swig_types[39] +#define SWIGTYPE_p_long swig_types[40] +#define SWIGTYPE_p_wxEvtHandler swig_types[41] +#define SWIGTYPE_p_wxListEvent swig_types[42] #define SWIGTYPE_p_wxCheckListBox swig_types[43] -#define SWIGTYPE_p_wxBookCtrl swig_types[44] -#define SWIGTYPE_p_wxSpinButton swig_types[45] -#define SWIGTYPE_p_wxButton swig_types[46] -#define SWIGTYPE_p_wxBitmapButton swig_types[47] -#define SWIGTYPE_p_wxRect swig_types[48] -#define SWIGTYPE_p_wxContextHelpButton swig_types[49] -#define SWIGTYPE_p_wxRadioBox swig_types[50] -#define SWIGTYPE_p_wxScrollBar swig_types[51] -#define SWIGTYPE_p_char swig_types[52] -#define SWIGTYPE_p_wxTreeItemId swig_types[53] -#define SWIGTYPE_p_wxComboBox swig_types[54] -#define SWIGTYPE_p_wxHelpEvent swig_types[55] -#define SWIGTYPE_p_wxListItem swig_types[56] -#define SWIGTYPE_p_wxNotebookSizer swig_types[57] -#define SWIGTYPE_p_wxSpinEvent swig_types[58] -#define SWIGTYPE_p_wxGenericDragImage swig_types[59] -#define SWIGTYPE_p_wxSpinCtrl swig_types[60] -#define SWIGTYPE_p_wxImageList swig_types[61] -#define SWIGTYPE_p_wxHelpProvider swig_types[62] -#define SWIGTYPE_p_wxTextAttr swig_types[63] -#define SWIGTYPE_p_wxSimpleHelpProvider swig_types[64] -#define SWIGTYPE_p_wxPoint swig_types[65] -#define SWIGTYPE_p_wxListbookEvent swig_types[66] -#define SWIGTYPE_p_wxNotebookEvent swig_types[67] -#define SWIGTYPE_p_wxObject swig_types[68] -#define SWIGTYPE_p_wxCursor swig_types[69] -#define SWIGTYPE_p_wxKeyEvent swig_types[70] -#define SWIGTYPE_p_wxWindow swig_types[71] -#define SWIGTYPE_p_wxString swig_types[72] -#define SWIGTYPE_p_wxBitmap swig_types[73] -#define SWIGTYPE_p_wxTreeEvent swig_types[74] -#define SWIGTYPE_p_wxMouseEvent swig_types[75] -#define SWIGTYPE_p_wxCommandEvent swig_types[76] -#define SWIGTYPE_p_wxStaticText swig_types[77] -#define SWIGTYPE_p_wxControlWithItems swig_types[78] -#define SWIGTYPE_p_wxToolBarToolBase swig_types[79] -#define SWIGTYPE_p_wxColour swig_types[80] -#define SWIGTYPE_p_wxToolBar swig_types[81] -#define SWIGTYPE_p_wxBookCtrlSizer swig_types[82] -#define SWIGTYPE_p_wxValidator swig_types[83] -static swig_type_info *swig_types[85]; +#define SWIGTYPE_p_wxListBox swig_types[44] +#define SWIGTYPE_p_wxBookCtrl swig_types[45] +#define SWIGTYPE_p_wxSpinButton swig_types[46] +#define SWIGTYPE_p_wxButton swig_types[47] +#define SWIGTYPE_p_wxBitmapButton swig_types[48] +#define SWIGTYPE_p_wxRect swig_types[49] +#define SWIGTYPE_p_wxContextHelpButton swig_types[50] +#define SWIGTYPE_p_wxRadioBox swig_types[51] +#define SWIGTYPE_p_wxScrollBar swig_types[52] +#define SWIGTYPE_p_char swig_types[53] +#define SWIGTYPE_p_wxTreeItemId swig_types[54] +#define SWIGTYPE_p_wxComboBox swig_types[55] +#define SWIGTYPE_p_wxHelpEvent swig_types[56] +#define SWIGTYPE_p_wxListItem swig_types[57] +#define SWIGTYPE_p_wxNotebookSizer swig_types[58] +#define SWIGTYPE_p_wxSpinEvent swig_types[59] +#define SWIGTYPE_p_wxGenericDragImage swig_types[60] +#define SWIGTYPE_p_wxSpinCtrl swig_types[61] +#define SWIGTYPE_p_wxImageList swig_types[62] +#define SWIGTYPE_p_wxHelpProvider swig_types[63] +#define SWIGTYPE_p_wxTextAttr swig_types[64] +#define SWIGTYPE_p_wxSimpleHelpProvider swig_types[65] +#define SWIGTYPE_p_wxPoint swig_types[66] +#define SWIGTYPE_p_wxListbookEvent swig_types[67] +#define SWIGTYPE_p_wxNotebookEvent swig_types[68] +#define SWIGTYPE_p_wxObject swig_types[69] +#define SWIGTYPE_p_wxCursor swig_types[70] +#define SWIGTYPE_p_wxKeyEvent swig_types[71] +#define SWIGTYPE_p_wxWindow swig_types[72] +#define SWIGTYPE_p_wxString swig_types[73] +#define SWIGTYPE_p_wxBitmap swig_types[74] +#define SWIGTYPE_p_wxTreeEvent swig_types[75] +#define SWIGTYPE_p_wxMouseEvent swig_types[76] +#define SWIGTYPE_p_wxCommandEvent swig_types[77] +#define SWIGTYPE_p_wxStaticText swig_types[78] +#define SWIGTYPE_p_wxControlWithItems swig_types[79] +#define SWIGTYPE_p_wxToolBarToolBase swig_types[80] +#define SWIGTYPE_p_wxColour swig_types[81] +#define SWIGTYPE_p_wxToolBar swig_types[82] +#define SWIGTYPE_p_wxBookCtrlSizer swig_types[83] +#define SWIGTYPE_p_wxValidator swig_types[84] +static swig_type_info *swig_types[86]; /* -------- TYPES TABLE (END) -------- */ @@ -2443,6 +2444,7 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg5->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -2588,6 +2590,7 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg6->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -2862,6 +2865,7 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg6->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -3026,6 +3030,7 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg7->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -5128,6 +5133,7 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg5->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -5273,6 +5279,7 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject * #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg6->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -5410,6 +5417,7 @@ static PyObject *_wrap_ListBox_InsertItems(PyObject *self, PyObject *args, PyObj #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg2->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -5466,6 +5474,7 @@ static PyObject *_wrap_ListBox_Set(PyObject *self, PyObject *args, PyObject *kwa #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg2->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -6001,6 +6010,38 @@ static PyObject *_wrap_ListBox_SetItemFont(PyObject *self, PyObject *args, PyObj } +static PyObject *_wrap_ListBox_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 = (int) wxWINDOW_VARIANT_NORMAL ; + wxVisualAttributes result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "variant", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:ListBox_GetClassDefaultAttributes",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (wxWindowVariant) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxListBox::GetClassDefaultAttributes((wxWindowVariant )arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxVisualAttributes * resultptr; + resultptr = new wxVisualAttributes((wxVisualAttributes &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxVisualAttributes, 1); + } + return resultobj; + fail: + return NULL; +} + + static PyObject * ListBox_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -6073,6 +6114,7 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg5->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -6218,6 +6260,7 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg6->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -11107,6 +11150,7 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg6->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -11274,6 +11318,7 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg7->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -22721,6 +22766,38 @@ static PyObject *_wrap_ListCtrl_GetMainWindow(PyObject *self, PyObject *args, Py } +static PyObject *_wrap_ListCtrl_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 = (int) wxWINDOW_VARIANT_NORMAL ; + wxVisualAttributes result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "variant", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:ListCtrl_GetClassDefaultAttributes",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (wxWindowVariant) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxPyListCtrl::GetClassDefaultAttributes((wxWindowVariant )arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxVisualAttributes * resultptr; + resultptr = new wxVisualAttributes((wxVisualAttributes &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxVisualAttributes, 1); + } + return resultobj; + fail: + return NULL; +} + + static PyObject * ListCtrl_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -26987,6 +27064,38 @@ static PyObject *_wrap_TreeCtrl_GetBoundingRect(PyObject *self, PyObject *args, } +static PyObject *_wrap_TreeCtrl_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 = (int) wxWINDOW_VARIANT_NORMAL ; + wxVisualAttributes result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "variant", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:TreeCtrl_GetClassDefaultAttributes",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (wxWindowVariant) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxPyTreeCtrl::GetClassDefaultAttributes((wxWindowVariant )arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxVisualAttributes * resultptr; + resultptr = new wxVisualAttributes((wxVisualAttributes &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxVisualAttributes, 1); + } + return resultobj; + fail: + return NULL; +} + + static PyObject * TreeCtrl_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -30421,6 +30530,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ListBox_SetItemForegroundColour", (PyCFunction) _wrap_ListBox_SetItemForegroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"ListBox_SetItemBackgroundColour", (PyCFunction) _wrap_ListBox_SetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"ListBox_SetItemFont", (PyCFunction) _wrap_ListBox_SetItemFont, METH_VARARGS | METH_KEYWORDS }, + { (char *)"ListBox_GetClassDefaultAttributes", (PyCFunction) _wrap_ListBox_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"ListBox_swigregister", ListBox_swigregister, METH_VARARGS }, { (char *)"new_CheckListBox", (PyCFunction) _wrap_new_CheckListBox, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_PreCheckListBox", (PyCFunction) _wrap_new_PreCheckListBox, METH_VARARGS | METH_KEYWORDS }, @@ -30911,6 +31021,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ListCtrl_GetItemBackgroundColour", (PyCFunction) _wrap_ListCtrl_GetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"ListCtrl_SortItems", (PyCFunction) _wrap_ListCtrl_SortItems, METH_VARARGS | METH_KEYWORDS }, { (char *)"ListCtrl_GetMainWindow", (PyCFunction) _wrap_ListCtrl_GetMainWindow, METH_VARARGS | METH_KEYWORDS }, + { (char *)"ListCtrl_GetClassDefaultAttributes", (PyCFunction) _wrap_ListCtrl_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"ListCtrl_swigregister", ListCtrl_swigregister, METH_VARARGS }, { (char *)"new_ListView", (PyCFunction) _wrap_new_ListView, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_PreListView", (PyCFunction) _wrap_new_PreListView, METH_VARARGS | METH_KEYWORDS }, @@ -31030,6 +31141,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeCtrl_SortChildren", (PyCFunction) _wrap_TreeCtrl_SortChildren, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_HitTest", (PyCFunction) _wrap_TreeCtrl_HitTest, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_GetBoundingRect", (PyCFunction) _wrap_TreeCtrl_GetBoundingRect, METH_VARARGS | METH_KEYWORDS }, + { (char *)"TreeCtrl_GetClassDefaultAttributes", (PyCFunction) _wrap_TreeCtrl_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"TreeCtrl_swigregister", TreeCtrl_swigregister, METH_VARARGS }, { (char *)"new_GenericDirCtrl", (PyCFunction) _wrap_new_GenericDirCtrl, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_PreGenericDirCtrl", (PyCFunction) _wrap_new_PreGenericDirCtrl, METH_VARARGS | METH_KEYWORDS }, @@ -32117,8 +32229,8 @@ static swig_type_info _swigt__p_wxGenericDirCtrl[] = {{"_p_wxGenericDirCtrl", 0, static swig_type_info _swigt__p_bool[] = {{"_p_bool", 0, "bool *", 0, 0, 0, 0},{"_p_bool", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyTreeItemData[] = {{"_p_wxPyTreeItemData", 0, "wxPyTreeItemData *", 0, 0, 0, 0},{"_p_wxPyTreeItemData", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxItemContainer[] = {{"_p_wxItemContainer", 0, "wxItemContainer *", 0, 0, 0, 0},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxItemContainer, 0, 0, 0, 0, 0},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxItemContainer, 0, 0, 0, 0, 0},{"_p_wxChoice", _p_wxChoiceTo_p_wxItemContainer, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxItemContainer, 0, 0, 0, 0, 0},{"_p_wxListBox", _p_wxListBoxTo_p_wxItemContainer, 0, 0, 0, 0, 0},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxItemContainer, 0, 0, 0, 0, 0},{"_p_wxItemContainer", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxDirFilterListCtrl[] = {{"_p_wxDirFilterListCtrl", 0, "wxDirFilterListCtrl *", 0, 0, 0, 0},{"_p_wxDirFilterListCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyListCtrl[] = {{"_p_wxPyListCtrl", 0, "wxPyListCtrl *", 0, 0, 0, 0},{"_p_wxPyListCtrl", 0, 0, 0, 0, 0, 0},{"_p_wxListView", _p_wxListViewTo_p_wxPyListCtrl, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxDirFilterListCtrl[] = {{"_p_wxDirFilterListCtrl", 0, "wxDirFilterListCtrl *", 0, 0, 0, 0},{"_p_wxDirFilterListCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxStaticLine[] = {{"_p_wxStaticLine", 0, "wxStaticLine *", 0, 0, 0, 0},{"_p_wxStaticLine", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxControl[] = {{"_p_wxControl", 0, "wxControl *", 0, 0, 0, 0},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxToolBar", _p_wxToolBarTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxControl", 0, 0, 0, 0, 0, 0},{"_p_wxPyControl", _p_wxPyControlTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxGauge", _p_wxGaugeTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxListbook", _p_wxListbookTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxListBox", _p_wxListBoxTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxChoice", _p_wxChoiceTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxListView", _p_wxListViewTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxNotebook", _p_wxNotebookTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxSlider", _p_wxSliderTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxButton", _p_wxButtonTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxControl, 0, 0, 0, 0, 0},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxControl, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyControl[] = {{"_p_wxPyControl", 0, "wxPyControl *", 0, 0, 0, 0},{"_p_wxPyControl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -32136,6 +32248,7 @@ static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0, 0, 0 static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0, 0, 0, 0},{"_p_wxDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxListView[] = {{"_p_wxListView", 0, "wxListView *", 0, 0, 0, 0},{"_p_wxListView", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxIcon[] = {{"_p_wxIcon", 0, "wxIcon *", 0, 0, 0, 0},{"_p_wxIcon", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxVisualAttributes[] = {{"_p_wxVisualAttributes", 0, "wxVisualAttributes *", 0, 0, 0, 0},{"_p_wxVisualAttributes", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxTextCtrl[] = {{"_p_wxTextCtrl", 0, "wxTextCtrl *", 0, 0, 0, 0},{"_p_wxTextCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxNotebook[] = {{"_p_wxNotebook", 0, "wxNotebook *", 0, 0, 0, 0},{"_p_wxNotebook", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxNotifyEvent[] = {{"_p_wxNotifyEvent", 0, "wxNotifyEvent *", 0, 0, 0, 0},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxNotifyEvent, 0, 0, 0, 0, 0},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxNotifyEvent, 0, 0, 0, 0, 0},{"_p_wxListEvent", _p_wxListEventTo_p_wxNotifyEvent, 0, 0, 0, 0, 0},{"_p_wxSpinEvent", _p_wxSpinEventTo_p_wxNotifyEvent, 0, 0, 0, 0, 0},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxNotifyEvent, 0, 0, 0, 0, 0},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxNotifyEvent, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -32149,8 +32262,8 @@ static swig_type_info _swigt__p_wxContextHelp[] = {{"_p_wxContextHelp", 0, "wxCo static swig_type_info _swigt__p_long[] = {{"_p_long", 0, "long *", 0, 0, 0, 0},{"_p_long", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxToolBar", _p_wxToolBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyControl", _p_wxPyControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxGauge", _p_wxGaugeTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxListbook", _p_wxListbookTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxListBox", _p_wxListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxChoice", _p_wxChoiceTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxListView", _p_wxListViewTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxNotebook", _p_wxNotebookTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSlider", _p_wxSliderTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxButton", _p_wxButtonTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxListEvent[] = {{"_p_wxListEvent", 0, "wxListEvent *", 0, 0, 0, 0},{"_p_wxListEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxListBox[] = {{"_p_wxListBox", 0, "wxListBox *", 0, 0, 0, 0},{"_p_wxListBox", 0, 0, 0, 0, 0, 0},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxListBox, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxCheckListBox[] = {{"_p_wxCheckListBox", 0, "wxCheckListBox *", 0, 0, 0, 0},{"_p_wxCheckListBox", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxListBox[] = {{"_p_wxListBox", 0, "wxListBox *", 0, 0, 0, 0},{"_p_wxListBox", 0, 0, 0, 0, 0, 0},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxListBox, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxBookCtrl[] = {{"_p_wxBookCtrl", 0, "wxBookCtrl *", 0, 0, 0, 0},{"_p_wxListbook", _p_wxListbookTo_p_wxBookCtrl, 0, 0, 0, 0, 0},{"_p_wxBookCtrl", 0, 0, 0, 0, 0, 0},{"_p_wxNotebook", _p_wxNotebookTo_p_wxBookCtrl, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxSpinButton[] = {{"_p_wxSpinButton", 0, "wxSpinButton *", 0, 0, 0, 0},{"_p_wxSpinButton", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxButton[] = {{"_p_wxButton", 0, "wxButton *", 0, 0, 0, 0},{"_p_wxButton", 0, 0, 0, 0, 0, 0},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxButton, 0, 0, 0, 0, 0},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxButton, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -32203,8 +32316,8 @@ _swigt__p_wxGenericDirCtrl, _swigt__p_bool, _swigt__p_wxPyTreeItemData, _swigt__p_wxItemContainer, -_swigt__p_wxDirFilterListCtrl, _swigt__p_wxPyListCtrl, +_swigt__p_wxDirFilterListCtrl, _swigt__p_wxStaticLine, _swigt__p_wxControl, _swigt__p_wxPyControl, @@ -32222,6 +32335,7 @@ _swigt__p_wxSize, _swigt__p_wxDC, _swigt__p_wxListView, _swigt__p_wxIcon, +_swigt__p_wxVisualAttributes, _swigt__p_wxTextCtrl, _swigt__p_wxNotebook, _swigt__p_wxNotifyEvent, @@ -32235,8 +32349,8 @@ _swigt__p_wxContextHelp, _swigt__p_long, _swigt__p_wxEvtHandler, _swigt__p_wxListEvent, -_swigt__p_wxListBox, _swigt__p_wxCheckListBox, +_swigt__p_wxListBox, _swigt__p_wxBookCtrl, _swigt__p_wxSpinButton, _swigt__p_wxButton, diff --git a/wxPython/src/msw/core.py b/wxPython/src/msw/core.py index 751bf3a773..3f3483f455 100644 --- a/wxPython/src/msw/core.py +++ b/wxPython/src/msw/core.py @@ -285,8 +285,9 @@ SHRINK = _core.SHRINK GROW = _core.GROW EXPAND = _core.EXPAND SHAPED = _core.SHAPED -ADJUST_MINSIZE = _core.ADJUST_MINSIZE +FIXED_SIZE = _core.FIXED_SIZE TILE = _core.TILE +ADJUST_MINSIZE = _core.ADJUST_MINSIZE BORDER_DEFAULT = _core.BORDER_DEFAULT BORDER_NONE = _core.BORDER_NONE BORDER_STATIC = _core.BORDER_STATIC @@ -747,6 +748,24 @@ class Size(object): """GetHeight() -> int""" return _core.Size_GetHeight(*args, **kwargs) + def IsFullySpecified(*args, **kwargs): + """ + IsFullySpecified() -> bool + + Returns True if both components of the size are non-default values. + """ + return _core.Size_IsFullySpecified(*args, **kwargs) + + def SetDefaults(*args, **kwargs): + """ + SetDefaults(Size size) + + Combine this size with the other one replacing the default + components of this object (i.e. equal to -1) with those of the + other. + """ + return _core.Size_SetDefaults(*args, **kwargs) + def Get(*args, **kwargs): """ Get() -> (width,height) @@ -4794,8 +4813,9 @@ class PyApp(EvtHandler): """ GetComCtl32Version() -> int - Returns 400, 470, 471 for comctl32.dll 4.00, 4.70, 4.71 or 0 if it - wasn't found at all. Raises an exception on non-Windows platforms. + Returns 400, 470, 471, etc. for comctl32.dll 4.00, 4.70, 4.71 or + 0 if it wasn't found at all. Raises an exception on non-Windows + platforms. """ return _core.PyApp_GetComCtl32Version(*args, **kwargs) @@ -4852,8 +4872,9 @@ def PyApp_GetComCtl32Version(*args, **kwargs): """ PyApp_GetComCtl32Version() -> int - Returns 400, 470, 471 for comctl32.dll 4.00, 4.70, 4.71 or 0 if it - wasn't found at all. Raises an exception on non-Windows platforms. + Returns 400, 470, 471, etc. for comctl32.dll 4.00, 4.70, 4.71 or + 0 if it wasn't found at all. Raises an exception on non-Windows + platforms. """ return _core.PyApp_GetComCtl32Version(*args, **kwargs) @@ -5231,11 +5252,44 @@ def GetAccelFromString(*args, **kwargs): return _core.GetAccelFromString(*args, **kwargs) #--------------------------------------------------------------------------- -WINDOW_VARIANT_DEFAULT = _core.WINDOW_VARIANT_DEFAULT +class VisualAttributes(object): + """struct containing all the visual attributes of a control""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxVisualAttributes instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """ + __init__() -> VisualAttributes + + struct containing all the visual attributes of a control + """ + newobj = _core.new_VisualAttributes(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + def __del__(self, destroy=_core.delete_VisualAttributes): + """__del__()""" + try: + if self.thisown: destroy(self) + except: pass + + font = property(_core.VisualAttributes_font_get, _core.VisualAttributes_font_set) + colFg = property(_core.VisualAttributes_colFg_get, _core.VisualAttributes_colFg_set) + colBg = property(_core.VisualAttributes_colBg_get, _core.VisualAttributes_colBg_set) + +class VisualAttributesPtr(VisualAttributes): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = VisualAttributes +_core.VisualAttributes_swigregister(VisualAttributesPtr) +NullAcceleratorTable = cvar.NullAcceleratorTable +PanelNameStr = cvar.PanelNameStr + WINDOW_VARIANT_NORMAL = _core.WINDOW_VARIANT_NORMAL WINDOW_VARIANT_SMALL = _core.WINDOW_VARIANT_SMALL WINDOW_VARIANT_MINI = _core.WINDOW_VARIANT_MINI WINDOW_VARIANT_LARGE = _core.WINDOW_VARIANT_LARGE +WINDOW_VARIANT_MAX = _core.WINDOW_VARIANT_MAX class Window(EvtHandler): """ wx.Window is the base class for all windows and represents any visible @@ -5248,8 +5302,8 @@ class Window(EvtHandler): return "<%s.%s; proxy of C++ wxWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, - long style=0, String name=PanelNameStr) -> Window + __init__(Window parent, int id=-1, Point pos=DefaultPosition, + Size size=DefaultSize, long style=0, String name=PanelNameStr) -> Window Construct and show a generic Window. """ @@ -5261,8 +5315,8 @@ class Window(EvtHandler): def Create(*args, **kwargs): """ - Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, - long style=0, String name=PanelNameStr) -> bool + Create(Window parent, int id=-1, Point pos=DefaultPosition, + Size size=DefaultSize, long style=0, String name=PanelNameStr) -> bool Create the GUI part of the Window for 2-phase creation mode. """ @@ -5362,7 +5416,7 @@ class Window(EvtHandler): differs from class to class. For frames and dialogs, the value returned is the title. For buttons or static text controls, it is the button text. This function can be useful for meta-programs - (such as testing tools or special-needs access programs) which + such as testing tools or special-needs access programs)which need to identify windows by name. """ return _core.Window_GetLabel(*args, **kwargs) @@ -5380,7 +5434,7 @@ class Window(EvtHandler): """ GetName() -> String - Returns the window's name. This name is not guaranteed to be + Returns the windows name. This name is not guaranteed to be unique; it is up to the programmer to supply an appropriate name in the window constructor or via wx.Window.SetName. """ @@ -5391,7 +5445,13 @@ class Window(EvtHandler): SetWindowVariant(int variant) Sets the variant of the window/font size to use for this window, - if the platform supports variants, (for example, wxMac.) + if the platform supports variants, for example, wxMac. Variant values are: + + wx.WINDOW_VARIANT_NORMAL Normal size + wx.WINDOW_VARIANT_SMALL Smaller size (about 25 % smaller than normal) + wx.WINDOW_VARIANT_MINI Mini size (about 33 % smaller than normal) + wx.WINDOW_VARIANT_LARGE Large size (about 25 % larger than normal) + """ return _core.Window_SetWindowVariant(*args, **kwargs) @@ -5734,10 +5794,11 @@ class Window(EvtHandler): """ return _core.Window_FitInside(*args, **kwargs) - def SetSizeHints(*args, **kwargs): + def SetSizeHints(*args): """ SetSizeHints(int minW, int minH, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1) + SetSizeHints(Size minSize, Size maxSize=DefaultSize, Size incSize=DefaultSize) Allows specification of minimum and maximum window sizes, and window size increments. If a pair of values is not set (or set to -1), the @@ -5745,18 +5806,19 @@ class Window(EvtHandler): will not be able to size the window outside the given bounds. The resizing increments are only significant under Motif or Xt. """ - return _core.Window_SetSizeHints(*args, **kwargs) + return _core.Window_SetSizeHints(*args) - def SetVirtualSizeHints(*args, **kwargs): + def SetVirtualSizeHints(*args): """ SetVirtualSizeHints(int minW, int minH, int maxW=-1, int maxH=-1) + SetVirtualSizeHints(Size minSize, Size maxSize=DefaultSize) Allows specification of minimum and maximum virtual window sizes. If a pair of values is not set (or set to -1), the default values will be used. If this function is called, the user will not be able to size the virtual area of the window outside the given bounds. """ - return _core.Window_SetVirtualSizeHints(*args, **kwargs) + return _core.Window_SetVirtualSizeHints(*args) def GetMinWidth(*args, **kwargs): """GetMinWidth() -> int""" @@ -5778,6 +5840,10 @@ class Window(EvtHandler): """GetMaxSize() -> Size""" return _core.Window_GetMaxSize(*args, **kwargs) + def GetMinSize(*args, **kwargs): + """GetMinSize() -> Size""" + return _core.Window_GetMinSize(*args, **kwargs) + def SetVirtualSize(*args, **kwargs): """ SetVirtualSize(Size size) @@ -6210,6 +6276,49 @@ class Window(EvtHandler): """ return _core.Window_GetValidator(*args, **kwargs) + def Validate(*args, **kwargs): + """ + Validate() -> bool + + Validates the current values of the child controls using their + validators. If the window has wx.WS_EX_VALIDATE_RECURSIVELY + extra style flag set, the method will also call Validate() of all + child windows. Returns false if any of the validations failed. + """ + return _core.Window_Validate(*args, **kwargs) + + def TransferDataToWindow(*args, **kwargs): + """ + TransferDataToWindow() -> bool + + Transfers values to child controls from data areas specified by + their validators. If the window has wx.WS_EX_VALIDATE_RECURSIVELY + extra style flag set, the method will also call + TransferDataToWindow() of all child windows. + """ + return _core.Window_TransferDataToWindow(*args, **kwargs) + + def TransferDataFromWindow(*args, **kwargs): + """ + TransferDataFromWindow() -> bool + + Transfers values from child controls to data areas specified by + their validators. Returns false if a transfer failed. If the + window has wx.WS_EX_VALIDATE_RECURSIVELY extra style flag set, the + method will also call TransferDataFromWindow() of all child + windows. + """ + return _core.Window_TransferDataFromWindow(*args, **kwargs) + + def InitDialog(*args, **kwargs): + """ + InitDialog() + + Sends an EVT_INIT_DIALOG event, whose handler usually transfers + data to the dialog via validators. + """ + return _core.Window_InitDialog(*args, **kwargs) + def SetAcceleratorTable(*args, **kwargs): """ SetAcceleratorTable(AcceleratorTable accel) @@ -6488,6 +6597,36 @@ class Window(EvtHandler): """ return _core.Window_IsExposedRect(*args, **kwargs) + def GetDefaultAttributes(*args, **kwargs): + """ + GetDefaultAttributes() -> VisualAttributes + + Get the default attributes for an instance of this class. This + is useful if you want to use the same font or colour in your own + control as in a standard control -- which is a much better idea + than hard coding specific colours or fonts which might look + completely out of place on the users system, especially if it + uses themes. + """ + return _core.Window_GetDefaultAttributes(*args, **kwargs) + + def GetClassDefaultAttributes(*args, **kwargs): + """ + GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _core.Window_GetClassDefaultAttributes(*args, **kwargs) + + GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) def SetBackgroundColour(*args, **kwargs): """ SetBackgroundColour(Colour colour) -> bool @@ -7091,8 +7230,6 @@ class WindowPtr(Window): if not hasattr(self,"thisown"): self.thisown = 0 self.__class__ = Window _core.Window_swigregister(WindowPtr) -NullAcceleratorTable = cvar.NullAcceleratorTable -PanelNameStr = cvar.PanelNameStr def PreWindow(*args, **kwargs): """ @@ -7147,6 +7284,22 @@ def Window_GetCapture(*args, **kwargs): """ return _core.Window_GetCapture(*args, **kwargs) +def Window_GetClassDefaultAttributes(*args, **kwargs): + """ + Window_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _core.Window_GetClassDefaultAttributes(*args, **kwargs) + def DLG_PNT(win, point_or_x, y=None): """ Convenience function for converting a Point or (x,y) in @@ -7904,7 +8057,7 @@ class Control(Window): Command(CommandEvent event) Simulates the effect of the user issuing a command to the - item. See wxCommandEvent. + item. See wx.CommandEvent. """ return _core.Control_Command(*args, **kwargs) @@ -7924,6 +8077,23 @@ class Control(Window): """ return _core.Control_SetLabel(*args, **kwargs) + def GetClassDefaultAttributes(*args, **kwargs): + """ + GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _core.Control_GetClassDefaultAttributes(*args, **kwargs) + + GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) class ControlPtr(Control): def __init__(self, this): @@ -7943,6 +8113,22 @@ def PreControl(*args, **kwargs): val.thisown = 1 return val +def Control_GetClassDefaultAttributes(*args, **kwargs): + """ + Control_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes + + Get the default attributes for this class. This is useful if + you want to use the same font or colour in your own control as + in a standard control -- which is a much better idea than hard + coding specific colours or fonts which might look completely out + of place on the users system, especially if it uses themes. + + The variant parameter is only relevant under Mac currently and is + ignore under other platforms. Under Mac, it will change the size of the + returned font. See SetWindowVariant for more about this. + """ + return _core.Control_GetClassDefaultAttributes(*args, **kwargs) + #--------------------------------------------------------------------------- class ItemContainer(object): diff --git a/wxPython/src/msw/core_wrap.cpp b/wxPython/src/msw/core_wrap.cpp index a040e889ef..c5112ac85b 100644 --- a/wxPython/src/msw/core_wrap.cpp +++ b/wxPython/src/msw/core_wrap.cpp @@ -242,85 +242,86 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxSize swig_types[33] #define SWIGTYPE_p_wxDC swig_types[34] #define SWIGTYPE_p_wxPySizer swig_types[35] -#define SWIGTYPE_p_wxNotifyEvent swig_types[36] -#define SWIGTYPE_p_wxPyEvent swig_types[37] -#define SWIGTYPE_p_wxPropagationDisabler swig_types[38] -#define SWIGTYPE_p_wxAppTraits swig_types[39] -#define SWIGTYPE_p_wxArrayString swig_types[40] -#define SWIGTYPE_p_wxShowEvent swig_types[41] -#define SWIGTYPE_p_wxToolTip swig_types[42] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[43] -#define SWIGTYPE_p_wxIconizeEvent swig_types[44] -#define SWIGTYPE_p_wxActivateEvent swig_types[45] -#define SWIGTYPE_p_wxMoveEvent swig_types[46] -#define SWIGTYPE_p_wxSizeEvent swig_types[47] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[48] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[49] -#define SWIGTYPE_p_wxIdleEvent swig_types[50] -#define SWIGTYPE_p_wxMenuItem swig_types[51] -#define SWIGTYPE_p_wxStaticBox swig_types[52] -#define SWIGTYPE_p_long swig_types[53] -#define SWIGTYPE_p_wxTIFFHandler swig_types[54] -#define SWIGTYPE_p_wxXPMHandler swig_types[55] -#define SWIGTYPE_p_wxPNMHandler swig_types[56] -#define SWIGTYPE_p_wxJPEGHandler swig_types[57] -#define SWIGTYPE_p_wxPCXHandler swig_types[58] -#define SWIGTYPE_p_wxGIFHandler swig_types[59] -#define SWIGTYPE_p_wxPNGHandler swig_types[60] -#define SWIGTYPE_p_wxANIHandler swig_types[61] -#define SWIGTYPE_p_wxMemoryFSHandler swig_types[62] -#define SWIGTYPE_p_wxEvtHandler swig_types[63] -#define SWIGTYPE_p_wxCURHandler swig_types[64] -#define SWIGTYPE_p_wxICOHandler swig_types[65] -#define SWIGTYPE_p_wxBMPHandler swig_types[66] -#define SWIGTYPE_p_wxImageHandler swig_types[67] -#define SWIGTYPE_p_wxFileSystemHandler swig_types[68] -#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[69] -#define SWIGTYPE_p_wxInternetFSHandler swig_types[70] -#define SWIGTYPE_p_wxZipFSHandler swig_types[71] -#define SWIGTYPE_p_wxRect swig_types[72] -#define SWIGTYPE_p_wxGBSpan swig_types[73] -#define SWIGTYPE_p_wxPropagateOnce swig_types[74] -#define SWIGTYPE_p_wxAcceleratorTable swig_types[75] -#define SWIGTYPE_p_char swig_types[76] -#define SWIGTYPE_p_wxGBPosition swig_types[77] -#define SWIGTYPE_p_wxImage swig_types[78] -#define SWIGTYPE_p_wxFrame swig_types[79] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[80] -#define SWIGTYPE_p_wxImageHistogram swig_types[81] -#define SWIGTYPE_p_byte swig_types[82] -#define SWIGTYPE_p_wxPoint swig_types[83] -#define SWIGTYPE_p_wxCursor swig_types[84] -#define SWIGTYPE_p_wxObject swig_types[85] -#define SWIGTYPE_p_wxPyInputStream swig_types[86] -#define SWIGTYPE_p_wxOutputStream swig_types[87] -#define SWIGTYPE_p_wxInputStream swig_types[88] -#define SWIGTYPE_p_wxDateTime swig_types[89] -#define SWIGTYPE_p_wxKeyEvent swig_types[90] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[91] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[92] -#define SWIGTYPE_p_wxWindow swig_types[93] -#define SWIGTYPE_p_wxMenuBar swig_types[94] -#define SWIGTYPE_p_wxFileSystem swig_types[95] -#define SWIGTYPE_p_wxBitmap swig_types[96] -#define SWIGTYPE_p_wxMenuEvent swig_types[97] -#define SWIGTYPE_p_wxContextMenuEvent swig_types[98] -#define SWIGTYPE_p_unsigned_char swig_types[99] -#define SWIGTYPE_p_wxCloseEvent swig_types[100] -#define SWIGTYPE_p_wxEraseEvent swig_types[101] -#define SWIGTYPE_p_wxMouseEvent swig_types[102] -#define SWIGTYPE_p_wxPyApp swig_types[103] -#define SWIGTYPE_p_wxCommandEvent swig_types[104] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[105] -#define SWIGTYPE_p_wxPyDropTarget swig_types[106] -#define SWIGTYPE_p_wxChildFocusEvent swig_types[107] -#define SWIGTYPE_p_wxFocusEvent swig_types[108] -#define SWIGTYPE_p_wxDropFilesEvent swig_types[109] -#define SWIGTYPE_p_wxControlWithItems swig_types[110] -#define SWIGTYPE_p_wxColour swig_types[111] -#define SWIGTYPE_p_wxValidator swig_types[112] -#define SWIGTYPE_p_wxPyValidator swig_types[113] -static swig_type_info *swig_types[115]; +#define SWIGTYPE_p_wxVisualAttributes swig_types[36] +#define SWIGTYPE_p_wxNotifyEvent swig_types[37] +#define SWIGTYPE_p_wxPyEvent swig_types[38] +#define SWIGTYPE_p_wxPropagationDisabler swig_types[39] +#define SWIGTYPE_p_wxAppTraits swig_types[40] +#define SWIGTYPE_p_wxArrayString swig_types[41] +#define SWIGTYPE_p_wxShowEvent swig_types[42] +#define SWIGTYPE_p_wxToolTip swig_types[43] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[44] +#define SWIGTYPE_p_wxIconizeEvent swig_types[45] +#define SWIGTYPE_p_wxActivateEvent swig_types[46] +#define SWIGTYPE_p_wxMoveEvent swig_types[47] +#define SWIGTYPE_p_wxSizeEvent swig_types[48] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[49] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[50] +#define SWIGTYPE_p_wxIdleEvent swig_types[51] +#define SWIGTYPE_p_wxMenuItem swig_types[52] +#define SWIGTYPE_p_wxStaticBox swig_types[53] +#define SWIGTYPE_p_long swig_types[54] +#define SWIGTYPE_p_wxTIFFHandler swig_types[55] +#define SWIGTYPE_p_wxXPMHandler swig_types[56] +#define SWIGTYPE_p_wxPNMHandler swig_types[57] +#define SWIGTYPE_p_wxJPEGHandler swig_types[58] +#define SWIGTYPE_p_wxPCXHandler swig_types[59] +#define SWIGTYPE_p_wxGIFHandler swig_types[60] +#define SWIGTYPE_p_wxPNGHandler swig_types[61] +#define SWIGTYPE_p_wxANIHandler swig_types[62] +#define SWIGTYPE_p_wxMemoryFSHandler swig_types[63] +#define SWIGTYPE_p_wxEvtHandler swig_types[64] +#define SWIGTYPE_p_wxCURHandler swig_types[65] +#define SWIGTYPE_p_wxICOHandler swig_types[66] +#define SWIGTYPE_p_wxBMPHandler swig_types[67] +#define SWIGTYPE_p_wxImageHandler swig_types[68] +#define SWIGTYPE_p_wxFileSystemHandler swig_types[69] +#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[70] +#define SWIGTYPE_p_wxInternetFSHandler swig_types[71] +#define SWIGTYPE_p_wxZipFSHandler swig_types[72] +#define SWIGTYPE_p_wxRect swig_types[73] +#define SWIGTYPE_p_wxGBSpan swig_types[74] +#define SWIGTYPE_p_wxPropagateOnce swig_types[75] +#define SWIGTYPE_p_wxAcceleratorTable swig_types[76] +#define SWIGTYPE_p_char swig_types[77] +#define SWIGTYPE_p_wxGBPosition swig_types[78] +#define SWIGTYPE_p_wxImage swig_types[79] +#define SWIGTYPE_p_wxFrame swig_types[80] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[81] +#define SWIGTYPE_p_wxImageHistogram swig_types[82] +#define SWIGTYPE_p_byte swig_types[83] +#define SWIGTYPE_p_wxPoint swig_types[84] +#define SWIGTYPE_p_wxCursor swig_types[85] +#define SWIGTYPE_p_wxObject swig_types[86] +#define SWIGTYPE_p_wxPyInputStream swig_types[87] +#define SWIGTYPE_p_wxOutputStream swig_types[88] +#define SWIGTYPE_p_wxInputStream swig_types[89] +#define SWIGTYPE_p_wxDateTime swig_types[90] +#define SWIGTYPE_p_wxKeyEvent swig_types[91] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[92] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[93] +#define SWIGTYPE_p_wxWindow swig_types[94] +#define SWIGTYPE_p_wxMenuBar swig_types[95] +#define SWIGTYPE_p_wxFileSystem swig_types[96] +#define SWIGTYPE_p_wxBitmap swig_types[97] +#define SWIGTYPE_p_wxMenuEvent swig_types[98] +#define SWIGTYPE_p_wxContextMenuEvent swig_types[99] +#define SWIGTYPE_p_unsigned_char swig_types[100] +#define SWIGTYPE_p_wxCloseEvent swig_types[101] +#define SWIGTYPE_p_wxEraseEvent swig_types[102] +#define SWIGTYPE_p_wxMouseEvent swig_types[103] +#define SWIGTYPE_p_wxPyApp swig_types[104] +#define SWIGTYPE_p_wxCommandEvent swig_types[105] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[106] +#define SWIGTYPE_p_wxPyDropTarget swig_types[107] +#define SWIGTYPE_p_wxChildFocusEvent swig_types[108] +#define SWIGTYPE_p_wxFocusEvent swig_types[109] +#define SWIGTYPE_p_wxDropFilesEvent swig_types[110] +#define SWIGTYPE_p_wxControlWithItems swig_types[111] +#define SWIGTYPE_p_wxColour swig_types[112] +#define SWIGTYPE_p_wxValidator swig_types[113] +#define SWIGTYPE_p_wxPyValidator swig_types[114] +static swig_type_info *swig_types[116]; /* -------- TYPES TABLE (END) -------- */ @@ -1342,16 +1343,18 @@ wxPyApp *new_wxPyApp(){ static const wxString wxPyPanelNameStr(wxPanelNameStr); +wxVisualAttributes *new_wxVisualAttributes(){ return new wxVisualAttributes; } +void delete_wxVisualAttributes(wxVisualAttributes *self){} PyObject *wxWindow_GetChildren(wxWindow *self){ wxWindowList& list = self->GetChildren(); return wxPy_ConvertList(&list); } bool wxWindow_RegisterHotKey(wxWindow *self,int hotkeyId,int modifiers,int keycode){ - - - + #if wxUSE_HOTKEY + return self->RegisterHotKey(hotkeyId, modifiers, keycode); + #else return False; - + #endif } bool wxWindow_UnregisterHotKey(wxWindow *self,int hotkeyId){ @@ -2335,6 +2338,66 @@ static PyObject *_wrap_Size_GetHeight(PyObject *self, PyObject *args, PyObject * } +static PyObject *_wrap_Size_IsFullySpecified(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxSize *arg1 = (wxSize *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_IsFullySpecified",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxSize const *)arg1)->IsFullySpecified(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Size_SetDefaults(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxSize *arg1 = (wxSize *) 0 ; + wxSize *arg2 = 0 ; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "size", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_SetDefaults",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetDefaults((wxSize const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Size_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxSize *arg1 = (wxSize *) 0 ; @@ -21096,10 +21159,199 @@ static PyObject *_wrap_PanelNameStr_get() { } +static PyObject *_wrap_new_VisualAttributes(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxVisualAttributes *result; + char *kwnames[] = { + NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_VisualAttributes",kwnames)) goto fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxVisualAttributes *)new_wxVisualAttributes(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxVisualAttributes, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_delete_VisualAttributes(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_VisualAttributes",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxVisualAttributes, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete_wxVisualAttributes(arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_VisualAttributes_font_set(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; + wxFont *arg2 = (wxFont *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "font", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VisualAttributes_font_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxVisualAttributes, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxFont, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (arg1) (arg1)->font = *arg2; + + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_VisualAttributes_font_get(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; + wxFont *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:VisualAttributes_font_get",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxVisualAttributes, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + result = (wxFont *)& ((arg1)->font); + + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 0); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_VisualAttributes_colFg_set(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; + wxColour *arg2 = (wxColour *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "colFg", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VisualAttributes_colFg_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxVisualAttributes, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxColour, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (arg1) (arg1)->colFg = *arg2; + + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_VisualAttributes_colFg_get(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; + wxColour *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:VisualAttributes_colFg_get",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxVisualAttributes, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + result = (wxColour *)& ((arg1)->colFg); + + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxColour, 0); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_VisualAttributes_colBg_set(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; + wxColour *arg2 = (wxColour *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "colBg", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VisualAttributes_colBg_set",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxVisualAttributes, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxColour, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (arg1) (arg1)->colBg = *arg2; + + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_VisualAttributes_colBg_get(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; + wxColour *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:VisualAttributes_colBg_get",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxVisualAttributes, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + result = (wxColour *)& ((arg1)->colBg); + + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxColour, 0); + return resultobj; + fail: + return NULL; +} + + +static PyObject * VisualAttributes_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxVisualAttributes, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - int arg2 ; + int arg2 = (int) (int)-1 ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; @@ -21121,11 +21373,13 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Window",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_Window",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int const) SWIG_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; + if (obj1) { + arg2 = (int const) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -21201,7 +21455,7 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - int arg3 ; + int arg3 = (int) (int)-1 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; @@ -21224,13 +21478,15 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Window_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:Window_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (int const) SWIG_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; + if (obj2) { + arg3 = (int const) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -22712,7 +22968,7 @@ static PyObject *_wrap_Window_FitInside(PyObject *self, PyObject *args, PyObject } -static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_SetSizeHints__SWIG_0(PyObject *self, PyObject *args) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; int arg2 ; @@ -22728,11 +22984,8 @@ static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args, PyObj PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "minW",(char *) "minH",(char *) "maxW",(char *) "maxH",(char *) "incW",(char *) "incH", NULL - }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Window_SetSizeHints",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OOO|OOOO:Window_SetSizeHints",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = (int) SWIG_AsInt(obj1); @@ -22769,7 +23022,152 @@ static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args, PyObj } -static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Window_SetSizeHints__SWIG_1(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize *arg2 = 0 ; + wxSize const &arg3_defvalue = wxDefaultSize ; + wxSize *arg3 = (wxSize *) &arg3_defvalue ; + wxSize const &arg4_defvalue = wxDefaultSize ; + wxSize *arg4 = (wxSize *) &arg4_defvalue ; + wxSize temp2 ; + wxSize temp3 ; + wxSize temp4 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"OO|OO:Window_SetSizeHints",&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + if (obj2) { + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + } + } + if (obj3) { + { + arg4 = &temp4; + if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetSizeHints((wxSize const &)*arg2,(wxSize const &)*arg3,(wxSize const &)*arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[8]; + int ii; + + argc = PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 7); ii++) { + argv[ii] = PyTuple_GetItem(args,ii); + } + if ((argc >= 2) && (argc <= 4)) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2); + } + if (_v) { + if (argc <= 2) { + return _wrap_Window_SetSizeHints__SWIG_1(self,args); + } + { + _v = wxPySimple_typecheck(argv[2], wxT("wxSize"), 2); + } + if (_v) { + if (argc <= 3) { + return _wrap_Window_SetSizeHints__SWIG_1(self,args); + } + { + _v = wxPySimple_typecheck(argv[3], wxT("wxSize"), 2); + } + if (_v) { + return _wrap_Window_SetSizeHints__SWIG_1(self,args); + } + } + } + } + } + if ((argc >= 3) && (argc <= 7)) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + _v = SWIG_CheckInt(argv[1]); + if (_v) { + _v = SWIG_CheckInt(argv[2]); + if (_v) { + if (argc <= 3) { + return _wrap_Window_SetSizeHints__SWIG_0(self,args); + } + _v = SWIG_CheckInt(argv[3]); + if (_v) { + if (argc <= 4) { + return _wrap_Window_SetSizeHints__SWIG_0(self,args); + } + _v = SWIG_CheckInt(argv[4]); + if (_v) { + if (argc <= 5) { + return _wrap_Window_SetSizeHints__SWIG_0(self,args); + } + _v = SWIG_CheckInt(argv[5]); + if (_v) { + if (argc <= 6) { + return _wrap_Window_SetSizeHints__SWIG_0(self,args); + } + _v = SWIG_CheckInt(argv[6]); + if (_v) { + return _wrap_Window_SetSizeHints__SWIG_0(self,args); + } + } + } + } + } + } + } + } + + PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'Window_SetSizeHints'"); + return NULL; +} + + +static PyObject *_wrap_Window_SetVirtualSizeHints__SWIG_0(PyObject *self, PyObject *args) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; int arg2 ; @@ -22781,11 +23179,8 @@ static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "minW",(char *) "minH",(char *) "maxW",(char *) "maxH", NULL - }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Window_SetVirtualSizeHints",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OOO|OO:Window_SetVirtualSizeHints",&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; arg2 = (int) SWIG_AsInt(obj1); @@ -22814,6 +23209,121 @@ static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args } +static PyObject *_wrap_Window_SetVirtualSizeHints__SWIG_1(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize *arg2 = 0 ; + wxSize const &arg3_defvalue = wxDefaultSize ; + wxSize *arg3 = (wxSize *) &arg3_defvalue ; + wxSize temp2 ; + wxSize temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"OO|O:Window_SetVirtualSizeHints",&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + if (obj2) { + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetVirtualSizeHints((wxSize const &)*arg2,(wxSize const &)*arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[6]; + int ii; + + argc = PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 5); ii++) { + argv[ii] = PyTuple_GetItem(args,ii); + } + if ((argc >= 2) && (argc <= 3)) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2); + } + if (_v) { + if (argc <= 2) { + return _wrap_Window_SetVirtualSizeHints__SWIG_1(self,args); + } + { + _v = wxPySimple_typecheck(argv[2], wxT("wxSize"), 2); + } + if (_v) { + return _wrap_Window_SetVirtualSizeHints__SWIG_1(self,args); + } + } + } + } + if ((argc >= 3) && (argc <= 5)) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + _v = SWIG_CheckInt(argv[1]); + if (_v) { + _v = SWIG_CheckInt(argv[2]); + if (_v) { + if (argc <= 3) { + return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); + } + _v = SWIG_CheckInt(argv[3]); + if (_v) { + if (argc <= 4) { + return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); + } + _v = SWIG_CheckInt(argv[4]); + if (_v) { + return _wrap_Window_SetVirtualSizeHints__SWIG_0(self,args); + } + } + } + } + } + } + + PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'Window_SetVirtualSizeHints'"); + return NULL; +} + + static PyObject *_wrap_Window_GetMinWidth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -22948,6 +23458,36 @@ static PyObject *_wrap_Window_GetMaxSize(PyObject *self, PyObject *args, PyObjec } +static PyObject *_wrap_Window_GetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetMinSize",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxWindow const *)arg1)->GetMinSize(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxSize * resultptr; + resultptr = new wxSize((wxSize &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Window_SetVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -24259,6 +24799,115 @@ static PyObject *_wrap_Window_GetValidator(PyObject *self, PyObject *args, PyObj } +static PyObject *_wrap_Window_Validate(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_Validate",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->Validate(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_TransferDataToWindow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_TransferDataToWindow",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->TransferDataToWindow(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_TransferDataFromWindow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_TransferDataFromWindow",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->TransferDataFromWindow(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_InitDialog(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_InitDialog",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->InitDialog(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Window_SetAcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -25128,6 +25777,68 @@ static PyObject *_wrap_Window_IsExposedRect(PyObject *self, PyObject *args, PyOb } +static PyObject *_wrap_Window_GetDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxVisualAttributes result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetDefaultAttributes",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxWindow const *)arg1)->GetDefaultAttributes(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxVisualAttributes * resultptr; + resultptr = new wxVisualAttributes((wxVisualAttributes &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxVisualAttributes, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Window_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 = (int) wxWINDOW_VARIANT_NORMAL ; + wxVisualAttributes result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "variant", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Window_GetClassDefaultAttributes",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (wxWindowVariant) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxWindow::GetClassDefaultAttributes((wxWindowVariant )arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxVisualAttributes * resultptr; + resultptr = new wxVisualAttributes((wxVisualAttributes &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxVisualAttributes, 1); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Window_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -32497,6 +33208,38 @@ static PyObject *_wrap_Control_SetLabel(PyObject *self, PyObject *args, PyObject } +static PyObject *_wrap_Control_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 = (int) wxWINDOW_VARIANT_NORMAL ; + wxVisualAttributes result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "variant", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Control_GetClassDefaultAttributes",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (wxWindowVariant) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxControl::GetClassDefaultAttributes((wxWindowVariant )arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxVisualAttributes * resultptr; + resultptr = new wxVisualAttributes((wxVisualAttributes &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxVisualAttributes, 1); + } + return resultobj; + fail: + return NULL; +} + + static PyObject * Control_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -32580,6 +33323,7 @@ static PyObject *_wrap_ItemContainer_AppendItems(PyObject *self, PyObject *args, #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg2->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -39752,6 +40496,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"Size_SetHeight", (PyCFunction) _wrap_Size_SetHeight, METH_VARARGS | METH_KEYWORDS }, { (char *)"Size_GetWidth", (PyCFunction) _wrap_Size_GetWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Size_GetHeight", (PyCFunction) _wrap_Size_GetHeight, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Size_IsFullySpecified", (PyCFunction) _wrap_Size_IsFullySpecified, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Size_SetDefaults", (PyCFunction) _wrap_Size_SetDefaults, METH_VARARGS | METH_KEYWORDS }, { (char *)"Size_Get", (PyCFunction) _wrap_Size_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Size_swigregister", Size_swigregister, METH_VARARGS }, { (char *)"RealPoint_x_set", (PyCFunction) _wrap_RealPoint_x_set, METH_VARARGS | METH_KEYWORDS }, @@ -40410,6 +41156,15 @@ static PyMethodDef SwigMethods[] = { { (char *)"AcceleratorTable_Ok", (PyCFunction) _wrap_AcceleratorTable_Ok, METH_VARARGS | METH_KEYWORDS }, { (char *)"AcceleratorTable_swigregister", AcceleratorTable_swigregister, METH_VARARGS }, { (char *)"GetAccelFromString", (PyCFunction) _wrap_GetAccelFromString, METH_VARARGS | METH_KEYWORDS }, + { (char *)"new_VisualAttributes", (PyCFunction) _wrap_new_VisualAttributes, METH_VARARGS | METH_KEYWORDS }, + { (char *)"delete_VisualAttributes", (PyCFunction) _wrap_delete_VisualAttributes, METH_VARARGS | METH_KEYWORDS }, + { (char *)"VisualAttributes_font_set", (PyCFunction) _wrap_VisualAttributes_font_set, METH_VARARGS | METH_KEYWORDS }, + { (char *)"VisualAttributes_font_get", (PyCFunction) _wrap_VisualAttributes_font_get, METH_VARARGS | METH_KEYWORDS }, + { (char *)"VisualAttributes_colFg_set", (PyCFunction) _wrap_VisualAttributes_colFg_set, METH_VARARGS | METH_KEYWORDS }, + { (char *)"VisualAttributes_colFg_get", (PyCFunction) _wrap_VisualAttributes_colFg_get, METH_VARARGS | METH_KEYWORDS }, + { (char *)"VisualAttributes_colBg_set", (PyCFunction) _wrap_VisualAttributes_colBg_set, METH_VARARGS | METH_KEYWORDS }, + { (char *)"VisualAttributes_colBg_get", (PyCFunction) _wrap_VisualAttributes_colBg_get, METH_VARARGS | METH_KEYWORDS }, + { (char *)"VisualAttributes_swigregister", VisualAttributes_swigregister, METH_VARARGS }, { (char *)"new_Window", (PyCFunction) _wrap_new_Window, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_PreWindow", (PyCFunction) _wrap_new_PreWindow, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_Create", (PyCFunction) _wrap_Window_Create, METH_VARARGS | METH_KEYWORDS }, @@ -40458,13 +41213,14 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_CenterOnParent", (PyCFunction) _wrap_Window_CenterOnParent, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_Fit", (PyCFunction) _wrap_Window_Fit, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_FitInside", (PyCFunction) _wrap_Window_FitInside, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_SetSizeHints", (PyCFunction) _wrap_Window_SetSizeHints, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Window_SetVirtualSizeHints", (PyCFunction) _wrap_Window_SetVirtualSizeHints, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetSizeHints", _wrap_Window_SetSizeHints, METH_VARARGS }, + { (char *)"Window_SetVirtualSizeHints", _wrap_Window_SetVirtualSizeHints, METH_VARARGS }, { (char *)"Window_GetMinWidth", (PyCFunction) _wrap_Window_GetMinWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMinHeight", (PyCFunction) _wrap_Window_GetMinHeight, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMaxWidth", (PyCFunction) _wrap_Window_GetMaxWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMaxHeight", (PyCFunction) _wrap_Window_GetMaxHeight, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetMaxSize", (PyCFunction) _wrap_Window_GetMaxSize, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_GetMinSize", (PyCFunction) _wrap_Window_GetMinSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetVirtualSize", (PyCFunction) _wrap_Window_SetVirtualSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetVirtualSizeWH", (PyCFunction) _wrap_Window_SetVirtualSizeWH, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetVirtualSize", (PyCFunction) _wrap_Window_GetVirtualSize, METH_VARARGS | METH_KEYWORDS }, @@ -40509,6 +41265,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_RemoveEventHandler", (PyCFunction) _wrap_Window_RemoveEventHandler, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetValidator", (PyCFunction) _wrap_Window_SetValidator, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetValidator", (PyCFunction) _wrap_Window_GetValidator, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_Validate", (PyCFunction) _wrap_Window_Validate, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_TransferDataToWindow", (PyCFunction) _wrap_Window_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_TransferDataFromWindow", (PyCFunction) _wrap_Window_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_InitDialog", (PyCFunction) _wrap_Window_InitDialog, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetAcceleratorTable", (PyCFunction) _wrap_Window_SetAcceleratorTable, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetAcceleratorTable", (PyCFunction) _wrap_Window_GetAcceleratorTable, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_RegisterHotKey", (PyCFunction) _wrap_Window_RegisterHotKey, METH_VARARGS | METH_KEYWORDS }, @@ -40536,6 +41296,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_IsExposed", (PyCFunction) _wrap_Window_IsExposed, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_IsExposedPoint", (PyCFunction) _wrap_Window_IsExposedPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_IsExposedRect", (PyCFunction) _wrap_Window_IsExposedRect, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_GetDefaultAttributes", (PyCFunction) _wrap_Window_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_GetClassDefaultAttributes", (PyCFunction) _wrap_Window_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetBackgroundColour", (PyCFunction) _wrap_Window_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetForegroundColour", (PyCFunction) _wrap_Window_SetForegroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetBackgroundColour", (PyCFunction) _wrap_Window_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, @@ -40743,6 +41505,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Control_Command", (PyCFunction) _wrap_Control_Command, METH_VARARGS | METH_KEYWORDS }, { (char *)"Control_GetLabel", (PyCFunction) _wrap_Control_GetLabel, METH_VARARGS | METH_KEYWORDS }, { (char *)"Control_SetLabel", (PyCFunction) _wrap_Control_SetLabel, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Control_GetClassDefaultAttributes", (PyCFunction) _wrap_Control_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Control_swigregister", Control_swigregister, METH_VARARGS }, { (char *)"ItemContainer_Append", (PyCFunction) _wrap_ItemContainer_Append, METH_VARARGS | METH_KEYWORDS }, { (char *)"ItemContainer_AppendItems", (PyCFunction) _wrap_ItemContainer_AppendItems, METH_VARARGS | METH_KEYWORDS }, @@ -41483,6 +42246,7 @@ static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0, 0, 0, 0},{"_p static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0, 0, 0, 0},{"_p_wxSize", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0, 0, 0, 0},{"_p_wxDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPySizer[] = {{"_p_wxPySizer", 0, "wxPySizer *", 0, 0, 0, 0},{"_p_wxPySizer", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxVisualAttributes[] = {{"_p_wxVisualAttributes", 0, "wxVisualAttributes *", 0, 0, 0, 0},{"_p_wxVisualAttributes", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxNotifyEvent[] = {{"_p_wxNotifyEvent", 0, "wxNotifyEvent *", 0, 0, 0, 0},{"_p_wxNotifyEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyEvent[] = {{"_p_wxPyEvent", 0, "wxPyEvent *", 0, 0, 0, 0},{"_p_wxPyEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPropagationDisabler[] = {{"_p_wxPropagationDisabler", 0, "wxPropagationDisabler *", 0, 0, 0, 0},{"_p_wxPropagationDisabler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -41599,6 +42363,7 @@ _swigt__p_int, _swigt__p_wxSize, _swigt__p_wxDC, _swigt__p_wxPySizer, +_swigt__p_wxVisualAttributes, _swigt__p_wxNotifyEvent, _swigt__p_wxPyEvent, _swigt__p_wxPropagationDisabler, @@ -41992,8 +42757,9 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"GROW", SWIG_FromInt((int)wxGROW)); PyDict_SetItemString(d,"EXPAND", SWIG_FromInt((int)wxEXPAND)); PyDict_SetItemString(d,"SHAPED", SWIG_FromInt((int)wxSHAPED)); - PyDict_SetItemString(d,"ADJUST_MINSIZE", SWIG_FromInt((int)wxADJUST_MINSIZE)); + PyDict_SetItemString(d,"FIXED_SIZE", SWIG_FromInt((int)wxFIXED_SIZE)); PyDict_SetItemString(d,"TILE", SWIG_FromInt((int)wxTILE)); + PyDict_SetItemString(d,"ADJUST_MINSIZE", SWIG_FromInt((int)wxADJUST_MINSIZE)); PyDict_SetItemString(d,"BORDER_DEFAULT", SWIG_FromInt((int)wxBORDER_DEFAULT)); PyDict_SetItemString(d,"BORDER_NONE", SWIG_FromInt((int)wxBORDER_NONE)); PyDict_SetItemString(d,"BORDER_STATIC", SWIG_FromInt((int)wxBORDER_STATIC)); @@ -42471,11 +43237,11 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"PRINT_POSTSCRIPT", SWIG_FromInt((int)wxPRINT_POSTSCRIPT)); SWIG_addvarlink(SWIG_globals,(char*)"NullAcceleratorTable",_wrap_NullAcceleratorTable_get, _wrap_NullAcceleratorTable_set); SWIG_addvarlink(SWIG_globals,(char*)"PanelNameStr",_wrap_PanelNameStr_get, _wrap_PanelNameStr_set); - PyDict_SetItemString(d,"WINDOW_VARIANT_DEFAULT", SWIG_FromInt((int)wxWINDOW_VARIANT_DEFAULT)); PyDict_SetItemString(d,"WINDOW_VARIANT_NORMAL", SWIG_FromInt((int)wxWINDOW_VARIANT_NORMAL)); PyDict_SetItemString(d,"WINDOW_VARIANT_SMALL", SWIG_FromInt((int)wxWINDOW_VARIANT_SMALL)); PyDict_SetItemString(d,"WINDOW_VARIANT_MINI", SWIG_FromInt((int)wxWINDOW_VARIANT_MINI)); PyDict_SetItemString(d,"WINDOW_VARIANT_LARGE", SWIG_FromInt((int)wxWINDOW_VARIANT_LARGE)); + PyDict_SetItemString(d,"WINDOW_VARIANT_MAX", SWIG_FromInt((int)wxWINDOW_VARIANT_MAX)); SWIG_addvarlink(SWIG_globals,(char*)"DefaultValidator",_wrap_DefaultValidator_get, _wrap_DefaultValidator_set); SWIG_addvarlink(SWIG_globals,(char*)"ControlNameStr",_wrap_ControlNameStr_get, _wrap_ControlNameStr_set); PyDict_SetItemString(d,"FLEX_GROWMODE_NONE", SWIG_FromInt((int)wxFLEX_GROWMODE_NONE)); diff --git a/wxPython/src/msw/grid_wrap.cpp b/wxPython/src/msw/grid_wrap.cpp index dd60ceaddd..48f22d5dda 100644 --- a/wxPython/src/msw/grid_wrap.cpp +++ b/wxPython/src/msw/grid_wrap.cpp @@ -8782,6 +8782,7 @@ static PyObject *_wrap_Grid_GetTextBoxSize(PyObject *self, PyObject *args, PyObj #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg3->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); diff --git a/wxPython/src/msw/misc_wrap.cpp b/wxPython/src/msw/misc_wrap.cpp index 3e38d3c3f1..11d0f9d310 100644 --- a/wxPython/src/msw/misc_wrap.cpp +++ b/wxPython/src/msw/misc_wrap.cpp @@ -11917,6 +11917,7 @@ static PyObject *_wrap_new_FileTypeInfoSequence(PyObject *self, PyObject *args, #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg1->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); diff --git a/wxPython/src/msw/windows.py b/wxPython/src/msw/windows.py index 4da0354318..aaca32c6d3 100644 --- a/wxPython/src/msw/windows.py +++ b/wxPython/src/msw/windows.py @@ -33,7 +33,12 @@ class Panel(core.Window): return _windows.Panel_Create(*args, **kwargs) def InitDialog(*args, **kwargs): - """InitDialog()""" + """ + InitDialog() + + Sends an EVT_INIT_DIALOG event, whose handler usually transfers + data to the dialog via validators. + """ return _windows.Panel_InitDialog(*args, **kwargs) @@ -683,8 +688,8 @@ class SplitterWindow(core.Window): return "<%s.%s; proxy of C++ wxSplitterWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, - long style=SP_3D, String name=SplitterNameStr) -> SplitterWindow + __init__(Window parent, int id=-1, Point pos=DefaultPosition, + Size size=DefaultSize, long style=SP_3D, String name=SplitterNameStr) -> SplitterWindow Constructor. Creates and shows a SplitterWindow. """ @@ -697,8 +702,8 @@ class SplitterWindow(core.Window): def Create(*args, **kwargs): """ - Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, - long style=SP_3D, String name=SplitterNameStr) -> bool + Create(Window parent, int id=-1, Point pos=DefaultPosition, + Size size=DefaultSize, long style=SP_3D, String name=SplitterNameStr) -> bool Create the GUI part of the SplitterWindow for the 2-phase create. """ @@ -1843,6 +1848,14 @@ class TaskBarIcon(core.EvtHandler): if self.thisown: destroy(self) except: pass + def Destroy(*args, **kwargs): + """ + Destroy() + + Deletes the C++ object this Python object is a proxy for. + """ + return _windows.TaskBarIcon_Destroy(*args, **kwargs) + def IsOk(*args, **kwargs): """IsOk() -> bool""" return _windows.TaskBarIcon_IsOk(*args, **kwargs) diff --git a/wxPython/src/msw/windows_wrap.cpp b/wxPython/src/msw/windows_wrap.cpp index 958f2f1fea..d68db194ae 100644 --- a/wxPython/src/msw/windows_wrap.cpp +++ b/wxPython/src/msw/windows_wrap.cpp @@ -825,6 +825,11 @@ enum { }; #endif +void wxTaskBarIcon_Destroy(wxTaskBarIcon *self){ + + self->RemoveIcon(); + + } static const wxString wxPyFileSelectorPromptStr(wxFileSelectorPromptStr); static const wxString wxPyDirSelectorPromptStr(wxDirSelectorPromptStr); static const wxString wxPyDirDialogNameStr(wxDirDialogNameStr); @@ -5424,7 +5429,7 @@ static PyObject *_wrap_SplitterNameStr_get() { static PyObject *_wrap_new_SplitterWindow(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - int arg2 ; + int arg2 = (int) -1 ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; @@ -5446,11 +5451,13 @@ static PyObject *_wrap_new_SplitterWindow(PyObject *self, PyObject *args, PyObje (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_SplitterWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_SplitterWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -5522,7 +5529,7 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - int arg3 ; + int arg3 = (int) -1 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; @@ -5545,13 +5552,15 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:SplitterWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:SplitterWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSplitterWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg3 = (int) SWIG_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -10648,6 +10657,31 @@ static PyObject *_wrap_delete_TaskBarIcon(PyObject *self, PyObject *args, PyObje } +static PyObject *_wrap_TaskBarIcon_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TaskBarIcon_Destroy",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTaskBarIcon, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxTaskBarIcon_Destroy(arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_TaskBarIcon_IsOk(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ; @@ -24658,6 +24692,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS }, { (char *)"new_TaskBarIcon", (PyCFunction) _wrap_new_TaskBarIcon, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_TaskBarIcon", (PyCFunction) _wrap_delete_TaskBarIcon, METH_VARARGS | METH_KEYWORDS }, + { (char *)"TaskBarIcon_Destroy", (PyCFunction) _wrap_TaskBarIcon_Destroy, METH_VARARGS | METH_KEYWORDS }, { (char *)"TaskBarIcon_IsOk", (PyCFunction) _wrap_TaskBarIcon_IsOk, METH_VARARGS | METH_KEYWORDS }, { (char *)"TaskBarIcon_IsIconInstalled", (PyCFunction) _wrap_TaskBarIcon_IsIconInstalled, METH_VARARGS | METH_KEYWORDS }, { (char *)"TaskBarIcon_SetIcon", (PyCFunction) _wrap_TaskBarIcon_SetIcon, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/wxPython/core.py b/wxPython/wxPython/core.py index c8e866a9be..879217de7e 100644 --- a/wxPython/wxPython/core.py +++ b/wxPython/wxPython/core.py @@ -292,8 +292,9 @@ wxSHRINK = wx.core.SHRINK wxGROW = wx.core.GROW wxEXPAND = wx.core.EXPAND wxSHAPED = wx.core.SHAPED -wxADJUST_MINSIZE = wx.core.ADJUST_MINSIZE +wxFIXED_SIZE = wx.core.FIXED_SIZE wxTILE = wx.core.TILE +wxADJUST_MINSIZE = wx.core.ADJUST_MINSIZE wxBORDER_DEFAULT = wx.core.BORDER_DEFAULT wxBORDER_NONE = wx.core.BORDER_NONE wxBORDER_STATIC = wx.core.BORDER_STATIC -- 2.45.2