From 33d6fd3b4c38226d3859de4a29ab317f588ada22 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 14 Sep 2006 21:27:26 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/gizmos/gtk/gizmos.py | 237 ++- wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp | 1809 ++++++++++++------- wxPython/contrib/gizmos/mac/gizmos.py | 237 ++- wxPython/contrib/gizmos/mac/gizmos_wrap.cpp | 1809 ++++++++++++------- wxPython/contrib/gizmos/msw/gizmos.py | 237 ++- wxPython/contrib/gizmos/msw/gizmos_wrap.cpp | 1809 ++++++++++++------- wxPython/src/gtk/_controls.py | 36 + wxPython/src/gtk/_controls_wrap.cpp | 3 + wxPython/src/gtk/_core.py | 143 +- wxPython/src/gtk/_core_wrap.cpp | 106 +- wxPython/src/gtk/_gdi.py | 93 +- wxPython/src/gtk/_gdi_wrap.cpp | 839 ++++++++- wxPython/src/gtk/_misc.py | 22 + wxPython/src/gtk/_windows.py | 103 +- wxPython/src/gtk/xrc.py | 23 +- wxPython/src/gtk/xrc_wrap.cpp | 179 +- wxPython/src/mac/_controls.py | 36 + wxPython/src/mac/_controls_wrap.cpp | 3 + wxPython/src/mac/_core.py | 143 +- wxPython/src/mac/_core_wrap.cpp | 106 +- wxPython/src/mac/_gdi.py | 92 +- wxPython/src/mac/_gdi_wrap.cpp | 839 ++++++++- wxPython/src/mac/_misc.py | 22 + wxPython/src/mac/_windows.py | 103 +- wxPython/src/mac/xrc.py | 23 +- wxPython/src/mac/xrc_wrap.cpp | 179 +- wxPython/src/msw/_controls.py | 36 + wxPython/src/msw/_controls_wrap.cpp | 3 + wxPython/src/msw/_core.py | 143 +- wxPython/src/msw/_core_wrap.cpp | 106 +- wxPython/src/msw/_gdi.py | 94 +- wxPython/src/msw/_gdi_wrap.cpp | 839 ++++++++- wxPython/src/msw/_misc.py | 22 + wxPython/src/msw/_windows.py | 103 +- wxPython/src/msw/xrc.py | 23 +- wxPython/src/msw/xrc_wrap.cpp | 179 +- 36 files changed, 8193 insertions(+), 2586 deletions(-) diff --git a/wxPython/contrib/gizmos/gtk/gizmos.py b/wxPython/contrib/gizmos/gtk/gizmos.py index 6a7f5add74..592f85aeae 100644 --- a/wxPython/contrib/gizmos/gtk/gizmos.py +++ b/wxPython/contrib/gizmos/gtk/gizmos.py @@ -76,7 +76,6 @@ _gizmos.DynamicSashSplitEvent_swigregister(DynamicSashSplitEvent) cvar = _gizmos.cvar DynamicSashNameStr = cvar.DynamicSashNameStr EditableListBoxNameStr = cvar.EditableListBoxNameStr -TreeListCtrlNameStr = cvar.TreeListCtrlNameStr StaticPictureNameStr = cvar.StaticPictureNameStr class DynamicSashUnifyEvent(_core.CommandEvent): @@ -331,33 +330,50 @@ def PreLEDNumberCtrl(*args, **kwargs): val = _gizmos.new_PreLEDNumberCtrl(*args, **kwargs) return val -TL_ALIGN_LEFT = _gizmos.TL_ALIGN_LEFT -TL_ALIGN_RIGHT = _gizmos.TL_ALIGN_RIGHT -TL_ALIGN_CENTER = _gizmos.TL_ALIGN_CENTER +#--------------------------------------------------------------------------- + +DEFAULT_COL_WIDTH = _gizmos.DEFAULT_COL_WIDTH +TL_MODE_NAV_FULLTREE = _gizmos.TL_MODE_NAV_FULLTREE +TL_MODE_NAV_EXPANDED = _gizmos.TL_MODE_NAV_EXPANDED +TL_MODE_NAV_VISIBLE = _gizmos.TL_MODE_NAV_VISIBLE +TL_MODE_NAV_LEVEL = _gizmos.TL_MODE_NAV_LEVEL +TL_MODE_FIND_EXACT = _gizmos.TL_MODE_FIND_EXACT +TL_MODE_FIND_PARTIAL = _gizmos.TL_MODE_FIND_PARTIAL +TL_MODE_FIND_NOCASE = _gizmos.TL_MODE_FIND_NOCASE TREE_HITTEST_ONITEMCOLUMN = _gizmos.TREE_HITTEST_ONITEMCOLUMN -TL_SEARCH_VISIBLE = _gizmos.TL_SEARCH_VISIBLE -TL_SEARCH_LEVEL = _gizmos.TL_SEARCH_LEVEL -TL_SEARCH_FULL = _gizmos.TL_SEARCH_FULL -TL_SEARCH_PARTIAL = _gizmos.TL_SEARCH_PARTIAL -TL_SEARCH_NOCASE = _gizmos.TL_SEARCH_NOCASE -TR_DONT_ADJUST_MAC = _gizmos.TR_DONT_ADJUST_MAC -wx.TR_DONT_ADJUST_MAC = TR_DONT_ADJUST_MAC +wx.TREE_HITTEST_ONITEMCOLUMN = TREE_HITTEST_ONITEMCOLUMN +TR_COLUMN_LINES = _gizmos.TR_COLUMN_LINES +TR_VIRTUAL = _gizmos.TR_VIRTUAL +wx.TR_COLUMN_LINES = TR_COLUMN_LINES +wxTR_VIRTUAL = TR_VIRTUAL + +#// Compatibility aliases for old names/values +TL_ALIGN_LEFT = wx.ALIGN_LEFT +TL_ALIGN_RIGHT = wx.ALIGN_RIGHT +TL_ALIGN_CENTER = wx.ALIGN_CENTER + +TL_SEARCH_VISIBLE = TL_MODE_NAV_VISIBLE +TL_SEARCH_LEVEL = TL_MODE_NAV_LEVEL +TL_SEARCH_FULL = TL_MODE_FIND_EXACT +TL_SEARCH_PARTIAL = TL_MODE_FIND_PARTIAL +TL_SEARCH_NOCASE = TL_MODE_FIND_NOCASE + +TR_DONT_ADJUST_MAC = 0 +wx.TR_DONT_ADJUST_MAC = TR_DONT_ADJUST_MAC + class TreeListColumnInfo(_core.Object): """Proxy of C++ TreeListColumnInfo class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr def __init__(self, *args, **kwargs): """ - __init__(self, String text=EmptyString, int image=-1, size_t width=100, - bool shown=True, int alignment=TL_ALIGN_LEFT) -> TreeListColumnInfo + __init__(self, String text=EmptyString, int width=DEFAULT_COL_WIDTH, + int flag=ALIGN_LEFT, int image=-1, bool shown=True, + bool edit=False) -> TreeListColumnInfo """ _gizmos.TreeListColumnInfo_swiginit(self,_gizmos.new_TreeListColumnInfo(*args, **kwargs)) __swig_destroy__ = _gizmos.delete_TreeListColumnInfo __del__ = lambda self : None; - def GetShown(*args, **kwargs): - """GetShown(self) -> bool""" - return _gizmos.TreeListColumnInfo_GetShown(*args, **kwargs) - def GetAlignment(*args, **kwargs): """GetAlignment(self) -> int""" return _gizmos.TreeListColumnInfo_GetAlignment(*args, **kwargs) @@ -378,9 +394,13 @@ class TreeListColumnInfo(_core.Object): """GetWidth(self) -> size_t""" return _gizmos.TreeListColumnInfo_GetWidth(*args, **kwargs) - def SetShown(*args, **kwargs): - """SetShown(self, bool shown)""" - return _gizmos.TreeListColumnInfo_SetShown(*args, **kwargs) + def IsEditable(*args, **kwargs): + """IsEditable(self) -> bool""" + return _gizmos.TreeListColumnInfo_IsEditable(*args, **kwargs) + + def IsShown(*args, **kwargs): + """IsShown(self) -> bool""" + return _gizmos.TreeListColumnInfo_IsShown(*args, **kwargs) def SetAlignment(*args, **kwargs): """SetAlignment(self, int alignment)""" @@ -402,7 +422,16 @@ class TreeListColumnInfo(_core.Object): """SetWidth(self, size_t with)""" return _gizmos.TreeListColumnInfo_SetWidth(*args, **kwargs) + def SetEditable(*args, **kwargs): + """SetEditable(self, bool edit)""" + return _gizmos.TreeListColumnInfo_SetEditable(*args, **kwargs) + + def SetShown(*args, **kwargs): + """SetShown(self, bool shown)""" + return _gizmos.TreeListColumnInfo_SetShown(*args, **kwargs) + _gizmos.TreeListColumnInfo_swigregister(TreeListColumnInfo) +TreeListCtrlNameStr = cvar.TreeListCtrlNameStr class TreeListCtrl(_core.Control): """Proxy of C++ TreeListCtrl class""" @@ -490,7 +519,10 @@ class TreeListCtrl(_core.Control): return _gizmos.TreeListCtrl_AssignButtonsImageList(*args, **kwargs) def AddColumn(*args, **kwargs): - """AddColumn(self, String text)""" + """ + AddColumn(self, String text, int width=DEFAULT_COL_WIDTH, int flag=ALIGN_LEFT, + int image=-1, bool shown=True, bool edit=False) + """ return _gizmos.TreeListCtrl_AddColumn(*args, **kwargs) def AddColumnInfo(*args, **kwargs): @@ -498,7 +530,11 @@ class TreeListCtrl(_core.Control): return _gizmos.TreeListCtrl_AddColumnInfo(*args, **kwargs) def InsertColumn(*args, **kwargs): - """InsertColumn(self, size_t before, String text)""" + """ + InsertColumn(self, int before, String text, int width=DEFAULT_COL_WIDTH, + int flag=ALIGN_LEFT, int image=-1, bool shown=True, + bool edit=False) + """ return _gizmos.TreeListCtrl_InsertColumn(*args, **kwargs) def InsertColumnInfo(*args, **kwargs): @@ -513,14 +549,6 @@ class TreeListCtrl(_core.Control): """GetColumnCount(self) -> size_t""" return _gizmos.TreeListCtrl_GetColumnCount(*args, **kwargs) - def SetColumnWidth(*args, **kwargs): - """SetColumnWidth(self, size_t column, size_t width)""" - return _gizmos.TreeListCtrl_SetColumnWidth(*args, **kwargs) - - def GetColumnWidth(*args, **kwargs): - """GetColumnWidth(self, size_t column) -> int""" - return _gizmos.TreeListCtrl_GetColumnWidth(*args, **kwargs) - def SetMainColumn(*args, **kwargs): """SetMainColumn(self, size_t column)""" return _gizmos.TreeListCtrl_SetMainColumn(*args, **kwargs) @@ -529,46 +557,63 @@ class TreeListCtrl(_core.Control): """GetMainColumn(self) -> size_t""" return _gizmos.TreeListCtrl_GetMainColumn(*args, **kwargs) + def SetColumn(*args, **kwargs): + """SetColumn(self, int column, TreeListColumnInfo colInfo)""" + return _gizmos.TreeListCtrl_SetColumn(*args, **kwargs) + + def GetColumn(*args, **kwargs): + """GetColumn(self, int column) -> TreeListColumnInfo""" + return _gizmos.TreeListCtrl_GetColumn(*args, **kwargs) + def SetColumnText(*args, **kwargs): - """SetColumnText(self, size_t column, String text)""" + """SetColumnText(self, int column, String text)""" return _gizmos.TreeListCtrl_SetColumnText(*args, **kwargs) def GetColumnText(*args, **kwargs): - """GetColumnText(self, size_t column) -> String""" + """GetColumnText(self, int column) -> String""" return _gizmos.TreeListCtrl_GetColumnText(*args, **kwargs) - def SetColumn(*args, **kwargs): - """SetColumn(self, size_t column, TreeListColumnInfo info)""" - return _gizmos.TreeListCtrl_SetColumn(*args, **kwargs) + def SetColumnWidth(*args, **kwargs): + """SetColumnWidth(self, int column, int width)""" + return _gizmos.TreeListCtrl_SetColumnWidth(*args, **kwargs) - def GetColumn(*args, **kwargs): - """GetColumn(self, size_t column) -> TreeListColumnInfo""" - return _gizmos.TreeListCtrl_GetColumn(*args, **kwargs) + def GetColumnWidth(*args, **kwargs): + """GetColumnWidth(self, int column) -> int""" + return _gizmos.TreeListCtrl_GetColumnWidth(*args, **kwargs) def SetColumnAlignment(*args, **kwargs): - """SetColumnAlignment(self, size_t column, int align)""" + """SetColumnAlignment(self, int column, int flag)""" return _gizmos.TreeListCtrl_SetColumnAlignment(*args, **kwargs) def GetColumnAlignment(*args, **kwargs): - """GetColumnAlignment(self, size_t column) -> int""" + """GetColumnAlignment(self, int column) -> int""" return _gizmos.TreeListCtrl_GetColumnAlignment(*args, **kwargs) def SetColumnImage(*args, **kwargs): - """SetColumnImage(self, size_t column, int image)""" + """SetColumnImage(self, int column, int image)""" return _gizmos.TreeListCtrl_SetColumnImage(*args, **kwargs) def GetColumnImage(*args, **kwargs): - """GetColumnImage(self, size_t column) -> int""" + """GetColumnImage(self, int column) -> int""" return _gizmos.TreeListCtrl_GetColumnImage(*args, **kwargs) - def ShowColumn(*args, **kwargs): - """ShowColumn(self, size_t column, bool shown)""" - return _gizmos.TreeListCtrl_ShowColumn(*args, **kwargs) + def SetColumnShown(*args, **kwargs): + """SetColumnShown(self, int column, bool shown=True)""" + return _gizmos.TreeListCtrl_SetColumnShown(*args, **kwargs) def IsColumnShown(*args, **kwargs): - """IsColumnShown(self, size_t column) -> bool""" + """IsColumnShown(self, int column) -> bool""" return _gizmos.TreeListCtrl_IsColumnShown(*args, **kwargs) + ShowColumn = SetColumnShown + def SetColumnEditable(*args, **kwargs): + """SetColumnEditable(self, int column, bool edit=True)""" + return _gizmos.TreeListCtrl_SetColumnEditable(*args, **kwargs) + + def IsColumnEditable(*args, **kwargs): + """IsColumnEditable(self, int column) -> bool""" + return _gizmos.TreeListCtrl_IsColumnEditable(*args, **kwargs) + def GetItemText(*args, **kwargs): """GetItemText(self, TreeItemId item, int column=-1) -> String""" return _gizmos.TreeListCtrl_GetItemText(*args, **kwargs) @@ -603,6 +648,22 @@ class TreeListCtrl(_core.Control): GetPyData = GetItemPyData SetPyData = SetItemPyData + def GetItemBold(*args, **kwargs): + """GetItemBold(self, TreeItemId item) -> bool""" + return _gizmos.TreeListCtrl_GetItemBold(*args, **kwargs) + + def GetItemTextColour(*args, **kwargs): + """GetItemTextColour(self, TreeItemId item) -> Colour""" + return _gizmos.TreeListCtrl_GetItemTextColour(*args, **kwargs) + + def GetItemBackgroundColour(*args, **kwargs): + """GetItemBackgroundColour(self, TreeItemId item) -> Colour""" + return _gizmos.TreeListCtrl_GetItemBackgroundColour(*args, **kwargs) + + def GetItemFont(*args, **kwargs): + """GetItemFont(self, TreeItemId item) -> Font""" + return _gizmos.TreeListCtrl_GetItemFont(*args, **kwargs) + def SetItemHasChildren(*args, **kwargs): """SetItemHasChildren(self, TreeItemId item, bool has=True)""" return _gizmos.TreeListCtrl_SetItemHasChildren(*args, **kwargs) @@ -623,30 +684,15 @@ class TreeListCtrl(_core.Control): """SetItemFont(self, TreeItemId item, Font font)""" return _gizmos.TreeListCtrl_SetItemFont(*args, **kwargs) - def GetItemBold(*args, **kwargs): - """GetItemBold(self, TreeItemId item) -> bool""" - return _gizmos.TreeListCtrl_GetItemBold(*args, **kwargs) - - def GetItemTextColour(*args, **kwargs): - """GetItemTextColour(self, TreeItemId item) -> Colour""" - return _gizmos.TreeListCtrl_GetItemTextColour(*args, **kwargs) - - def GetItemBackgroundColour(*args, **kwargs): - """GetItemBackgroundColour(self, TreeItemId item) -> Colour""" - return _gizmos.TreeListCtrl_GetItemBackgroundColour(*args, **kwargs) - - def GetItemFont(*args, **kwargs): - """GetItemFont(self, TreeItemId item) -> Font""" - return _gizmos.TreeListCtrl_GetItemFont(*args, **kwargs) - def IsVisible(*args, **kwargs): """IsVisible(self, TreeItemId item) -> bool""" return _gizmos.TreeListCtrl_IsVisible(*args, **kwargs) - def ItemHasChildren(*args, **kwargs): - """ItemHasChildren(self, TreeItemId item) -> bool""" - return _gizmos.TreeListCtrl_ItemHasChildren(*args, **kwargs) + def HasChildren(*args, **kwargs): + """HasChildren(self, TreeItemId item) -> bool""" + return _gizmos.TreeListCtrl_HasChildren(*args, **kwargs) + ItemHasChildren = HasChildren def IsExpanded(*args, **kwargs): """IsExpanded(self, TreeItemId item) -> bool""" return _gizmos.TreeListCtrl_IsExpanded(*args, **kwargs) @@ -688,9 +734,13 @@ class TreeListCtrl(_core.Control): return _gizmos.TreeListCtrl_GetNextChild(*args, **kwargs) def GetLastChild(*args, **kwargs): - """GetLastChild(self, TreeItemId item) -> TreeItemId""" + """GetLastChild(self, TreeItemId item) -> PyObject""" return _gizmos.TreeListCtrl_GetLastChild(*args, **kwargs) + def GetPrevChild(*args, **kwargs): + """GetPrevChild(self, TreeItemId item, void cookie) -> PyObject""" + return _gizmos.TreeListCtrl_GetPrevChild(*args, **kwargs) + def GetNextSibling(*args, **kwargs): """GetNextSibling(self, TreeItemId item) -> TreeItemId""" return _gizmos.TreeListCtrl_GetNextSibling(*args, **kwargs) @@ -699,22 +749,38 @@ class TreeListCtrl(_core.Control): """GetPrevSibling(self, TreeItemId item) -> TreeItemId""" return _gizmos.TreeListCtrl_GetPrevSibling(*args, **kwargs) + def GetNext(*args, **kwargs): + """GetNext(self, TreeItemId item) -> TreeItemId""" + return _gizmos.TreeListCtrl_GetNext(*args, **kwargs) + + def GetPrev(*args, **kwargs): + """GetPrev(self, TreeItemId item) -> TreeItemId""" + return _gizmos.TreeListCtrl_GetPrev(*args, **kwargs) + + def GetFirstExpandedItem(*args, **kwargs): + """GetFirstExpandedItem(self) -> TreeItemId""" + return _gizmos.TreeListCtrl_GetFirstExpandedItem(*args, **kwargs) + + def GetNextExpanded(*args, **kwargs): + """GetNextExpanded(self, TreeItemId item) -> TreeItemId""" + return _gizmos.TreeListCtrl_GetNextExpanded(*args, **kwargs) + + def GetPrevExpanded(*args, **kwargs): + """GetPrevExpanded(self, TreeItemId item) -> TreeItemId""" + return _gizmos.TreeListCtrl_GetPrevExpanded(*args, **kwargs) + def GetFirstVisibleItem(*args, **kwargs): - """GetFirstVisibleItem(self) -> TreeItemId""" + """GetFirstVisibleItem(self, bool fullRow=False) -> TreeItemId""" return _gizmos.TreeListCtrl_GetFirstVisibleItem(*args, **kwargs) def GetNextVisible(*args, **kwargs): - """GetNextVisible(self, TreeItemId item) -> TreeItemId""" + """GetNextVisible(self, TreeItemId item, bool fullRow=False) -> TreeItemId""" return _gizmos.TreeListCtrl_GetNextVisible(*args, **kwargs) def GetPrevVisible(*args, **kwargs): - """GetPrevVisible(self, TreeItemId item) -> TreeItemId""" + """GetPrevVisible(self, TreeItemId item, bool fullRow=False) -> TreeItemId""" return _gizmos.TreeListCtrl_GetPrevVisible(*args, **kwargs) - def GetNext(*args, **kwargs): - """GetNext(self, TreeItemId item) -> TreeItemId""" - return _gizmos.TreeListCtrl_GetNext(*args, **kwargs) - def AddRoot(*args, **kwargs): """AddRoot(self, String text, int image=-1, int selectedImage=-1, TreeItemData data=None) -> TreeItemId""" return _gizmos.TreeListCtrl_AddRoot(*args, **kwargs) @@ -755,10 +821,11 @@ class TreeListCtrl(_core.Control): """DeleteChildren(self, TreeItemId item)""" return _gizmos.TreeListCtrl_DeleteChildren(*args, **kwargs) - def DeleteAllItems(*args, **kwargs): - """DeleteAllItems(self)""" - return _gizmos.TreeListCtrl_DeleteAllItems(*args, **kwargs) + def DeleteRoot(*args, **kwargs): + """DeleteRoot(self)""" + return _gizmos.TreeListCtrl_DeleteRoot(*args, **kwargs) + DeleteAllItems = DeleteRoot def Expand(*args, **kwargs): """Expand(self, TreeItemId item)""" return _gizmos.TreeListCtrl_Expand(*args, **kwargs) @@ -788,11 +855,14 @@ class TreeListCtrl(_core.Control): return _gizmos.TreeListCtrl_UnselectAll(*args, **kwargs) def SelectItem(*args, **kwargs): - """SelectItem(self, TreeItemId item, bool unselect_others=True, bool extended_select=False)""" + """ + SelectItem(self, TreeItemId item, TreeItemId last=(wxTreeItemId *) NULL, + bool unselect_others=True) + """ return _gizmos.TreeListCtrl_SelectItem(*args, **kwargs) def SelectAll(*args, **kwargs): - """SelectAll(self, bool extended_select=False)""" + """SelectAll(self)""" return _gizmos.TreeListCtrl_SelectAll(*args, **kwargs) def EnsureVisible(*args, **kwargs): @@ -812,13 +882,10 @@ class TreeListCtrl(_core.Control): return _gizmos.TreeListCtrl_GetBoundingRect(*args, **kwargs) def EditLabel(*args, **kwargs): - """EditLabel(self, TreeItemId item)""" + """EditLabel(self, TreeItemId item, int column=-1)""" return _gizmos.TreeListCtrl_EditLabel(*args, **kwargs) - def Edit(*args, **kwargs): - """Edit(self, TreeItemId item)""" - return _gizmos.TreeListCtrl_Edit(*args, **kwargs) - + Edit = EditLabel def SortChildren(*args, **kwargs): """SortChildren(self, TreeItemId item)""" return _gizmos.TreeListCtrl_SortChildren(*args, **kwargs) @@ -827,6 +894,10 @@ class TreeListCtrl(_core.Control): """FindItem(self, TreeItemId item, String str, int flags=0) -> TreeItemId""" return _gizmos.TreeListCtrl_FindItem(*args, **kwargs) + def SetDragItem(*args, **kwargs): + """SetDragItem(self, TreeItemId item=(wxTreeItemId *) NULL)""" + return _gizmos.TreeListCtrl_SetDragItem(*args, **kwargs) + def GetHeaderWindow(*args, **kwargs): """GetHeaderWindow(self) -> Window""" return _gizmos.TreeListCtrl_GetHeaderWindow(*args, **kwargs) diff --git a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp index 37141a3f24..f7f2b367a1 100644 --- a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp @@ -2805,13 +2805,9 @@ namespace swig { #include #include -#include "wx/treelistctrl.h" -#include "wx/wxPython/pytree.h" - static const wxString wxPyDynamicSashNameStr(wxT("dynamicSashWindow")); static const wxString wxPyEditableListBoxNameStr(wxT("editableListBox")); - static const wxString wxPyTreeListCtrlNameStr(wxT("treelistctrl")); static const wxString wxPyStaticPictureNameStr(wxStaticPictureNameStr); static const wxString wxPyEmptyString(wxEmptyString); @@ -2921,6 +2917,27 @@ SWIG_AsVal_bool (PyObject *obj, bool *val) } +#include "wx/treelistctrl.h" +#include "wx/wxPython/pytree.h" + + + static const wxString wxPyTreeListCtrlNameStr(wxT("treelistctrl")); + +SWIGINTERNINLINE PyObject* +SWIG_From_unsigned_SS_long (unsigned long value) +{ + return (value > LONG_MAX) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong(static_cast< long >(value)); +} + + +SWIGINTERNINLINE PyObject * +SWIG_From_size_t (size_t value) +{ + return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value)); +} + + SWIGINTERN int SWIG_AsVal_unsigned_SS_long (PyObject* obj, unsigned long* val) { @@ -2943,21 +2960,6 @@ SWIG_AsVal_size_t (PyObject * obj, size_t *val) return res; } - -SWIGINTERNINLINE PyObject* -SWIG_From_unsigned_SS_long (unsigned long value) -{ - return (value > LONG_MAX) ? - PyLong_FromUnsignedLong(value) : PyInt_FromLong(static_cast< long >(value)); -} - - -SWIGINTERNINLINE PyObject * -SWIG_From_size_t (size_t value) -{ - return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value)); -} - // C++ version of Python aware control class wxPyTreeListCtrl : public wxTreeListCtrl { DECLARE_ABSTRACT_CLASS(wxPyTreeListCtrl); @@ -2971,8 +2973,8 @@ public: const wxString& name) : wxTreeListCtrl(parent, id, pos, size, style, validator, name) {} - int OnCompareItems(const wxTreeItemId& item1, - const wxTreeItemId& item2) { + virtual int OnCompareItems(const wxTreeItemId& item1, + const wxTreeItemId& item2) { int rval = 0; bool found; wxPyBlock_t blocked = wxPyBeginBlockThreads(); @@ -2988,6 +2990,27 @@ public: rval = wxTreeListCtrl::OnCompareItems(item1, item2); return rval; } + + virtual wxString OnGetItemText( wxTreeItemData* item, long column ) const { + wxString rval; + bool found; + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + if ((found = wxPyCBH_findCallback(m_myInst, "OnGetItemText"))) { + PyObject* ro; + PyObject* itemo = wxPyConstructObject((void*)&item, wxT("wxTreeItemId"), 0); + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Oi)", itemo, column)); + Py_DECREF(itemo); + if (ro) { + rval = Py2wxString(ro); + Py_DECREF(ro); + } + } + wxPyEndBlockThreads(blocked); + if (! found) + rval = wxTreeListCtrl::OnGetItemText(item, column); + return rval; + } + PYPRIVATE; }; @@ -3098,6 +3121,25 @@ SWIGINTERN PyObject *wxPyTreeListCtrl_GetNextChild(wxPyTreeListCtrl *self,wxTree wxPyEndBlockThreads(blocked); return tup; } +SWIGINTERN PyObject *wxPyTreeListCtrl_GetLastChild(wxPyTreeListCtrl *self,wxTreeItemId const &item){ + void* cookie = 0; + wxTreeItemId* ritem = new wxTreeItemId(self->GetLastChild(item, cookie)); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + PyObject* tup = PyTuple_New(2); + PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true)); + PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); + wxPyEndBlockThreads(blocked); + return tup; + } +SWIGINTERN PyObject *wxPyTreeListCtrl_GetPrevChild(wxPyTreeListCtrl *self,wxTreeItemId const &item,void *cookie){ + wxTreeItemId* ritem = new wxTreeItemId(self->GetPrevChild(item, cookie)); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + PyObject* tup = PyTuple_New(2); + PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true)); + PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); + wxPyEndBlockThreads(blocked); + return tup; + } SWIGINTERN PyObject *wxPyTreeListCtrl_GetBoundingRect(wxPyTreeListCtrl *self,wxTreeItemId const &item,bool textOnly=false){ wxRect rect; if (self->GetBoundingRect(item, rect, textOnly)) { @@ -3111,6 +3153,10 @@ SWIGINTERN PyObject *wxPyTreeListCtrl_GetBoundingRect(wxPyTreeListCtrl *self,wxT RETURN_NONE(); } } +SWIGINTERN void wxPyTreeListCtrl_EditLabel(wxPyTreeListCtrl *self,wxTreeItemId const &item,int column=-1){ + if (column < 0) column = self->GetMainColumn(); + self->EditLabel(item, column); + } #include @@ -3194,26 +3240,6 @@ SWIGINTERN PyObject *EditableListBoxNameStr_get(void) { } -SWIGINTERN int TreeListCtrlNameStr_set(PyObject *) { - SWIG_Error(SWIG_AttributeError,"Variable TreeListCtrlNameStr is read-only."); - return 1; -} - - -SWIGINTERN PyObject *TreeListCtrlNameStr_get(void) { - PyObject *pyobj = 0; - - { -#if wxUSE_UNICODE - pyobj = PyUnicode_FromWideChar((&wxPyTreeListCtrlNameStr)->c_str(), (&wxPyTreeListCtrlNameStr)->Len()); -#else - pyobj = PyString_FromStringAndSize((&wxPyTreeListCtrlNameStr)->c_str(), (&wxPyTreeListCtrlNameStr)->Len()); -#endif - } - return pyobj; -} - - SWIGINTERN int StaticPictureNameStr_set(PyObject *) { SWIG_Error(SWIG_AttributeError,"Variable StaticPictureNameStr is read-only."); return 1; @@ -5070,34 +5096,58 @@ SWIGINTERN PyObject *LEDNumberCtrl_swiginit(PyObject *SWIGUNUSEDPARM(self), PyOb return SWIG_Python_InitShadowInstance(args); } +SWIGINTERN int TreeListCtrlNameStr_set(PyObject *) { + SWIG_Error(SWIG_AttributeError,"Variable TreeListCtrlNameStr is read-only."); + return 1; +} + + +SWIGINTERN PyObject *TreeListCtrlNameStr_get(void) { + PyObject *pyobj = 0; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyTreeListCtrlNameStr)->c_str(), (&wxPyTreeListCtrlNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyTreeListCtrlNameStr)->c_str(), (&wxPyTreeListCtrlNameStr)->Len()); +#endif + } + return pyobj; +} + + SWIGINTERN PyObject *_wrap_new_TreeListColumnInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxString const &arg1_defvalue = wxPyEmptyString ; wxString *arg1 = (wxString *) &arg1_defvalue ; - int arg2 = (int) -1 ; - size_t arg3 = (size_t) 100 ; - bool arg4 = (bool) true ; - wxTreeListColumnAlign arg5 = (wxTreeListColumnAlign) wxTL_ALIGN_LEFT ; + int arg2 = (int) DEFAULT_COL_WIDTH ; + int arg3 = (int) wxALIGN_LEFT ; + int arg4 = (int) -1 ; + bool arg5 = (bool) true ; + bool arg6 = (bool) false ; wxTreeListColumnInfo *result = 0 ; bool temp1 = false ; int val2 ; int ecode2 = 0 ; - size_t val3 ; + int val3 ; int ecode3 = 0 ; - bool val4 ; + int val4 ; int ecode4 = 0 ; - int val5 ; + bool val5 ; int ecode5 = 0 ; + bool val6 ; + int ecode6 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char * kwnames[] = { - (char *) "text",(char *) "image",(char *) "width",(char *) "shown",(char *) "alignment", NULL + (char *) "text",(char *) "width",(char *) "flag",(char *) "image",(char *) "shown",(char *) "edit", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOO:new_TreeListColumnInfo",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOO:new_TreeListColumnInfo",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; if (obj0) { { arg1 = wxString_in_helper(obj0); @@ -5113,29 +5163,36 @@ SWIGINTERN PyObject *_wrap_new_TreeListColumnInfo(PyObject *SWIGUNUSEDPARM(self) arg2 = static_cast< int >(val2); } if (obj2) { - ecode3 = SWIG_AsVal_size_t(obj2, &val3); + ecode3 = SWIG_AsVal_int(obj2, &val3); if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_TreeListColumnInfo" "', expected argument " "3"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_TreeListColumnInfo" "', expected argument " "3"" of type '" "int""'"); } - arg3 = static_cast< size_t >(val3); + arg3 = static_cast< int >(val3); } if (obj3) { - ecode4 = SWIG_AsVal_bool(obj3, &val4); + ecode4 = SWIG_AsVal_int(obj3, &val4); if (!SWIG_IsOK(ecode4)) { - SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_TreeListColumnInfo" "', expected argument " "4"" of type '" "bool""'"); + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_TreeListColumnInfo" "', expected argument " "4"" of type '" "int""'"); } - arg4 = static_cast< bool >(val4); + arg4 = static_cast< int >(val4); } if (obj4) { - ecode5 = SWIG_AsVal_int(obj4, &val5); + ecode5 = SWIG_AsVal_bool(obj4, &val5); if (!SWIG_IsOK(ecode5)) { - SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_TreeListColumnInfo" "', expected argument " "5"" of type '" "wxTreeListColumnAlign""'"); + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_TreeListColumnInfo" "', expected argument " "5"" of type '" "bool""'"); + } + arg5 = static_cast< bool >(val5); + } + if (obj5) { + ecode6 = SWIG_AsVal_bool(obj5, &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_TreeListColumnInfo" "', expected argument " "6"" of type '" "bool""'"); } - arg5 = static_cast< wxTreeListColumnAlign >(val5); + arg6 = static_cast< bool >(val6); } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTreeListColumnInfo *)new wxTreeListColumnInfo((wxString const &)*arg1,arg2,arg3,arg4,arg5); + result = (wxTreeListColumnInfo *)new wxTreeListColumnInfo((wxString const &)*arg1,arg2,arg3,arg4,arg5,arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -5182,40 +5239,10 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListColumnInfo_GetShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; - bool result; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListColumnInfo_GetShown" "', expected argument " "1"" of type '" "wxTreeListColumnInfo const *""'"); - } - arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxTreeListColumnInfo const *)arg1)->GetShown(); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_TreeListColumnInfo_GetAlignment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; - wxTreeListColumnAlign result; + int result; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -5229,7 +5256,7 @@ SWIGINTERN PyObject *_wrap_TreeListColumnInfo_GetAlignment(PyObject *SWIGUNUSEDP arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTreeListColumnAlign)((wxTreeListColumnInfo const *)arg1)->GetAlignment(); + result = (int)((wxTreeListColumnInfo const *)arg1)->GetAlignment(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -5358,38 +5385,60 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListColumnInfo_SetShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListColumnInfo_IsEditable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; - bool arg2 ; + bool result; void *argp1 = 0 ; int res1 = 0 ; - bool val2 ; - int ecode2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "shown", NULL - }; + PyObject *swig_obj[1] ; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetShown",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListColumnInfo_SetShown" "', expected argument " "1"" of type '" "wxTreeListColumnInfo *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListColumnInfo_IsEditable" "', expected argument " "1"" of type '" "wxTreeListColumnInfo const *""'"); } arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); - ecode2 = SWIG_AsVal_bool(obj1, &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListColumnInfo_SetShown" "', expected argument " "2"" of type '" "bool""'"); - } - arg2 = static_cast< bool >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetShown(arg2); + result = (bool)((wxTreeListColumnInfo const *)arg1)->IsEditable(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_Py_Void(); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListColumnInfo_IsShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListColumnInfo_IsShown" "', expected argument " "1"" of type '" "wxTreeListColumnInfo const *""'"); + } + arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxTreeListColumnInfo const *)arg1)->IsShown(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5399,7 +5448,7 @@ fail: SWIGINTERN PyObject *_wrap_TreeListColumnInfo_SetAlignment(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; - wxTreeListColumnAlign arg2 ; + int arg2 ; void *argp1 = 0 ; int res1 = 0 ; int val2 ; @@ -5418,9 +5467,9 @@ SWIGINTERN PyObject *_wrap_TreeListColumnInfo_SetAlignment(PyObject *SWIGUNUSEDP arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListColumnInfo_SetAlignment" "', expected argument " "2"" of type '" "wxTreeListColumnAlign""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListColumnInfo_SetAlignment" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< wxTreeListColumnAlign >(val2); + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignment(arg2); @@ -5593,55 +5642,131 @@ fail: } -SWIGINTERN PyObject *TreeListColumnInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_wxTreeListColumnInfo, SWIG_NewClientData(obj)); - return SWIG_Py_Void(); -} - -SWIGINTERN PyObject *TreeListColumnInfo_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - return SWIG_Python_InitShadowInstance(args); -} - -SWIGINTERN PyObject *_wrap_new_TreeListCtrl(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListColumnInfo_SetEditable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; - wxWindow *arg1 = (wxWindow *) 0 ; - int arg2 = (int) -1 ; - wxPoint const &arg3_defvalue = wxDefaultPosition ; - wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; - wxSize const &arg4_defvalue = wxDefaultSize ; - wxSize *arg4 = (wxSize *) &arg4_defvalue ; - long arg5 = (long) wxTR_DEFAULT_STYLE ; - wxValidator const &arg6_defvalue = wxDefaultValidator ; - wxValidator *arg6 = (wxValidator *) &arg6_defvalue ; - wxString const &arg7_defvalue = wxPyTreeListCtrlNameStr ; - wxString *arg7 = (wxString *) &arg7_defvalue ; - wxPyTreeListCtrl *result = 0 ; + wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; + bool arg2 ; void *argp1 = 0 ; int res1 = 0 ; - int val2 ; + bool val2 ; int ecode2 = 0 ; - wxPoint temp3 ; - wxSize temp4 ; - long val5 ; - int ecode5 = 0 ; - void *argp6 = 0 ; - int res6 = 0 ; - bool temp7 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - PyObject * obj5 = 0 ; - PyObject * obj6 = 0 ; char * kwnames[] = { - (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL + (char *) "self",(char *) "edit", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_TreeListCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetEditable",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListColumnInfo_SetEditable" "', expected argument " "1"" of type '" "wxTreeListColumnInfo *""'"); + } + arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); + ecode2 = SWIG_AsVal_bool(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListColumnInfo_SetEditable" "', expected argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetEditable(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListColumnInfo_SetShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; + bool arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + bool val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "shown", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetShown",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListColumnInfo_SetShown" "', expected argument " "1"" of type '" "wxTreeListColumnInfo *""'"); + } + arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); + ecode2 = SWIG_AsVal_bool(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListColumnInfo_SetShown" "', expected argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetShown(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *TreeListColumnInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_wxTreeListColumnInfo, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *TreeListColumnInfo_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + return SWIG_Python_InitShadowInstance(args); +} + +SWIGINTERN PyObject *_wrap_new_TreeListCtrl(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxWindow *arg1 = (wxWindow *) 0 ; + int arg2 = (int) -1 ; + wxPoint const &arg3_defvalue = wxDefaultPosition ; + wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; + wxSize const &arg4_defvalue = wxDefaultSize ; + wxSize *arg4 = (wxSize *) &arg4_defvalue ; + long arg5 = (long) wxTR_DEFAULT_STYLE ; + wxValidator const &arg6_defvalue = wxDefaultValidator ; + wxValidator *arg6 = (wxValidator *) &arg6_defvalue ; + wxString const &arg7_defvalue = wxPyTreeListCtrlNameStr ; + wxString *arg7 = (wxString *) &arg7_defvalue ; + wxPyTreeListCtrl *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + wxPoint temp3 ; + wxSize temp4 ; + long val5 ; + int ecode5 = 0 ; + void *argp6 = 0 ; + int res6 = 0 ; + bool temp7 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + char * kwnames[] = { + (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_TreeListCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_TreeListCtrl" "', expected argument " "1"" of type '" "wxWindow *""'"); } @@ -6358,16 +6483,36 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_AddColumn(PyObject *SWIGUNUSEDPARM(self) PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxString *arg2 = 0 ; + int arg3 = (int) DEFAULT_COL_WIDTH ; + int arg4 = (int) wxALIGN_LEFT ; + int arg5 = (int) -1 ; + bool arg6 = (bool) true ; + bool arg7 = (bool) false ; void *argp1 = 0 ; int res1 = 0 ; bool temp2 = false ; + int val3 ; + int ecode3 = 0 ; + int val4 ; + int ecode4 = 0 ; + int val5 ; + int ecode5 = 0 ; + bool val6 ; + int ecode6 = 0 ; + bool val7 ; + int ecode7 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "text", NULL + (char *) "self",(char *) "text",(char *) "width",(char *) "flag",(char *) "image",(char *) "shown",(char *) "edit", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_AddColumn",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:TreeListCtrl_AddColumn",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_AddColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); @@ -6378,9 +6523,44 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_AddColumn(PyObject *SWIGUNUSEDPARM(self) if (arg2 == NULL) SWIG_fail; temp2 = true; } + if (obj2) { + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_AddColumn" "', expected argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + } + if (obj3) { + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "TreeListCtrl_AddColumn" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + } + if (obj4) { + ecode5 = SWIG_AsVal_int(obj4, &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "TreeListCtrl_AddColumn" "', expected argument " "5"" of type '" "int""'"); + } + arg5 = static_cast< int >(val5); + } + if (obj5) { + ecode6 = SWIG_AsVal_bool(obj5, &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "TreeListCtrl_AddColumn" "', expected argument " "6"" of type '" "bool""'"); + } + arg6 = static_cast< bool >(val6); + } + if (obj6) { + ecode7 = SWIG_AsVal_bool(obj6, &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "TreeListCtrl_AddColumn" "', expected argument " "7"" of type '" "bool""'"); + } + arg7 = static_cast< bool >(val7); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AddColumn((wxString const &)*arg2); + (arg1)->AddColumn((wxString const &)*arg2,arg3,arg4,arg5,arg6,arg7); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6443,39 +6623,94 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_InsertColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; wxString *arg3 = 0 ; + int arg4 = (int) DEFAULT_COL_WIDTH ; + int arg5 = (int) wxALIGN_LEFT ; + int arg6 = (int) -1 ; + bool arg7 = (bool) true ; + bool arg8 = (bool) false ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; bool temp3 = false ; + int val4 ; + int ecode4 = 0 ; + int val5 ; + int ecode5 = 0 ; + int val6 ; + int ecode6 = 0 ; + bool val7 ; + int ecode7 = 0 ; + bool val8 ; + int ecode8 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "before",(char *) "text", NULL + (char *) "self",(char *) "before",(char *) "text",(char *) "width",(char *) "flag",(char *) "image",(char *) "shown",(char *) "edit", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_InsertColumn",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:TreeListCtrl_InsertColumn",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; temp3 = true; } + if (obj3) { + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + } + if (obj4) { + ecode5 = SWIG_AsVal_int(obj4, &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "5"" of type '" "int""'"); + } + arg5 = static_cast< int >(val5); + } + if (obj5) { + ecode6 = SWIG_AsVal_int(obj5, &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "6"" of type '" "int""'"); + } + arg6 = static_cast< int >(val6); + } + if (obj6) { + ecode7 = SWIG_AsVal_bool(obj6, &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "7"" of type '" "bool""'"); + } + arg7 = static_cast< bool >(val7); + } + if (obj7) { + ecode8 = SWIG_AsVal_bool(obj7, &val8); + if (!SWIG_IsOK(ecode8)) { + SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "8"" of type '" "bool""'"); + } + arg8 = static_cast< bool >(val8); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->InsertColumn(arg2,(wxString const &)*arg3); + (arg1)->InsertColumn(arg2,(wxString const &)*arg3,arg4,arg5,arg6,arg7,arg8); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6610,43 +6845,34 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetMainColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; size_t arg2 ; - size_t arg3 ; void *argp1 = 0 ; int res1 = 0 ; size_t val2 ; int ecode2 = 0 ; - size_t val3 ; - int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "column",(char *) "width", NULL + (char *) "self",(char *) "column", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnWidth",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_SetMainColumn",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnWidth" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetMainColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); ecode2 = SWIG_AsVal_size_t(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnWidth" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetMainColumn" "', expected argument " "2"" of type '" "size_t""'"); } arg2 = static_cast< size_t >(val2); - ecode3 = SWIG_AsVal_size_t(obj2, &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnWidth" "', expected argument " "3"" of type '" "size_t""'"); - } - arg3 = static_cast< size_t >(val3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetColumnWidth(arg2,arg3); + (arg1)->SetMainColumn(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6657,73 +6883,74 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetMainColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; - int result; + size_t result; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; - int ecode2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "column", NULL - }; + PyObject *swig_obj[1] ; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumnWidth",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumnWidth" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetMainColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnWidth" "', expected argument " "2"" of type '" "size_t""'"); - } - arg2 = static_cast< size_t >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)((wxPyTreeListCtrl const *)arg1)->GetColumnWidth(arg2); + result = (size_t)((wxPyTreeListCtrl const *)arg1)->GetMainColumn(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_From_int(static_cast< int >(result)); + resultobj = SWIG_From_size_t(static_cast< size_t >(result)); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetMainColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; + wxTreeListColumnInfo *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "column", NULL + (char *) "self",(char *) "column",(char *) "colInfo", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_SetMainColumn",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumn",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetMainColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetMainColumn" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumn" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_SetColumn" "', expected argument " "3"" of type '" "wxTreeListColumnInfo const &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetColumn" "', expected argument " "3"" of type '" "wxTreeListColumnInfo const &""'"); + } + arg3 = reinterpret_cast< wxTreeListColumnInfo * >(argp3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetMainColumn(arg2); + (arg1)->SetColumn(arg2,(wxTreeListColumnInfo const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6734,28 +6961,42 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetMainColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t result; + int arg2 ; + wxTreeListColumnInfo *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; - PyObject *swig_obj[1] ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "column", NULL + }; - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumn",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetMainColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumn" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (size_t)((wxPyTreeListCtrl const *)arg1)->GetMainColumn(); + { + wxTreeListColumnInfo &_result_ref = (arg1)->GetColumn(arg2); + result = (wxTreeListColumnInfo *) &_result_ref; + } wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_From_size_t(static_cast< size_t >(result)); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); return resultobj; fail: return NULL; @@ -6765,11 +7006,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnText(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; wxString *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; bool temp3 = false ; PyObject * obj0 = 0 ; @@ -6785,11 +7026,11 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnText(PyObject *SWIGUNUSEDPARM(s SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnText" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnText" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnText" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -6819,11 +7060,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnText(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; wxString result; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -6837,11 +7078,11 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnText(PyObject *SWIGUNUSEDPARM(s SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumnText" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnText" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnText" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxPyTreeListCtrl const *)arg1)->GetColumnText(arg2); @@ -6861,46 +7102,43 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; - wxTreeListColumnInfo *arg3 = 0 ; + int arg2 ; + int arg3 ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; - void *argp3 = 0 ; - int res3 = 0 ; + int val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "column",(char *) "info", NULL + (char *) "self",(char *) "column",(char *) "width", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumn",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnWidth",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnWidth" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumn" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnWidth" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); - res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_SetColumn" "', expected argument " "3"" of type '" "wxTreeListColumnInfo const &""'"); - } - if (!argp3) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetColumn" "', expected argument " "3"" of type '" "wxTreeListColumnInfo const &""'"); - } - arg3 = reinterpret_cast< wxTreeListColumnInfo * >(argp3); + arg2 = static_cast< int >(val2); + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnWidth" "', expected argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetColumn(arg2,(wxTreeListColumnInfo const &)*arg3); + (arg1)->SetColumnWidth(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6911,14 +7149,14 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; - wxTreeListColumnInfo *result = 0 ; + int arg2 ; + int result; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -6926,27 +7164,24 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumn(PyObject *SWIGUNUSEDPARM(self) (char *) "self",(char *) "column", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumn",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumnWidth",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumnWidth" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumn" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnWidth" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - { - wxTreeListColumnInfo &_result_ref = (arg1)->GetColumn(arg2); - result = (wxTreeListColumnInfo *) &_result_ref; - } + result = (int)((wxPyTreeListCtrl const *)arg1)->GetColumnWidth(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); + resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; fail: return NULL; @@ -6956,11 +7191,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnAlignment(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; - wxTreeListColumnAlign arg3 ; + int arg2 ; + int arg3 ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; int val3 ; int ecode3 = 0 ; @@ -6968,7 +7203,7 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnAlignment(PyObject *SWIGUNUSEDP PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "column",(char *) "align", NULL + (char *) "self",(char *) "column",(char *) "flag", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnAlignment",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; @@ -6977,16 +7212,16 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnAlignment(PyObject *SWIGUNUSEDP SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnAlignment" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnAlignment" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnAlignment" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); ecode3 = SWIG_AsVal_int(obj2, &val3); if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnAlignment" "', expected argument " "3"" of type '" "wxTreeListColumnAlign""'"); + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnAlignment" "', expected argument " "3"" of type '" "int""'"); } - arg3 = static_cast< wxTreeListColumnAlign >(val3); + arg3 = static_cast< int >(val3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColumnAlignment(arg2,arg3); @@ -7003,11 +7238,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnAlignment(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; - wxTreeListColumnAlign result; + int arg2 ; + int result; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -7021,14 +7256,14 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnAlignment(PyObject *SWIGUNUSEDP SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumnAlignment" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnAlignment" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnAlignment" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTreeListColumnAlign)((wxPyTreeListCtrl const *)arg1)->GetColumnAlignment(arg2); + result = (int)((wxPyTreeListCtrl const *)arg1)->GetColumnAlignment(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -7042,11 +7277,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnImage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; int arg3 ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; int val3 ; int ecode3 = 0 ; @@ -7063,11 +7298,11 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnImage(PyObject *SWIGUNUSEDPARM( SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnImage" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnImage" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnImage" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); ecode3 = SWIG_AsVal_int(obj2, &val3); if (!SWIG_IsOK(ecode3)) { SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnImage" "', expected argument " "3"" of type '" "int""'"); @@ -7089,11 +7324,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnImage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; int result; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -7107,11 +7342,11 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnImage(PyObject *SWIGUNUSEDPARM( SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumnImage" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnImage" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnImage" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxPyTreeListCtrl const *)arg1)->GetColumnImage(arg2); @@ -7125,14 +7360,14 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_ShowColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; - bool arg3 ; + int arg2 ; + bool arg3 = (bool) true ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; bool val3 ; int ecode3 = 0 ; @@ -7143,25 +7378,27 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_ShowColumn(PyObject *SWIGUNUSEDPARM(self (char *) "self",(char *) "column",(char *) "shown", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_ShowColumn",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_SetColumnShown",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_ShowColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnShown" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_ShowColumn" "', expected argument " "2"" of type '" "size_t""'"); - } - arg2 = static_cast< size_t >(val2); - ecode3 = SWIG_AsVal_bool(obj2, &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_ShowColumn" "', expected argument " "3"" of type '" "bool""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnShown" "', expected argument " "2"" of type '" "int""'"); } - arg3 = static_cast< bool >(val3); + arg2 = static_cast< int >(val2); + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnShown" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->ShowColumn(arg2,arg3); + (arg1)->SetColumnShown(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -7175,11 +7412,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_IsColumnShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; bool result; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -7193,11 +7430,11 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_IsColumnShown(PyObject *SWIGUNUSEDPARM(s SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_IsColumnShown" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_IsColumnShown" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_IsColumnShown" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxPyTreeListCtrl const *)arg1)->IsColumnShown(arg2); @@ -7213,6 +7450,96 @@ fail: } +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnEditable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + int arg2 ; + bool arg3 = (bool) true ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + bool val3 ; + int ecode3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "column",(char *) "edit", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_SetColumnEditable",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnEditable" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnEditable" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnEditable" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetColumnEditable(arg2,arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListCtrl_IsColumnEditable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + int arg2 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "column", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_IsColumnEditable",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_IsColumnEditable" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_IsColumnEditable" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxPyTreeListCtrl const *)arg1)->IsColumnEditable(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemText(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; @@ -7652,249 +7979,218 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemHasChildren(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemBold(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - bool arg3 = (bool) true ; + bool result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - bool val3 ; - int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item",(char *) "has", NULL + (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_SetItemHasChildren",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemBold",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemBold" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); - if (obj2) { - ecode3 = SWIG_AsVal_bool(obj2, &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "3"" of type '" "bool""'"); - } - arg3 = static_cast< bool >(val3); - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetItemHasChildren((wxTreeItemId const &)*arg2,arg3); + result = (bool)((wxPyTreeListCtrl const *)arg1)->GetItemBold((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_Py_Void(); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemBold(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemTextColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - bool arg3 = (bool) true ; + wxColour result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - bool val3 ; - int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item",(char *) "bold", NULL + (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_SetItemBold",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemTextColour",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemTextColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); - if (obj2) { - ecode3 = SWIG_AsVal_bool(obj2, &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "3"" of type '" "bool""'"); - } - arg3 = static_cast< bool >(val3); - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetItemBold((wxTreeItemId const &)*arg2,arg3); + result = ((wxPyTreeListCtrl const *)arg1)->GetItemTextColour((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_Py_Void(); + resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemTextColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxColour *arg3 = 0 ; + wxColour result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - wxColour temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item",(char *) "colour", NULL + (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemTextColour",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemBackgroundColour",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemTextColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemBackgroundColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); - { - arg3 = &temp3; - if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetItemTextColour((wxTreeItemId const &)*arg2,(wxColour const &)*arg3); + result = ((wxPyTreeListCtrl const *)arg1)->GetItemBackgroundColour((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_Py_Void(); + resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxColour *arg3 = 0 ; + wxFont result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - wxColour temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item",(char *) "colour", NULL + (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemBackgroundColour",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemFont",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemBackgroundColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemFont" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); - { - arg3 = &temp3; - if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetItemBackgroundColour((wxTreeItemId const &)*arg2,(wxColour const &)*arg3); + result = ((wxPyTreeListCtrl const *)arg1)->GetItemFont((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_Py_Void(); + resultobj = SWIG_NewPointerObj((new wxFont(static_cast< const wxFont& >(result))), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemHasChildren(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxFont *arg3 = 0 ; + bool arg3 = (bool) true ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - void *argp3 = 0 ; - int res3 = 0 ; + bool val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item",(char *) "font", NULL + (char *) "self",(char *) "item",(char *) "has", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemFont",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_SetItemHasChildren",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); - res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxFont, 0 | 0); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "3"" of type '" "wxFont const &""'"); - } - if (!argp3) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "3"" of type '" "wxFont const &""'"); + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); } - arg3 = reinterpret_cast< wxFont * >(argp3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetItemFont((wxTreeItemId const &)*arg2,(wxFont const &)*arg3); + (arg1)->SetItemHasChildren((wxTreeItemId const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -7905,170 +8201,201 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemBold(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemBold(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - bool result; + bool arg3 = (bool) true ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + bool val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "bold", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemBold",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_SetItemBold",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemBold" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyTreeListCtrl const *)arg1)->GetItemBold((wxTreeItemId const &)*arg2); + (arg1)->SetItemBold((wxTreeItemId const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemTextColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemTextColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxColour result; + wxColour *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + wxColour temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "colour", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemTextColour",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemTextColour",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemTextColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemTextColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + { + arg3 = &temp3; + if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetItemTextColour((wxTreeItemId const &)*arg2); + (arg1)->SetItemTextColour((wxTreeItemId const &)*arg2,(wxColour const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxColour result; + wxColour *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + wxColour temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "colour", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemBackgroundColour",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemBackgroundColour",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemBackgroundColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemBackgroundColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + { + arg3 = &temp3; + if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetItemBackgroundColour((wxTreeItemId const &)*arg2); + (arg1)->SetItemBackgroundColour((wxTreeItemId const &)*arg2,(wxColour const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxFont result; + wxFont *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "font", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemFont",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemFont",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemFont" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxFont, 0 | 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "3"" of type '" "wxFont const &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "3"" of type '" "wxFont const &""'"); + } + arg3 = reinterpret_cast< wxFont * >(argp3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetItemFont((wxTreeItemId const &)*arg2); + (arg1)->SetItemFont((wxTreeItemId const &)*arg2,(wxFont const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((new wxFont(static_cast< const wxFont& >(result))), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; @@ -8119,7 +8446,7 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_ItemHasChildren(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_HasChildren(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; @@ -8134,23 +8461,23 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_ItemHasChildren(PyObject *SWIGUNUSEDPARM (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_ItemHasChildren",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_HasChildren",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_ItemHasChildren" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_HasChildren" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_ItemHasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_HasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_ItemHasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_HasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyTreeListCtrl const *)arg1)->ItemHasChildren((wxTreeItemId const &)*arg2); + result = (bool)((wxPyTreeListCtrl const *)arg1)->HasChildren((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8558,14 +8885,231 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNextChild(PyObject *SWIGUNUSEDPARM(se wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result; + resultobj = result; + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetLastChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; + PyObject *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetLastChild",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetLastChild" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetLastChild" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetLastChild" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (PyObject *)wxPyTreeListCtrl_GetLastChild(arg1,(wxTreeItemId const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = result; + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; + void *arg3 = (void *) 0 ; + PyObject *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + int res3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item",(char *) "cookie", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_GetPrevChild",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrevChild" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrevChild" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrevChild" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + res3 = SWIG_ConvertPtr(obj2,SWIG_as_voidptrptr(&arg3), 0, 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_GetPrevChild" "', expected argument " "3"" of type '" "void *""'"); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (PyObject *)wxPyTreeListCtrl_GetPrevChild(arg1,(wxTreeItemId const &)*arg2,arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = result; + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNextSibling(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; + wxTreeItemId result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetNextSibling",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNextSibling" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNextSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNextSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxPyTreeListCtrl const *)arg1)->GetNextSibling((wxTreeItemId const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxTreeItemId(static_cast< const wxTreeItemId& >(result))), SWIGTYPE_p_wxTreeItemId, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevSibling(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; + wxTreeItemId result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetPrevSibling",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrevSibling" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrevSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrevSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxPyTreeListCtrl const *)arg1)->GetPrevSibling((wxTreeItemId const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxTreeItemId(static_cast< const wxTreeItemId& >(result))), SWIGTYPE_p_wxTreeItemId, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNext(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; + wxTreeItemId result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetNext",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNext" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNext" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNext" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxPyTreeListCtrl const *)arg1)->GetNext((wxTreeItemId const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxTreeItemId(static_cast< const wxTreeItemId& >(result))), SWIGTYPE_p_wxTreeItemId, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetLastChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrev(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; @@ -8580,23 +9124,23 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetLastChild(PyObject *SWIGUNUSEDPARM(se (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetLastChild",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetPrev",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetLastChild" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrev" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetLastChild" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrev" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetLastChild" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrev" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetLastChild((wxTreeItemId const &)*arg2); + result = ((wxPyTreeListCtrl const *)arg1)->GetPrev((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8607,38 +9151,24 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNextSibling(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetFirstExpandedItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - wxTreeItemId *arg2 = 0 ; wxTreeItemId result; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "item", NULL - }; + PyObject *swig_obj[1] ; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetNextSibling",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNextSibling" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetFirstExpandedItem" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNextSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNextSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); - } - arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetNextSibling((wxTreeItemId const &)*arg2); + result = ((wxPyTreeListCtrl const *)arg1)->GetFirstExpandedItem(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8649,7 +9179,7 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevSibling(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNextExpanded(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; @@ -8664,23 +9194,23 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevSibling(PyObject *SWIGUNUSEDPARM( (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetPrevSibling",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetNextExpanded",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrevSibling" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNextExpanded" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrevSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNextExpanded" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrevSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNextExpanded" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetPrevSibling((wxTreeItemId const &)*arg2); + result = ((wxPyTreeListCtrl const *)arg1)->GetNextExpanded((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8691,24 +9221,38 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetFirstVisibleItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevExpanded(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; wxTreeItemId result; void *argp1 = 0 ; int res1 = 0 ; - PyObject *swig_obj[1] ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item", NULL + }; - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetPrevExpanded",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetFirstVisibleItem" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrevExpanded" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrevExpanded" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrevExpanded" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetFirstVisibleItem(); + result = ((wxPyTreeListCtrl const *)arg1)->GetPrevExpanded((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8719,38 +9263,37 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNextVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetFirstVisibleItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - wxTreeItemId *arg2 = 0 ; + bool arg2 = (bool) false ; wxTreeItemId result; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; + bool val2 ; + int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "fullRow", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetNextVisible",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:TreeListCtrl_GetFirstVisibleItem",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetFirstVisibleItem" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + if (obj1) { + ecode2 = SWIG_AsVal_bool(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetFirstVisibleItem" "', expected argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); } - arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetNextVisible((wxTreeItemId const &)*arg2); + result = ((wxPyTreeListCtrl const *)arg1)->GetFirstVisibleItem(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8761,38 +9304,49 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNextVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; + bool arg3 = (bool) false ; wxTreeItemId result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + bool val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "fullRow", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetPrevVisible",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_GetNextVisible",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetPrevVisible((wxTreeItemId const &)*arg2); + result = ((wxPyTreeListCtrl const *)arg1)->GetNextVisible((wxTreeItemId const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8803,38 +9357,49 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNext(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; + bool arg3 = (bool) false ; wxTreeItemId result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + bool val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "fullRow", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetNext",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_GetPrevVisible",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNext" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNext" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNext" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetNext((wxTreeItemId const &)*arg2); + result = ((wxPyTreeListCtrl const *)arg1)->GetPrevVisible((wxTreeItemId const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -9381,7 +9946,7 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_DeleteAllItems(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_DeleteRoot(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; void *argp1 = 0 ; @@ -9392,12 +9957,12 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_DeleteAllItems(PyObject *SWIGUNUSEDPARM( swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_DeleteAllItems" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_DeleteRoot" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DeleteAllItems(); + (arg1)->DeleteRoot(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -9671,14 +10236,15 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SelectItem(PyObject *SWIGUNUSEDPARM(self PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - bool arg3 = (bool) true ; - bool arg4 = (bool) false ; + wxTreeItemId const &arg3_defvalue = (wxTreeItemId *) NULL ; + wxTreeItemId *arg3 = (wxTreeItemId *) &arg3_defvalue ; + bool arg4 = (bool) true ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - bool val3 ; - int ecode3 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; bool val4 ; int ecode4 = 0 ; PyObject * obj0 = 0 ; @@ -9686,7 +10252,7 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SelectItem(PyObject *SWIGUNUSEDPARM(self PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item",(char *) "unselect_others",(char *) "extended_select", NULL + (char *) "self",(char *) "item",(char *) "last",(char *) "unselect_others", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:TreeListCtrl_SelectItem",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; @@ -9704,11 +10270,14 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SelectItem(PyObject *SWIGUNUSEDPARM(self } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); if (obj2) { - ecode3 = SWIG_AsVal_bool(obj2, &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SelectItem" "', expected argument " "3"" of type '" "bool""'"); - } - arg3 = static_cast< bool >(val3); + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_SelectItem" "', expected argument " "3"" of type '" "wxTreeItemId const &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SelectItem" "', expected argument " "3"" of type '" "wxTreeItemId const &""'"); + } + arg3 = reinterpret_cast< wxTreeItemId * >(argp3); } if (obj3) { ecode4 = SWIG_AsVal_bool(obj3, &val4); @@ -9719,7 +10288,7 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SelectItem(PyObject *SWIGUNUSEDPARM(self } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SelectItem((wxTreeItemId const &)*arg2,arg3,arg4); + (arg1)->SelectItem((wxTreeItemId const &)*arg2,(wxTreeItemId const &)*arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -9730,36 +10299,23 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SelectAll(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SelectAll(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - bool arg2 = (bool) false ; void *argp1 = 0 ; int res1 = 0 ; - bool val2 ; - int ecode2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "extended_select", NULL - }; + PyObject *swig_obj[1] ; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:TreeListCtrl_SelectAll",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SelectAll" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - if (obj1) { - ecode2 = SWIG_AsVal_bool(obj1, &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SelectAll" "', expected argument " "2"" of type '" "bool""'"); - } - arg2 = static_cast< bool >(val2); - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SelectAll(arg2); + (arg1)->SelectAll(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -9966,17 +10522,21 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_EditLabel(PyObject *SWIGUNUSEDPARM(self) PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; + int arg3 = (int) -1 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + int val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "column", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_EditLabel",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_EditLabel",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_EditLabel" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); @@ -9990,50 +10550,16 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_EditLabel(PyObject *SWIGUNUSEDPARM(self) SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_EditLabel" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->EditLabel((wxTreeItemId const &)*arg2); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_TreeListCtrl_Edit(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - wxTreeItemId *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "item", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_Edit",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_Edit" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); - } - arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_Edit" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_Edit" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + if (obj2) { + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_EditLabel" "', expected argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); } - arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->Edit((wxTreeItemId const &)*arg2); + wxPyTreeListCtrl_EditLabel(arg1,(wxTreeItemId const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -10154,6 +10680,50 @@ fail: } +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetDragItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId const &arg2_defvalue = (wxTreeItemId *) NULL ; + wxTreeItemId *arg2 = (wxTreeItemId *) &arg2_defvalue ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:TreeListCtrl_SetDragItem",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetDragItem" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + if (obj1) { + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetDragItem" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetDragItem" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetDragItem((wxTreeItemId const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_TreeListCtrl_GetHeaderWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; @@ -10902,18 +11472,20 @@ static PyMethodDef SwigMethods[] = { { (char *)"LEDNumberCtrl_swiginit", LEDNumberCtrl_swiginit, METH_VARARGS, NULL}, { (char *)"new_TreeListColumnInfo", (PyCFunction) _wrap_new_TreeListColumnInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_TreeListColumnInfo", (PyCFunction)_wrap_delete_TreeListColumnInfo, METH_O, NULL}, - { (char *)"TreeListColumnInfo_GetShown", (PyCFunction)_wrap_TreeListColumnInfo_GetShown, METH_O, NULL}, { (char *)"TreeListColumnInfo_GetAlignment", (PyCFunction)_wrap_TreeListColumnInfo_GetAlignment, METH_O, NULL}, { (char *)"TreeListColumnInfo_GetText", (PyCFunction)_wrap_TreeListColumnInfo_GetText, METH_O, NULL}, { (char *)"TreeListColumnInfo_GetImage", (PyCFunction)_wrap_TreeListColumnInfo_GetImage, METH_O, NULL}, { (char *)"TreeListColumnInfo_GetSelectedImage", (PyCFunction)_wrap_TreeListColumnInfo_GetSelectedImage, METH_O, NULL}, { (char *)"TreeListColumnInfo_GetWidth", (PyCFunction)_wrap_TreeListColumnInfo_GetWidth, METH_O, NULL}, - { (char *)"TreeListColumnInfo_SetShown", (PyCFunction) _wrap_TreeListColumnInfo_SetShown, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListColumnInfo_IsEditable", (PyCFunction)_wrap_TreeListColumnInfo_IsEditable, METH_O, NULL}, + { (char *)"TreeListColumnInfo_IsShown", (PyCFunction)_wrap_TreeListColumnInfo_IsShown, METH_O, NULL}, { (char *)"TreeListColumnInfo_SetAlignment", (PyCFunction) _wrap_TreeListColumnInfo_SetAlignment, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListColumnInfo_SetText", (PyCFunction) _wrap_TreeListColumnInfo_SetText, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListColumnInfo_SetImage", (PyCFunction) _wrap_TreeListColumnInfo_SetImage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListColumnInfo_SetSelectedImage", (PyCFunction) _wrap_TreeListColumnInfo_SetSelectedImage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListColumnInfo_SetWidth", (PyCFunction) _wrap_TreeListColumnInfo_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListColumnInfo_SetEditable", (PyCFunction) _wrap_TreeListColumnInfo_SetEditable, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListColumnInfo_SetShown", (PyCFunction) _wrap_TreeListColumnInfo_SetShown, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListColumnInfo_swigregister", TreeListColumnInfo_swigregister, METH_VARARGS, NULL}, { (char *)"TreeListColumnInfo_swiginit", TreeListColumnInfo_swiginit, METH_VARARGS, NULL}, { (char *)"new_TreeListCtrl", (PyCFunction) _wrap_new_TreeListCtrl, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -10940,20 +11512,22 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeListCtrl_InsertColumnInfo", (PyCFunction) _wrap_TreeListCtrl_InsertColumnInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_RemoveColumn", (PyCFunction) _wrap_TreeListCtrl_RemoveColumn, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetColumnCount", (PyCFunction)_wrap_TreeListCtrl_GetColumnCount, METH_O, NULL}, - { (char *)"TreeListCtrl_SetColumnWidth", (PyCFunction) _wrap_TreeListCtrl_SetColumnWidth, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetColumnWidth", (PyCFunction) _wrap_TreeListCtrl_GetColumnWidth, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetMainColumn", (PyCFunction) _wrap_TreeListCtrl_SetMainColumn, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetMainColumn", (PyCFunction)_wrap_TreeListCtrl_GetMainColumn, METH_O, NULL}, - { (char *)"TreeListCtrl_SetColumnText", (PyCFunction) _wrap_TreeListCtrl_SetColumnText, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetColumnText", (PyCFunction) _wrap_TreeListCtrl_GetColumnText, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetColumn", (PyCFunction) _wrap_TreeListCtrl_SetColumn, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetColumn", (PyCFunction) _wrap_TreeListCtrl_GetColumn, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_SetColumnText", (PyCFunction) _wrap_TreeListCtrl_SetColumnText, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetColumnText", (PyCFunction) _wrap_TreeListCtrl_GetColumnText, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_SetColumnWidth", (PyCFunction) _wrap_TreeListCtrl_SetColumnWidth, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetColumnWidth", (PyCFunction) _wrap_TreeListCtrl_GetColumnWidth, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetColumnAlignment", (PyCFunction) _wrap_TreeListCtrl_SetColumnAlignment, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetColumnAlignment", (PyCFunction) _wrap_TreeListCtrl_GetColumnAlignment, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetColumnImage", (PyCFunction) _wrap_TreeListCtrl_SetColumnImage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetColumnImage", (PyCFunction) _wrap_TreeListCtrl_GetColumnImage, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_ShowColumn", (PyCFunction) _wrap_TreeListCtrl_ShowColumn, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_SetColumnShown", (PyCFunction) _wrap_TreeListCtrl_SetColumnShown, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_IsColumnShown", (PyCFunction) _wrap_TreeListCtrl_IsColumnShown, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_SetColumnEditable", (PyCFunction) _wrap_TreeListCtrl_SetColumnEditable, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_IsColumnEditable", (PyCFunction) _wrap_TreeListCtrl_IsColumnEditable, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetItemText", (PyCFunction) _wrap_TreeListCtrl_GetItemText, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetItemImage", (PyCFunction) _wrap_TreeListCtrl_GetItemImage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemText", (PyCFunction) _wrap_TreeListCtrl_SetItemText, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -10962,17 +11536,17 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeListCtrl_SetItemData", (PyCFunction) _wrap_TreeListCtrl_SetItemData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetItemPyData", (PyCFunction) _wrap_TreeListCtrl_GetItemPyData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemPyData", (PyCFunction) _wrap_TreeListCtrl_SetItemPyData, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetItemBold", (PyCFunction) _wrap_TreeListCtrl_GetItemBold, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetItemTextColour", (PyCFunction) _wrap_TreeListCtrl_GetItemTextColour, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetItemBackgroundColour", (PyCFunction) _wrap_TreeListCtrl_GetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetItemFont", (PyCFunction) _wrap_TreeListCtrl_GetItemFont, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemHasChildren", (PyCFunction) _wrap_TreeListCtrl_SetItemHasChildren, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemBold", (PyCFunction) _wrap_TreeListCtrl_SetItemBold, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemTextColour", (PyCFunction) _wrap_TreeListCtrl_SetItemTextColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemBackgroundColour", (PyCFunction) _wrap_TreeListCtrl_SetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemFont", (PyCFunction) _wrap_TreeListCtrl_SetItemFont, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetItemBold", (PyCFunction) _wrap_TreeListCtrl_GetItemBold, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetItemTextColour", (PyCFunction) _wrap_TreeListCtrl_GetItemTextColour, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetItemBackgroundColour", (PyCFunction) _wrap_TreeListCtrl_GetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetItemFont", (PyCFunction) _wrap_TreeListCtrl_GetItemFont, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_IsVisible", (PyCFunction) _wrap_TreeListCtrl_IsVisible, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_ItemHasChildren", (PyCFunction) _wrap_TreeListCtrl_ItemHasChildren, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_HasChildren", (PyCFunction) _wrap_TreeListCtrl_HasChildren, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_IsExpanded", (PyCFunction) _wrap_TreeListCtrl_IsExpanded, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_IsSelected", (PyCFunction) _wrap_TreeListCtrl_IsSelected, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_IsBold", (PyCFunction) _wrap_TreeListCtrl_IsBold, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -10984,12 +11558,17 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeListCtrl_GetFirstChild", (PyCFunction) _wrap_TreeListCtrl_GetFirstChild, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetNextChild", (PyCFunction) _wrap_TreeListCtrl_GetNextChild, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetLastChild", (PyCFunction) _wrap_TreeListCtrl_GetLastChild, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetPrevChild", (PyCFunction) _wrap_TreeListCtrl_GetPrevChild, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetNextSibling", (PyCFunction) _wrap_TreeListCtrl_GetNextSibling, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetPrevSibling", (PyCFunction) _wrap_TreeListCtrl_GetPrevSibling, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetFirstVisibleItem", (PyCFunction)_wrap_TreeListCtrl_GetFirstVisibleItem, METH_O, NULL}, + { (char *)"TreeListCtrl_GetNext", (PyCFunction) _wrap_TreeListCtrl_GetNext, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetPrev", (PyCFunction) _wrap_TreeListCtrl_GetPrev, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetFirstExpandedItem", (PyCFunction)_wrap_TreeListCtrl_GetFirstExpandedItem, METH_O, NULL}, + { (char *)"TreeListCtrl_GetNextExpanded", (PyCFunction) _wrap_TreeListCtrl_GetNextExpanded, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetPrevExpanded", (PyCFunction) _wrap_TreeListCtrl_GetPrevExpanded, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetFirstVisibleItem", (PyCFunction) _wrap_TreeListCtrl_GetFirstVisibleItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetNextVisible", (PyCFunction) _wrap_TreeListCtrl_GetNextVisible, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetPrevVisible", (PyCFunction) _wrap_TreeListCtrl_GetPrevVisible, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetNext", (PyCFunction) _wrap_TreeListCtrl_GetNext, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_AddRoot", (PyCFunction) _wrap_TreeListCtrl_AddRoot, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_PrependItem", (PyCFunction) _wrap_TreeListCtrl_PrependItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_InsertItem", (PyCFunction) _wrap_TreeListCtrl_InsertItem, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -10997,7 +11576,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeListCtrl_AppendItem", (PyCFunction) _wrap_TreeListCtrl_AppendItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_Delete", (PyCFunction) _wrap_TreeListCtrl_Delete, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_DeleteChildren", (PyCFunction) _wrap_TreeListCtrl_DeleteChildren, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_DeleteAllItems", (PyCFunction)_wrap_TreeListCtrl_DeleteAllItems, METH_O, NULL}, + { (char *)"TreeListCtrl_DeleteRoot", (PyCFunction)_wrap_TreeListCtrl_DeleteRoot, METH_O, NULL}, { (char *)"TreeListCtrl_Expand", (PyCFunction) _wrap_TreeListCtrl_Expand, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_ExpandAll", (PyCFunction) _wrap_TreeListCtrl_ExpandAll, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_Collapse", (PyCFunction) _wrap_TreeListCtrl_Collapse, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -11006,15 +11585,15 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeListCtrl_Unselect", (PyCFunction)_wrap_TreeListCtrl_Unselect, METH_O, NULL}, { (char *)"TreeListCtrl_UnselectAll", (PyCFunction)_wrap_TreeListCtrl_UnselectAll, METH_O, NULL}, { (char *)"TreeListCtrl_SelectItem", (PyCFunction) _wrap_TreeListCtrl_SelectItem, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_SelectAll", (PyCFunction) _wrap_TreeListCtrl_SelectAll, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_SelectAll", (PyCFunction)_wrap_TreeListCtrl_SelectAll, METH_O, NULL}, { (char *)"TreeListCtrl_EnsureVisible", (PyCFunction) _wrap_TreeListCtrl_EnsureVisible, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_ScrollTo", (PyCFunction) _wrap_TreeListCtrl_ScrollTo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_HitTest", (PyCFunction) _wrap_TreeListCtrl_HitTest, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetBoundingRect", (PyCFunction) _wrap_TreeListCtrl_GetBoundingRect, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_EditLabel", (PyCFunction) _wrap_TreeListCtrl_EditLabel, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_Edit", (PyCFunction) _wrap_TreeListCtrl_Edit, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SortChildren", (PyCFunction) _wrap_TreeListCtrl_SortChildren, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_FindItem", (PyCFunction) _wrap_TreeListCtrl_FindItem, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_SetDragItem", (PyCFunction) _wrap_TreeListCtrl_SetDragItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetHeaderWindow", (PyCFunction)_wrap_TreeListCtrl_GetHeaderWindow, METH_O, NULL}, { (char *)"TreeListCtrl_GetMainWindow", (PyCFunction)_wrap_TreeListCtrl_GetMainWindow, METH_O, NULL}, { (char *)"TreeListCtrl_swigregister", TreeListCtrl_swigregister, METH_VARARGS, NULL}, @@ -14164,7 +14743,6 @@ SWIGEXPORT void SWIG_init(void) { PyDict_SetItemString(d,(char*)"cvar", SWIG_globals()); SWIG_addvarlink(SWIG_globals(),(char*)"DynamicSashNameStr",DynamicSashNameStr_get, DynamicSashNameStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"EditableListBoxNameStr",EditableListBoxNameStr_get, EditableListBoxNameStr_set); - SWIG_addvarlink(SWIG_globals(),(char*)"TreeListCtrlNameStr",TreeListCtrlNameStr_get, TreeListCtrlNameStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"StaticPictureNameStr",StaticPictureNameStr_get, StaticPictureNameStr_set); SWIG_Python_SetConstant(d, "DS_MANAGE_SCROLLBARS",SWIG_From_int(static_cast< int >(wxDS_MANAGE_SCROLLBARS))); SWIG_Python_SetConstant(d, "DS_DRAG_CORNER",SWIG_From_int(static_cast< int >(wxDS_DRAG_CORNER))); @@ -14178,24 +14756,27 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "LED_ALIGN_CENTER",SWIG_From_int(static_cast< int >(wxLED_ALIGN_CENTER))); SWIG_Python_SetConstant(d, "LED_ALIGN_MASK",SWIG_From_int(static_cast< int >(wxLED_ALIGN_MASK))); SWIG_Python_SetConstant(d, "LED_DRAW_FADED",SWIG_From_int(static_cast< int >(wxLED_DRAW_FADED))); - SWIG_Python_SetConstant(d, "TL_ALIGN_LEFT",SWIG_From_int(static_cast< int >(wxTL_ALIGN_LEFT))); - SWIG_Python_SetConstant(d, "TL_ALIGN_RIGHT",SWIG_From_int(static_cast< int >(wxTL_ALIGN_RIGHT))); - SWIG_Python_SetConstant(d, "TL_ALIGN_CENTER",SWIG_From_int(static_cast< int >(wxTL_ALIGN_CENTER))); + SWIG_addvarlink(SWIG_globals(),(char*)"TreeListCtrlNameStr",TreeListCtrlNameStr_get, TreeListCtrlNameStr_set); + SWIG_Python_SetConstant(d, "DEFAULT_COL_WIDTH",SWIG_From_int(static_cast< int >(DEFAULT_COL_WIDTH))); + SWIG_Python_SetConstant(d, "TL_MODE_NAV_FULLTREE",SWIG_From_int(static_cast< int >(wxTL_MODE_NAV_FULLTREE))); + SWIG_Python_SetConstant(d, "TL_MODE_NAV_EXPANDED",SWIG_From_int(static_cast< int >(wxTL_MODE_NAV_EXPANDED))); + SWIG_Python_SetConstant(d, "TL_MODE_NAV_VISIBLE",SWIG_From_int(static_cast< int >(wxTL_MODE_NAV_VISIBLE))); + SWIG_Python_SetConstant(d, "TL_MODE_NAV_LEVEL",SWIG_From_int(static_cast< int >(wxTL_MODE_NAV_LEVEL))); + SWIG_Python_SetConstant(d, "TL_MODE_FIND_EXACT",SWIG_From_int(static_cast< int >(wxTL_MODE_FIND_EXACT))); + SWIG_Python_SetConstant(d, "TL_MODE_FIND_PARTIAL",SWIG_From_int(static_cast< int >(wxTL_MODE_FIND_PARTIAL))); + SWIG_Python_SetConstant(d, "TL_MODE_FIND_NOCASE",SWIG_From_int(static_cast< int >(wxTL_MODE_FIND_NOCASE))); SWIG_Python_SetConstant(d, "TREE_HITTEST_ONITEMCOLUMN",SWIG_From_int(static_cast< int >(wxTREE_HITTEST_ONITEMCOLUMN))); - SWIG_Python_SetConstant(d, "TL_SEARCH_VISIBLE",SWIG_From_int(static_cast< int >(wxTL_SEARCH_VISIBLE))); - SWIG_Python_SetConstant(d, "TL_SEARCH_LEVEL",SWIG_From_int(static_cast< int >(wxTL_SEARCH_LEVEL))); - SWIG_Python_SetConstant(d, "TL_SEARCH_FULL",SWIG_From_int(static_cast< int >(wxTL_SEARCH_FULL))); - SWIG_Python_SetConstant(d, "TL_SEARCH_PARTIAL",SWIG_From_int(static_cast< int >(wxTL_SEARCH_PARTIAL))); - SWIG_Python_SetConstant(d, "TL_SEARCH_NOCASE",SWIG_From_int(static_cast< int >(wxTL_SEARCH_NOCASE))); - SWIG_Python_SetConstant(d, "TR_DONT_ADJUST_MAC",SWIG_From_int(static_cast< int >(wxTR_DONT_ADJUST_MAC))); + SWIG_Python_SetConstant(d, "TR_COLUMN_LINES",SWIG_From_int(static_cast< int >(wxTR_COLUMN_LINES))); + SWIG_Python_SetConstant(d, "TR_VIRTUAL",SWIG_From_int(static_cast< int >(wxTR_VIRTUAL))); + + wxPyPtrTypeMap_Add("wxTreeListCtrl", "wxPyTreeListCtrl"); + SWIG_Python_SetConstant(d, "SCALE_HORIZONTAL",SWIG_From_int(static_cast< int >(wxSCALE_HORIZONTAL))); SWIG_Python_SetConstant(d, "SCALE_VERTICAL",SWIG_From_int(static_cast< int >(wxSCALE_VERTICAL))); SWIG_Python_SetConstant(d, "SCALE_UNIFORM",SWIG_From_int(static_cast< int >(wxSCALE_UNIFORM))); SWIG_Python_SetConstant(d, "SCALE_CUSTOM",SWIG_From_int(static_cast< int >(wxSCALE_CUSTOM))); - wxPyPtrTypeMap_Add("wxTreeCompanionWindow", "wxPyTreeCompanionWindow"); - wxPyPtrTypeMap_Add("wxTreeListCtrl", "wxPyTreeListCtrl"); } diff --git a/wxPython/contrib/gizmos/mac/gizmos.py b/wxPython/contrib/gizmos/mac/gizmos.py index 6a7f5add74..592f85aeae 100644 --- a/wxPython/contrib/gizmos/mac/gizmos.py +++ b/wxPython/contrib/gizmos/mac/gizmos.py @@ -76,7 +76,6 @@ _gizmos.DynamicSashSplitEvent_swigregister(DynamicSashSplitEvent) cvar = _gizmos.cvar DynamicSashNameStr = cvar.DynamicSashNameStr EditableListBoxNameStr = cvar.EditableListBoxNameStr -TreeListCtrlNameStr = cvar.TreeListCtrlNameStr StaticPictureNameStr = cvar.StaticPictureNameStr class DynamicSashUnifyEvent(_core.CommandEvent): @@ -331,33 +330,50 @@ def PreLEDNumberCtrl(*args, **kwargs): val = _gizmos.new_PreLEDNumberCtrl(*args, **kwargs) return val -TL_ALIGN_LEFT = _gizmos.TL_ALIGN_LEFT -TL_ALIGN_RIGHT = _gizmos.TL_ALIGN_RIGHT -TL_ALIGN_CENTER = _gizmos.TL_ALIGN_CENTER +#--------------------------------------------------------------------------- + +DEFAULT_COL_WIDTH = _gizmos.DEFAULT_COL_WIDTH +TL_MODE_NAV_FULLTREE = _gizmos.TL_MODE_NAV_FULLTREE +TL_MODE_NAV_EXPANDED = _gizmos.TL_MODE_NAV_EXPANDED +TL_MODE_NAV_VISIBLE = _gizmos.TL_MODE_NAV_VISIBLE +TL_MODE_NAV_LEVEL = _gizmos.TL_MODE_NAV_LEVEL +TL_MODE_FIND_EXACT = _gizmos.TL_MODE_FIND_EXACT +TL_MODE_FIND_PARTIAL = _gizmos.TL_MODE_FIND_PARTIAL +TL_MODE_FIND_NOCASE = _gizmos.TL_MODE_FIND_NOCASE TREE_HITTEST_ONITEMCOLUMN = _gizmos.TREE_HITTEST_ONITEMCOLUMN -TL_SEARCH_VISIBLE = _gizmos.TL_SEARCH_VISIBLE -TL_SEARCH_LEVEL = _gizmos.TL_SEARCH_LEVEL -TL_SEARCH_FULL = _gizmos.TL_SEARCH_FULL -TL_SEARCH_PARTIAL = _gizmos.TL_SEARCH_PARTIAL -TL_SEARCH_NOCASE = _gizmos.TL_SEARCH_NOCASE -TR_DONT_ADJUST_MAC = _gizmos.TR_DONT_ADJUST_MAC -wx.TR_DONT_ADJUST_MAC = TR_DONT_ADJUST_MAC +wx.TREE_HITTEST_ONITEMCOLUMN = TREE_HITTEST_ONITEMCOLUMN +TR_COLUMN_LINES = _gizmos.TR_COLUMN_LINES +TR_VIRTUAL = _gizmos.TR_VIRTUAL +wx.TR_COLUMN_LINES = TR_COLUMN_LINES +wxTR_VIRTUAL = TR_VIRTUAL + +#// Compatibility aliases for old names/values +TL_ALIGN_LEFT = wx.ALIGN_LEFT +TL_ALIGN_RIGHT = wx.ALIGN_RIGHT +TL_ALIGN_CENTER = wx.ALIGN_CENTER + +TL_SEARCH_VISIBLE = TL_MODE_NAV_VISIBLE +TL_SEARCH_LEVEL = TL_MODE_NAV_LEVEL +TL_SEARCH_FULL = TL_MODE_FIND_EXACT +TL_SEARCH_PARTIAL = TL_MODE_FIND_PARTIAL +TL_SEARCH_NOCASE = TL_MODE_FIND_NOCASE + +TR_DONT_ADJUST_MAC = 0 +wx.TR_DONT_ADJUST_MAC = TR_DONT_ADJUST_MAC + class TreeListColumnInfo(_core.Object): """Proxy of C++ TreeListColumnInfo class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr def __init__(self, *args, **kwargs): """ - __init__(self, String text=EmptyString, int image=-1, size_t width=100, - bool shown=True, int alignment=TL_ALIGN_LEFT) -> TreeListColumnInfo + __init__(self, String text=EmptyString, int width=DEFAULT_COL_WIDTH, + int flag=ALIGN_LEFT, int image=-1, bool shown=True, + bool edit=False) -> TreeListColumnInfo """ _gizmos.TreeListColumnInfo_swiginit(self,_gizmos.new_TreeListColumnInfo(*args, **kwargs)) __swig_destroy__ = _gizmos.delete_TreeListColumnInfo __del__ = lambda self : None; - def GetShown(*args, **kwargs): - """GetShown(self) -> bool""" - return _gizmos.TreeListColumnInfo_GetShown(*args, **kwargs) - def GetAlignment(*args, **kwargs): """GetAlignment(self) -> int""" return _gizmos.TreeListColumnInfo_GetAlignment(*args, **kwargs) @@ -378,9 +394,13 @@ class TreeListColumnInfo(_core.Object): """GetWidth(self) -> size_t""" return _gizmos.TreeListColumnInfo_GetWidth(*args, **kwargs) - def SetShown(*args, **kwargs): - """SetShown(self, bool shown)""" - return _gizmos.TreeListColumnInfo_SetShown(*args, **kwargs) + def IsEditable(*args, **kwargs): + """IsEditable(self) -> bool""" + return _gizmos.TreeListColumnInfo_IsEditable(*args, **kwargs) + + def IsShown(*args, **kwargs): + """IsShown(self) -> bool""" + return _gizmos.TreeListColumnInfo_IsShown(*args, **kwargs) def SetAlignment(*args, **kwargs): """SetAlignment(self, int alignment)""" @@ -402,7 +422,16 @@ class TreeListColumnInfo(_core.Object): """SetWidth(self, size_t with)""" return _gizmos.TreeListColumnInfo_SetWidth(*args, **kwargs) + def SetEditable(*args, **kwargs): + """SetEditable(self, bool edit)""" + return _gizmos.TreeListColumnInfo_SetEditable(*args, **kwargs) + + def SetShown(*args, **kwargs): + """SetShown(self, bool shown)""" + return _gizmos.TreeListColumnInfo_SetShown(*args, **kwargs) + _gizmos.TreeListColumnInfo_swigregister(TreeListColumnInfo) +TreeListCtrlNameStr = cvar.TreeListCtrlNameStr class TreeListCtrl(_core.Control): """Proxy of C++ TreeListCtrl class""" @@ -490,7 +519,10 @@ class TreeListCtrl(_core.Control): return _gizmos.TreeListCtrl_AssignButtonsImageList(*args, **kwargs) def AddColumn(*args, **kwargs): - """AddColumn(self, String text)""" + """ + AddColumn(self, String text, int width=DEFAULT_COL_WIDTH, int flag=ALIGN_LEFT, + int image=-1, bool shown=True, bool edit=False) + """ return _gizmos.TreeListCtrl_AddColumn(*args, **kwargs) def AddColumnInfo(*args, **kwargs): @@ -498,7 +530,11 @@ class TreeListCtrl(_core.Control): return _gizmos.TreeListCtrl_AddColumnInfo(*args, **kwargs) def InsertColumn(*args, **kwargs): - """InsertColumn(self, size_t before, String text)""" + """ + InsertColumn(self, int before, String text, int width=DEFAULT_COL_WIDTH, + int flag=ALIGN_LEFT, int image=-1, bool shown=True, + bool edit=False) + """ return _gizmos.TreeListCtrl_InsertColumn(*args, **kwargs) def InsertColumnInfo(*args, **kwargs): @@ -513,14 +549,6 @@ class TreeListCtrl(_core.Control): """GetColumnCount(self) -> size_t""" return _gizmos.TreeListCtrl_GetColumnCount(*args, **kwargs) - def SetColumnWidth(*args, **kwargs): - """SetColumnWidth(self, size_t column, size_t width)""" - return _gizmos.TreeListCtrl_SetColumnWidth(*args, **kwargs) - - def GetColumnWidth(*args, **kwargs): - """GetColumnWidth(self, size_t column) -> int""" - return _gizmos.TreeListCtrl_GetColumnWidth(*args, **kwargs) - def SetMainColumn(*args, **kwargs): """SetMainColumn(self, size_t column)""" return _gizmos.TreeListCtrl_SetMainColumn(*args, **kwargs) @@ -529,46 +557,63 @@ class TreeListCtrl(_core.Control): """GetMainColumn(self) -> size_t""" return _gizmos.TreeListCtrl_GetMainColumn(*args, **kwargs) + def SetColumn(*args, **kwargs): + """SetColumn(self, int column, TreeListColumnInfo colInfo)""" + return _gizmos.TreeListCtrl_SetColumn(*args, **kwargs) + + def GetColumn(*args, **kwargs): + """GetColumn(self, int column) -> TreeListColumnInfo""" + return _gizmos.TreeListCtrl_GetColumn(*args, **kwargs) + def SetColumnText(*args, **kwargs): - """SetColumnText(self, size_t column, String text)""" + """SetColumnText(self, int column, String text)""" return _gizmos.TreeListCtrl_SetColumnText(*args, **kwargs) def GetColumnText(*args, **kwargs): - """GetColumnText(self, size_t column) -> String""" + """GetColumnText(self, int column) -> String""" return _gizmos.TreeListCtrl_GetColumnText(*args, **kwargs) - def SetColumn(*args, **kwargs): - """SetColumn(self, size_t column, TreeListColumnInfo info)""" - return _gizmos.TreeListCtrl_SetColumn(*args, **kwargs) + def SetColumnWidth(*args, **kwargs): + """SetColumnWidth(self, int column, int width)""" + return _gizmos.TreeListCtrl_SetColumnWidth(*args, **kwargs) - def GetColumn(*args, **kwargs): - """GetColumn(self, size_t column) -> TreeListColumnInfo""" - return _gizmos.TreeListCtrl_GetColumn(*args, **kwargs) + def GetColumnWidth(*args, **kwargs): + """GetColumnWidth(self, int column) -> int""" + return _gizmos.TreeListCtrl_GetColumnWidth(*args, **kwargs) def SetColumnAlignment(*args, **kwargs): - """SetColumnAlignment(self, size_t column, int align)""" + """SetColumnAlignment(self, int column, int flag)""" return _gizmos.TreeListCtrl_SetColumnAlignment(*args, **kwargs) def GetColumnAlignment(*args, **kwargs): - """GetColumnAlignment(self, size_t column) -> int""" + """GetColumnAlignment(self, int column) -> int""" return _gizmos.TreeListCtrl_GetColumnAlignment(*args, **kwargs) def SetColumnImage(*args, **kwargs): - """SetColumnImage(self, size_t column, int image)""" + """SetColumnImage(self, int column, int image)""" return _gizmos.TreeListCtrl_SetColumnImage(*args, **kwargs) def GetColumnImage(*args, **kwargs): - """GetColumnImage(self, size_t column) -> int""" + """GetColumnImage(self, int column) -> int""" return _gizmos.TreeListCtrl_GetColumnImage(*args, **kwargs) - def ShowColumn(*args, **kwargs): - """ShowColumn(self, size_t column, bool shown)""" - return _gizmos.TreeListCtrl_ShowColumn(*args, **kwargs) + def SetColumnShown(*args, **kwargs): + """SetColumnShown(self, int column, bool shown=True)""" + return _gizmos.TreeListCtrl_SetColumnShown(*args, **kwargs) def IsColumnShown(*args, **kwargs): - """IsColumnShown(self, size_t column) -> bool""" + """IsColumnShown(self, int column) -> bool""" return _gizmos.TreeListCtrl_IsColumnShown(*args, **kwargs) + ShowColumn = SetColumnShown + def SetColumnEditable(*args, **kwargs): + """SetColumnEditable(self, int column, bool edit=True)""" + return _gizmos.TreeListCtrl_SetColumnEditable(*args, **kwargs) + + def IsColumnEditable(*args, **kwargs): + """IsColumnEditable(self, int column) -> bool""" + return _gizmos.TreeListCtrl_IsColumnEditable(*args, **kwargs) + def GetItemText(*args, **kwargs): """GetItemText(self, TreeItemId item, int column=-1) -> String""" return _gizmos.TreeListCtrl_GetItemText(*args, **kwargs) @@ -603,6 +648,22 @@ class TreeListCtrl(_core.Control): GetPyData = GetItemPyData SetPyData = SetItemPyData + def GetItemBold(*args, **kwargs): + """GetItemBold(self, TreeItemId item) -> bool""" + return _gizmos.TreeListCtrl_GetItemBold(*args, **kwargs) + + def GetItemTextColour(*args, **kwargs): + """GetItemTextColour(self, TreeItemId item) -> Colour""" + return _gizmos.TreeListCtrl_GetItemTextColour(*args, **kwargs) + + def GetItemBackgroundColour(*args, **kwargs): + """GetItemBackgroundColour(self, TreeItemId item) -> Colour""" + return _gizmos.TreeListCtrl_GetItemBackgroundColour(*args, **kwargs) + + def GetItemFont(*args, **kwargs): + """GetItemFont(self, TreeItemId item) -> Font""" + return _gizmos.TreeListCtrl_GetItemFont(*args, **kwargs) + def SetItemHasChildren(*args, **kwargs): """SetItemHasChildren(self, TreeItemId item, bool has=True)""" return _gizmos.TreeListCtrl_SetItemHasChildren(*args, **kwargs) @@ -623,30 +684,15 @@ class TreeListCtrl(_core.Control): """SetItemFont(self, TreeItemId item, Font font)""" return _gizmos.TreeListCtrl_SetItemFont(*args, **kwargs) - def GetItemBold(*args, **kwargs): - """GetItemBold(self, TreeItemId item) -> bool""" - return _gizmos.TreeListCtrl_GetItemBold(*args, **kwargs) - - def GetItemTextColour(*args, **kwargs): - """GetItemTextColour(self, TreeItemId item) -> Colour""" - return _gizmos.TreeListCtrl_GetItemTextColour(*args, **kwargs) - - def GetItemBackgroundColour(*args, **kwargs): - """GetItemBackgroundColour(self, TreeItemId item) -> Colour""" - return _gizmos.TreeListCtrl_GetItemBackgroundColour(*args, **kwargs) - - def GetItemFont(*args, **kwargs): - """GetItemFont(self, TreeItemId item) -> Font""" - return _gizmos.TreeListCtrl_GetItemFont(*args, **kwargs) - def IsVisible(*args, **kwargs): """IsVisible(self, TreeItemId item) -> bool""" return _gizmos.TreeListCtrl_IsVisible(*args, **kwargs) - def ItemHasChildren(*args, **kwargs): - """ItemHasChildren(self, TreeItemId item) -> bool""" - return _gizmos.TreeListCtrl_ItemHasChildren(*args, **kwargs) + def HasChildren(*args, **kwargs): + """HasChildren(self, TreeItemId item) -> bool""" + return _gizmos.TreeListCtrl_HasChildren(*args, **kwargs) + ItemHasChildren = HasChildren def IsExpanded(*args, **kwargs): """IsExpanded(self, TreeItemId item) -> bool""" return _gizmos.TreeListCtrl_IsExpanded(*args, **kwargs) @@ -688,9 +734,13 @@ class TreeListCtrl(_core.Control): return _gizmos.TreeListCtrl_GetNextChild(*args, **kwargs) def GetLastChild(*args, **kwargs): - """GetLastChild(self, TreeItemId item) -> TreeItemId""" + """GetLastChild(self, TreeItemId item) -> PyObject""" return _gizmos.TreeListCtrl_GetLastChild(*args, **kwargs) + def GetPrevChild(*args, **kwargs): + """GetPrevChild(self, TreeItemId item, void cookie) -> PyObject""" + return _gizmos.TreeListCtrl_GetPrevChild(*args, **kwargs) + def GetNextSibling(*args, **kwargs): """GetNextSibling(self, TreeItemId item) -> TreeItemId""" return _gizmos.TreeListCtrl_GetNextSibling(*args, **kwargs) @@ -699,22 +749,38 @@ class TreeListCtrl(_core.Control): """GetPrevSibling(self, TreeItemId item) -> TreeItemId""" return _gizmos.TreeListCtrl_GetPrevSibling(*args, **kwargs) + def GetNext(*args, **kwargs): + """GetNext(self, TreeItemId item) -> TreeItemId""" + return _gizmos.TreeListCtrl_GetNext(*args, **kwargs) + + def GetPrev(*args, **kwargs): + """GetPrev(self, TreeItemId item) -> TreeItemId""" + return _gizmos.TreeListCtrl_GetPrev(*args, **kwargs) + + def GetFirstExpandedItem(*args, **kwargs): + """GetFirstExpandedItem(self) -> TreeItemId""" + return _gizmos.TreeListCtrl_GetFirstExpandedItem(*args, **kwargs) + + def GetNextExpanded(*args, **kwargs): + """GetNextExpanded(self, TreeItemId item) -> TreeItemId""" + return _gizmos.TreeListCtrl_GetNextExpanded(*args, **kwargs) + + def GetPrevExpanded(*args, **kwargs): + """GetPrevExpanded(self, TreeItemId item) -> TreeItemId""" + return _gizmos.TreeListCtrl_GetPrevExpanded(*args, **kwargs) + def GetFirstVisibleItem(*args, **kwargs): - """GetFirstVisibleItem(self) -> TreeItemId""" + """GetFirstVisibleItem(self, bool fullRow=False) -> TreeItemId""" return _gizmos.TreeListCtrl_GetFirstVisibleItem(*args, **kwargs) def GetNextVisible(*args, **kwargs): - """GetNextVisible(self, TreeItemId item) -> TreeItemId""" + """GetNextVisible(self, TreeItemId item, bool fullRow=False) -> TreeItemId""" return _gizmos.TreeListCtrl_GetNextVisible(*args, **kwargs) def GetPrevVisible(*args, **kwargs): - """GetPrevVisible(self, TreeItemId item) -> TreeItemId""" + """GetPrevVisible(self, TreeItemId item, bool fullRow=False) -> TreeItemId""" return _gizmos.TreeListCtrl_GetPrevVisible(*args, **kwargs) - def GetNext(*args, **kwargs): - """GetNext(self, TreeItemId item) -> TreeItemId""" - return _gizmos.TreeListCtrl_GetNext(*args, **kwargs) - def AddRoot(*args, **kwargs): """AddRoot(self, String text, int image=-1, int selectedImage=-1, TreeItemData data=None) -> TreeItemId""" return _gizmos.TreeListCtrl_AddRoot(*args, **kwargs) @@ -755,10 +821,11 @@ class TreeListCtrl(_core.Control): """DeleteChildren(self, TreeItemId item)""" return _gizmos.TreeListCtrl_DeleteChildren(*args, **kwargs) - def DeleteAllItems(*args, **kwargs): - """DeleteAllItems(self)""" - return _gizmos.TreeListCtrl_DeleteAllItems(*args, **kwargs) + def DeleteRoot(*args, **kwargs): + """DeleteRoot(self)""" + return _gizmos.TreeListCtrl_DeleteRoot(*args, **kwargs) + DeleteAllItems = DeleteRoot def Expand(*args, **kwargs): """Expand(self, TreeItemId item)""" return _gizmos.TreeListCtrl_Expand(*args, **kwargs) @@ -788,11 +855,14 @@ class TreeListCtrl(_core.Control): return _gizmos.TreeListCtrl_UnselectAll(*args, **kwargs) def SelectItem(*args, **kwargs): - """SelectItem(self, TreeItemId item, bool unselect_others=True, bool extended_select=False)""" + """ + SelectItem(self, TreeItemId item, TreeItemId last=(wxTreeItemId *) NULL, + bool unselect_others=True) + """ return _gizmos.TreeListCtrl_SelectItem(*args, **kwargs) def SelectAll(*args, **kwargs): - """SelectAll(self, bool extended_select=False)""" + """SelectAll(self)""" return _gizmos.TreeListCtrl_SelectAll(*args, **kwargs) def EnsureVisible(*args, **kwargs): @@ -812,13 +882,10 @@ class TreeListCtrl(_core.Control): return _gizmos.TreeListCtrl_GetBoundingRect(*args, **kwargs) def EditLabel(*args, **kwargs): - """EditLabel(self, TreeItemId item)""" + """EditLabel(self, TreeItemId item, int column=-1)""" return _gizmos.TreeListCtrl_EditLabel(*args, **kwargs) - def Edit(*args, **kwargs): - """Edit(self, TreeItemId item)""" - return _gizmos.TreeListCtrl_Edit(*args, **kwargs) - + Edit = EditLabel def SortChildren(*args, **kwargs): """SortChildren(self, TreeItemId item)""" return _gizmos.TreeListCtrl_SortChildren(*args, **kwargs) @@ -827,6 +894,10 @@ class TreeListCtrl(_core.Control): """FindItem(self, TreeItemId item, String str, int flags=0) -> TreeItemId""" return _gizmos.TreeListCtrl_FindItem(*args, **kwargs) + def SetDragItem(*args, **kwargs): + """SetDragItem(self, TreeItemId item=(wxTreeItemId *) NULL)""" + return _gizmos.TreeListCtrl_SetDragItem(*args, **kwargs) + def GetHeaderWindow(*args, **kwargs): """GetHeaderWindow(self) -> Window""" return _gizmos.TreeListCtrl_GetHeaderWindow(*args, **kwargs) diff --git a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp index 5828739f67..12cc76f92c 100644 --- a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp @@ -2805,13 +2805,9 @@ namespace swig { #include #include -#include "wx/treelistctrl.h" -#include "wx/wxPython/pytree.h" - static const wxString wxPyDynamicSashNameStr(wxT("dynamicSashWindow")); static const wxString wxPyEditableListBoxNameStr(wxT("editableListBox")); - static const wxString wxPyTreeListCtrlNameStr(wxT("treelistctrl")); static const wxString wxPyStaticPictureNameStr(wxStaticPictureNameStr); static const wxString wxPyEmptyString(wxEmptyString); @@ -2921,6 +2917,27 @@ SWIG_AsVal_bool (PyObject *obj, bool *val) } +#include "wx/treelistctrl.h" +#include "wx/wxPython/pytree.h" + + + static const wxString wxPyTreeListCtrlNameStr(wxT("treelistctrl")); + +SWIGINTERNINLINE PyObject* +SWIG_From_unsigned_SS_long (unsigned long value) +{ + return (value > LONG_MAX) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong(static_cast< long >(value)); +} + + +SWIGINTERNINLINE PyObject * +SWIG_From_size_t (size_t value) +{ + return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value)); +} + + SWIGINTERN int SWIG_AsVal_unsigned_SS_long (PyObject* obj, unsigned long* val) { @@ -2943,21 +2960,6 @@ SWIG_AsVal_size_t (PyObject * obj, size_t *val) return res; } - -SWIGINTERNINLINE PyObject* -SWIG_From_unsigned_SS_long (unsigned long value) -{ - return (value > LONG_MAX) ? - PyLong_FromUnsignedLong(value) : PyInt_FromLong(static_cast< long >(value)); -} - - -SWIGINTERNINLINE PyObject * -SWIG_From_size_t (size_t value) -{ - return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value)); -} - // C++ version of Python aware control class wxPyTreeListCtrl : public wxTreeListCtrl { DECLARE_ABSTRACT_CLASS(wxPyTreeListCtrl); @@ -2971,8 +2973,8 @@ public: const wxString& name) : wxTreeListCtrl(parent, id, pos, size, style, validator, name) {} - int OnCompareItems(const wxTreeItemId& item1, - const wxTreeItemId& item2) { + virtual int OnCompareItems(const wxTreeItemId& item1, + const wxTreeItemId& item2) { int rval = 0; bool found; wxPyBlock_t blocked = wxPyBeginBlockThreads(); @@ -2988,6 +2990,27 @@ public: rval = wxTreeListCtrl::OnCompareItems(item1, item2); return rval; } + + virtual wxString OnGetItemText( wxTreeItemData* item, long column ) const { + wxString rval; + bool found; + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + if ((found = wxPyCBH_findCallback(m_myInst, "OnGetItemText"))) { + PyObject* ro; + PyObject* itemo = wxPyConstructObject((void*)&item, wxT("wxTreeItemId"), 0); + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Oi)", itemo, column)); + Py_DECREF(itemo); + if (ro) { + rval = Py2wxString(ro); + Py_DECREF(ro); + } + } + wxPyEndBlockThreads(blocked); + if (! found) + rval = wxTreeListCtrl::OnGetItemText(item, column); + return rval; + } + PYPRIVATE; }; @@ -3098,6 +3121,25 @@ SWIGINTERN PyObject *wxPyTreeListCtrl_GetNextChild(wxPyTreeListCtrl *self,wxTree wxPyEndBlockThreads(blocked); return tup; } +SWIGINTERN PyObject *wxPyTreeListCtrl_GetLastChild(wxPyTreeListCtrl *self,wxTreeItemId const &item){ + void* cookie = 0; + wxTreeItemId* ritem = new wxTreeItemId(self->GetLastChild(item, cookie)); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + PyObject* tup = PyTuple_New(2); + PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true)); + PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); + wxPyEndBlockThreads(blocked); + return tup; + } +SWIGINTERN PyObject *wxPyTreeListCtrl_GetPrevChild(wxPyTreeListCtrl *self,wxTreeItemId const &item,void *cookie){ + wxTreeItemId* ritem = new wxTreeItemId(self->GetPrevChild(item, cookie)); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + PyObject* tup = PyTuple_New(2); + PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true)); + PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); + wxPyEndBlockThreads(blocked); + return tup; + } SWIGINTERN PyObject *wxPyTreeListCtrl_GetBoundingRect(wxPyTreeListCtrl *self,wxTreeItemId const &item,bool textOnly=false){ wxRect rect; if (self->GetBoundingRect(item, rect, textOnly)) { @@ -3111,6 +3153,10 @@ SWIGINTERN PyObject *wxPyTreeListCtrl_GetBoundingRect(wxPyTreeListCtrl *self,wxT RETURN_NONE(); } } +SWIGINTERN void wxPyTreeListCtrl_EditLabel(wxPyTreeListCtrl *self,wxTreeItemId const &item,int column=-1){ + if (column < 0) column = self->GetMainColumn(); + self->EditLabel(item, column); + } #include @@ -3194,26 +3240,6 @@ SWIGINTERN PyObject *EditableListBoxNameStr_get(void) { } -SWIGINTERN int TreeListCtrlNameStr_set(PyObject *) { - SWIG_Error(SWIG_AttributeError,"Variable TreeListCtrlNameStr is read-only."); - return 1; -} - - -SWIGINTERN PyObject *TreeListCtrlNameStr_get(void) { - PyObject *pyobj = 0; - - { -#if wxUSE_UNICODE - pyobj = PyUnicode_FromWideChar((&wxPyTreeListCtrlNameStr)->c_str(), (&wxPyTreeListCtrlNameStr)->Len()); -#else - pyobj = PyString_FromStringAndSize((&wxPyTreeListCtrlNameStr)->c_str(), (&wxPyTreeListCtrlNameStr)->Len()); -#endif - } - return pyobj; -} - - SWIGINTERN int StaticPictureNameStr_set(PyObject *) { SWIG_Error(SWIG_AttributeError,"Variable StaticPictureNameStr is read-only."); return 1; @@ -5070,34 +5096,58 @@ SWIGINTERN PyObject *LEDNumberCtrl_swiginit(PyObject *SWIGUNUSEDPARM(self), PyOb return SWIG_Python_InitShadowInstance(args); } +SWIGINTERN int TreeListCtrlNameStr_set(PyObject *) { + SWIG_Error(SWIG_AttributeError,"Variable TreeListCtrlNameStr is read-only."); + return 1; +} + + +SWIGINTERN PyObject *TreeListCtrlNameStr_get(void) { + PyObject *pyobj = 0; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyTreeListCtrlNameStr)->c_str(), (&wxPyTreeListCtrlNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyTreeListCtrlNameStr)->c_str(), (&wxPyTreeListCtrlNameStr)->Len()); +#endif + } + return pyobj; +} + + SWIGINTERN PyObject *_wrap_new_TreeListColumnInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxString const &arg1_defvalue = wxPyEmptyString ; wxString *arg1 = (wxString *) &arg1_defvalue ; - int arg2 = (int) -1 ; - size_t arg3 = (size_t) 100 ; - bool arg4 = (bool) true ; - wxTreeListColumnAlign arg5 = (wxTreeListColumnAlign) wxTL_ALIGN_LEFT ; + int arg2 = (int) DEFAULT_COL_WIDTH ; + int arg3 = (int) wxALIGN_LEFT ; + int arg4 = (int) -1 ; + bool arg5 = (bool) true ; + bool arg6 = (bool) false ; wxTreeListColumnInfo *result = 0 ; bool temp1 = false ; int val2 ; int ecode2 = 0 ; - size_t val3 ; + int val3 ; int ecode3 = 0 ; - bool val4 ; + int val4 ; int ecode4 = 0 ; - int val5 ; + bool val5 ; int ecode5 = 0 ; + bool val6 ; + int ecode6 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char * kwnames[] = { - (char *) "text",(char *) "image",(char *) "width",(char *) "shown",(char *) "alignment", NULL + (char *) "text",(char *) "width",(char *) "flag",(char *) "image",(char *) "shown",(char *) "edit", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOO:new_TreeListColumnInfo",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOO:new_TreeListColumnInfo",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; if (obj0) { { arg1 = wxString_in_helper(obj0); @@ -5113,29 +5163,36 @@ SWIGINTERN PyObject *_wrap_new_TreeListColumnInfo(PyObject *SWIGUNUSEDPARM(self) arg2 = static_cast< int >(val2); } if (obj2) { - ecode3 = SWIG_AsVal_size_t(obj2, &val3); + ecode3 = SWIG_AsVal_int(obj2, &val3); if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_TreeListColumnInfo" "', expected argument " "3"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_TreeListColumnInfo" "', expected argument " "3"" of type '" "int""'"); } - arg3 = static_cast< size_t >(val3); + arg3 = static_cast< int >(val3); } if (obj3) { - ecode4 = SWIG_AsVal_bool(obj3, &val4); + ecode4 = SWIG_AsVal_int(obj3, &val4); if (!SWIG_IsOK(ecode4)) { - SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_TreeListColumnInfo" "', expected argument " "4"" of type '" "bool""'"); + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_TreeListColumnInfo" "', expected argument " "4"" of type '" "int""'"); } - arg4 = static_cast< bool >(val4); + arg4 = static_cast< int >(val4); } if (obj4) { - ecode5 = SWIG_AsVal_int(obj4, &val5); + ecode5 = SWIG_AsVal_bool(obj4, &val5); if (!SWIG_IsOK(ecode5)) { - SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_TreeListColumnInfo" "', expected argument " "5"" of type '" "wxTreeListColumnAlign""'"); + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_TreeListColumnInfo" "', expected argument " "5"" of type '" "bool""'"); + } + arg5 = static_cast< bool >(val5); + } + if (obj5) { + ecode6 = SWIG_AsVal_bool(obj5, &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_TreeListColumnInfo" "', expected argument " "6"" of type '" "bool""'"); } - arg5 = static_cast< wxTreeListColumnAlign >(val5); + arg6 = static_cast< bool >(val6); } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTreeListColumnInfo *)new wxTreeListColumnInfo((wxString const &)*arg1,arg2,arg3,arg4,arg5); + result = (wxTreeListColumnInfo *)new wxTreeListColumnInfo((wxString const &)*arg1,arg2,arg3,arg4,arg5,arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -5182,40 +5239,10 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListColumnInfo_GetShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; - bool result; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListColumnInfo_GetShown" "', expected argument " "1"" of type '" "wxTreeListColumnInfo const *""'"); - } - arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxTreeListColumnInfo const *)arg1)->GetShown(); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_TreeListColumnInfo_GetAlignment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; - wxTreeListColumnAlign result; + int result; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -5229,7 +5256,7 @@ SWIGINTERN PyObject *_wrap_TreeListColumnInfo_GetAlignment(PyObject *SWIGUNUSEDP arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTreeListColumnAlign)((wxTreeListColumnInfo const *)arg1)->GetAlignment(); + result = (int)((wxTreeListColumnInfo const *)arg1)->GetAlignment(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -5358,38 +5385,60 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListColumnInfo_SetShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListColumnInfo_IsEditable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; - bool arg2 ; + bool result; void *argp1 = 0 ; int res1 = 0 ; - bool val2 ; - int ecode2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "shown", NULL - }; + PyObject *swig_obj[1] ; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetShown",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListColumnInfo_SetShown" "', expected argument " "1"" of type '" "wxTreeListColumnInfo *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListColumnInfo_IsEditable" "', expected argument " "1"" of type '" "wxTreeListColumnInfo const *""'"); } arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); - ecode2 = SWIG_AsVal_bool(obj1, &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListColumnInfo_SetShown" "', expected argument " "2"" of type '" "bool""'"); - } - arg2 = static_cast< bool >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetShown(arg2); + result = (bool)((wxTreeListColumnInfo const *)arg1)->IsEditable(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_Py_Void(); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListColumnInfo_IsShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListColumnInfo_IsShown" "', expected argument " "1"" of type '" "wxTreeListColumnInfo const *""'"); + } + arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxTreeListColumnInfo const *)arg1)->IsShown(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5399,7 +5448,7 @@ fail: SWIGINTERN PyObject *_wrap_TreeListColumnInfo_SetAlignment(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; - wxTreeListColumnAlign arg2 ; + int arg2 ; void *argp1 = 0 ; int res1 = 0 ; int val2 ; @@ -5418,9 +5467,9 @@ SWIGINTERN PyObject *_wrap_TreeListColumnInfo_SetAlignment(PyObject *SWIGUNUSEDP arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListColumnInfo_SetAlignment" "', expected argument " "2"" of type '" "wxTreeListColumnAlign""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListColumnInfo_SetAlignment" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< wxTreeListColumnAlign >(val2); + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignment(arg2); @@ -5593,55 +5642,131 @@ fail: } -SWIGINTERN PyObject *TreeListColumnInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_wxTreeListColumnInfo, SWIG_NewClientData(obj)); - return SWIG_Py_Void(); -} - -SWIGINTERN PyObject *TreeListColumnInfo_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - return SWIG_Python_InitShadowInstance(args); -} - -SWIGINTERN PyObject *_wrap_new_TreeListCtrl(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListColumnInfo_SetEditable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; - wxWindow *arg1 = (wxWindow *) 0 ; - int arg2 = (int) -1 ; - wxPoint const &arg3_defvalue = wxDefaultPosition ; - wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; - wxSize const &arg4_defvalue = wxDefaultSize ; - wxSize *arg4 = (wxSize *) &arg4_defvalue ; - long arg5 = (long) wxTR_DEFAULT_STYLE ; - wxValidator const &arg6_defvalue = wxDefaultValidator ; - wxValidator *arg6 = (wxValidator *) &arg6_defvalue ; - wxString const &arg7_defvalue = wxPyTreeListCtrlNameStr ; - wxString *arg7 = (wxString *) &arg7_defvalue ; - wxPyTreeListCtrl *result = 0 ; + wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; + bool arg2 ; void *argp1 = 0 ; int res1 = 0 ; - int val2 ; + bool val2 ; int ecode2 = 0 ; - wxPoint temp3 ; - wxSize temp4 ; - long val5 ; - int ecode5 = 0 ; - void *argp6 = 0 ; - int res6 = 0 ; - bool temp7 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - PyObject * obj5 = 0 ; - PyObject * obj6 = 0 ; char * kwnames[] = { - (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL + (char *) "self",(char *) "edit", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_TreeListCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetEditable",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListColumnInfo_SetEditable" "', expected argument " "1"" of type '" "wxTreeListColumnInfo *""'"); + } + arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); + ecode2 = SWIG_AsVal_bool(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListColumnInfo_SetEditable" "', expected argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetEditable(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListColumnInfo_SetShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; + bool arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + bool val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "shown", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetShown",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListColumnInfo_SetShown" "', expected argument " "1"" of type '" "wxTreeListColumnInfo *""'"); + } + arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); + ecode2 = SWIG_AsVal_bool(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListColumnInfo_SetShown" "', expected argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetShown(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *TreeListColumnInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_wxTreeListColumnInfo, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *TreeListColumnInfo_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + return SWIG_Python_InitShadowInstance(args); +} + +SWIGINTERN PyObject *_wrap_new_TreeListCtrl(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxWindow *arg1 = (wxWindow *) 0 ; + int arg2 = (int) -1 ; + wxPoint const &arg3_defvalue = wxDefaultPosition ; + wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; + wxSize const &arg4_defvalue = wxDefaultSize ; + wxSize *arg4 = (wxSize *) &arg4_defvalue ; + long arg5 = (long) wxTR_DEFAULT_STYLE ; + wxValidator const &arg6_defvalue = wxDefaultValidator ; + wxValidator *arg6 = (wxValidator *) &arg6_defvalue ; + wxString const &arg7_defvalue = wxPyTreeListCtrlNameStr ; + wxString *arg7 = (wxString *) &arg7_defvalue ; + wxPyTreeListCtrl *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + wxPoint temp3 ; + wxSize temp4 ; + long val5 ; + int ecode5 = 0 ; + void *argp6 = 0 ; + int res6 = 0 ; + bool temp7 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + char * kwnames[] = { + (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_TreeListCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_TreeListCtrl" "', expected argument " "1"" of type '" "wxWindow *""'"); } @@ -6358,16 +6483,36 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_AddColumn(PyObject *SWIGUNUSEDPARM(self) PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxString *arg2 = 0 ; + int arg3 = (int) DEFAULT_COL_WIDTH ; + int arg4 = (int) wxALIGN_LEFT ; + int arg5 = (int) -1 ; + bool arg6 = (bool) true ; + bool arg7 = (bool) false ; void *argp1 = 0 ; int res1 = 0 ; bool temp2 = false ; + int val3 ; + int ecode3 = 0 ; + int val4 ; + int ecode4 = 0 ; + int val5 ; + int ecode5 = 0 ; + bool val6 ; + int ecode6 = 0 ; + bool val7 ; + int ecode7 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "text", NULL + (char *) "self",(char *) "text",(char *) "width",(char *) "flag",(char *) "image",(char *) "shown",(char *) "edit", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_AddColumn",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:TreeListCtrl_AddColumn",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_AddColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); @@ -6378,9 +6523,44 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_AddColumn(PyObject *SWIGUNUSEDPARM(self) if (arg2 == NULL) SWIG_fail; temp2 = true; } + if (obj2) { + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_AddColumn" "', expected argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + } + if (obj3) { + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "TreeListCtrl_AddColumn" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + } + if (obj4) { + ecode5 = SWIG_AsVal_int(obj4, &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "TreeListCtrl_AddColumn" "', expected argument " "5"" of type '" "int""'"); + } + arg5 = static_cast< int >(val5); + } + if (obj5) { + ecode6 = SWIG_AsVal_bool(obj5, &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "TreeListCtrl_AddColumn" "', expected argument " "6"" of type '" "bool""'"); + } + arg6 = static_cast< bool >(val6); + } + if (obj6) { + ecode7 = SWIG_AsVal_bool(obj6, &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "TreeListCtrl_AddColumn" "', expected argument " "7"" of type '" "bool""'"); + } + arg7 = static_cast< bool >(val7); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AddColumn((wxString const &)*arg2); + (arg1)->AddColumn((wxString const &)*arg2,arg3,arg4,arg5,arg6,arg7); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6443,39 +6623,94 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_InsertColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; wxString *arg3 = 0 ; + int arg4 = (int) DEFAULT_COL_WIDTH ; + int arg5 = (int) wxALIGN_LEFT ; + int arg6 = (int) -1 ; + bool arg7 = (bool) true ; + bool arg8 = (bool) false ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; bool temp3 = false ; + int val4 ; + int ecode4 = 0 ; + int val5 ; + int ecode5 = 0 ; + int val6 ; + int ecode6 = 0 ; + bool val7 ; + int ecode7 = 0 ; + bool val8 ; + int ecode8 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "before",(char *) "text", NULL + (char *) "self",(char *) "before",(char *) "text",(char *) "width",(char *) "flag",(char *) "image",(char *) "shown",(char *) "edit", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_InsertColumn",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:TreeListCtrl_InsertColumn",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; temp3 = true; } + if (obj3) { + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + } + if (obj4) { + ecode5 = SWIG_AsVal_int(obj4, &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "5"" of type '" "int""'"); + } + arg5 = static_cast< int >(val5); + } + if (obj5) { + ecode6 = SWIG_AsVal_int(obj5, &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "6"" of type '" "int""'"); + } + arg6 = static_cast< int >(val6); + } + if (obj6) { + ecode7 = SWIG_AsVal_bool(obj6, &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "7"" of type '" "bool""'"); + } + arg7 = static_cast< bool >(val7); + } + if (obj7) { + ecode8 = SWIG_AsVal_bool(obj7, &val8); + if (!SWIG_IsOK(ecode8)) { + SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "8"" of type '" "bool""'"); + } + arg8 = static_cast< bool >(val8); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->InsertColumn(arg2,(wxString const &)*arg3); + (arg1)->InsertColumn(arg2,(wxString const &)*arg3,arg4,arg5,arg6,arg7,arg8); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6610,43 +6845,34 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetMainColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; size_t arg2 ; - size_t arg3 ; void *argp1 = 0 ; int res1 = 0 ; size_t val2 ; int ecode2 = 0 ; - size_t val3 ; - int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "column",(char *) "width", NULL + (char *) "self",(char *) "column", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnWidth",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_SetMainColumn",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnWidth" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetMainColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); ecode2 = SWIG_AsVal_size_t(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnWidth" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetMainColumn" "', expected argument " "2"" of type '" "size_t""'"); } arg2 = static_cast< size_t >(val2); - ecode3 = SWIG_AsVal_size_t(obj2, &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnWidth" "', expected argument " "3"" of type '" "size_t""'"); - } - arg3 = static_cast< size_t >(val3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetColumnWidth(arg2,arg3); + (arg1)->SetMainColumn(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6657,73 +6883,74 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetMainColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; - int result; + size_t result; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; - int ecode2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "column", NULL - }; + PyObject *swig_obj[1] ; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumnWidth",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumnWidth" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetMainColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnWidth" "', expected argument " "2"" of type '" "size_t""'"); - } - arg2 = static_cast< size_t >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)((wxPyTreeListCtrl const *)arg1)->GetColumnWidth(arg2); + result = (size_t)((wxPyTreeListCtrl const *)arg1)->GetMainColumn(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_From_int(static_cast< int >(result)); + resultobj = SWIG_From_size_t(static_cast< size_t >(result)); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetMainColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; + wxTreeListColumnInfo *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "column", NULL + (char *) "self",(char *) "column",(char *) "colInfo", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_SetMainColumn",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumn",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetMainColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetMainColumn" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumn" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_SetColumn" "', expected argument " "3"" of type '" "wxTreeListColumnInfo const &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetColumn" "', expected argument " "3"" of type '" "wxTreeListColumnInfo const &""'"); + } + arg3 = reinterpret_cast< wxTreeListColumnInfo * >(argp3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetMainColumn(arg2); + (arg1)->SetColumn(arg2,(wxTreeListColumnInfo const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6734,28 +6961,42 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetMainColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t result; + int arg2 ; + wxTreeListColumnInfo *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; - PyObject *swig_obj[1] ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "column", NULL + }; - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumn",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetMainColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumn" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (size_t)((wxPyTreeListCtrl const *)arg1)->GetMainColumn(); + { + wxTreeListColumnInfo &_result_ref = (arg1)->GetColumn(arg2); + result = (wxTreeListColumnInfo *) &_result_ref; + } wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_From_size_t(static_cast< size_t >(result)); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); return resultobj; fail: return NULL; @@ -6765,11 +7006,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnText(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; wxString *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; bool temp3 = false ; PyObject * obj0 = 0 ; @@ -6785,11 +7026,11 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnText(PyObject *SWIGUNUSEDPARM(s SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnText" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnText" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnText" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -6819,11 +7060,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnText(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; wxString result; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -6837,11 +7078,11 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnText(PyObject *SWIGUNUSEDPARM(s SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumnText" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnText" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnText" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxPyTreeListCtrl const *)arg1)->GetColumnText(arg2); @@ -6861,46 +7102,43 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; - wxTreeListColumnInfo *arg3 = 0 ; + int arg2 ; + int arg3 ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; - void *argp3 = 0 ; - int res3 = 0 ; + int val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "column",(char *) "info", NULL + (char *) "self",(char *) "column",(char *) "width", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumn",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnWidth",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnWidth" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumn" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnWidth" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); - res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_SetColumn" "', expected argument " "3"" of type '" "wxTreeListColumnInfo const &""'"); - } - if (!argp3) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetColumn" "', expected argument " "3"" of type '" "wxTreeListColumnInfo const &""'"); - } - arg3 = reinterpret_cast< wxTreeListColumnInfo * >(argp3); + arg2 = static_cast< int >(val2); + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnWidth" "', expected argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetColumn(arg2,(wxTreeListColumnInfo const &)*arg3); + (arg1)->SetColumnWidth(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6911,14 +7149,14 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; - wxTreeListColumnInfo *result = 0 ; + int arg2 ; + int result; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -6926,27 +7164,24 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumn(PyObject *SWIGUNUSEDPARM(self) (char *) "self",(char *) "column", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumn",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumnWidth",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumnWidth" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumn" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnWidth" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - { - wxTreeListColumnInfo &_result_ref = (arg1)->GetColumn(arg2); - result = (wxTreeListColumnInfo *) &_result_ref; - } + result = (int)((wxPyTreeListCtrl const *)arg1)->GetColumnWidth(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); + resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; fail: return NULL; @@ -6956,11 +7191,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnAlignment(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; - wxTreeListColumnAlign arg3 ; + int arg2 ; + int arg3 ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; int val3 ; int ecode3 = 0 ; @@ -6968,7 +7203,7 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnAlignment(PyObject *SWIGUNUSEDP PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "column",(char *) "align", NULL + (char *) "self",(char *) "column",(char *) "flag", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnAlignment",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; @@ -6977,16 +7212,16 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnAlignment(PyObject *SWIGUNUSEDP SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnAlignment" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnAlignment" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnAlignment" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); ecode3 = SWIG_AsVal_int(obj2, &val3); if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnAlignment" "', expected argument " "3"" of type '" "wxTreeListColumnAlign""'"); + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnAlignment" "', expected argument " "3"" of type '" "int""'"); } - arg3 = static_cast< wxTreeListColumnAlign >(val3); + arg3 = static_cast< int >(val3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColumnAlignment(arg2,arg3); @@ -7003,11 +7238,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnAlignment(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; - wxTreeListColumnAlign result; + int arg2 ; + int result; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -7021,14 +7256,14 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnAlignment(PyObject *SWIGUNUSEDP SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumnAlignment" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnAlignment" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnAlignment" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTreeListColumnAlign)((wxPyTreeListCtrl const *)arg1)->GetColumnAlignment(arg2); + result = (int)((wxPyTreeListCtrl const *)arg1)->GetColumnAlignment(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -7042,11 +7277,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnImage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; int arg3 ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; int val3 ; int ecode3 = 0 ; @@ -7063,11 +7298,11 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnImage(PyObject *SWIGUNUSEDPARM( SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnImage" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnImage" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnImage" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); ecode3 = SWIG_AsVal_int(obj2, &val3); if (!SWIG_IsOK(ecode3)) { SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnImage" "', expected argument " "3"" of type '" "int""'"); @@ -7089,11 +7324,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnImage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; int result; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -7107,11 +7342,11 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnImage(PyObject *SWIGUNUSEDPARM( SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumnImage" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnImage" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnImage" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxPyTreeListCtrl const *)arg1)->GetColumnImage(arg2); @@ -7125,14 +7360,14 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_ShowColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; - bool arg3 ; + int arg2 ; + bool arg3 = (bool) true ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; bool val3 ; int ecode3 = 0 ; @@ -7143,25 +7378,27 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_ShowColumn(PyObject *SWIGUNUSEDPARM(self (char *) "self",(char *) "column",(char *) "shown", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_ShowColumn",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_SetColumnShown",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_ShowColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnShown" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_ShowColumn" "', expected argument " "2"" of type '" "size_t""'"); - } - arg2 = static_cast< size_t >(val2); - ecode3 = SWIG_AsVal_bool(obj2, &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_ShowColumn" "', expected argument " "3"" of type '" "bool""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnShown" "', expected argument " "2"" of type '" "int""'"); } - arg3 = static_cast< bool >(val3); + arg2 = static_cast< int >(val2); + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnShown" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->ShowColumn(arg2,arg3); + (arg1)->SetColumnShown(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -7175,11 +7412,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_IsColumnShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; bool result; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -7193,11 +7430,11 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_IsColumnShown(PyObject *SWIGUNUSEDPARM(s SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_IsColumnShown" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_IsColumnShown" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_IsColumnShown" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxPyTreeListCtrl const *)arg1)->IsColumnShown(arg2); @@ -7213,6 +7450,96 @@ fail: } +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnEditable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + int arg2 ; + bool arg3 = (bool) true ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + bool val3 ; + int ecode3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "column",(char *) "edit", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_SetColumnEditable",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnEditable" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnEditable" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnEditable" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetColumnEditable(arg2,arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListCtrl_IsColumnEditable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + int arg2 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "column", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_IsColumnEditable",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_IsColumnEditable" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_IsColumnEditable" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxPyTreeListCtrl const *)arg1)->IsColumnEditable(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemText(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; @@ -7652,249 +7979,218 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemHasChildren(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemBold(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - bool arg3 = (bool) true ; + bool result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - bool val3 ; - int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item",(char *) "has", NULL + (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_SetItemHasChildren",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemBold",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemBold" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); - if (obj2) { - ecode3 = SWIG_AsVal_bool(obj2, &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "3"" of type '" "bool""'"); - } - arg3 = static_cast< bool >(val3); - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetItemHasChildren((wxTreeItemId const &)*arg2,arg3); + result = (bool)((wxPyTreeListCtrl const *)arg1)->GetItemBold((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_Py_Void(); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemBold(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemTextColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - bool arg3 = (bool) true ; + wxColour result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - bool val3 ; - int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item",(char *) "bold", NULL + (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_SetItemBold",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemTextColour",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemTextColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); - if (obj2) { - ecode3 = SWIG_AsVal_bool(obj2, &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "3"" of type '" "bool""'"); - } - arg3 = static_cast< bool >(val3); - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetItemBold((wxTreeItemId const &)*arg2,arg3); + result = ((wxPyTreeListCtrl const *)arg1)->GetItemTextColour((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_Py_Void(); + resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemTextColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxColour *arg3 = 0 ; + wxColour result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - wxColour temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item",(char *) "colour", NULL + (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemTextColour",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemBackgroundColour",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemTextColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemBackgroundColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); - { - arg3 = &temp3; - if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetItemTextColour((wxTreeItemId const &)*arg2,(wxColour const &)*arg3); + result = ((wxPyTreeListCtrl const *)arg1)->GetItemBackgroundColour((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_Py_Void(); + resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxColour *arg3 = 0 ; + wxFont result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - wxColour temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item",(char *) "colour", NULL + (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemBackgroundColour",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemFont",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemBackgroundColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemFont" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); - { - arg3 = &temp3; - if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetItemBackgroundColour((wxTreeItemId const &)*arg2,(wxColour const &)*arg3); + result = ((wxPyTreeListCtrl const *)arg1)->GetItemFont((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_Py_Void(); + resultobj = SWIG_NewPointerObj((new wxFont(static_cast< const wxFont& >(result))), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemHasChildren(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxFont *arg3 = 0 ; + bool arg3 = (bool) true ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - void *argp3 = 0 ; - int res3 = 0 ; + bool val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item",(char *) "font", NULL + (char *) "self",(char *) "item",(char *) "has", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemFont",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_SetItemHasChildren",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); - res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxFont, 0 | 0); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "3"" of type '" "wxFont const &""'"); - } - if (!argp3) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "3"" of type '" "wxFont const &""'"); + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); } - arg3 = reinterpret_cast< wxFont * >(argp3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetItemFont((wxTreeItemId const &)*arg2,(wxFont const &)*arg3); + (arg1)->SetItemHasChildren((wxTreeItemId const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -7905,170 +8201,201 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemBold(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemBold(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - bool result; + bool arg3 = (bool) true ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + bool val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "bold", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemBold",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_SetItemBold",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemBold" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyTreeListCtrl const *)arg1)->GetItemBold((wxTreeItemId const &)*arg2); + (arg1)->SetItemBold((wxTreeItemId const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemTextColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemTextColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxColour result; + wxColour *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + wxColour temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "colour", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemTextColour",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemTextColour",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemTextColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemTextColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + { + arg3 = &temp3; + if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetItemTextColour((wxTreeItemId const &)*arg2); + (arg1)->SetItemTextColour((wxTreeItemId const &)*arg2,(wxColour const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxColour result; + wxColour *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + wxColour temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "colour", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemBackgroundColour",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemBackgroundColour",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemBackgroundColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemBackgroundColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + { + arg3 = &temp3; + if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetItemBackgroundColour((wxTreeItemId const &)*arg2); + (arg1)->SetItemBackgroundColour((wxTreeItemId const &)*arg2,(wxColour const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxFont result; + wxFont *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "font", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemFont",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemFont",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemFont" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxFont, 0 | 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "3"" of type '" "wxFont const &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "3"" of type '" "wxFont const &""'"); + } + arg3 = reinterpret_cast< wxFont * >(argp3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetItemFont((wxTreeItemId const &)*arg2); + (arg1)->SetItemFont((wxTreeItemId const &)*arg2,(wxFont const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((new wxFont(static_cast< const wxFont& >(result))), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; @@ -8119,7 +8446,7 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_ItemHasChildren(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_HasChildren(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; @@ -8134,23 +8461,23 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_ItemHasChildren(PyObject *SWIGUNUSEDPARM (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_ItemHasChildren",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_HasChildren",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_ItemHasChildren" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_HasChildren" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_ItemHasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_HasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_ItemHasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_HasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyTreeListCtrl const *)arg1)->ItemHasChildren((wxTreeItemId const &)*arg2); + result = (bool)((wxPyTreeListCtrl const *)arg1)->HasChildren((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8558,14 +8885,231 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNextChild(PyObject *SWIGUNUSEDPARM(se wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result; + resultobj = result; + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetLastChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; + PyObject *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetLastChild",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetLastChild" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetLastChild" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetLastChild" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (PyObject *)wxPyTreeListCtrl_GetLastChild(arg1,(wxTreeItemId const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = result; + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; + void *arg3 = (void *) 0 ; + PyObject *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + int res3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item",(char *) "cookie", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_GetPrevChild",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrevChild" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrevChild" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrevChild" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + res3 = SWIG_ConvertPtr(obj2,SWIG_as_voidptrptr(&arg3), 0, 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_GetPrevChild" "', expected argument " "3"" of type '" "void *""'"); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (PyObject *)wxPyTreeListCtrl_GetPrevChild(arg1,(wxTreeItemId const &)*arg2,arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = result; + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNextSibling(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; + wxTreeItemId result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetNextSibling",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNextSibling" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNextSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNextSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxPyTreeListCtrl const *)arg1)->GetNextSibling((wxTreeItemId const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxTreeItemId(static_cast< const wxTreeItemId& >(result))), SWIGTYPE_p_wxTreeItemId, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevSibling(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; + wxTreeItemId result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetPrevSibling",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrevSibling" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrevSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrevSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxPyTreeListCtrl const *)arg1)->GetPrevSibling((wxTreeItemId const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxTreeItemId(static_cast< const wxTreeItemId& >(result))), SWIGTYPE_p_wxTreeItemId, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNext(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; + wxTreeItemId result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetNext",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNext" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNext" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNext" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxPyTreeListCtrl const *)arg1)->GetNext((wxTreeItemId const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxTreeItemId(static_cast< const wxTreeItemId& >(result))), SWIGTYPE_p_wxTreeItemId, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetLastChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrev(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; @@ -8580,23 +9124,23 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetLastChild(PyObject *SWIGUNUSEDPARM(se (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetLastChild",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetPrev",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetLastChild" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrev" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetLastChild" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrev" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetLastChild" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrev" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetLastChild((wxTreeItemId const &)*arg2); + result = ((wxPyTreeListCtrl const *)arg1)->GetPrev((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8607,38 +9151,24 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNextSibling(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetFirstExpandedItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - wxTreeItemId *arg2 = 0 ; wxTreeItemId result; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "item", NULL - }; + PyObject *swig_obj[1] ; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetNextSibling",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNextSibling" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetFirstExpandedItem" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNextSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNextSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); - } - arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetNextSibling((wxTreeItemId const &)*arg2); + result = ((wxPyTreeListCtrl const *)arg1)->GetFirstExpandedItem(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8649,7 +9179,7 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevSibling(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNextExpanded(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; @@ -8664,23 +9194,23 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevSibling(PyObject *SWIGUNUSEDPARM( (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetPrevSibling",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetNextExpanded",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrevSibling" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNextExpanded" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrevSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNextExpanded" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrevSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNextExpanded" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetPrevSibling((wxTreeItemId const &)*arg2); + result = ((wxPyTreeListCtrl const *)arg1)->GetNextExpanded((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8691,24 +9221,38 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetFirstVisibleItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevExpanded(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; wxTreeItemId result; void *argp1 = 0 ; int res1 = 0 ; - PyObject *swig_obj[1] ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item", NULL + }; - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetPrevExpanded",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetFirstVisibleItem" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrevExpanded" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrevExpanded" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrevExpanded" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetFirstVisibleItem(); + result = ((wxPyTreeListCtrl const *)arg1)->GetPrevExpanded((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8719,38 +9263,37 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNextVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetFirstVisibleItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - wxTreeItemId *arg2 = 0 ; + bool arg2 = (bool) false ; wxTreeItemId result; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; + bool val2 ; + int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "fullRow", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetNextVisible",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:TreeListCtrl_GetFirstVisibleItem",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetFirstVisibleItem" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + if (obj1) { + ecode2 = SWIG_AsVal_bool(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetFirstVisibleItem" "', expected argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); } - arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetNextVisible((wxTreeItemId const &)*arg2); + result = ((wxPyTreeListCtrl const *)arg1)->GetFirstVisibleItem(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8761,38 +9304,49 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNextVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; + bool arg3 = (bool) false ; wxTreeItemId result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + bool val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "fullRow", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetPrevVisible",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_GetNextVisible",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetPrevVisible((wxTreeItemId const &)*arg2); + result = ((wxPyTreeListCtrl const *)arg1)->GetNextVisible((wxTreeItemId const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8803,38 +9357,49 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNext(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; + bool arg3 = (bool) false ; wxTreeItemId result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + bool val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "fullRow", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetNext",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_GetPrevVisible",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNext" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNext" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNext" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetNext((wxTreeItemId const &)*arg2); + result = ((wxPyTreeListCtrl const *)arg1)->GetPrevVisible((wxTreeItemId const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -9381,7 +9946,7 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_DeleteAllItems(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_DeleteRoot(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; void *argp1 = 0 ; @@ -9392,12 +9957,12 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_DeleteAllItems(PyObject *SWIGUNUSEDPARM( swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_DeleteAllItems" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_DeleteRoot" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DeleteAllItems(); + (arg1)->DeleteRoot(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -9671,14 +10236,15 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SelectItem(PyObject *SWIGUNUSEDPARM(self PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - bool arg3 = (bool) true ; - bool arg4 = (bool) false ; + wxTreeItemId const &arg3_defvalue = (wxTreeItemId *) NULL ; + wxTreeItemId *arg3 = (wxTreeItemId *) &arg3_defvalue ; + bool arg4 = (bool) true ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - bool val3 ; - int ecode3 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; bool val4 ; int ecode4 = 0 ; PyObject * obj0 = 0 ; @@ -9686,7 +10252,7 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SelectItem(PyObject *SWIGUNUSEDPARM(self PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item",(char *) "unselect_others",(char *) "extended_select", NULL + (char *) "self",(char *) "item",(char *) "last",(char *) "unselect_others", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:TreeListCtrl_SelectItem",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; @@ -9704,11 +10270,14 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SelectItem(PyObject *SWIGUNUSEDPARM(self } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); if (obj2) { - ecode3 = SWIG_AsVal_bool(obj2, &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SelectItem" "', expected argument " "3"" of type '" "bool""'"); - } - arg3 = static_cast< bool >(val3); + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_SelectItem" "', expected argument " "3"" of type '" "wxTreeItemId const &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SelectItem" "', expected argument " "3"" of type '" "wxTreeItemId const &""'"); + } + arg3 = reinterpret_cast< wxTreeItemId * >(argp3); } if (obj3) { ecode4 = SWIG_AsVal_bool(obj3, &val4); @@ -9719,7 +10288,7 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SelectItem(PyObject *SWIGUNUSEDPARM(self } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SelectItem((wxTreeItemId const &)*arg2,arg3,arg4); + (arg1)->SelectItem((wxTreeItemId const &)*arg2,(wxTreeItemId const &)*arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -9730,36 +10299,23 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SelectAll(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SelectAll(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - bool arg2 = (bool) false ; void *argp1 = 0 ; int res1 = 0 ; - bool val2 ; - int ecode2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "extended_select", NULL - }; + PyObject *swig_obj[1] ; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:TreeListCtrl_SelectAll",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SelectAll" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - if (obj1) { - ecode2 = SWIG_AsVal_bool(obj1, &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SelectAll" "', expected argument " "2"" of type '" "bool""'"); - } - arg2 = static_cast< bool >(val2); - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SelectAll(arg2); + (arg1)->SelectAll(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -9966,17 +10522,21 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_EditLabel(PyObject *SWIGUNUSEDPARM(self) PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; + int arg3 = (int) -1 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + int val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "column", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_EditLabel",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_EditLabel",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_EditLabel" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); @@ -9990,50 +10550,16 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_EditLabel(PyObject *SWIGUNUSEDPARM(self) SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_EditLabel" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->EditLabel((wxTreeItemId const &)*arg2); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_TreeListCtrl_Edit(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - wxTreeItemId *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "item", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_Edit",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_Edit" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); - } - arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_Edit" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_Edit" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + if (obj2) { + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_EditLabel" "', expected argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); } - arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->Edit((wxTreeItemId const &)*arg2); + wxPyTreeListCtrl_EditLabel(arg1,(wxTreeItemId const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -10154,6 +10680,50 @@ fail: } +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetDragItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId const &arg2_defvalue = (wxTreeItemId *) NULL ; + wxTreeItemId *arg2 = (wxTreeItemId *) &arg2_defvalue ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:TreeListCtrl_SetDragItem",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetDragItem" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + if (obj1) { + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetDragItem" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetDragItem" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetDragItem((wxTreeItemId const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_TreeListCtrl_GetHeaderWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; @@ -10902,18 +11472,20 @@ static PyMethodDef SwigMethods[] = { { (char *)"LEDNumberCtrl_swiginit", LEDNumberCtrl_swiginit, METH_VARARGS, NULL}, { (char *)"new_TreeListColumnInfo", (PyCFunction) _wrap_new_TreeListColumnInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_TreeListColumnInfo", (PyCFunction)_wrap_delete_TreeListColumnInfo, METH_O, NULL}, - { (char *)"TreeListColumnInfo_GetShown", (PyCFunction)_wrap_TreeListColumnInfo_GetShown, METH_O, NULL}, { (char *)"TreeListColumnInfo_GetAlignment", (PyCFunction)_wrap_TreeListColumnInfo_GetAlignment, METH_O, NULL}, { (char *)"TreeListColumnInfo_GetText", (PyCFunction)_wrap_TreeListColumnInfo_GetText, METH_O, NULL}, { (char *)"TreeListColumnInfo_GetImage", (PyCFunction)_wrap_TreeListColumnInfo_GetImage, METH_O, NULL}, { (char *)"TreeListColumnInfo_GetSelectedImage", (PyCFunction)_wrap_TreeListColumnInfo_GetSelectedImage, METH_O, NULL}, { (char *)"TreeListColumnInfo_GetWidth", (PyCFunction)_wrap_TreeListColumnInfo_GetWidth, METH_O, NULL}, - { (char *)"TreeListColumnInfo_SetShown", (PyCFunction) _wrap_TreeListColumnInfo_SetShown, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListColumnInfo_IsEditable", (PyCFunction)_wrap_TreeListColumnInfo_IsEditable, METH_O, NULL}, + { (char *)"TreeListColumnInfo_IsShown", (PyCFunction)_wrap_TreeListColumnInfo_IsShown, METH_O, NULL}, { (char *)"TreeListColumnInfo_SetAlignment", (PyCFunction) _wrap_TreeListColumnInfo_SetAlignment, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListColumnInfo_SetText", (PyCFunction) _wrap_TreeListColumnInfo_SetText, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListColumnInfo_SetImage", (PyCFunction) _wrap_TreeListColumnInfo_SetImage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListColumnInfo_SetSelectedImage", (PyCFunction) _wrap_TreeListColumnInfo_SetSelectedImage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListColumnInfo_SetWidth", (PyCFunction) _wrap_TreeListColumnInfo_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListColumnInfo_SetEditable", (PyCFunction) _wrap_TreeListColumnInfo_SetEditable, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListColumnInfo_SetShown", (PyCFunction) _wrap_TreeListColumnInfo_SetShown, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListColumnInfo_swigregister", TreeListColumnInfo_swigregister, METH_VARARGS, NULL}, { (char *)"TreeListColumnInfo_swiginit", TreeListColumnInfo_swiginit, METH_VARARGS, NULL}, { (char *)"new_TreeListCtrl", (PyCFunction) _wrap_new_TreeListCtrl, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -10940,20 +11512,22 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeListCtrl_InsertColumnInfo", (PyCFunction) _wrap_TreeListCtrl_InsertColumnInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_RemoveColumn", (PyCFunction) _wrap_TreeListCtrl_RemoveColumn, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetColumnCount", (PyCFunction)_wrap_TreeListCtrl_GetColumnCount, METH_O, NULL}, - { (char *)"TreeListCtrl_SetColumnWidth", (PyCFunction) _wrap_TreeListCtrl_SetColumnWidth, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetColumnWidth", (PyCFunction) _wrap_TreeListCtrl_GetColumnWidth, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetMainColumn", (PyCFunction) _wrap_TreeListCtrl_SetMainColumn, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetMainColumn", (PyCFunction)_wrap_TreeListCtrl_GetMainColumn, METH_O, NULL}, - { (char *)"TreeListCtrl_SetColumnText", (PyCFunction) _wrap_TreeListCtrl_SetColumnText, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetColumnText", (PyCFunction) _wrap_TreeListCtrl_GetColumnText, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetColumn", (PyCFunction) _wrap_TreeListCtrl_SetColumn, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetColumn", (PyCFunction) _wrap_TreeListCtrl_GetColumn, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_SetColumnText", (PyCFunction) _wrap_TreeListCtrl_SetColumnText, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetColumnText", (PyCFunction) _wrap_TreeListCtrl_GetColumnText, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_SetColumnWidth", (PyCFunction) _wrap_TreeListCtrl_SetColumnWidth, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetColumnWidth", (PyCFunction) _wrap_TreeListCtrl_GetColumnWidth, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetColumnAlignment", (PyCFunction) _wrap_TreeListCtrl_SetColumnAlignment, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetColumnAlignment", (PyCFunction) _wrap_TreeListCtrl_GetColumnAlignment, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetColumnImage", (PyCFunction) _wrap_TreeListCtrl_SetColumnImage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetColumnImage", (PyCFunction) _wrap_TreeListCtrl_GetColumnImage, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_ShowColumn", (PyCFunction) _wrap_TreeListCtrl_ShowColumn, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_SetColumnShown", (PyCFunction) _wrap_TreeListCtrl_SetColumnShown, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_IsColumnShown", (PyCFunction) _wrap_TreeListCtrl_IsColumnShown, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_SetColumnEditable", (PyCFunction) _wrap_TreeListCtrl_SetColumnEditable, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_IsColumnEditable", (PyCFunction) _wrap_TreeListCtrl_IsColumnEditable, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetItemText", (PyCFunction) _wrap_TreeListCtrl_GetItemText, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetItemImage", (PyCFunction) _wrap_TreeListCtrl_GetItemImage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemText", (PyCFunction) _wrap_TreeListCtrl_SetItemText, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -10962,17 +11536,17 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeListCtrl_SetItemData", (PyCFunction) _wrap_TreeListCtrl_SetItemData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetItemPyData", (PyCFunction) _wrap_TreeListCtrl_GetItemPyData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemPyData", (PyCFunction) _wrap_TreeListCtrl_SetItemPyData, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetItemBold", (PyCFunction) _wrap_TreeListCtrl_GetItemBold, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetItemTextColour", (PyCFunction) _wrap_TreeListCtrl_GetItemTextColour, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetItemBackgroundColour", (PyCFunction) _wrap_TreeListCtrl_GetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetItemFont", (PyCFunction) _wrap_TreeListCtrl_GetItemFont, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemHasChildren", (PyCFunction) _wrap_TreeListCtrl_SetItemHasChildren, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemBold", (PyCFunction) _wrap_TreeListCtrl_SetItemBold, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemTextColour", (PyCFunction) _wrap_TreeListCtrl_SetItemTextColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemBackgroundColour", (PyCFunction) _wrap_TreeListCtrl_SetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemFont", (PyCFunction) _wrap_TreeListCtrl_SetItemFont, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetItemBold", (PyCFunction) _wrap_TreeListCtrl_GetItemBold, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetItemTextColour", (PyCFunction) _wrap_TreeListCtrl_GetItemTextColour, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetItemBackgroundColour", (PyCFunction) _wrap_TreeListCtrl_GetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetItemFont", (PyCFunction) _wrap_TreeListCtrl_GetItemFont, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_IsVisible", (PyCFunction) _wrap_TreeListCtrl_IsVisible, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_ItemHasChildren", (PyCFunction) _wrap_TreeListCtrl_ItemHasChildren, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_HasChildren", (PyCFunction) _wrap_TreeListCtrl_HasChildren, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_IsExpanded", (PyCFunction) _wrap_TreeListCtrl_IsExpanded, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_IsSelected", (PyCFunction) _wrap_TreeListCtrl_IsSelected, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_IsBold", (PyCFunction) _wrap_TreeListCtrl_IsBold, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -10984,12 +11558,17 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeListCtrl_GetFirstChild", (PyCFunction) _wrap_TreeListCtrl_GetFirstChild, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetNextChild", (PyCFunction) _wrap_TreeListCtrl_GetNextChild, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetLastChild", (PyCFunction) _wrap_TreeListCtrl_GetLastChild, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetPrevChild", (PyCFunction) _wrap_TreeListCtrl_GetPrevChild, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetNextSibling", (PyCFunction) _wrap_TreeListCtrl_GetNextSibling, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetPrevSibling", (PyCFunction) _wrap_TreeListCtrl_GetPrevSibling, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetFirstVisibleItem", (PyCFunction)_wrap_TreeListCtrl_GetFirstVisibleItem, METH_O, NULL}, + { (char *)"TreeListCtrl_GetNext", (PyCFunction) _wrap_TreeListCtrl_GetNext, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetPrev", (PyCFunction) _wrap_TreeListCtrl_GetPrev, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetFirstExpandedItem", (PyCFunction)_wrap_TreeListCtrl_GetFirstExpandedItem, METH_O, NULL}, + { (char *)"TreeListCtrl_GetNextExpanded", (PyCFunction) _wrap_TreeListCtrl_GetNextExpanded, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetPrevExpanded", (PyCFunction) _wrap_TreeListCtrl_GetPrevExpanded, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetFirstVisibleItem", (PyCFunction) _wrap_TreeListCtrl_GetFirstVisibleItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetNextVisible", (PyCFunction) _wrap_TreeListCtrl_GetNextVisible, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetPrevVisible", (PyCFunction) _wrap_TreeListCtrl_GetPrevVisible, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetNext", (PyCFunction) _wrap_TreeListCtrl_GetNext, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_AddRoot", (PyCFunction) _wrap_TreeListCtrl_AddRoot, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_PrependItem", (PyCFunction) _wrap_TreeListCtrl_PrependItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_InsertItem", (PyCFunction) _wrap_TreeListCtrl_InsertItem, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -10997,7 +11576,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeListCtrl_AppendItem", (PyCFunction) _wrap_TreeListCtrl_AppendItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_Delete", (PyCFunction) _wrap_TreeListCtrl_Delete, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_DeleteChildren", (PyCFunction) _wrap_TreeListCtrl_DeleteChildren, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_DeleteAllItems", (PyCFunction)_wrap_TreeListCtrl_DeleteAllItems, METH_O, NULL}, + { (char *)"TreeListCtrl_DeleteRoot", (PyCFunction)_wrap_TreeListCtrl_DeleteRoot, METH_O, NULL}, { (char *)"TreeListCtrl_Expand", (PyCFunction) _wrap_TreeListCtrl_Expand, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_ExpandAll", (PyCFunction) _wrap_TreeListCtrl_ExpandAll, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_Collapse", (PyCFunction) _wrap_TreeListCtrl_Collapse, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -11006,15 +11585,15 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeListCtrl_Unselect", (PyCFunction)_wrap_TreeListCtrl_Unselect, METH_O, NULL}, { (char *)"TreeListCtrl_UnselectAll", (PyCFunction)_wrap_TreeListCtrl_UnselectAll, METH_O, NULL}, { (char *)"TreeListCtrl_SelectItem", (PyCFunction) _wrap_TreeListCtrl_SelectItem, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_SelectAll", (PyCFunction) _wrap_TreeListCtrl_SelectAll, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_SelectAll", (PyCFunction)_wrap_TreeListCtrl_SelectAll, METH_O, NULL}, { (char *)"TreeListCtrl_EnsureVisible", (PyCFunction) _wrap_TreeListCtrl_EnsureVisible, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_ScrollTo", (PyCFunction) _wrap_TreeListCtrl_ScrollTo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_HitTest", (PyCFunction) _wrap_TreeListCtrl_HitTest, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetBoundingRect", (PyCFunction) _wrap_TreeListCtrl_GetBoundingRect, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_EditLabel", (PyCFunction) _wrap_TreeListCtrl_EditLabel, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_Edit", (PyCFunction) _wrap_TreeListCtrl_Edit, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SortChildren", (PyCFunction) _wrap_TreeListCtrl_SortChildren, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_FindItem", (PyCFunction) _wrap_TreeListCtrl_FindItem, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_SetDragItem", (PyCFunction) _wrap_TreeListCtrl_SetDragItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetHeaderWindow", (PyCFunction)_wrap_TreeListCtrl_GetHeaderWindow, METH_O, NULL}, { (char *)"TreeListCtrl_GetMainWindow", (PyCFunction)_wrap_TreeListCtrl_GetMainWindow, METH_O, NULL}, { (char *)"TreeListCtrl_swigregister", TreeListCtrl_swigregister, METH_VARARGS, NULL}, @@ -14164,7 +14743,6 @@ SWIGEXPORT void SWIG_init(void) { PyDict_SetItemString(d,(char*)"cvar", SWIG_globals()); SWIG_addvarlink(SWIG_globals(),(char*)"DynamicSashNameStr",DynamicSashNameStr_get, DynamicSashNameStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"EditableListBoxNameStr",EditableListBoxNameStr_get, EditableListBoxNameStr_set); - SWIG_addvarlink(SWIG_globals(),(char*)"TreeListCtrlNameStr",TreeListCtrlNameStr_get, TreeListCtrlNameStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"StaticPictureNameStr",StaticPictureNameStr_get, StaticPictureNameStr_set); SWIG_Python_SetConstant(d, "DS_MANAGE_SCROLLBARS",SWIG_From_int(static_cast< int >(wxDS_MANAGE_SCROLLBARS))); SWIG_Python_SetConstant(d, "DS_DRAG_CORNER",SWIG_From_int(static_cast< int >(wxDS_DRAG_CORNER))); @@ -14178,24 +14756,27 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "LED_ALIGN_CENTER",SWIG_From_int(static_cast< int >(wxLED_ALIGN_CENTER))); SWIG_Python_SetConstant(d, "LED_ALIGN_MASK",SWIG_From_int(static_cast< int >(wxLED_ALIGN_MASK))); SWIG_Python_SetConstant(d, "LED_DRAW_FADED",SWIG_From_int(static_cast< int >(wxLED_DRAW_FADED))); - SWIG_Python_SetConstant(d, "TL_ALIGN_LEFT",SWIG_From_int(static_cast< int >(wxTL_ALIGN_LEFT))); - SWIG_Python_SetConstant(d, "TL_ALIGN_RIGHT",SWIG_From_int(static_cast< int >(wxTL_ALIGN_RIGHT))); - SWIG_Python_SetConstant(d, "TL_ALIGN_CENTER",SWIG_From_int(static_cast< int >(wxTL_ALIGN_CENTER))); + SWIG_addvarlink(SWIG_globals(),(char*)"TreeListCtrlNameStr",TreeListCtrlNameStr_get, TreeListCtrlNameStr_set); + SWIG_Python_SetConstant(d, "DEFAULT_COL_WIDTH",SWIG_From_int(static_cast< int >(DEFAULT_COL_WIDTH))); + SWIG_Python_SetConstant(d, "TL_MODE_NAV_FULLTREE",SWIG_From_int(static_cast< int >(wxTL_MODE_NAV_FULLTREE))); + SWIG_Python_SetConstant(d, "TL_MODE_NAV_EXPANDED",SWIG_From_int(static_cast< int >(wxTL_MODE_NAV_EXPANDED))); + SWIG_Python_SetConstant(d, "TL_MODE_NAV_VISIBLE",SWIG_From_int(static_cast< int >(wxTL_MODE_NAV_VISIBLE))); + SWIG_Python_SetConstant(d, "TL_MODE_NAV_LEVEL",SWIG_From_int(static_cast< int >(wxTL_MODE_NAV_LEVEL))); + SWIG_Python_SetConstant(d, "TL_MODE_FIND_EXACT",SWIG_From_int(static_cast< int >(wxTL_MODE_FIND_EXACT))); + SWIG_Python_SetConstant(d, "TL_MODE_FIND_PARTIAL",SWIG_From_int(static_cast< int >(wxTL_MODE_FIND_PARTIAL))); + SWIG_Python_SetConstant(d, "TL_MODE_FIND_NOCASE",SWIG_From_int(static_cast< int >(wxTL_MODE_FIND_NOCASE))); SWIG_Python_SetConstant(d, "TREE_HITTEST_ONITEMCOLUMN",SWIG_From_int(static_cast< int >(wxTREE_HITTEST_ONITEMCOLUMN))); - SWIG_Python_SetConstant(d, "TL_SEARCH_VISIBLE",SWIG_From_int(static_cast< int >(wxTL_SEARCH_VISIBLE))); - SWIG_Python_SetConstant(d, "TL_SEARCH_LEVEL",SWIG_From_int(static_cast< int >(wxTL_SEARCH_LEVEL))); - SWIG_Python_SetConstant(d, "TL_SEARCH_FULL",SWIG_From_int(static_cast< int >(wxTL_SEARCH_FULL))); - SWIG_Python_SetConstant(d, "TL_SEARCH_PARTIAL",SWIG_From_int(static_cast< int >(wxTL_SEARCH_PARTIAL))); - SWIG_Python_SetConstant(d, "TL_SEARCH_NOCASE",SWIG_From_int(static_cast< int >(wxTL_SEARCH_NOCASE))); - SWIG_Python_SetConstant(d, "TR_DONT_ADJUST_MAC",SWIG_From_int(static_cast< int >(wxTR_DONT_ADJUST_MAC))); + SWIG_Python_SetConstant(d, "TR_COLUMN_LINES",SWIG_From_int(static_cast< int >(wxTR_COLUMN_LINES))); + SWIG_Python_SetConstant(d, "TR_VIRTUAL",SWIG_From_int(static_cast< int >(wxTR_VIRTUAL))); + + wxPyPtrTypeMap_Add("wxTreeListCtrl", "wxPyTreeListCtrl"); + SWIG_Python_SetConstant(d, "SCALE_HORIZONTAL",SWIG_From_int(static_cast< int >(wxSCALE_HORIZONTAL))); SWIG_Python_SetConstant(d, "SCALE_VERTICAL",SWIG_From_int(static_cast< int >(wxSCALE_VERTICAL))); SWIG_Python_SetConstant(d, "SCALE_UNIFORM",SWIG_From_int(static_cast< int >(wxSCALE_UNIFORM))); SWIG_Python_SetConstant(d, "SCALE_CUSTOM",SWIG_From_int(static_cast< int >(wxSCALE_CUSTOM))); - wxPyPtrTypeMap_Add("wxTreeCompanionWindow", "wxPyTreeCompanionWindow"); - wxPyPtrTypeMap_Add("wxTreeListCtrl", "wxPyTreeListCtrl"); } diff --git a/wxPython/contrib/gizmos/msw/gizmos.py b/wxPython/contrib/gizmos/msw/gizmos.py index 6a7f5add74..592f85aeae 100644 --- a/wxPython/contrib/gizmos/msw/gizmos.py +++ b/wxPython/contrib/gizmos/msw/gizmos.py @@ -76,7 +76,6 @@ _gizmos.DynamicSashSplitEvent_swigregister(DynamicSashSplitEvent) cvar = _gizmos.cvar DynamicSashNameStr = cvar.DynamicSashNameStr EditableListBoxNameStr = cvar.EditableListBoxNameStr -TreeListCtrlNameStr = cvar.TreeListCtrlNameStr StaticPictureNameStr = cvar.StaticPictureNameStr class DynamicSashUnifyEvent(_core.CommandEvent): @@ -331,33 +330,50 @@ def PreLEDNumberCtrl(*args, **kwargs): val = _gizmos.new_PreLEDNumberCtrl(*args, **kwargs) return val -TL_ALIGN_LEFT = _gizmos.TL_ALIGN_LEFT -TL_ALIGN_RIGHT = _gizmos.TL_ALIGN_RIGHT -TL_ALIGN_CENTER = _gizmos.TL_ALIGN_CENTER +#--------------------------------------------------------------------------- + +DEFAULT_COL_WIDTH = _gizmos.DEFAULT_COL_WIDTH +TL_MODE_NAV_FULLTREE = _gizmos.TL_MODE_NAV_FULLTREE +TL_MODE_NAV_EXPANDED = _gizmos.TL_MODE_NAV_EXPANDED +TL_MODE_NAV_VISIBLE = _gizmos.TL_MODE_NAV_VISIBLE +TL_MODE_NAV_LEVEL = _gizmos.TL_MODE_NAV_LEVEL +TL_MODE_FIND_EXACT = _gizmos.TL_MODE_FIND_EXACT +TL_MODE_FIND_PARTIAL = _gizmos.TL_MODE_FIND_PARTIAL +TL_MODE_FIND_NOCASE = _gizmos.TL_MODE_FIND_NOCASE TREE_HITTEST_ONITEMCOLUMN = _gizmos.TREE_HITTEST_ONITEMCOLUMN -TL_SEARCH_VISIBLE = _gizmos.TL_SEARCH_VISIBLE -TL_SEARCH_LEVEL = _gizmos.TL_SEARCH_LEVEL -TL_SEARCH_FULL = _gizmos.TL_SEARCH_FULL -TL_SEARCH_PARTIAL = _gizmos.TL_SEARCH_PARTIAL -TL_SEARCH_NOCASE = _gizmos.TL_SEARCH_NOCASE -TR_DONT_ADJUST_MAC = _gizmos.TR_DONT_ADJUST_MAC -wx.TR_DONT_ADJUST_MAC = TR_DONT_ADJUST_MAC +wx.TREE_HITTEST_ONITEMCOLUMN = TREE_HITTEST_ONITEMCOLUMN +TR_COLUMN_LINES = _gizmos.TR_COLUMN_LINES +TR_VIRTUAL = _gizmos.TR_VIRTUAL +wx.TR_COLUMN_LINES = TR_COLUMN_LINES +wxTR_VIRTUAL = TR_VIRTUAL + +#// Compatibility aliases for old names/values +TL_ALIGN_LEFT = wx.ALIGN_LEFT +TL_ALIGN_RIGHT = wx.ALIGN_RIGHT +TL_ALIGN_CENTER = wx.ALIGN_CENTER + +TL_SEARCH_VISIBLE = TL_MODE_NAV_VISIBLE +TL_SEARCH_LEVEL = TL_MODE_NAV_LEVEL +TL_SEARCH_FULL = TL_MODE_FIND_EXACT +TL_SEARCH_PARTIAL = TL_MODE_FIND_PARTIAL +TL_SEARCH_NOCASE = TL_MODE_FIND_NOCASE + +TR_DONT_ADJUST_MAC = 0 +wx.TR_DONT_ADJUST_MAC = TR_DONT_ADJUST_MAC + class TreeListColumnInfo(_core.Object): """Proxy of C++ TreeListColumnInfo class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr def __init__(self, *args, **kwargs): """ - __init__(self, String text=EmptyString, int image=-1, size_t width=100, - bool shown=True, int alignment=TL_ALIGN_LEFT) -> TreeListColumnInfo + __init__(self, String text=EmptyString, int width=DEFAULT_COL_WIDTH, + int flag=ALIGN_LEFT, int image=-1, bool shown=True, + bool edit=False) -> TreeListColumnInfo """ _gizmos.TreeListColumnInfo_swiginit(self,_gizmos.new_TreeListColumnInfo(*args, **kwargs)) __swig_destroy__ = _gizmos.delete_TreeListColumnInfo __del__ = lambda self : None; - def GetShown(*args, **kwargs): - """GetShown(self) -> bool""" - return _gizmos.TreeListColumnInfo_GetShown(*args, **kwargs) - def GetAlignment(*args, **kwargs): """GetAlignment(self) -> int""" return _gizmos.TreeListColumnInfo_GetAlignment(*args, **kwargs) @@ -378,9 +394,13 @@ class TreeListColumnInfo(_core.Object): """GetWidth(self) -> size_t""" return _gizmos.TreeListColumnInfo_GetWidth(*args, **kwargs) - def SetShown(*args, **kwargs): - """SetShown(self, bool shown)""" - return _gizmos.TreeListColumnInfo_SetShown(*args, **kwargs) + def IsEditable(*args, **kwargs): + """IsEditable(self) -> bool""" + return _gizmos.TreeListColumnInfo_IsEditable(*args, **kwargs) + + def IsShown(*args, **kwargs): + """IsShown(self) -> bool""" + return _gizmos.TreeListColumnInfo_IsShown(*args, **kwargs) def SetAlignment(*args, **kwargs): """SetAlignment(self, int alignment)""" @@ -402,7 +422,16 @@ class TreeListColumnInfo(_core.Object): """SetWidth(self, size_t with)""" return _gizmos.TreeListColumnInfo_SetWidth(*args, **kwargs) + def SetEditable(*args, **kwargs): + """SetEditable(self, bool edit)""" + return _gizmos.TreeListColumnInfo_SetEditable(*args, **kwargs) + + def SetShown(*args, **kwargs): + """SetShown(self, bool shown)""" + return _gizmos.TreeListColumnInfo_SetShown(*args, **kwargs) + _gizmos.TreeListColumnInfo_swigregister(TreeListColumnInfo) +TreeListCtrlNameStr = cvar.TreeListCtrlNameStr class TreeListCtrl(_core.Control): """Proxy of C++ TreeListCtrl class""" @@ -490,7 +519,10 @@ class TreeListCtrl(_core.Control): return _gizmos.TreeListCtrl_AssignButtonsImageList(*args, **kwargs) def AddColumn(*args, **kwargs): - """AddColumn(self, String text)""" + """ + AddColumn(self, String text, int width=DEFAULT_COL_WIDTH, int flag=ALIGN_LEFT, + int image=-1, bool shown=True, bool edit=False) + """ return _gizmos.TreeListCtrl_AddColumn(*args, **kwargs) def AddColumnInfo(*args, **kwargs): @@ -498,7 +530,11 @@ class TreeListCtrl(_core.Control): return _gizmos.TreeListCtrl_AddColumnInfo(*args, **kwargs) def InsertColumn(*args, **kwargs): - """InsertColumn(self, size_t before, String text)""" + """ + InsertColumn(self, int before, String text, int width=DEFAULT_COL_WIDTH, + int flag=ALIGN_LEFT, int image=-1, bool shown=True, + bool edit=False) + """ return _gizmos.TreeListCtrl_InsertColumn(*args, **kwargs) def InsertColumnInfo(*args, **kwargs): @@ -513,14 +549,6 @@ class TreeListCtrl(_core.Control): """GetColumnCount(self) -> size_t""" return _gizmos.TreeListCtrl_GetColumnCount(*args, **kwargs) - def SetColumnWidth(*args, **kwargs): - """SetColumnWidth(self, size_t column, size_t width)""" - return _gizmos.TreeListCtrl_SetColumnWidth(*args, **kwargs) - - def GetColumnWidth(*args, **kwargs): - """GetColumnWidth(self, size_t column) -> int""" - return _gizmos.TreeListCtrl_GetColumnWidth(*args, **kwargs) - def SetMainColumn(*args, **kwargs): """SetMainColumn(self, size_t column)""" return _gizmos.TreeListCtrl_SetMainColumn(*args, **kwargs) @@ -529,46 +557,63 @@ class TreeListCtrl(_core.Control): """GetMainColumn(self) -> size_t""" return _gizmos.TreeListCtrl_GetMainColumn(*args, **kwargs) + def SetColumn(*args, **kwargs): + """SetColumn(self, int column, TreeListColumnInfo colInfo)""" + return _gizmos.TreeListCtrl_SetColumn(*args, **kwargs) + + def GetColumn(*args, **kwargs): + """GetColumn(self, int column) -> TreeListColumnInfo""" + return _gizmos.TreeListCtrl_GetColumn(*args, **kwargs) + def SetColumnText(*args, **kwargs): - """SetColumnText(self, size_t column, String text)""" + """SetColumnText(self, int column, String text)""" return _gizmos.TreeListCtrl_SetColumnText(*args, **kwargs) def GetColumnText(*args, **kwargs): - """GetColumnText(self, size_t column) -> String""" + """GetColumnText(self, int column) -> String""" return _gizmos.TreeListCtrl_GetColumnText(*args, **kwargs) - def SetColumn(*args, **kwargs): - """SetColumn(self, size_t column, TreeListColumnInfo info)""" - return _gizmos.TreeListCtrl_SetColumn(*args, **kwargs) + def SetColumnWidth(*args, **kwargs): + """SetColumnWidth(self, int column, int width)""" + return _gizmos.TreeListCtrl_SetColumnWidth(*args, **kwargs) - def GetColumn(*args, **kwargs): - """GetColumn(self, size_t column) -> TreeListColumnInfo""" - return _gizmos.TreeListCtrl_GetColumn(*args, **kwargs) + def GetColumnWidth(*args, **kwargs): + """GetColumnWidth(self, int column) -> int""" + return _gizmos.TreeListCtrl_GetColumnWidth(*args, **kwargs) def SetColumnAlignment(*args, **kwargs): - """SetColumnAlignment(self, size_t column, int align)""" + """SetColumnAlignment(self, int column, int flag)""" return _gizmos.TreeListCtrl_SetColumnAlignment(*args, **kwargs) def GetColumnAlignment(*args, **kwargs): - """GetColumnAlignment(self, size_t column) -> int""" + """GetColumnAlignment(self, int column) -> int""" return _gizmos.TreeListCtrl_GetColumnAlignment(*args, **kwargs) def SetColumnImage(*args, **kwargs): - """SetColumnImage(self, size_t column, int image)""" + """SetColumnImage(self, int column, int image)""" return _gizmos.TreeListCtrl_SetColumnImage(*args, **kwargs) def GetColumnImage(*args, **kwargs): - """GetColumnImage(self, size_t column) -> int""" + """GetColumnImage(self, int column) -> int""" return _gizmos.TreeListCtrl_GetColumnImage(*args, **kwargs) - def ShowColumn(*args, **kwargs): - """ShowColumn(self, size_t column, bool shown)""" - return _gizmos.TreeListCtrl_ShowColumn(*args, **kwargs) + def SetColumnShown(*args, **kwargs): + """SetColumnShown(self, int column, bool shown=True)""" + return _gizmos.TreeListCtrl_SetColumnShown(*args, **kwargs) def IsColumnShown(*args, **kwargs): - """IsColumnShown(self, size_t column) -> bool""" + """IsColumnShown(self, int column) -> bool""" return _gizmos.TreeListCtrl_IsColumnShown(*args, **kwargs) + ShowColumn = SetColumnShown + def SetColumnEditable(*args, **kwargs): + """SetColumnEditable(self, int column, bool edit=True)""" + return _gizmos.TreeListCtrl_SetColumnEditable(*args, **kwargs) + + def IsColumnEditable(*args, **kwargs): + """IsColumnEditable(self, int column) -> bool""" + return _gizmos.TreeListCtrl_IsColumnEditable(*args, **kwargs) + def GetItemText(*args, **kwargs): """GetItemText(self, TreeItemId item, int column=-1) -> String""" return _gizmos.TreeListCtrl_GetItemText(*args, **kwargs) @@ -603,6 +648,22 @@ class TreeListCtrl(_core.Control): GetPyData = GetItemPyData SetPyData = SetItemPyData + def GetItemBold(*args, **kwargs): + """GetItemBold(self, TreeItemId item) -> bool""" + return _gizmos.TreeListCtrl_GetItemBold(*args, **kwargs) + + def GetItemTextColour(*args, **kwargs): + """GetItemTextColour(self, TreeItemId item) -> Colour""" + return _gizmos.TreeListCtrl_GetItemTextColour(*args, **kwargs) + + def GetItemBackgroundColour(*args, **kwargs): + """GetItemBackgroundColour(self, TreeItemId item) -> Colour""" + return _gizmos.TreeListCtrl_GetItemBackgroundColour(*args, **kwargs) + + def GetItemFont(*args, **kwargs): + """GetItemFont(self, TreeItemId item) -> Font""" + return _gizmos.TreeListCtrl_GetItemFont(*args, **kwargs) + def SetItemHasChildren(*args, **kwargs): """SetItemHasChildren(self, TreeItemId item, bool has=True)""" return _gizmos.TreeListCtrl_SetItemHasChildren(*args, **kwargs) @@ -623,30 +684,15 @@ class TreeListCtrl(_core.Control): """SetItemFont(self, TreeItemId item, Font font)""" return _gizmos.TreeListCtrl_SetItemFont(*args, **kwargs) - def GetItemBold(*args, **kwargs): - """GetItemBold(self, TreeItemId item) -> bool""" - return _gizmos.TreeListCtrl_GetItemBold(*args, **kwargs) - - def GetItemTextColour(*args, **kwargs): - """GetItemTextColour(self, TreeItemId item) -> Colour""" - return _gizmos.TreeListCtrl_GetItemTextColour(*args, **kwargs) - - def GetItemBackgroundColour(*args, **kwargs): - """GetItemBackgroundColour(self, TreeItemId item) -> Colour""" - return _gizmos.TreeListCtrl_GetItemBackgroundColour(*args, **kwargs) - - def GetItemFont(*args, **kwargs): - """GetItemFont(self, TreeItemId item) -> Font""" - return _gizmos.TreeListCtrl_GetItemFont(*args, **kwargs) - def IsVisible(*args, **kwargs): """IsVisible(self, TreeItemId item) -> bool""" return _gizmos.TreeListCtrl_IsVisible(*args, **kwargs) - def ItemHasChildren(*args, **kwargs): - """ItemHasChildren(self, TreeItemId item) -> bool""" - return _gizmos.TreeListCtrl_ItemHasChildren(*args, **kwargs) + def HasChildren(*args, **kwargs): + """HasChildren(self, TreeItemId item) -> bool""" + return _gizmos.TreeListCtrl_HasChildren(*args, **kwargs) + ItemHasChildren = HasChildren def IsExpanded(*args, **kwargs): """IsExpanded(self, TreeItemId item) -> bool""" return _gizmos.TreeListCtrl_IsExpanded(*args, **kwargs) @@ -688,9 +734,13 @@ class TreeListCtrl(_core.Control): return _gizmos.TreeListCtrl_GetNextChild(*args, **kwargs) def GetLastChild(*args, **kwargs): - """GetLastChild(self, TreeItemId item) -> TreeItemId""" + """GetLastChild(self, TreeItemId item) -> PyObject""" return _gizmos.TreeListCtrl_GetLastChild(*args, **kwargs) + def GetPrevChild(*args, **kwargs): + """GetPrevChild(self, TreeItemId item, void cookie) -> PyObject""" + return _gizmos.TreeListCtrl_GetPrevChild(*args, **kwargs) + def GetNextSibling(*args, **kwargs): """GetNextSibling(self, TreeItemId item) -> TreeItemId""" return _gizmos.TreeListCtrl_GetNextSibling(*args, **kwargs) @@ -699,22 +749,38 @@ class TreeListCtrl(_core.Control): """GetPrevSibling(self, TreeItemId item) -> TreeItemId""" return _gizmos.TreeListCtrl_GetPrevSibling(*args, **kwargs) + def GetNext(*args, **kwargs): + """GetNext(self, TreeItemId item) -> TreeItemId""" + return _gizmos.TreeListCtrl_GetNext(*args, **kwargs) + + def GetPrev(*args, **kwargs): + """GetPrev(self, TreeItemId item) -> TreeItemId""" + return _gizmos.TreeListCtrl_GetPrev(*args, **kwargs) + + def GetFirstExpandedItem(*args, **kwargs): + """GetFirstExpandedItem(self) -> TreeItemId""" + return _gizmos.TreeListCtrl_GetFirstExpandedItem(*args, **kwargs) + + def GetNextExpanded(*args, **kwargs): + """GetNextExpanded(self, TreeItemId item) -> TreeItemId""" + return _gizmos.TreeListCtrl_GetNextExpanded(*args, **kwargs) + + def GetPrevExpanded(*args, **kwargs): + """GetPrevExpanded(self, TreeItemId item) -> TreeItemId""" + return _gizmos.TreeListCtrl_GetPrevExpanded(*args, **kwargs) + def GetFirstVisibleItem(*args, **kwargs): - """GetFirstVisibleItem(self) -> TreeItemId""" + """GetFirstVisibleItem(self, bool fullRow=False) -> TreeItemId""" return _gizmos.TreeListCtrl_GetFirstVisibleItem(*args, **kwargs) def GetNextVisible(*args, **kwargs): - """GetNextVisible(self, TreeItemId item) -> TreeItemId""" + """GetNextVisible(self, TreeItemId item, bool fullRow=False) -> TreeItemId""" return _gizmos.TreeListCtrl_GetNextVisible(*args, **kwargs) def GetPrevVisible(*args, **kwargs): - """GetPrevVisible(self, TreeItemId item) -> TreeItemId""" + """GetPrevVisible(self, TreeItemId item, bool fullRow=False) -> TreeItemId""" return _gizmos.TreeListCtrl_GetPrevVisible(*args, **kwargs) - def GetNext(*args, **kwargs): - """GetNext(self, TreeItemId item) -> TreeItemId""" - return _gizmos.TreeListCtrl_GetNext(*args, **kwargs) - def AddRoot(*args, **kwargs): """AddRoot(self, String text, int image=-1, int selectedImage=-1, TreeItemData data=None) -> TreeItemId""" return _gizmos.TreeListCtrl_AddRoot(*args, **kwargs) @@ -755,10 +821,11 @@ class TreeListCtrl(_core.Control): """DeleteChildren(self, TreeItemId item)""" return _gizmos.TreeListCtrl_DeleteChildren(*args, **kwargs) - def DeleteAllItems(*args, **kwargs): - """DeleteAllItems(self)""" - return _gizmos.TreeListCtrl_DeleteAllItems(*args, **kwargs) + def DeleteRoot(*args, **kwargs): + """DeleteRoot(self)""" + return _gizmos.TreeListCtrl_DeleteRoot(*args, **kwargs) + DeleteAllItems = DeleteRoot def Expand(*args, **kwargs): """Expand(self, TreeItemId item)""" return _gizmos.TreeListCtrl_Expand(*args, **kwargs) @@ -788,11 +855,14 @@ class TreeListCtrl(_core.Control): return _gizmos.TreeListCtrl_UnselectAll(*args, **kwargs) def SelectItem(*args, **kwargs): - """SelectItem(self, TreeItemId item, bool unselect_others=True, bool extended_select=False)""" + """ + SelectItem(self, TreeItemId item, TreeItemId last=(wxTreeItemId *) NULL, + bool unselect_others=True) + """ return _gizmos.TreeListCtrl_SelectItem(*args, **kwargs) def SelectAll(*args, **kwargs): - """SelectAll(self, bool extended_select=False)""" + """SelectAll(self)""" return _gizmos.TreeListCtrl_SelectAll(*args, **kwargs) def EnsureVisible(*args, **kwargs): @@ -812,13 +882,10 @@ class TreeListCtrl(_core.Control): return _gizmos.TreeListCtrl_GetBoundingRect(*args, **kwargs) def EditLabel(*args, **kwargs): - """EditLabel(self, TreeItemId item)""" + """EditLabel(self, TreeItemId item, int column=-1)""" return _gizmos.TreeListCtrl_EditLabel(*args, **kwargs) - def Edit(*args, **kwargs): - """Edit(self, TreeItemId item)""" - return _gizmos.TreeListCtrl_Edit(*args, **kwargs) - + Edit = EditLabel def SortChildren(*args, **kwargs): """SortChildren(self, TreeItemId item)""" return _gizmos.TreeListCtrl_SortChildren(*args, **kwargs) @@ -827,6 +894,10 @@ class TreeListCtrl(_core.Control): """FindItem(self, TreeItemId item, String str, int flags=0) -> TreeItemId""" return _gizmos.TreeListCtrl_FindItem(*args, **kwargs) + def SetDragItem(*args, **kwargs): + """SetDragItem(self, TreeItemId item=(wxTreeItemId *) NULL)""" + return _gizmos.TreeListCtrl_SetDragItem(*args, **kwargs) + def GetHeaderWindow(*args, **kwargs): """GetHeaderWindow(self) -> Window""" return _gizmos.TreeListCtrl_GetHeaderWindow(*args, **kwargs) diff --git a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp index 2be30125ff..6385157c4a 100644 --- a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp @@ -2805,13 +2805,9 @@ namespace swig { #include #include -#include "wx/treelistctrl.h" -#include "wx/wxPython/pytree.h" - static const wxString wxPyDynamicSashNameStr(wxT("dynamicSashWindow")); static const wxString wxPyEditableListBoxNameStr(wxT("editableListBox")); - static const wxString wxPyTreeListCtrlNameStr(wxT("treelistctrl")); static const wxString wxPyStaticPictureNameStr(wxStaticPictureNameStr); static const wxString wxPyEmptyString(wxEmptyString); @@ -2921,6 +2917,27 @@ SWIG_AsVal_bool (PyObject *obj, bool *val) } +#include "wx/treelistctrl.h" +#include "wx/wxPython/pytree.h" + + + static const wxString wxPyTreeListCtrlNameStr(wxT("treelistctrl")); + +SWIGINTERNINLINE PyObject* +SWIG_From_unsigned_SS_long (unsigned long value) +{ + return (value > LONG_MAX) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong(static_cast< long >(value)); +} + + +SWIGINTERNINLINE PyObject * +SWIG_From_size_t (size_t value) +{ + return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value)); +} + + SWIGINTERN int SWIG_AsVal_unsigned_SS_long (PyObject* obj, unsigned long* val) { @@ -2943,21 +2960,6 @@ SWIG_AsVal_size_t (PyObject * obj, size_t *val) return res; } - -SWIGINTERNINLINE PyObject* -SWIG_From_unsigned_SS_long (unsigned long value) -{ - return (value > LONG_MAX) ? - PyLong_FromUnsignedLong(value) : PyInt_FromLong(static_cast< long >(value)); -} - - -SWIGINTERNINLINE PyObject * -SWIG_From_size_t (size_t value) -{ - return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value)); -} - // C++ version of Python aware control class wxPyTreeListCtrl : public wxTreeListCtrl { DECLARE_ABSTRACT_CLASS(wxPyTreeListCtrl); @@ -2971,8 +2973,8 @@ public: const wxString& name) : wxTreeListCtrl(parent, id, pos, size, style, validator, name) {} - int OnCompareItems(const wxTreeItemId& item1, - const wxTreeItemId& item2) { + virtual int OnCompareItems(const wxTreeItemId& item1, + const wxTreeItemId& item2) { int rval = 0; bool found; wxPyBlock_t blocked = wxPyBeginBlockThreads(); @@ -2988,6 +2990,27 @@ public: rval = wxTreeListCtrl::OnCompareItems(item1, item2); return rval; } + + virtual wxString OnGetItemText( wxTreeItemData* item, long column ) const { + wxString rval; + bool found; + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + if ((found = wxPyCBH_findCallback(m_myInst, "OnGetItemText"))) { + PyObject* ro; + PyObject* itemo = wxPyConstructObject((void*)&item, wxT("wxTreeItemId"), 0); + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Oi)", itemo, column)); + Py_DECREF(itemo); + if (ro) { + rval = Py2wxString(ro); + Py_DECREF(ro); + } + } + wxPyEndBlockThreads(blocked); + if (! found) + rval = wxTreeListCtrl::OnGetItemText(item, column); + return rval; + } + PYPRIVATE; }; @@ -3098,6 +3121,25 @@ SWIGINTERN PyObject *wxPyTreeListCtrl_GetNextChild(wxPyTreeListCtrl *self,wxTree wxPyEndBlockThreads(blocked); return tup; } +SWIGINTERN PyObject *wxPyTreeListCtrl_GetLastChild(wxPyTreeListCtrl *self,wxTreeItemId const &item){ + void* cookie = 0; + wxTreeItemId* ritem = new wxTreeItemId(self->GetLastChild(item, cookie)); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + PyObject* tup = PyTuple_New(2); + PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true)); + PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); + wxPyEndBlockThreads(blocked); + return tup; + } +SWIGINTERN PyObject *wxPyTreeListCtrl_GetPrevChild(wxPyTreeListCtrl *self,wxTreeItemId const &item,void *cookie){ + wxTreeItemId* ritem = new wxTreeItemId(self->GetPrevChild(item, cookie)); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + PyObject* tup = PyTuple_New(2); + PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true)); + PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); + wxPyEndBlockThreads(blocked); + return tup; + } SWIGINTERN PyObject *wxPyTreeListCtrl_GetBoundingRect(wxPyTreeListCtrl *self,wxTreeItemId const &item,bool textOnly=false){ wxRect rect; if (self->GetBoundingRect(item, rect, textOnly)) { @@ -3111,6 +3153,10 @@ SWIGINTERN PyObject *wxPyTreeListCtrl_GetBoundingRect(wxPyTreeListCtrl *self,wxT RETURN_NONE(); } } +SWIGINTERN void wxPyTreeListCtrl_EditLabel(wxPyTreeListCtrl *self,wxTreeItemId const &item,int column=-1){ + if (column < 0) column = self->GetMainColumn(); + self->EditLabel(item, column); + } #include @@ -3194,26 +3240,6 @@ SWIGINTERN PyObject *EditableListBoxNameStr_get(void) { } -SWIGINTERN int TreeListCtrlNameStr_set(PyObject *) { - SWIG_Error(SWIG_AttributeError,"Variable TreeListCtrlNameStr is read-only."); - return 1; -} - - -SWIGINTERN PyObject *TreeListCtrlNameStr_get(void) { - PyObject *pyobj = 0; - - { -#if wxUSE_UNICODE - pyobj = PyUnicode_FromWideChar((&wxPyTreeListCtrlNameStr)->c_str(), (&wxPyTreeListCtrlNameStr)->Len()); -#else - pyobj = PyString_FromStringAndSize((&wxPyTreeListCtrlNameStr)->c_str(), (&wxPyTreeListCtrlNameStr)->Len()); -#endif - } - return pyobj; -} - - SWIGINTERN int StaticPictureNameStr_set(PyObject *) { SWIG_Error(SWIG_AttributeError,"Variable StaticPictureNameStr is read-only."); return 1; @@ -5070,34 +5096,58 @@ SWIGINTERN PyObject *LEDNumberCtrl_swiginit(PyObject *SWIGUNUSEDPARM(self), PyOb return SWIG_Python_InitShadowInstance(args); } +SWIGINTERN int TreeListCtrlNameStr_set(PyObject *) { + SWIG_Error(SWIG_AttributeError,"Variable TreeListCtrlNameStr is read-only."); + return 1; +} + + +SWIGINTERN PyObject *TreeListCtrlNameStr_get(void) { + PyObject *pyobj = 0; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyTreeListCtrlNameStr)->c_str(), (&wxPyTreeListCtrlNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyTreeListCtrlNameStr)->c_str(), (&wxPyTreeListCtrlNameStr)->Len()); +#endif + } + return pyobj; +} + + SWIGINTERN PyObject *_wrap_new_TreeListColumnInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxString const &arg1_defvalue = wxPyEmptyString ; wxString *arg1 = (wxString *) &arg1_defvalue ; - int arg2 = (int) -1 ; - size_t arg3 = (size_t) 100 ; - bool arg4 = (bool) true ; - wxTreeListColumnAlign arg5 = (wxTreeListColumnAlign) wxTL_ALIGN_LEFT ; + int arg2 = (int) DEFAULT_COL_WIDTH ; + int arg3 = (int) wxALIGN_LEFT ; + int arg4 = (int) -1 ; + bool arg5 = (bool) true ; + bool arg6 = (bool) false ; wxTreeListColumnInfo *result = 0 ; bool temp1 = false ; int val2 ; int ecode2 = 0 ; - size_t val3 ; + int val3 ; int ecode3 = 0 ; - bool val4 ; + int val4 ; int ecode4 = 0 ; - int val5 ; + bool val5 ; int ecode5 = 0 ; + bool val6 ; + int ecode6 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char * kwnames[] = { - (char *) "text",(char *) "image",(char *) "width",(char *) "shown",(char *) "alignment", NULL + (char *) "text",(char *) "width",(char *) "flag",(char *) "image",(char *) "shown",(char *) "edit", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOO:new_TreeListColumnInfo",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOO:new_TreeListColumnInfo",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; if (obj0) { { arg1 = wxString_in_helper(obj0); @@ -5113,29 +5163,36 @@ SWIGINTERN PyObject *_wrap_new_TreeListColumnInfo(PyObject *SWIGUNUSEDPARM(self) arg2 = static_cast< int >(val2); } if (obj2) { - ecode3 = SWIG_AsVal_size_t(obj2, &val3); + ecode3 = SWIG_AsVal_int(obj2, &val3); if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_TreeListColumnInfo" "', expected argument " "3"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_TreeListColumnInfo" "', expected argument " "3"" of type '" "int""'"); } - arg3 = static_cast< size_t >(val3); + arg3 = static_cast< int >(val3); } if (obj3) { - ecode4 = SWIG_AsVal_bool(obj3, &val4); + ecode4 = SWIG_AsVal_int(obj3, &val4); if (!SWIG_IsOK(ecode4)) { - SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_TreeListColumnInfo" "', expected argument " "4"" of type '" "bool""'"); + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_TreeListColumnInfo" "', expected argument " "4"" of type '" "int""'"); } - arg4 = static_cast< bool >(val4); + arg4 = static_cast< int >(val4); } if (obj4) { - ecode5 = SWIG_AsVal_int(obj4, &val5); + ecode5 = SWIG_AsVal_bool(obj4, &val5); if (!SWIG_IsOK(ecode5)) { - SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_TreeListColumnInfo" "', expected argument " "5"" of type '" "wxTreeListColumnAlign""'"); + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_TreeListColumnInfo" "', expected argument " "5"" of type '" "bool""'"); + } + arg5 = static_cast< bool >(val5); + } + if (obj5) { + ecode6 = SWIG_AsVal_bool(obj5, &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_TreeListColumnInfo" "', expected argument " "6"" of type '" "bool""'"); } - arg5 = static_cast< wxTreeListColumnAlign >(val5); + arg6 = static_cast< bool >(val6); } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTreeListColumnInfo *)new wxTreeListColumnInfo((wxString const &)*arg1,arg2,arg3,arg4,arg5); + result = (wxTreeListColumnInfo *)new wxTreeListColumnInfo((wxString const &)*arg1,arg2,arg3,arg4,arg5,arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -5182,40 +5239,10 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListColumnInfo_GetShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; - bool result; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListColumnInfo_GetShown" "', expected argument " "1"" of type '" "wxTreeListColumnInfo const *""'"); - } - arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxTreeListColumnInfo const *)arg1)->GetShown(); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_TreeListColumnInfo_GetAlignment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; - wxTreeListColumnAlign result; + int result; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -5229,7 +5256,7 @@ SWIGINTERN PyObject *_wrap_TreeListColumnInfo_GetAlignment(PyObject *SWIGUNUSEDP arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTreeListColumnAlign)((wxTreeListColumnInfo const *)arg1)->GetAlignment(); + result = (int)((wxTreeListColumnInfo const *)arg1)->GetAlignment(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -5358,38 +5385,60 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListColumnInfo_SetShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListColumnInfo_IsEditable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; - bool arg2 ; + bool result; void *argp1 = 0 ; int res1 = 0 ; - bool val2 ; - int ecode2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "shown", NULL - }; + PyObject *swig_obj[1] ; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetShown",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListColumnInfo_SetShown" "', expected argument " "1"" of type '" "wxTreeListColumnInfo *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListColumnInfo_IsEditable" "', expected argument " "1"" of type '" "wxTreeListColumnInfo const *""'"); } arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); - ecode2 = SWIG_AsVal_bool(obj1, &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListColumnInfo_SetShown" "', expected argument " "2"" of type '" "bool""'"); - } - arg2 = static_cast< bool >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetShown(arg2); + result = (bool)((wxTreeListColumnInfo const *)arg1)->IsEditable(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_Py_Void(); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListColumnInfo_IsShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListColumnInfo_IsShown" "', expected argument " "1"" of type '" "wxTreeListColumnInfo const *""'"); + } + arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxTreeListColumnInfo const *)arg1)->IsShown(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; @@ -5399,7 +5448,7 @@ fail: SWIGINTERN PyObject *_wrap_TreeListColumnInfo_SetAlignment(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; - wxTreeListColumnAlign arg2 ; + int arg2 ; void *argp1 = 0 ; int res1 = 0 ; int val2 ; @@ -5418,9 +5467,9 @@ SWIGINTERN PyObject *_wrap_TreeListColumnInfo_SetAlignment(PyObject *SWIGUNUSEDP arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListColumnInfo_SetAlignment" "', expected argument " "2"" of type '" "wxTreeListColumnAlign""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListColumnInfo_SetAlignment" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< wxTreeListColumnAlign >(val2); + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignment(arg2); @@ -5593,55 +5642,131 @@ fail: } -SWIGINTERN PyObject *TreeListColumnInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_wxTreeListColumnInfo, SWIG_NewClientData(obj)); - return SWIG_Py_Void(); -} - -SWIGINTERN PyObject *TreeListColumnInfo_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - return SWIG_Python_InitShadowInstance(args); -} - -SWIGINTERN PyObject *_wrap_new_TreeListCtrl(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListColumnInfo_SetEditable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; - wxWindow *arg1 = (wxWindow *) 0 ; - int arg2 = (int) -1 ; - wxPoint const &arg3_defvalue = wxDefaultPosition ; - wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; - wxSize const &arg4_defvalue = wxDefaultSize ; - wxSize *arg4 = (wxSize *) &arg4_defvalue ; - long arg5 = (long) wxTR_DEFAULT_STYLE ; - wxValidator const &arg6_defvalue = wxDefaultValidator ; - wxValidator *arg6 = (wxValidator *) &arg6_defvalue ; - wxString const &arg7_defvalue = wxPyTreeListCtrlNameStr ; - wxString *arg7 = (wxString *) &arg7_defvalue ; - wxPyTreeListCtrl *result = 0 ; + wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; + bool arg2 ; void *argp1 = 0 ; int res1 = 0 ; - int val2 ; + bool val2 ; int ecode2 = 0 ; - wxPoint temp3 ; - wxSize temp4 ; - long val5 ; - int ecode5 = 0 ; - void *argp6 = 0 ; - int res6 = 0 ; - bool temp7 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - PyObject * obj5 = 0 ; - PyObject * obj6 = 0 ; char * kwnames[] = { - (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL + (char *) "self",(char *) "edit", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_TreeListCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetEditable",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListColumnInfo_SetEditable" "', expected argument " "1"" of type '" "wxTreeListColumnInfo *""'"); + } + arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); + ecode2 = SWIG_AsVal_bool(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListColumnInfo_SetEditable" "', expected argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetEditable(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListColumnInfo_SetShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ; + bool arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + bool val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "shown", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetShown",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListColumnInfo_SetShown" "', expected argument " "1"" of type '" "wxTreeListColumnInfo *""'"); + } + arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1); + ecode2 = SWIG_AsVal_bool(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListColumnInfo_SetShown" "', expected argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetShown(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *TreeListColumnInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_wxTreeListColumnInfo, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *TreeListColumnInfo_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + return SWIG_Python_InitShadowInstance(args); +} + +SWIGINTERN PyObject *_wrap_new_TreeListCtrl(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxWindow *arg1 = (wxWindow *) 0 ; + int arg2 = (int) -1 ; + wxPoint const &arg3_defvalue = wxDefaultPosition ; + wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; + wxSize const &arg4_defvalue = wxDefaultSize ; + wxSize *arg4 = (wxSize *) &arg4_defvalue ; + long arg5 = (long) wxTR_DEFAULT_STYLE ; + wxValidator const &arg6_defvalue = wxDefaultValidator ; + wxValidator *arg6 = (wxValidator *) &arg6_defvalue ; + wxString const &arg7_defvalue = wxPyTreeListCtrlNameStr ; + wxString *arg7 = (wxString *) &arg7_defvalue ; + wxPyTreeListCtrl *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + wxPoint temp3 ; + wxSize temp4 ; + long val5 ; + int ecode5 = 0 ; + void *argp6 = 0 ; + int res6 = 0 ; + bool temp7 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + char * kwnames[] = { + (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "validator",(char *) "name", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_TreeListCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_TreeListCtrl" "', expected argument " "1"" of type '" "wxWindow *""'"); } @@ -6358,16 +6483,36 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_AddColumn(PyObject *SWIGUNUSEDPARM(self) PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxString *arg2 = 0 ; + int arg3 = (int) DEFAULT_COL_WIDTH ; + int arg4 = (int) wxALIGN_LEFT ; + int arg5 = (int) -1 ; + bool arg6 = (bool) true ; + bool arg7 = (bool) false ; void *argp1 = 0 ; int res1 = 0 ; bool temp2 = false ; + int val3 ; + int ecode3 = 0 ; + int val4 ; + int ecode4 = 0 ; + int val5 ; + int ecode5 = 0 ; + bool val6 ; + int ecode6 = 0 ; + bool val7 ; + int ecode7 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "text", NULL + (char *) "self",(char *) "text",(char *) "width",(char *) "flag",(char *) "image",(char *) "shown",(char *) "edit", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_AddColumn",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:TreeListCtrl_AddColumn",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_AddColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); @@ -6378,9 +6523,44 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_AddColumn(PyObject *SWIGUNUSEDPARM(self) if (arg2 == NULL) SWIG_fail; temp2 = true; } + if (obj2) { + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_AddColumn" "', expected argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + } + if (obj3) { + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "TreeListCtrl_AddColumn" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + } + if (obj4) { + ecode5 = SWIG_AsVal_int(obj4, &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "TreeListCtrl_AddColumn" "', expected argument " "5"" of type '" "int""'"); + } + arg5 = static_cast< int >(val5); + } + if (obj5) { + ecode6 = SWIG_AsVal_bool(obj5, &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "TreeListCtrl_AddColumn" "', expected argument " "6"" of type '" "bool""'"); + } + arg6 = static_cast< bool >(val6); + } + if (obj6) { + ecode7 = SWIG_AsVal_bool(obj6, &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "TreeListCtrl_AddColumn" "', expected argument " "7"" of type '" "bool""'"); + } + arg7 = static_cast< bool >(val7); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AddColumn((wxString const &)*arg2); + (arg1)->AddColumn((wxString const &)*arg2,arg3,arg4,arg5,arg6,arg7); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6443,39 +6623,94 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_InsertColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; wxString *arg3 = 0 ; + int arg4 = (int) DEFAULT_COL_WIDTH ; + int arg5 = (int) wxALIGN_LEFT ; + int arg6 = (int) -1 ; + bool arg7 = (bool) true ; + bool arg8 = (bool) false ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; bool temp3 = false ; + int val4 ; + int ecode4 = 0 ; + int val5 ; + int ecode5 = 0 ; + int val6 ; + int ecode6 = 0 ; + bool val7 ; + int ecode7 = 0 ; + bool val8 ; + int ecode8 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "before",(char *) "text", NULL + (char *) "self",(char *) "before",(char *) "text",(char *) "width",(char *) "flag",(char *) "image",(char *) "shown",(char *) "edit", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_InsertColumn",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:TreeListCtrl_InsertColumn",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; temp3 = true; } + if (obj3) { + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + } + if (obj4) { + ecode5 = SWIG_AsVal_int(obj4, &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "5"" of type '" "int""'"); + } + arg5 = static_cast< int >(val5); + } + if (obj5) { + ecode6 = SWIG_AsVal_int(obj5, &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "6"" of type '" "int""'"); + } + arg6 = static_cast< int >(val6); + } + if (obj6) { + ecode7 = SWIG_AsVal_bool(obj6, &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "7"" of type '" "bool""'"); + } + arg7 = static_cast< bool >(val7); + } + if (obj7) { + ecode8 = SWIG_AsVal_bool(obj7, &val8); + if (!SWIG_IsOK(ecode8)) { + SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "TreeListCtrl_InsertColumn" "', expected argument " "8"" of type '" "bool""'"); + } + arg8 = static_cast< bool >(val8); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->InsertColumn(arg2,(wxString const &)*arg3); + (arg1)->InsertColumn(arg2,(wxString const &)*arg3,arg4,arg5,arg6,arg7,arg8); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6610,43 +6845,34 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetMainColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; size_t arg2 ; - size_t arg3 ; void *argp1 = 0 ; int res1 = 0 ; size_t val2 ; int ecode2 = 0 ; - size_t val3 ; - int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "column",(char *) "width", NULL + (char *) "self",(char *) "column", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnWidth",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_SetMainColumn",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnWidth" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetMainColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); ecode2 = SWIG_AsVal_size_t(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnWidth" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetMainColumn" "', expected argument " "2"" of type '" "size_t""'"); } arg2 = static_cast< size_t >(val2); - ecode3 = SWIG_AsVal_size_t(obj2, &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnWidth" "', expected argument " "3"" of type '" "size_t""'"); - } - arg3 = static_cast< size_t >(val3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetColumnWidth(arg2,arg3); + (arg1)->SetMainColumn(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6657,73 +6883,74 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetMainColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; - int result; + size_t result; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; - int ecode2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "column", NULL - }; + PyObject *swig_obj[1] ; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumnWidth",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumnWidth" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetMainColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnWidth" "', expected argument " "2"" of type '" "size_t""'"); - } - arg2 = static_cast< size_t >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)((wxPyTreeListCtrl const *)arg1)->GetColumnWidth(arg2); + result = (size_t)((wxPyTreeListCtrl const *)arg1)->GetMainColumn(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_From_int(static_cast< int >(result)); + resultobj = SWIG_From_size_t(static_cast< size_t >(result)); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetMainColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; + wxTreeListColumnInfo *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "column", NULL + (char *) "self",(char *) "column",(char *) "colInfo", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_SetMainColumn",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumn",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetMainColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetMainColumn" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumn" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_SetColumn" "', expected argument " "3"" of type '" "wxTreeListColumnInfo const &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetColumn" "', expected argument " "3"" of type '" "wxTreeListColumnInfo const &""'"); + } + arg3 = reinterpret_cast< wxTreeListColumnInfo * >(argp3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetMainColumn(arg2); + (arg1)->SetColumn(arg2,(wxTreeListColumnInfo const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6734,28 +6961,42 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetMainColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t result; + int arg2 ; + wxTreeListColumnInfo *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; - PyObject *swig_obj[1] ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "column", NULL + }; - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumn",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetMainColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumn" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (size_t)((wxPyTreeListCtrl const *)arg1)->GetMainColumn(); + { + wxTreeListColumnInfo &_result_ref = (arg1)->GetColumn(arg2); + result = (wxTreeListColumnInfo *) &_result_ref; + } wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_From_size_t(static_cast< size_t >(result)); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); return resultobj; fail: return NULL; @@ -6765,11 +7006,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnText(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; wxString *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; bool temp3 = false ; PyObject * obj0 = 0 ; @@ -6785,11 +7026,11 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnText(PyObject *SWIGUNUSEDPARM(s SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnText" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnText" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnText" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; @@ -6819,11 +7060,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnText(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; wxString result; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -6837,11 +7078,11 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnText(PyObject *SWIGUNUSEDPARM(s SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumnText" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnText" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnText" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxPyTreeListCtrl const *)arg1)->GetColumnText(arg2); @@ -6861,46 +7102,43 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; - wxTreeListColumnInfo *arg3 = 0 ; + int arg2 ; + int arg3 ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; - void *argp3 = 0 ; - int res3 = 0 ; + int val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "column",(char *) "info", NULL + (char *) "self",(char *) "column",(char *) "width", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumn",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnWidth",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnWidth" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumn" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnWidth" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); - res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_SetColumn" "', expected argument " "3"" of type '" "wxTreeListColumnInfo const &""'"); - } - if (!argp3) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetColumn" "', expected argument " "3"" of type '" "wxTreeListColumnInfo const &""'"); - } - arg3 = reinterpret_cast< wxTreeListColumnInfo * >(argp3); + arg2 = static_cast< int >(val2); + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnWidth" "', expected argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetColumn(arg2,(wxTreeListColumnInfo const &)*arg3); + (arg1)->SetColumnWidth(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6911,14 +7149,14 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; - wxTreeListColumnInfo *result = 0 ; + int arg2 ; + int result; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -6926,27 +7164,24 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumn(PyObject *SWIGUNUSEDPARM(self) (char *) "self",(char *) "column", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumn",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumnWidth",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumnWidth" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumn" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnWidth" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - { - wxTreeListColumnInfo &_result_ref = (arg1)->GetColumn(arg2); - result = (wxTreeListColumnInfo *) &_result_ref; - } + result = (int)((wxPyTreeListCtrl const *)arg1)->GetColumnWidth(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxTreeListColumnInfo, 0 | 0 ); + resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; fail: return NULL; @@ -6956,11 +7191,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnAlignment(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; - wxTreeListColumnAlign arg3 ; + int arg2 ; + int arg3 ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; int val3 ; int ecode3 = 0 ; @@ -6968,7 +7203,7 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnAlignment(PyObject *SWIGUNUSEDP PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "column",(char *) "align", NULL + (char *) "self",(char *) "column",(char *) "flag", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnAlignment",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; @@ -6977,16 +7212,16 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnAlignment(PyObject *SWIGUNUSEDP SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnAlignment" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnAlignment" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnAlignment" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); ecode3 = SWIG_AsVal_int(obj2, &val3); if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnAlignment" "', expected argument " "3"" of type '" "wxTreeListColumnAlign""'"); + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnAlignment" "', expected argument " "3"" of type '" "int""'"); } - arg3 = static_cast< wxTreeListColumnAlign >(val3); + arg3 = static_cast< int >(val3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColumnAlignment(arg2,arg3); @@ -7003,11 +7238,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnAlignment(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; - wxTreeListColumnAlign result; + int arg2 ; + int result; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -7021,14 +7256,14 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnAlignment(PyObject *SWIGUNUSEDP SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumnAlignment" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnAlignment" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnAlignment" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTreeListColumnAlign)((wxPyTreeListCtrl const *)arg1)->GetColumnAlignment(arg2); + result = (int)((wxPyTreeListCtrl const *)arg1)->GetColumnAlignment(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -7042,11 +7277,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnImage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; int arg3 ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; int val3 ; int ecode3 = 0 ; @@ -7063,11 +7298,11 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnImage(PyObject *SWIGUNUSEDPARM( SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnImage" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnImage" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnImage" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); ecode3 = SWIG_AsVal_int(obj2, &val3); if (!SWIG_IsOK(ecode3)) { SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnImage" "', expected argument " "3"" of type '" "int""'"); @@ -7089,11 +7324,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnImage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; int result; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -7107,11 +7342,11 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetColumnImage(PyObject *SWIGUNUSEDPARM( SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetColumnImage" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnImage" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetColumnImage" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxPyTreeListCtrl const *)arg1)->GetColumnImage(arg2); @@ -7125,14 +7360,14 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_ShowColumn(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; - bool arg3 ; + int arg2 ; + bool arg3 = (bool) true ; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; bool val3 ; int ecode3 = 0 ; @@ -7143,25 +7378,27 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_ShowColumn(PyObject *SWIGUNUSEDPARM(self (char *) "self",(char *) "column",(char *) "shown", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_ShowColumn",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_SetColumnShown",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_ShowColumn" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnShown" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_ShowColumn" "', expected argument " "2"" of type '" "size_t""'"); - } - arg2 = static_cast< size_t >(val2); - ecode3 = SWIG_AsVal_bool(obj2, &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_ShowColumn" "', expected argument " "3"" of type '" "bool""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnShown" "', expected argument " "2"" of type '" "int""'"); } - arg3 = static_cast< bool >(val3); + arg2 = static_cast< int >(val2); + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnShown" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->ShowColumn(arg2,arg3); + (arg1)->SetColumnShown(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -7175,11 +7412,11 @@ fail: SWIGINTERN PyObject *_wrap_TreeListCtrl_IsColumnShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - size_t arg2 ; + int arg2 ; bool result; void *argp1 = 0 ; int res1 = 0 ; - size_t val2 ; + int val2 ; int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -7193,11 +7430,11 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_IsColumnShown(PyObject *SWIGUNUSEDPARM(s SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_IsColumnShown" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - ecode2 = SWIG_AsVal_size_t(obj1, &val2); + ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_IsColumnShown" "', expected argument " "2"" of type '" "size_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_IsColumnShown" "', expected argument " "2"" of type '" "int""'"); } - arg2 = static_cast< size_t >(val2); + arg2 = static_cast< int >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxPyTreeListCtrl const *)arg1)->IsColumnShown(arg2); @@ -7213,6 +7450,96 @@ fail: } +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetColumnEditable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + int arg2 ; + bool arg3 = (bool) true ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + bool val3 ; + int ecode3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "column",(char *) "edit", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_SetColumnEditable",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetColumnEditable" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SetColumnEditable" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetColumnEditable" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetColumnEditable(arg2,arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListCtrl_IsColumnEditable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + int arg2 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "column", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_IsColumnEditable",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_IsColumnEditable" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_IsColumnEditable" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxPyTreeListCtrl const *)arg1)->IsColumnEditable(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemText(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; @@ -7652,249 +7979,218 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemHasChildren(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemBold(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - bool arg3 = (bool) true ; + bool result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - bool val3 ; - int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item",(char *) "has", NULL + (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_SetItemHasChildren",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemBold",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemBold" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); - if (obj2) { - ecode3 = SWIG_AsVal_bool(obj2, &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "3"" of type '" "bool""'"); - } - arg3 = static_cast< bool >(val3); - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetItemHasChildren((wxTreeItemId const &)*arg2,arg3); + result = (bool)((wxPyTreeListCtrl const *)arg1)->GetItemBold((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_Py_Void(); + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemBold(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemTextColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - bool arg3 = (bool) true ; + wxColour result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - bool val3 ; - int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item",(char *) "bold", NULL + (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_SetItemBold",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemTextColour",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemTextColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); - if (obj2) { - ecode3 = SWIG_AsVal_bool(obj2, &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "3"" of type '" "bool""'"); - } - arg3 = static_cast< bool >(val3); - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetItemBold((wxTreeItemId const &)*arg2,arg3); + result = ((wxPyTreeListCtrl const *)arg1)->GetItemTextColour((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_Py_Void(); + resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemTextColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxColour *arg3 = 0 ; + wxColour result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - wxColour temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item",(char *) "colour", NULL + (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemTextColour",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemBackgroundColour",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemTextColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemBackgroundColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); - { - arg3 = &temp3; - if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetItemTextColour((wxTreeItemId const &)*arg2,(wxColour const &)*arg3); + result = ((wxPyTreeListCtrl const *)arg1)->GetItemBackgroundColour((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_Py_Void(); + resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxColour *arg3 = 0 ; + wxFont result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - wxColour temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item",(char *) "colour", NULL + (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemBackgroundColour",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemFont",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemBackgroundColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemFont" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); - { - arg3 = &temp3; - if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetItemBackgroundColour((wxTreeItemId const &)*arg2,(wxColour const &)*arg3); + result = ((wxPyTreeListCtrl const *)arg1)->GetItemFont((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_Py_Void(); + resultobj = SWIG_NewPointerObj((new wxFont(static_cast< const wxFont& >(result))), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemHasChildren(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxFont *arg3 = 0 ; + bool arg3 = (bool) true ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - void *argp3 = 0 ; - int res3 = 0 ; + bool val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item",(char *) "font", NULL + (char *) "self",(char *) "item",(char *) "has", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemFont",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_SetItemHasChildren",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); - res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxFont, 0 | 0); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "3"" of type '" "wxFont const &""'"); - } - if (!argp3) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "3"" of type '" "wxFont const &""'"); + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetItemHasChildren" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); } - arg3 = reinterpret_cast< wxFont * >(argp3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetItemFont((wxTreeItemId const &)*arg2,(wxFont const &)*arg3); + (arg1)->SetItemHasChildren((wxTreeItemId const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -7905,170 +8201,201 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemBold(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemBold(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - bool result; + bool arg3 = (bool) true ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + bool val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "bold", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemBold",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_SetItemBold",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemBold" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SetItemBold" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyTreeListCtrl const *)arg1)->GetItemBold((wxTreeItemId const &)*arg2); + (arg1)->SetItemBold((wxTreeItemId const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemTextColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemTextColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxColour result; + wxColour *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + wxColour temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "colour", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemTextColour",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemTextColour",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemTextColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemTextColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemTextColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + { + arg3 = &temp3; + if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetItemTextColour((wxTreeItemId const &)*arg2); + (arg1)->SetItemTextColour((wxTreeItemId const &)*arg2,(wxColour const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxColour result; + wxColour *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + wxColour temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "colour", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemBackgroundColour",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemBackgroundColour",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemBackgroundColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemBackgroundColour" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemBackgroundColour" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + { + arg3 = &temp3; + if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetItemBackgroundColour((wxTreeItemId const &)*arg2); + (arg1)->SetItemBackgroundColour((wxTreeItemId const &)*arg2,(wxColour const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetItemFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - wxFont result; + wxFont *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "font", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetItemFont",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetItemFont",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetItemFont" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxFont, 0 | 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "3"" of type '" "wxFont const &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemFont" "', expected argument " "3"" of type '" "wxFont const &""'"); + } + arg3 = reinterpret_cast< wxFont * >(argp3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetItemFont((wxTreeItemId const &)*arg2); + (arg1)->SetItemFont((wxTreeItemId const &)*arg2,(wxFont const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((new wxFont(static_cast< const wxFont& >(result))), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; @@ -8119,7 +8446,7 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_ItemHasChildren(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_HasChildren(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; @@ -8134,23 +8461,23 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_ItemHasChildren(PyObject *SWIGUNUSEDPARM (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_ItemHasChildren",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_HasChildren",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_ItemHasChildren" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_HasChildren" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_ItemHasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_HasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_ItemHasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_HasChildren" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyTreeListCtrl const *)arg1)->ItemHasChildren((wxTreeItemId const &)*arg2); + result = (bool)((wxPyTreeListCtrl const *)arg1)->HasChildren((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8558,14 +8885,231 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNextChild(PyObject *SWIGUNUSEDPARM(se wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = result; + resultobj = result; + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetLastChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; + PyObject *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetLastChild",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetLastChild" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetLastChild" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetLastChild" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (PyObject *)wxPyTreeListCtrl_GetLastChild(arg1,(wxTreeItemId const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = result; + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; + void *arg3 = (void *) 0 ; + PyObject *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + int res3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item",(char *) "cookie", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_GetPrevChild",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrevChild" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrevChild" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrevChild" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + res3 = SWIG_ConvertPtr(obj2,SWIG_as_voidptrptr(&arg3), 0, 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_GetPrevChild" "', expected argument " "3"" of type '" "void *""'"); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (PyObject *)wxPyTreeListCtrl_GetPrevChild(arg1,(wxTreeItemId const &)*arg2,arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = result; + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNextSibling(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; + wxTreeItemId result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetNextSibling",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNextSibling" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNextSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNextSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxPyTreeListCtrl const *)arg1)->GetNextSibling((wxTreeItemId const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxTreeItemId(static_cast< const wxTreeItemId& >(result))), SWIGTYPE_p_wxTreeItemId, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevSibling(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; + wxTreeItemId result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetPrevSibling",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrevSibling" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrevSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrevSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxPyTreeListCtrl const *)arg1)->GetPrevSibling((wxTreeItemId const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxTreeItemId(static_cast< const wxTreeItemId& >(result))), SWIGTYPE_p_wxTreeItemId, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNext(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; + wxTreeItemId result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetNext",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNext" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNext" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNext" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxPyTreeListCtrl const *)arg1)->GetNext((wxTreeItemId const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxTreeItemId(static_cast< const wxTreeItemId& >(result))), SWIGTYPE_p_wxTreeItemId, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetLastChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrev(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; @@ -8580,23 +9124,23 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetLastChild(PyObject *SWIGUNUSEDPARM(se (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetLastChild",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetPrev",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetLastChild" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrev" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetLastChild" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrev" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetLastChild" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrev" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetLastChild((wxTreeItemId const &)*arg2); + result = ((wxPyTreeListCtrl const *)arg1)->GetPrev((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8607,38 +9151,24 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNextSibling(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetFirstExpandedItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - wxTreeItemId *arg2 = 0 ; wxTreeItemId result; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "item", NULL - }; + PyObject *swig_obj[1] ; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetNextSibling",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNextSibling" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetFirstExpandedItem" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNextSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNextSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); - } - arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetNextSibling((wxTreeItemId const &)*arg2); + result = ((wxPyTreeListCtrl const *)arg1)->GetFirstExpandedItem(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8649,7 +9179,7 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevSibling(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNextExpanded(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; @@ -8664,23 +9194,23 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevSibling(PyObject *SWIGUNUSEDPARM( (char *) "self",(char *) "item", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetPrevSibling",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetNextExpanded",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrevSibling" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNextExpanded" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrevSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNextExpanded" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrevSibling" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNextExpanded" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetPrevSibling((wxTreeItemId const &)*arg2); + result = ((wxPyTreeListCtrl const *)arg1)->GetNextExpanded((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8691,24 +9221,38 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetFirstVisibleItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevExpanded(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; wxTreeItemId result; void *argp1 = 0 ; int res1 = 0 ; - PyObject *swig_obj[1] ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item", NULL + }; - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetPrevExpanded",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetFirstVisibleItem" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrevExpanded" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrevExpanded" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrevExpanded" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetFirstVisibleItem(); + result = ((wxPyTreeListCtrl const *)arg1)->GetPrevExpanded((wxTreeItemId const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8719,38 +9263,37 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNextVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetFirstVisibleItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - wxTreeItemId *arg2 = 0 ; + bool arg2 = (bool) false ; wxTreeItemId result; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; + bool val2 ; + int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "fullRow", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetNextVisible",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:TreeListCtrl_GetFirstVisibleItem",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetFirstVisibleItem" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + if (obj1) { + ecode2 = SWIG_AsVal_bool(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_GetFirstVisibleItem" "', expected argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); } - arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetNextVisible((wxTreeItemId const &)*arg2); + result = ((wxPyTreeListCtrl const *)arg1)->GetFirstVisibleItem(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8761,38 +9304,49 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNextVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; + bool arg3 = (bool) false ; wxTreeItemId result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + bool val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "fullRow", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetPrevVisible",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_GetNextVisible",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_GetNextVisible" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetPrevVisible((wxTreeItemId const &)*arg2); + result = ((wxPyTreeListCtrl const *)arg1)->GetNextVisible((wxTreeItemId const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8803,38 +9357,49 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_GetNext(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_GetPrevVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; + bool arg3 = (bool) false ; wxTreeItemId result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + bool val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "fullRow", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetNext",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_GetPrevVisible",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetNext" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "1"" of type '" "wxPyTreeListCtrl const *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetNext" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetNext" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_GetPrevVisible" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyTreeListCtrl const *)arg1)->GetNext((wxTreeItemId const &)*arg2); + result = ((wxPyTreeListCtrl const *)arg1)->GetPrevVisible((wxTreeItemId const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -9381,7 +9946,7 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_DeleteAllItems(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_DeleteRoot(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; void *argp1 = 0 ; @@ -9392,12 +9957,12 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_DeleteAllItems(PyObject *SWIGUNUSEDPARM( swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_DeleteAllItems" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_DeleteRoot" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DeleteAllItems(); + (arg1)->DeleteRoot(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -9671,14 +10236,15 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SelectItem(PyObject *SWIGUNUSEDPARM(self PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; - bool arg3 = (bool) true ; - bool arg4 = (bool) false ; + wxTreeItemId const &arg3_defvalue = (wxTreeItemId *) NULL ; + wxTreeItemId *arg3 = (wxTreeItemId *) &arg3_defvalue ; + bool arg4 = (bool) true ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - bool val3 ; - int ecode3 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; bool val4 ; int ecode4 = 0 ; PyObject * obj0 = 0 ; @@ -9686,7 +10252,7 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SelectItem(PyObject *SWIGUNUSEDPARM(self PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item",(char *) "unselect_others",(char *) "extended_select", NULL + (char *) "self",(char *) "item",(char *) "last",(char *) "unselect_others", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:TreeListCtrl_SelectItem",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; @@ -9704,11 +10270,14 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SelectItem(PyObject *SWIGUNUSEDPARM(self } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); if (obj2) { - ecode3 = SWIG_AsVal_bool(obj2, &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_SelectItem" "', expected argument " "3"" of type '" "bool""'"); - } - arg3 = static_cast< bool >(val3); + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_SelectItem" "', expected argument " "3"" of type '" "wxTreeItemId const &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SelectItem" "', expected argument " "3"" of type '" "wxTreeItemId const &""'"); + } + arg3 = reinterpret_cast< wxTreeItemId * >(argp3); } if (obj3) { ecode4 = SWIG_AsVal_bool(obj3, &val4); @@ -9719,7 +10288,7 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SelectItem(PyObject *SWIGUNUSEDPARM(self } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SelectItem((wxTreeItemId const &)*arg2,arg3,arg4); + (arg1)->SelectItem((wxTreeItemId const &)*arg2,(wxTreeItemId const &)*arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -9730,36 +10299,23 @@ fail: } -SWIGINTERN PyObject *_wrap_TreeListCtrl_SelectAll(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_TreeListCtrl_SelectAll(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - bool arg2 = (bool) false ; void *argp1 = 0 ; int res1 = 0 ; - bool val2 ; - int ecode2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "extended_select", NULL - }; + PyObject *swig_obj[1] ; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:TreeListCtrl_SelectAll",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SelectAll" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); } arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - if (obj1) { - ecode2 = SWIG_AsVal_bool(obj1, &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TreeListCtrl_SelectAll" "', expected argument " "2"" of type '" "bool""'"); - } - arg2 = static_cast< bool >(val2); - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SelectAll(arg2); + (arg1)->SelectAll(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -9966,17 +10522,21 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_EditLabel(PyObject *SWIGUNUSEDPARM(self) PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; wxTreeItemId *arg2 = 0 ; + int arg3 = (int) -1 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + int val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "column", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_EditLabel",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeListCtrl_EditLabel",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_EditLabel" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); @@ -9990,50 +10550,16 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_EditLabel(PyObject *SWIGUNUSEDPARM(self) SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_EditLabel" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); } arg2 = reinterpret_cast< wxTreeItemId * >(argp2); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->EditLabel((wxTreeItemId const &)*arg2); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_TreeListCtrl_Edit(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - wxTreeItemId *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "item", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_Edit",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_Edit" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); - } - arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_Edit" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_Edit" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + if (obj2) { + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TreeListCtrl_EditLabel" "', expected argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); } - arg2 = reinterpret_cast< wxTreeItemId * >(argp2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->Edit((wxTreeItemId const &)*arg2); + wxPyTreeListCtrl_EditLabel(arg1,(wxTreeItemId const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -10154,6 +10680,50 @@ fail: } +SWIGINTERN PyObject *_wrap_TreeListCtrl_SetDragItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId const &arg2_defvalue = (wxTreeItemId *) NULL ; + wxTreeItemId *arg2 = (wxTreeItemId *) &arg2_defvalue ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:TreeListCtrl_SetDragItem",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTreeListCtrl, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TreeListCtrl_SetDragItem" "', expected argument " "1"" of type '" "wxPyTreeListCtrl *""'"); + } + arg1 = reinterpret_cast< wxPyTreeListCtrl * >(argp1); + if (obj1) { + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTreeItemId, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TreeListCtrl_SetDragItem" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetDragItem" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); + } + arg2 = reinterpret_cast< wxTreeItemId * >(argp2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetDragItem((wxTreeItemId const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_TreeListCtrl_GetHeaderWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; @@ -10902,18 +11472,20 @@ static PyMethodDef SwigMethods[] = { { (char *)"LEDNumberCtrl_swiginit", LEDNumberCtrl_swiginit, METH_VARARGS, NULL}, { (char *)"new_TreeListColumnInfo", (PyCFunction) _wrap_new_TreeListColumnInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_TreeListColumnInfo", (PyCFunction)_wrap_delete_TreeListColumnInfo, METH_O, NULL}, - { (char *)"TreeListColumnInfo_GetShown", (PyCFunction)_wrap_TreeListColumnInfo_GetShown, METH_O, NULL}, { (char *)"TreeListColumnInfo_GetAlignment", (PyCFunction)_wrap_TreeListColumnInfo_GetAlignment, METH_O, NULL}, { (char *)"TreeListColumnInfo_GetText", (PyCFunction)_wrap_TreeListColumnInfo_GetText, METH_O, NULL}, { (char *)"TreeListColumnInfo_GetImage", (PyCFunction)_wrap_TreeListColumnInfo_GetImage, METH_O, NULL}, { (char *)"TreeListColumnInfo_GetSelectedImage", (PyCFunction)_wrap_TreeListColumnInfo_GetSelectedImage, METH_O, NULL}, { (char *)"TreeListColumnInfo_GetWidth", (PyCFunction)_wrap_TreeListColumnInfo_GetWidth, METH_O, NULL}, - { (char *)"TreeListColumnInfo_SetShown", (PyCFunction) _wrap_TreeListColumnInfo_SetShown, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListColumnInfo_IsEditable", (PyCFunction)_wrap_TreeListColumnInfo_IsEditable, METH_O, NULL}, + { (char *)"TreeListColumnInfo_IsShown", (PyCFunction)_wrap_TreeListColumnInfo_IsShown, METH_O, NULL}, { (char *)"TreeListColumnInfo_SetAlignment", (PyCFunction) _wrap_TreeListColumnInfo_SetAlignment, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListColumnInfo_SetText", (PyCFunction) _wrap_TreeListColumnInfo_SetText, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListColumnInfo_SetImage", (PyCFunction) _wrap_TreeListColumnInfo_SetImage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListColumnInfo_SetSelectedImage", (PyCFunction) _wrap_TreeListColumnInfo_SetSelectedImage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListColumnInfo_SetWidth", (PyCFunction) _wrap_TreeListColumnInfo_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListColumnInfo_SetEditable", (PyCFunction) _wrap_TreeListColumnInfo_SetEditable, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListColumnInfo_SetShown", (PyCFunction) _wrap_TreeListColumnInfo_SetShown, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListColumnInfo_swigregister", TreeListColumnInfo_swigregister, METH_VARARGS, NULL}, { (char *)"TreeListColumnInfo_swiginit", TreeListColumnInfo_swiginit, METH_VARARGS, NULL}, { (char *)"new_TreeListCtrl", (PyCFunction) _wrap_new_TreeListCtrl, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -10940,20 +11512,22 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeListCtrl_InsertColumnInfo", (PyCFunction) _wrap_TreeListCtrl_InsertColumnInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_RemoveColumn", (PyCFunction) _wrap_TreeListCtrl_RemoveColumn, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetColumnCount", (PyCFunction)_wrap_TreeListCtrl_GetColumnCount, METH_O, NULL}, - { (char *)"TreeListCtrl_SetColumnWidth", (PyCFunction) _wrap_TreeListCtrl_SetColumnWidth, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetColumnWidth", (PyCFunction) _wrap_TreeListCtrl_GetColumnWidth, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetMainColumn", (PyCFunction) _wrap_TreeListCtrl_SetMainColumn, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetMainColumn", (PyCFunction)_wrap_TreeListCtrl_GetMainColumn, METH_O, NULL}, - { (char *)"TreeListCtrl_SetColumnText", (PyCFunction) _wrap_TreeListCtrl_SetColumnText, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetColumnText", (PyCFunction) _wrap_TreeListCtrl_GetColumnText, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetColumn", (PyCFunction) _wrap_TreeListCtrl_SetColumn, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetColumn", (PyCFunction) _wrap_TreeListCtrl_GetColumn, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_SetColumnText", (PyCFunction) _wrap_TreeListCtrl_SetColumnText, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetColumnText", (PyCFunction) _wrap_TreeListCtrl_GetColumnText, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_SetColumnWidth", (PyCFunction) _wrap_TreeListCtrl_SetColumnWidth, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetColumnWidth", (PyCFunction) _wrap_TreeListCtrl_GetColumnWidth, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetColumnAlignment", (PyCFunction) _wrap_TreeListCtrl_SetColumnAlignment, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetColumnAlignment", (PyCFunction) _wrap_TreeListCtrl_GetColumnAlignment, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetColumnImage", (PyCFunction) _wrap_TreeListCtrl_SetColumnImage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetColumnImage", (PyCFunction) _wrap_TreeListCtrl_GetColumnImage, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_ShowColumn", (PyCFunction) _wrap_TreeListCtrl_ShowColumn, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_SetColumnShown", (PyCFunction) _wrap_TreeListCtrl_SetColumnShown, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_IsColumnShown", (PyCFunction) _wrap_TreeListCtrl_IsColumnShown, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_SetColumnEditable", (PyCFunction) _wrap_TreeListCtrl_SetColumnEditable, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_IsColumnEditable", (PyCFunction) _wrap_TreeListCtrl_IsColumnEditable, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetItemText", (PyCFunction) _wrap_TreeListCtrl_GetItemText, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetItemImage", (PyCFunction) _wrap_TreeListCtrl_GetItemImage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemText", (PyCFunction) _wrap_TreeListCtrl_SetItemText, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -10962,17 +11536,17 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeListCtrl_SetItemData", (PyCFunction) _wrap_TreeListCtrl_SetItemData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetItemPyData", (PyCFunction) _wrap_TreeListCtrl_GetItemPyData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemPyData", (PyCFunction) _wrap_TreeListCtrl_SetItemPyData, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetItemBold", (PyCFunction) _wrap_TreeListCtrl_GetItemBold, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetItemTextColour", (PyCFunction) _wrap_TreeListCtrl_GetItemTextColour, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetItemBackgroundColour", (PyCFunction) _wrap_TreeListCtrl_GetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetItemFont", (PyCFunction) _wrap_TreeListCtrl_GetItemFont, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemHasChildren", (PyCFunction) _wrap_TreeListCtrl_SetItemHasChildren, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemBold", (PyCFunction) _wrap_TreeListCtrl_SetItemBold, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemTextColour", (PyCFunction) _wrap_TreeListCtrl_SetItemTextColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemBackgroundColour", (PyCFunction) _wrap_TreeListCtrl_SetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SetItemFont", (PyCFunction) _wrap_TreeListCtrl_SetItemFont, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetItemBold", (PyCFunction) _wrap_TreeListCtrl_GetItemBold, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetItemTextColour", (PyCFunction) _wrap_TreeListCtrl_GetItemTextColour, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetItemBackgroundColour", (PyCFunction) _wrap_TreeListCtrl_GetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetItemFont", (PyCFunction) _wrap_TreeListCtrl_GetItemFont, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_IsVisible", (PyCFunction) _wrap_TreeListCtrl_IsVisible, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_ItemHasChildren", (PyCFunction) _wrap_TreeListCtrl_ItemHasChildren, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_HasChildren", (PyCFunction) _wrap_TreeListCtrl_HasChildren, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_IsExpanded", (PyCFunction) _wrap_TreeListCtrl_IsExpanded, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_IsSelected", (PyCFunction) _wrap_TreeListCtrl_IsSelected, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_IsBold", (PyCFunction) _wrap_TreeListCtrl_IsBold, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -10984,12 +11558,17 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeListCtrl_GetFirstChild", (PyCFunction) _wrap_TreeListCtrl_GetFirstChild, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetNextChild", (PyCFunction) _wrap_TreeListCtrl_GetNextChild, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetLastChild", (PyCFunction) _wrap_TreeListCtrl_GetLastChild, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetPrevChild", (PyCFunction) _wrap_TreeListCtrl_GetPrevChild, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetNextSibling", (PyCFunction) _wrap_TreeListCtrl_GetNextSibling, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetPrevSibling", (PyCFunction) _wrap_TreeListCtrl_GetPrevSibling, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetFirstVisibleItem", (PyCFunction)_wrap_TreeListCtrl_GetFirstVisibleItem, METH_O, NULL}, + { (char *)"TreeListCtrl_GetNext", (PyCFunction) _wrap_TreeListCtrl_GetNext, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetPrev", (PyCFunction) _wrap_TreeListCtrl_GetPrev, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetFirstExpandedItem", (PyCFunction)_wrap_TreeListCtrl_GetFirstExpandedItem, METH_O, NULL}, + { (char *)"TreeListCtrl_GetNextExpanded", (PyCFunction) _wrap_TreeListCtrl_GetNextExpanded, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetPrevExpanded", (PyCFunction) _wrap_TreeListCtrl_GetPrevExpanded, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_GetFirstVisibleItem", (PyCFunction) _wrap_TreeListCtrl_GetFirstVisibleItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetNextVisible", (PyCFunction) _wrap_TreeListCtrl_GetNextVisible, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetPrevVisible", (PyCFunction) _wrap_TreeListCtrl_GetPrevVisible, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_GetNext", (PyCFunction) _wrap_TreeListCtrl_GetNext, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_AddRoot", (PyCFunction) _wrap_TreeListCtrl_AddRoot, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_PrependItem", (PyCFunction) _wrap_TreeListCtrl_PrependItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_InsertItem", (PyCFunction) _wrap_TreeListCtrl_InsertItem, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -10997,7 +11576,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeListCtrl_AppendItem", (PyCFunction) _wrap_TreeListCtrl_AppendItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_Delete", (PyCFunction) _wrap_TreeListCtrl_Delete, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_DeleteChildren", (PyCFunction) _wrap_TreeListCtrl_DeleteChildren, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_DeleteAllItems", (PyCFunction)_wrap_TreeListCtrl_DeleteAllItems, METH_O, NULL}, + { (char *)"TreeListCtrl_DeleteRoot", (PyCFunction)_wrap_TreeListCtrl_DeleteRoot, METH_O, NULL}, { (char *)"TreeListCtrl_Expand", (PyCFunction) _wrap_TreeListCtrl_Expand, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_ExpandAll", (PyCFunction) _wrap_TreeListCtrl_ExpandAll, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_Collapse", (PyCFunction) _wrap_TreeListCtrl_Collapse, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -11006,15 +11585,15 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeListCtrl_Unselect", (PyCFunction)_wrap_TreeListCtrl_Unselect, METH_O, NULL}, { (char *)"TreeListCtrl_UnselectAll", (PyCFunction)_wrap_TreeListCtrl_UnselectAll, METH_O, NULL}, { (char *)"TreeListCtrl_SelectItem", (PyCFunction) _wrap_TreeListCtrl_SelectItem, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_SelectAll", (PyCFunction) _wrap_TreeListCtrl_SelectAll, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_SelectAll", (PyCFunction)_wrap_TreeListCtrl_SelectAll, METH_O, NULL}, { (char *)"TreeListCtrl_EnsureVisible", (PyCFunction) _wrap_TreeListCtrl_EnsureVisible, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_ScrollTo", (PyCFunction) _wrap_TreeListCtrl_ScrollTo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_HitTest", (PyCFunction) _wrap_TreeListCtrl_HitTest, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetBoundingRect", (PyCFunction) _wrap_TreeListCtrl_GetBoundingRect, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_EditLabel", (PyCFunction) _wrap_TreeListCtrl_EditLabel, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TreeListCtrl_Edit", (PyCFunction) _wrap_TreeListCtrl_Edit, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_SortChildren", (PyCFunction) _wrap_TreeListCtrl_SortChildren, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_FindItem", (PyCFunction) _wrap_TreeListCtrl_FindItem, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreeListCtrl_SetDragItem", (PyCFunction) _wrap_TreeListCtrl_SetDragItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeListCtrl_GetHeaderWindow", (PyCFunction)_wrap_TreeListCtrl_GetHeaderWindow, METH_O, NULL}, { (char *)"TreeListCtrl_GetMainWindow", (PyCFunction)_wrap_TreeListCtrl_GetMainWindow, METH_O, NULL}, { (char *)"TreeListCtrl_swigregister", TreeListCtrl_swigregister, METH_VARARGS, NULL}, @@ -14164,7 +14743,6 @@ SWIGEXPORT void SWIG_init(void) { PyDict_SetItemString(d,(char*)"cvar", SWIG_globals()); SWIG_addvarlink(SWIG_globals(),(char*)"DynamicSashNameStr",DynamicSashNameStr_get, DynamicSashNameStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"EditableListBoxNameStr",EditableListBoxNameStr_get, EditableListBoxNameStr_set); - SWIG_addvarlink(SWIG_globals(),(char*)"TreeListCtrlNameStr",TreeListCtrlNameStr_get, TreeListCtrlNameStr_set); SWIG_addvarlink(SWIG_globals(),(char*)"StaticPictureNameStr",StaticPictureNameStr_get, StaticPictureNameStr_set); SWIG_Python_SetConstant(d, "DS_MANAGE_SCROLLBARS",SWIG_From_int(static_cast< int >(wxDS_MANAGE_SCROLLBARS))); SWIG_Python_SetConstant(d, "DS_DRAG_CORNER",SWIG_From_int(static_cast< int >(wxDS_DRAG_CORNER))); @@ -14178,24 +14756,27 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "LED_ALIGN_CENTER",SWIG_From_int(static_cast< int >(wxLED_ALIGN_CENTER))); SWIG_Python_SetConstant(d, "LED_ALIGN_MASK",SWIG_From_int(static_cast< int >(wxLED_ALIGN_MASK))); SWIG_Python_SetConstant(d, "LED_DRAW_FADED",SWIG_From_int(static_cast< int >(wxLED_DRAW_FADED))); - SWIG_Python_SetConstant(d, "TL_ALIGN_LEFT",SWIG_From_int(static_cast< int >(wxTL_ALIGN_LEFT))); - SWIG_Python_SetConstant(d, "TL_ALIGN_RIGHT",SWIG_From_int(static_cast< int >(wxTL_ALIGN_RIGHT))); - SWIG_Python_SetConstant(d, "TL_ALIGN_CENTER",SWIG_From_int(static_cast< int >(wxTL_ALIGN_CENTER))); + SWIG_addvarlink(SWIG_globals(),(char*)"TreeListCtrlNameStr",TreeListCtrlNameStr_get, TreeListCtrlNameStr_set); + SWIG_Python_SetConstant(d, "DEFAULT_COL_WIDTH",SWIG_From_int(static_cast< int >(DEFAULT_COL_WIDTH))); + SWIG_Python_SetConstant(d, "TL_MODE_NAV_FULLTREE",SWIG_From_int(static_cast< int >(wxTL_MODE_NAV_FULLTREE))); + SWIG_Python_SetConstant(d, "TL_MODE_NAV_EXPANDED",SWIG_From_int(static_cast< int >(wxTL_MODE_NAV_EXPANDED))); + SWIG_Python_SetConstant(d, "TL_MODE_NAV_VISIBLE",SWIG_From_int(static_cast< int >(wxTL_MODE_NAV_VISIBLE))); + SWIG_Python_SetConstant(d, "TL_MODE_NAV_LEVEL",SWIG_From_int(static_cast< int >(wxTL_MODE_NAV_LEVEL))); + SWIG_Python_SetConstant(d, "TL_MODE_FIND_EXACT",SWIG_From_int(static_cast< int >(wxTL_MODE_FIND_EXACT))); + SWIG_Python_SetConstant(d, "TL_MODE_FIND_PARTIAL",SWIG_From_int(static_cast< int >(wxTL_MODE_FIND_PARTIAL))); + SWIG_Python_SetConstant(d, "TL_MODE_FIND_NOCASE",SWIG_From_int(static_cast< int >(wxTL_MODE_FIND_NOCASE))); SWIG_Python_SetConstant(d, "TREE_HITTEST_ONITEMCOLUMN",SWIG_From_int(static_cast< int >(wxTREE_HITTEST_ONITEMCOLUMN))); - SWIG_Python_SetConstant(d, "TL_SEARCH_VISIBLE",SWIG_From_int(static_cast< int >(wxTL_SEARCH_VISIBLE))); - SWIG_Python_SetConstant(d, "TL_SEARCH_LEVEL",SWIG_From_int(static_cast< int >(wxTL_SEARCH_LEVEL))); - SWIG_Python_SetConstant(d, "TL_SEARCH_FULL",SWIG_From_int(static_cast< int >(wxTL_SEARCH_FULL))); - SWIG_Python_SetConstant(d, "TL_SEARCH_PARTIAL",SWIG_From_int(static_cast< int >(wxTL_SEARCH_PARTIAL))); - SWIG_Python_SetConstant(d, "TL_SEARCH_NOCASE",SWIG_From_int(static_cast< int >(wxTL_SEARCH_NOCASE))); - SWIG_Python_SetConstant(d, "TR_DONT_ADJUST_MAC",SWIG_From_int(static_cast< int >(wxTR_DONT_ADJUST_MAC))); + SWIG_Python_SetConstant(d, "TR_COLUMN_LINES",SWIG_From_int(static_cast< int >(wxTR_COLUMN_LINES))); + SWIG_Python_SetConstant(d, "TR_VIRTUAL",SWIG_From_int(static_cast< int >(wxTR_VIRTUAL))); + + wxPyPtrTypeMap_Add("wxTreeListCtrl", "wxPyTreeListCtrl"); + SWIG_Python_SetConstant(d, "SCALE_HORIZONTAL",SWIG_From_int(static_cast< int >(wxSCALE_HORIZONTAL))); SWIG_Python_SetConstant(d, "SCALE_VERTICAL",SWIG_From_int(static_cast< int >(wxSCALE_VERTICAL))); SWIG_Python_SetConstant(d, "SCALE_UNIFORM",SWIG_From_int(static_cast< int >(wxSCALE_UNIFORM))); SWIG_Python_SetConstant(d, "SCALE_CUSTOM",SWIG_From_int(static_cast< int >(wxSCALE_CUSTOM))); - wxPyPtrTypeMap_Add("wxTreeCompanionWindow", "wxPyTreeCompanionWindow"); - wxPyPtrTypeMap_Add("wxTreeListCtrl", "wxPyTreeListCtrl"); } diff --git a/wxPython/src/gtk/_controls.py b/wxPython/src/gtk/_controls.py index cb930520e7..1e0a06ec07 100644 --- a/wxPython/src/gtk/_controls.py +++ b/wxPython/src/gtk/_controls.py @@ -2060,6 +2060,10 @@ class ScrollBar(_core.Control): return _controls_.ScrollBar_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + PageSize = property(GetPageSize,doc="See `GetPageSize`") + Range = property(GetRange,doc="See `GetRange`") + ThumbPosition = property(GetThumbPosition,SetThumbPosition,doc="See `GetThumbPosition` and `SetThumbPosition`") + ThumbSize = property(GetThumbSize,doc="See `GetThumbSize`") _controls_.ScrollBar_swigregister(ScrollBar) ScrollBarNameStr = cvar.ScrollBarNameStr @@ -2162,6 +2166,9 @@ class SpinButton(_core.Control): return _controls_.SpinButton_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + Max = property(GetMax,SetMax,doc="See `GetMax` and `SetMax`") + Min = property(GetMin,SetMin,doc="See `GetMin` and `SetMin`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _controls_.SpinButton_swigregister(SpinButton) SPIN_BUTTON_NAME = cvar.SPIN_BUTTON_NAME SpinCtrlNameStr = cvar.SpinCtrlNameStr @@ -2257,6 +2264,9 @@ class SpinCtrl(_core.Control): return _controls_.SpinCtrl_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + Max = property(GetMax,doc="See `GetMax`") + Min = property(GetMin,doc="See `GetMin`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _controls_.SpinCtrl_swigregister(SpinCtrl) def PreSpinCtrl(*args, **kwargs): @@ -2296,6 +2306,7 @@ class SpinEvent(_core.NotifyEvent): """SetPosition(self, int pos)""" return _controls_.SpinEvent_SetPosition(*args, **kwargs) + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") _controls_.SpinEvent_swigregister(SpinEvent) wxEVT_COMMAND_SPINCTRL_UPDATED = _controls_.wxEVT_COMMAND_SPINCTRL_UPDATED @@ -2430,6 +2441,11 @@ class RadioBox(_core.Control): return _controls_.RadioBox_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + ColumnCount = property(GetColumnCount,doc="See `GetColumnCount`") + Count = property(GetCount,doc="See `GetCount`") + RowCount = property(GetRowCount,doc="See `GetRowCount`") + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + StringSelection = property(GetStringSelection,SetStringSelection,doc="See `GetStringSelection` and `SetStringSelection`") _controls_.RadioBox_swigregister(RadioBox) RadioBoxNameStr = cvar.RadioBoxNameStr RadioButtonNameStr = cvar.RadioButtonNameStr @@ -2507,6 +2523,7 @@ class RadioButton(_core.Control): return _controls_.RadioButton_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _controls_.RadioButton_swigregister(RadioButton) def PreRadioButton(*args, **kwargs): @@ -2673,6 +2690,15 @@ class Slider(_core.Control): return _controls_.Slider_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + LineSize = property(GetLineSize,SetLineSize,doc="See `GetLineSize` and `SetLineSize`") + Max = property(GetMax,SetMax,doc="See `GetMax` and `SetMax`") + Min = property(GetMin,SetMin,doc="See `GetMin` and `SetMin`") + PageSize = property(GetPageSize,SetPageSize,doc="See `GetPageSize` and `SetPageSize`") + SelEnd = property(GetSelEnd,doc="See `GetSelEnd`") + SelStart = property(GetSelStart,doc="See `GetSelStart`") + ThumbLength = property(GetThumbLength,SetThumbLength,doc="See `GetThumbLength` and `SetThumbLength`") + TickFreq = property(GetTickFreq,SetTickFreq,doc="See `GetTickFreq` and `SetTickFreq`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _controls_.Slider_swigregister(Slider) SliderNameStr = cvar.SliderNameStr @@ -6325,6 +6351,9 @@ def PreDatePickerCtrl(*args, **kwargs): return val HL_CONTEXTMENU = _controls_.HL_CONTEXTMENU +HL_ALIGN_LEFT = _controls_.HL_ALIGN_LEFT +HL_ALIGN_RIGHT = _controls_.HL_ALIGN_RIGHT +HL_ALIGN_CENTRE = _controls_.HL_ALIGN_CENTRE HL_DEFAULT_STYLE = _controls_.HL_DEFAULT_STYLE #--------------------------------------------------------------------------- @@ -6576,6 +6605,13 @@ class PickerBase(_core.Control): """GetPickerCtrl(self) -> Control""" return _controls_.PickerBase_GetPickerCtrl(*args, **kwargs) + InternalMargin = property(GetInternalMargin,SetInternalMargin,doc="See `GetInternalMargin` and `SetInternalMargin`") + PickerCtrl = property(GetPickerCtrl,doc="See `GetPickerCtrl`") + PickerCtrlProportion = property(GetPickerCtrlProportion,SetPickerCtrlProportion,doc="See `GetPickerCtrlProportion` and `SetPickerCtrlProportion`") + TextCtrl = property(GetTextCtrl,doc="See `GetTextCtrl`") + TextCtrlProportion = property(GetTextCtrlProportion,SetTextCtrlProportion,doc="See `GetTextCtrlProportion` and `SetTextCtrlProportion`") + TextCtrlGrowable = property(IsTextCtrlGrowable,SetTextCtrlGrowable,doc="See `IsTextCtrlGrowable` and `SetTextCtrlGrowable`") + PickerCtrlGrowable = property(IsPickerCtrlGrowable,SetPickerCtrlGrowable,doc="See `IsPickerCtrlGrowable` and `SetPickerCtrlGrowable`") _controls_.PickerBase_swigregister(PickerBase) #--------------------------------------------------------------------------- diff --git a/wxPython/src/gtk/_controls_wrap.cpp b/wxPython/src/gtk/_controls_wrap.cpp index 58c611e9c9..bbf5790f4f 100644 --- a/wxPython/src/gtk/_controls_wrap.cpp +++ b/wxPython/src/gtk/_controls_wrap.cpp @@ -48979,6 +48979,9 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "DP_ALLOWNONE",SWIG_From_int(static_cast< int >(wxDP_ALLOWNONE))); SWIG_addvarlink(SWIG_globals(),(char*)"HyperlinkCtrlNameStr",HyperlinkCtrlNameStr_get, HyperlinkCtrlNameStr_set); SWIG_Python_SetConstant(d, "HL_CONTEXTMENU",SWIG_From_int(static_cast< int >(wxHL_CONTEXTMENU))); + SWIG_Python_SetConstant(d, "HL_ALIGN_LEFT",SWIG_From_int(static_cast< int >(wxHL_ALIGN_LEFT))); + SWIG_Python_SetConstant(d, "HL_ALIGN_RIGHT",SWIG_From_int(static_cast< int >(wxHL_ALIGN_RIGHT))); + SWIG_Python_SetConstant(d, "HL_ALIGN_CENTRE",SWIG_From_int(static_cast< int >(wxHL_ALIGN_CENTRE))); SWIG_Python_SetConstant(d, "HL_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxHL_DEFAULT_STYLE))); PyDict_SetItemString(d, "wxEVT_COMMAND_HYPERLINK", PyInt_FromLong(wxEVT_COMMAND_HYPERLINK)); SWIG_Python_SetConstant(d, "PB_USE_TEXTCTRL",SWIG_From_int(static_cast< int >(wxPB_USE_TEXTCTRL))); diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index ff15cd415f..d28b51d65f 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -706,6 +706,7 @@ class Object(object): args[0].thisown = 0 return val + ClassName = property(GetClassName,doc="See `GetClassName`") _core_.Object_swigregister(Object) _wxPySetDictionary = _core_._wxPySetDictionary cvar = _core_.cvar @@ -1320,30 +1321,34 @@ class Rect(object): """ return _core_.Rect___ne__(*args, **kwargs) - def InsideXY(*args, **kwargs): + def ContainsXY(*args, **kwargs): """ - InsideXY(self, int x, int y) -> bool + ContainsXY(self, int x, int y) -> bool - Return True if the point is (not strcitly) inside the rect. + Return True if the point is inside the rect. """ - return _core_.Rect_InsideXY(*args, **kwargs) + return _core_.Rect_ContainsXY(*args, **kwargs) - def Inside(*args, **kwargs): + def Contains(*args, **kwargs): """ - Inside(self, Point pt) -> bool + Contains(self, Point pt) -> bool - Return True if the point is (not strcitly) inside the rect. + Return True if the point is inside the rect. """ - return _core_.Rect_Inside(*args, **kwargs) + return _core_.Rect_Contains(*args, **kwargs) - def InsideRect(*args, **kwargs): + def ContainsRect(*args, **kwargs): """ - InsideRect(self, Rect rect) -> bool + ContainsRect(self, Rect rect) -> bool Returns ``True`` if the given rectangle is completely inside this rectangle or touches its boundary. """ - return _core_.Rect_InsideRect(*args, **kwargs) + return _core_.Rect_ContainsRect(*args, **kwargs) + + Inside = wx._deprecated(Contains, "Use `Contains` instead.") + InsideXY = wx._deprecated(ContainsXY, "Use `ContainsXY` instead.") + InsideRect = wx._deprecated(ContainsRect, "Use `ContainsRect` instead.") def Intersects(*args, **kwargs): """ @@ -1398,6 +1403,19 @@ class Rect(object): __safe_for_unpickling__ = True def __reduce__(self): return (wx.Rect, self.Get()) + Bottom = property(GetBottom,SetBottom,doc="See `GetBottom` and `SetBottom`") + BottomRight = property(GetBottomRight,SetBottomRight,doc="See `GetBottomRight` and `SetBottomRight`") + Height = property(GetHeight,SetHeight,doc="See `GetHeight` and `SetHeight`") + Left = property(GetLeft,SetLeft,doc="See `GetLeft` and `SetLeft`") + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") + Right = property(GetRight,SetRight,doc="See `GetRight` and `SetRight`") + Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") + Top = property(GetTop,SetTop,doc="See `GetTop` and `SetTop`") + TopLeft = property(GetTopLeft,SetTopLeft,doc="See `GetTopLeft` and `SetTopLeft`") + Width = property(GetWidth,SetWidth,doc="See `GetWidth` and `SetWidth`") + X = property(GetX,SetX,doc="See `GetX` and `SetX`") + Y = property(GetY,SetY,doc="See `GetY` and `SetY`") + Empty = property(IsEmpty,doc="See `IsEmpty`") _core_.Rect_swigregister(Rect) def RectPP(*args, **kwargs): @@ -1572,6 +1590,10 @@ class Point2D(object): __safe_for_unpickling__ = True def __reduce__(self): return (wx.Point2D, self.Get()) + Floor = property(GetFloor,doc="See `GetFloor`") + Rounded = property(GetRounded,doc="See `GetRounded`") + VectorAngle = property(GetVectorAngle,SetVectorAngle,doc="See `GetVectorAngle` and `SetVectorAngle`") + VectorLength = property(GetVectorLength,SetVectorLength,doc="See `GetVectorLength` and `SetVectorLength`") _core_.Point2D_swigregister(Point2D) def Point2DCopy(*args, **kwargs): @@ -4230,6 +4252,8 @@ class ScrollEvent(CommandEvent): """SetPosition(self, int pos)""" return _core_.ScrollEvent_SetPosition(*args, **kwargs) + Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") _core_.ScrollEvent_swigregister(ScrollEvent) #--------------------------------------------------------------------------- @@ -4276,6 +4300,8 @@ class ScrollWinEvent(Event): """SetPosition(self, int pos)""" return _core_.ScrollWinEvent_SetPosition(*args, **kwargs) + Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") _core_.ScrollWinEvent_swigregister(ScrollWinEvent) #--------------------------------------------------------------------------- @@ -4760,6 +4786,9 @@ class SetCursorEvent(Event): """ return _core_.SetCursorEvent_HasCursor(*args, **kwargs) + Cursor = property(GetCursor,SetCursor,doc="See `GetCursor` and `SetCursor`") + X = property(GetX,doc="See `GetX`") + Y = property(GetY,doc="See `GetY`") _core_.SetCursorEvent_swigregister(SetCursorEvent) #--------------------------------------------------------------------------- @@ -5073,6 +5102,8 @@ class SizeEvent(Event): m_size = property(_core_.SizeEvent_m_size_get, _core_.SizeEvent_m_size_set) m_rect = property(_core_.SizeEvent_m_rect_get, _core_.SizeEvent_m_rect_set) + Rect = property(GetRect,SetRect,doc="See `GetRect` and `SetRect`") + Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") _core_.SizeEvent_swigregister(SizeEvent) #--------------------------------------------------------------------------- @@ -5233,9 +5264,14 @@ _core_.FocusEvent_swigregister(FocusEvent) class ChildFocusEvent(CommandEvent): """ - wx.ChildFocusEvent notifies the parent that a child has received the - focus. Unlike `wx.FocusEvent` it is propagated up the window - heirarchy. + A child focus event is sent to a (parent-)window when one of its child + windows gains focus, so that the window could restore the focus back + to its corresponding child if it loses it now and regains later. + + Notice that child window is the direct child of the window receiving + the event, and so may not be the actual widget recieving focus if it + is further down the containment heirarchy. Use `wx.Window.FindFocus` + to get the widget that is actually receiving focus. """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr @@ -5250,7 +5286,8 @@ class ChildFocusEvent(CommandEvent): """ GetWindow(self) -> Window - The window which has just received the focus. + The window, or (grand)parent of the window which has just received the + focus. """ return _core_.ChildFocusEvent_GetWindow(*args, **kwargs) @@ -5481,6 +5518,7 @@ class ShowEvent(Event): """GetShow(self) -> bool""" return _core_.ShowEvent_GetShow(*args, **kwargs) + Show = property(GetShow,SetShow,doc="See `GetShow` and `SetShow`") _core_.ShowEvent_swigregister(ShowEvent) #--------------------------------------------------------------------------- @@ -6067,6 +6105,7 @@ class PaletteChangedEvent(Event): """GetChangedWindow(self) -> Window""" return _core_.PaletteChangedEvent_GetChangedWindow(*args, **kwargs) + ChangedWindow = property(GetChangedWindow,SetChangedWindow,doc="See `GetChangedWindow` and `SetChangedWindow`") _core_.PaletteChangedEvent_swigregister(PaletteChangedEvent) #--------------------------------------------------------------------------- @@ -6099,6 +6138,7 @@ class QueryNewPaletteEvent(Event): """GetPaletteRealized(self) -> bool""" return _core_.QueryNewPaletteEvent_GetPaletteRealized(*args, **kwargs) + PaletteRealized = property(GetPaletteRealized,SetPaletteRealized,doc="See `GetPaletteRealized` and `SetPaletteRealized`") _core_.QueryNewPaletteEvent_swigregister(QueryNewPaletteEvent) #--------------------------------------------------------------------------- @@ -6954,9 +6994,9 @@ class PyApp(EvtHandler): return _core_.PyApp_GetComCtl32Version(*args, **kwargs) GetComCtl32Version = staticmethod(GetComCtl32Version) - def DisplayAvailable(*args, **kwargs): + def IsDisplayAvailable(*args, **kwargs): """ - DisplayAvailable() -> bool + IsDisplayAvailable() -> bool Tests if it is possible to create a GUI in the current environment. This will mean different things on the different platforms. @@ -6973,9 +7013,20 @@ class PyApp(EvtHandler): * On MS Windows... """ - return _core_.PyApp_DisplayAvailable(*args, **kwargs) - - DisplayAvailable = staticmethod(DisplayAvailable) + return _core_.PyApp_IsDisplayAvailable(*args, **kwargs) + + IsDisplayAvailable = staticmethod(IsDisplayAvailable) + AppName = property(GetAppName,SetAppName,doc="See `GetAppName` and `SetAppName`") + AssertMode = property(GetAssertMode,SetAssertMode,doc="See `GetAssertMode` and `SetAssertMode`") + ClassName = property(GetClassName,SetClassName,doc="See `GetClassName` and `SetClassName`") + ExitOnFrameDelete = property(GetExitOnFrameDelete,SetExitOnFrameDelete,doc="See `GetExitOnFrameDelete` and `SetExitOnFrameDelete`") + LayoutDirection = property(GetLayoutDirection,doc="See `GetLayoutDirection`") + PrintMode = property(GetPrintMode,SetPrintMode,doc="See `GetPrintMode` and `SetPrintMode`") + TopWindow = property(GetTopWindow,SetTopWindow,doc="See `GetTopWindow` and `SetTopWindow`") + Traits = property(GetTraits,doc="See `GetTraits`") + UseBestVisual = property(GetUseBestVisual,SetUseBestVisual,doc="See `GetUseBestVisual` and `SetUseBestVisual`") + VendorName = property(GetVendorName,SetVendorName,doc="See `GetVendorName` and `SetVendorName`") + Active = property(IsActive) _core_.PyApp_swigregister(PyApp) def PyApp_IsMainLoopRunning(*args): @@ -7036,9 +7087,9 @@ def PyApp_GetComCtl32Version(*args): """ return _core_.PyApp_GetComCtl32Version(*args) -def PyApp_DisplayAvailable(*args): +def PyApp_IsDisplayAvailable(*args): """ - PyApp_DisplayAvailable() -> bool + PyApp_IsDisplayAvailable() -> bool Tests if it is possible to create a GUI in the current environment. This will mean different things on the different platforms. @@ -7055,7 +7106,7 @@ def PyApp_DisplayAvailable(*args): * On MS Windows... """ - return _core_.PyApp_DisplayAvailable(*args) + return _core_.PyApp_IsDisplayAvailable(*args) #--------------------------------------------------------------------------- @@ -7288,7 +7339,7 @@ class App(wx.PyApp): wx.PyApp.__init__(self) # make sure we can create a GUI - if not self.DisplayAvailable(): + if not self.IsDisplayAvailable(): if wx.Platform == "__WXMAC__": msg = """This program needs access to the screen. @@ -8456,6 +8507,16 @@ class Window(EvtHandler): """ return _core_.Window_IsEnabled(*args, **kwargs) + def IsShownOnScreen(*args, **kwargs): + """ + IsShownOnScreen(self) -> bool + + Returns ``True`` if the window is physically visible on the screen, + i.e. it is shown and all its parents up to the toplevel window are + shown as well. + """ + return _core_.Window_IsShownOnScreen(*args, **kwargs) + def SetWindowStyleFlag(*args, **kwargs): """ SetWindowStyleFlag(self, long style) @@ -9058,6 +9119,16 @@ class Window(EvtHandler): """ return _core_.Window_Freeze(*args, **kwargs) + def IsFrozen(*args, **kwargs): + """ + IsFrozen(self) -> bool + + Returns ``True`` if the window has been frozen and not thawed yet. + + :see: `Freeze` and `Thaw` + """ + return _core_.Window_IsFrozen(*args, **kwargs) + def Thaw(*args, **kwargs): """ Thaw(self) @@ -11411,6 +11482,19 @@ class SizerItem(Object): """ return _core_.SizerItem_SetUserData(*args, **kwargs) + Border = property(GetBorder,SetBorder,doc="See `GetBorder` and `SetBorder`") + Flag = property(GetFlag,SetFlag,doc="See `GetFlag` and `SetFlag`") + MinSize = property(GetMinSize,doc="See `GetMinSize`") + MinSizeWithBorder = property(GetMinSizeWithBorder,doc="See `GetMinSizeWithBorder`") + Position = property(GetPosition,doc="See `GetPosition`") + Proportion = property(GetProportion,SetProportion,doc="See `GetProportion` and `SetProportion`") + Ratio = property(GetRatio,SetRatio,doc="See `GetRatio` and `SetRatio`") + Rect = property(GetRect,doc="See `GetRect`") + Size = property(GetSize,doc="See `GetSize`") + Sizer = property(GetSizer,SetSizer,doc="See `GetSizer` and `SetSizer`") + Spacer = property(GetSpacer,SetSpacer,doc="See `GetSpacer` and `SetSpacer`") + UserData = property(GetUserData,SetUserData,doc="See `GetUserData` and `SetUserData`") + Window = property(GetWindow,SetWindow,doc="See `GetWindow` and `SetWindow`") _core_.SizerItem_swigregister(SizerItem) def SizerItemWindow(*args, **kwargs): @@ -11933,6 +12017,11 @@ class Sizer(Object): """ return _core_.Sizer_ShowItems(*args, **kwargs) + Children = property(GetChildren,doc="See `GetChildren`") + ContainingWindow = property(GetContainingWindow,SetContainingWindow,doc="See `GetContainingWindow` and `SetContainingWindow`") + MinSize = property(GetMinSize,SetMinSize,doc="See `GetMinSize` and `SetMinSize`") + Position = property(GetPosition,doc="See `GetPosition`") + Size = property(GetSize,doc="See `GetSize`") _core_.Sizer_swigregister(Sizer) class PySizer(Sizer): @@ -12067,6 +12156,7 @@ class StaticBoxSizer(BoxSizer): """ return _core_.StaticBoxSizer_GetStaticBox(*args, **kwargs) + StaticBox = property(GetStaticBox,doc="See `GetStaticBox`") _core_.StaticBoxSizer_swigregister(StaticBoxSizer) #--------------------------------------------------------------------------- @@ -12424,6 +12514,11 @@ class StdDialogButtonSizer(BoxSizer): """GetHelpButton(self) -> wxButton""" return _core_.StdDialogButtonSizer_GetHelpButton(*args, **kwargs) + AffirmativeButton = property(GetAffirmativeButton,SetAffirmativeButton,doc="See `GetAffirmativeButton` and `SetAffirmativeButton`") + ApplyButton = property(GetApplyButton,doc="See `GetApplyButton`") + CancelButton = property(GetCancelButton,SetCancelButton,doc="See `GetCancelButton` and `SetCancelButton`") + HelpButton = property(GetHelpButton,doc="See `GetHelpButton`") + NegativeButton = property(GetNegativeButton,SetNegativeButton,doc="See `GetNegativeButton` and `SetNegativeButton`") _core_.StdDialogButtonSizer_swigregister(StdDialogButtonSizer) #--------------------------------------------------------------------------- diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp index c9cbda4e64..ceb5d5e6b0 100644 --- a/wxPython/src/gtk/_core_wrap.cpp +++ b/wxPython/src/gtk/_core_wrap.cpp @@ -3788,7 +3788,7 @@ SWIGINTERN wxPyApp *new_wxPyApp(){ return wxPythonApp; } SWIGINTERN int wxPyApp_GetComCtl32Version(){ wxPyRaiseNotImplemented(); return 0; } -SWIGINTERN bool wxPyApp_DisplayAvailable(){ +SWIGINTERN bool wxPyApp_IsDisplayAvailable(){ return wxPyTestDisplayAvailable(); } @@ -7492,7 +7492,7 @@ fail: } -SWIGINTERN PyObject *_wrap_Rect_InsideXY(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_Rect_ContainsXY(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxRect *arg1 = (wxRect *) 0 ; int arg2 ; @@ -7511,25 +7511,25 @@ SWIGINTERN PyObject *_wrap_Rect_InsideXY(PyObject *SWIGUNUSEDPARM(self), PyObjec (char *) "self",(char *) "x",(char *) "y", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_InsideXY",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_ContainsXY",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect_InsideXY" "', expected argument " "1"" of type '" "wxRect const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect_ContainsXY" "', expected argument " "1"" of type '" "wxRect const *""'"); } arg1 = reinterpret_cast< wxRect * >(argp1); ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Rect_InsideXY" "', expected argument " "2"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Rect_ContainsXY" "', expected argument " "2"" of type '" "int""'"); } arg2 = static_cast< int >(val2); ecode3 = SWIG_AsVal_int(obj2, &val3); if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Rect_InsideXY" "', expected argument " "3"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Rect_ContainsXY" "', expected argument " "3"" of type '" "int""'"); } arg3 = static_cast< int >(val3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxRect const *)arg1)->Inside(arg2,arg3); + result = (bool)((wxRect const *)arg1)->Contains(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -7542,7 +7542,7 @@ fail: } -SWIGINTERN PyObject *_wrap_Rect_Inside(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_Rect_Contains(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxRect *arg1 = (wxRect *) 0 ; wxPoint *arg2 = 0 ; @@ -7556,10 +7556,10 @@ SWIGINTERN PyObject *_wrap_Rect_Inside(PyObject *SWIGUNUSEDPARM(self), PyObject (char *) "self",(char *) "pt", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_Inside",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_Contains",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect_Inside" "', expected argument " "1"" of type '" "wxRect const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect_Contains" "', expected argument " "1"" of type '" "wxRect const *""'"); } arg1 = reinterpret_cast< wxRect * >(argp1); { @@ -7568,7 +7568,7 @@ SWIGINTERN PyObject *_wrap_Rect_Inside(PyObject *SWIGUNUSEDPARM(self), PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxRect const *)arg1)->Inside((wxPoint const &)*arg2); + result = (bool)((wxRect const *)arg1)->Contains((wxPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -7581,7 +7581,7 @@ fail: } -SWIGINTERN PyObject *_wrap_Rect_InsideRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_Rect_ContainsRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxRect *arg1 = (wxRect *) 0 ; wxRect *arg2 = 0 ; @@ -7595,10 +7595,10 @@ SWIGINTERN PyObject *_wrap_Rect_InsideRect(PyObject *SWIGUNUSEDPARM(self), PyObj (char *) "self",(char *) "rect", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_InsideRect",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_ContainsRect",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect_InsideRect" "', expected argument " "1"" of type '" "wxRect const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect_ContainsRect" "', expected argument " "1"" of type '" "wxRect const *""'"); } arg1 = reinterpret_cast< wxRect * >(argp1); { @@ -7607,7 +7607,7 @@ SWIGINTERN PyObject *_wrap_Rect_InsideRect(PyObject *SWIGUNUSEDPARM(self), PyObj } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxRect const *)arg1)->Inside((wxRect const &)*arg2); + result = (bool)((wxRect const *)arg1)->Contains((wxRect const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -28629,14 +28629,14 @@ fail: } -SWIGINTERN PyObject *_wrap_PyApp_DisplayAvailable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_PyApp_IsDisplayAvailable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; bool result; - if (!SWIG_Python_UnpackTuple(args,"PyApp_DisplayAvailable",0,0,0)) SWIG_fail; + if (!SWIG_Python_UnpackTuple(args,"PyApp_IsDisplayAvailable",0,0,0)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxPyApp_DisplayAvailable(); + result = (bool)wxPyApp_IsDisplayAvailable(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -33007,6 +33007,36 @@ fail: } +SWIGINTERN PyObject *_wrap_Window_IsShownOnScreen(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxWindow *arg1 = (wxWindow *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_IsShownOnScreen" "', expected argument " "1"" of type '" "wxWindow const *""'"); + } + arg1 = reinterpret_cast< wxWindow * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxWindow const *)arg1)->IsShownOnScreen(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Window_SetWindowStyleFlag(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxWindow *arg1 = (wxWindow *) 0 ; @@ -35034,6 +35064,36 @@ fail: } +SWIGINTERN PyObject *_wrap_Window_IsFrozen(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxWindow *arg1 = (wxWindow *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_IsFrozen" "', expected argument " "1"" of type '" "wxWindow const *""'"); + } + arg1 = reinterpret_cast< wxWindow * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxWindow const *)arg1)->IsFrozen(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Window_Thaw(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxWindow *arg1 = (wxWindow *) 0 ; @@ -53768,9 +53828,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"Rect___iadd__", (PyCFunction) _wrap_Rect___iadd__, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Rect___eq__", (PyCFunction) _wrap_Rect___eq__, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Rect___ne__", (PyCFunction) _wrap_Rect___ne__, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Rect_InsideXY", (PyCFunction) _wrap_Rect_InsideXY, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Rect_Inside", (PyCFunction) _wrap_Rect_Inside, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Rect_InsideRect", (PyCFunction) _wrap_Rect_InsideRect, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Rect_ContainsXY", (PyCFunction) _wrap_Rect_ContainsXY, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Rect_Contains", (PyCFunction) _wrap_Rect_Contains, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Rect_ContainsRect", (PyCFunction) _wrap_Rect_ContainsRect, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Rect_Intersects", (PyCFunction) _wrap_Rect_Intersects, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Rect_CenterIn", (PyCFunction) _wrap_Rect_CenterIn, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Rect_x_set", _wrap_Rect_x_set, METH_VARARGS, NULL}, @@ -54466,7 +54526,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"PyApp_SetMacHelpMenuTitleName", (PyCFunction) _wrap_PyApp_SetMacHelpMenuTitleName, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyApp__BootstrapApp", (PyCFunction)_wrap_PyApp__BootstrapApp, METH_O, NULL}, { (char *)"PyApp_GetComCtl32Version", (PyCFunction)_wrap_PyApp_GetComCtl32Version, METH_NOARGS, NULL}, - { (char *)"PyApp_DisplayAvailable", (PyCFunction)_wrap_PyApp_DisplayAvailable, METH_NOARGS, NULL}, + { (char *)"PyApp_IsDisplayAvailable", (PyCFunction)_wrap_PyApp_IsDisplayAvailable, METH_NOARGS, NULL}, { (char *)"PyApp_swigregister", PyApp_swigregister, METH_VARARGS, NULL}, { (char *)"PyApp_swiginit", PyApp_swiginit, METH_VARARGS, NULL}, { (char *)"Exit", (PyCFunction)_wrap_Exit, METH_NOARGS, NULL}, @@ -54600,6 +54660,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_Disable", (PyCFunction)_wrap_Window_Disable, METH_O, NULL}, { (char *)"Window_IsShown", (PyCFunction)_wrap_Window_IsShown, METH_O, NULL}, { (char *)"Window_IsEnabled", (PyCFunction)_wrap_Window_IsEnabled, METH_O, NULL}, + { (char *)"Window_IsShownOnScreen", (PyCFunction)_wrap_Window_IsShownOnScreen, METH_O, NULL}, { (char *)"Window_SetWindowStyleFlag", (PyCFunction) _wrap_Window_SetWindowStyleFlag, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_GetWindowStyleFlag", (PyCFunction)_wrap_Window_GetWindowStyleFlag, METH_O, NULL}, { (char *)"Window_HasFlag", (PyCFunction) _wrap_Window_HasFlag, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -54658,6 +54719,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_Update", (PyCFunction)_wrap_Window_Update, METH_O, NULL}, { (char *)"Window_ClearBackground", (PyCFunction)_wrap_Window_ClearBackground, METH_O, NULL}, { (char *)"Window_Freeze", (PyCFunction)_wrap_Window_Freeze, METH_O, NULL}, + { (char *)"Window_IsFrozen", (PyCFunction)_wrap_Window_IsFrozen, METH_O, NULL}, { (char *)"Window_Thaw", (PyCFunction)_wrap_Window_Thaw, METH_O, NULL}, { (char *)"Window_PrepareDC", (PyCFunction) _wrap_Window_PrepareDC, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_GetUpdateRegion", (PyCFunction)_wrap_Window_GetUpdateRegion, METH_O, NULL}, diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py index 7be2b88f3a..26fe829251 100644 --- a/wxPython/src/gtk/_gdi.py +++ b/wxPython/src/gtk/_gdi.py @@ -296,6 +296,7 @@ class Palette(GDIObject): return _gdi_.Palette_Ok(*args, **kwargs) def __nonzero__(self): return self.Ok() + ColoursCount = property(GetColoursCount,doc="See `GetColoursCount`") _gdi_.Palette_swigregister(Palette) #--------------------------------------------------------------------------- @@ -375,6 +376,7 @@ class Pen(GDIObject): """GetDashCount(self) -> int""" return _gdi_.Pen_GetDashCount(*args, **kwargs) + DashCount = property(GetDashCount,doc="See `GetDashCount`") def __eq__(*args, **kwargs): """__eq__(self, Pen other) -> bool""" return _gdi_.Pen___eq__(*args, **kwargs) @@ -384,6 +386,12 @@ class Pen(GDIObject): return _gdi_.Pen___ne__(*args, **kwargs) def __nonzero__(self): return self.Ok() + Cap = property(GetCap,SetCap,doc="See `GetCap` and `SetCap`") + Colour = property(GetColour,SetColour,doc="See `GetColour` and `SetColour`") + Dashes = property(GetDashes,SetDashes,doc="See `GetDashes` and `SetDashes`") + Join = property(GetJoin,SetJoin,doc="See `GetJoin` and `SetJoin`") + Style = property(GetStyle,SetStyle,doc="See `GetStyle` and `SetStyle`") + Width = property(GetWidth,SetWidth,doc="See `GetWidth` and `SetWidth`") _gdi_.Pen_swigregister(Pen) #--------------------------------------------------------------------------- @@ -813,6 +821,11 @@ class PixelDataBase(object): """GetRowStride(self) -> int""" return _gdi_.PixelDataBase_GetRowStride(*args, **kwargs) + Height = property(GetHeight,doc="See `GetHeight`") + Origin = property(GetOrigin,doc="See `GetOrigin`") + RowStride = property(GetRowStride,doc="See `GetRowStride`") + Size = property(GetSize,doc="See `GetSize`") + Width = property(GetWidth,doc="See `GetWidth`") _gdi_.PixelDataBase_swigregister(PixelDataBase) class NativePixelData(PixelDataBase): @@ -1374,6 +1387,7 @@ class Region(GDIObject): """UnionBitmapColour(self, Bitmap bmp, Colour transColour, int tolerance=0) -> bool""" return _gdi_.Region_UnionBitmapColour(*args, **kwargs) + Box = property(GetBox,doc="See `GetBox`") _gdi_.Region_swigregister(Region) def RegionFromBitmap(*args, **kwargs): @@ -1444,6 +1458,13 @@ class RegionIterator(_core.Object): """__nonzero__(self) -> bool""" return _gdi_.RegionIterator___nonzero__(*args, **kwargs) + H = property(GetH,doc="See `GetH`") + Height = property(GetHeight,doc="See `GetHeight`") + Rect = property(GetRect,doc="See `GetRect`") + W = property(GetW,doc="See `GetW`") + Width = property(GetWidth,doc="See `GetWidth`") + X = property(GetX,doc="See `GetX`") + Y = property(GetY,doc="See `GetY`") _gdi_.RegionIterator_swigregister(RegionIterator) #--------------------------------------------------------------------------- @@ -2646,6 +2667,11 @@ class Locale(object): """AddCatalog(self, String szDomain) -> bool""" return _gdi_.Locale_AddCatalog(*args, **kwargs) + def IsAvailable(*args, **kwargs): + """IsAvailable(int lang) -> bool""" + return _gdi_.Locale_IsAvailable(*args, **kwargs) + + IsAvailable = staticmethod(IsAvailable) def IsLoaded(*args, **kwargs): """IsLoaded(self, String szDomain) -> bool""" return _gdi_.Locale_IsLoaded(*args, **kwargs) @@ -2702,6 +2728,10 @@ def Locale_AddCatalogLookupPathPrefix(*args, **kwargs): """Locale_AddCatalogLookupPathPrefix(String prefix)""" return _gdi_.Locale_AddCatalogLookupPathPrefix(*args, **kwargs) +def Locale_IsAvailable(*args, **kwargs): + """Locale_IsAvailable(int lang) -> bool""" + return _gdi_.Locale_IsAvailable(*args, **kwargs) + def Locale_GetLanguageInfo(*args, **kwargs): """Locale_GetLanguageInfo(int lang) -> LanguageInfo""" return _gdi_.Locale_GetLanguageInfo(*args, **kwargs) @@ -4664,6 +4694,7 @@ class PostScriptDC(DC): return _gdi_.PostScriptDC_GetResolution(*args, **kwargs) GetResolution = staticmethod(GetResolution) + PrintData = property(GetPrintData,SetPrintData,doc="See `GetPrintData` and `SetPrintData`") _gdi_.PostScriptDC_swigregister(PostScriptDC) def PostScriptDC_SetResolution(*args, **kwargs): @@ -5248,6 +5279,31 @@ class SplitterRenderParams(object): isHotSensitive = property(_gdi_.SplitterRenderParams_isHotSensitive_get) _gdi_.SplitterRenderParams_swigregister(SplitterRenderParams) +class HeaderButtonParams(object): + """Extra (optional) parameters for `wx.RendererNative.DrawHeaderButton`""" + thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') + __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """ + __init__(self) -> HeaderButtonParams + + Extra (optional) parameters for `wx.RendererNative.DrawHeaderButton` + """ + _gdi_.HeaderButtonParams_swiginit(self,_gdi_.new_HeaderButtonParams(*args, **kwargs)) + __swig_destroy__ = _gdi_.delete_HeaderButtonParams + __del__ = lambda self : None; + m_arrowColour = property(_gdi_.HeaderButtonParams_m_arrowColour_get, _gdi_.HeaderButtonParams_m_arrowColour_set) + m_selectionColour = property(_gdi_.HeaderButtonParams_m_selectionColour_get, _gdi_.HeaderButtonParams_m_selectionColour_set) + m_labelText = property(_gdi_.HeaderButtonParams_m_labelText_get, _gdi_.HeaderButtonParams_m_labelText_set) + m_labelFont = property(_gdi_.HeaderButtonParams_m_labelFont_get, _gdi_.HeaderButtonParams_m_labelFont_set) + m_labelColour = property(_gdi_.HeaderButtonParams_m_labelColour_get, _gdi_.HeaderButtonParams_m_labelColour_set) + m_labelBitmap = property(_gdi_.HeaderButtonParams_m_labelBitmap_get, _gdi_.HeaderButtonParams_m_labelBitmap_set) + m_labelAlignment = property(_gdi_.HeaderButtonParams_m_labelAlignment_get, _gdi_.HeaderButtonParams_m_labelAlignment_set) +_gdi_.HeaderButtonParams_swigregister(HeaderButtonParams) + +HDR_SORT_ICON_NONE = _gdi_.HDR_SORT_ICON_NONE +HDR_SORT_ICON_UP = _gdi_.HDR_SORT_ICON_UP +HDR_SORT_ICON_DOWN = _gdi_.HDR_SORT_ICON_DOWN class RendererVersion(object): """ This simple struct represents the `wx.RendererNative` interface @@ -5284,11 +5340,12 @@ def RendererVersion_IsCompatible(*args, **kwargs): class RendererNative(object): """ - One of the design principles of wxWidgets is to use the native widgets - on every platform in order to be as close to the native look and feel - on every platform. However there are still cases when some generic - widgets are needed for various reasons, but it can sometimes take a - lot of messy work to make them conform to the native LnF. + One of the design principles of wxWidgets is to use the native + widgets on every platform in order to be as close as possible to + the native look and feel on every platform. However there are + still cases when some generic widgets are needed for various + reasons, but it can sometimes take a lot of messy work to make + them conform to the native LnF. The wx.RendererNative class is a collection of functions that have platform-specific implementations for drawing certain parts of @@ -5306,13 +5363,33 @@ class RendererNative(object): __repr__ = _swig_repr def DrawHeaderButton(*args, **kwargs): """ - DrawHeaderButton(self, Window win, DC dc, Rect rect, int flags=0) + DrawHeaderButton(self, Window win, DC dc, Rect rect, int flags=0, int sortArrow=HDR_SORT_ICON_NONE, + HeaderButtonParams params=None) Draw the header control button (such as what is used by `wx.ListCtrl` in report mode.) """ return _gdi_.RendererNative_DrawHeaderButton(*args, **kwargs) + def DrawHeaderButtonContents(*args, **kwargs): + """ + DrawHeaderButtonContents(self, Window win, DC dc, Rect rect, int flags=0, int sortArrow=HDR_SORT_ICON_NONE, + HeaderButtonParams params=None) + + Draw the contents of a header control button, (label, sort + arrows, etc.) Normally this is only called by `DrawHeaderButton`. + """ + return _gdi_.RendererNative_DrawHeaderButtonContents(*args, **kwargs) + + def GetHeaderButtonHeight(*args, **kwargs): + """ + GetHeaderButtonHeight(self, Window win) -> int + + Returns the default height of a header button, either a fixed platform + height if available, or a generic height based on the window's font. + """ + return _gdi_.RendererNative_GetHeaderButtonHeight(*args, **kwargs) + def DrawTreeItemButton(*args, **kwargs): """ DrawTreeItemButton(self, Window win, DC dc, Rect rect, int flags=0) @@ -5463,6 +5540,8 @@ class RendererNative(object): """ return _gdi_.RendererNative_GetVersion(*args, **kwargs) + SplitterParams = property(GetSplitterParams,doc="See `GetSplitterParams`") + Version = property(GetVersion,doc="See `GetVersion`") _gdi_.RendererNative_swigregister(RendererNative) def RendererNative_Get(*args): @@ -6242,6 +6321,8 @@ class PseudoDC(_core.Object): """ return _gdi_.PseudoDC_SetLogicalFunction(*args, **kwargs) + IdBounds = property(GetIdBounds,SetIdBounds,doc="See `GetIdBounds` and `SetIdBounds`") + Len = property(GetLen,doc="See `GetLen`") _gdi_.PseudoDC_swigregister(PseudoDC) diff --git a/wxPython/src/gtk/_gdi_wrap.cpp b/wxPython/src/gtk/_gdi_wrap.cpp index 1104500fa2..3d48f3a0db 100644 --- a/wxPython/src/gtk/_gdi_wrap.cpp +++ b/wxPython/src/gtk/_gdi_wrap.cpp @@ -2520,99 +2520,100 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_wxGIFHandler swig_types[54] #define SWIGTYPE_p_wxGridBagSizer swig_types[55] #define SWIGTYPE_p_wxGridSizer swig_types[56] -#define SWIGTYPE_p_wxICOHandler swig_types[57] -#define SWIGTYPE_p_wxIcon swig_types[58] -#define SWIGTYPE_p_wxIconBundle swig_types[59] -#define SWIGTYPE_p_wxIconLocation swig_types[60] -#define SWIGTYPE_p_wxIconizeEvent swig_types[61] -#define SWIGTYPE_p_wxIdleEvent swig_types[62] -#define SWIGTYPE_p_wxImage swig_types[63] -#define SWIGTYPE_p_wxImageHandler swig_types[64] -#define SWIGTYPE_p_wxImageList swig_types[65] -#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[66] -#define SWIGTYPE_p_wxInitDialogEvent swig_types[67] -#define SWIGTYPE_p_wxJPEGHandler swig_types[68] -#define SWIGTYPE_p_wxKeyEvent swig_types[69] -#define SWIGTYPE_p_wxLanguageInfo swig_types[70] -#define SWIGTYPE_p_wxLayoutConstraints swig_types[71] -#define SWIGTYPE_p_wxLocale swig_types[72] -#define SWIGTYPE_p_wxMask swig_types[73] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[74] -#define SWIGTYPE_p_wxMemoryDC swig_types[75] -#define SWIGTYPE_p_wxMenu swig_types[76] -#define SWIGTYPE_p_wxMenuBar swig_types[77] -#define SWIGTYPE_p_wxMenuEvent swig_types[78] -#define SWIGTYPE_p_wxMenuItem swig_types[79] -#define SWIGTYPE_p_wxMetaFile swig_types[80] -#define SWIGTYPE_p_wxMetaFileDC swig_types[81] -#define SWIGTYPE_p_wxMirrorDC swig_types[82] -#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[83] -#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[84] -#define SWIGTYPE_p_wxMouseEvent swig_types[85] -#define SWIGTYPE_p_wxMoveEvent swig_types[86] -#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[87] -#define SWIGTYPE_p_wxNativeFontInfo swig_types[88] -#define SWIGTYPE_p_wxNativePixelData swig_types[89] -#define SWIGTYPE_p_wxNativePixelData_Accessor swig_types[90] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[91] -#define SWIGTYPE_p_wxNcPaintEvent swig_types[92] -#define SWIGTYPE_p_wxNotifyEvent swig_types[93] -#define SWIGTYPE_p_wxObject swig_types[94] -#define SWIGTYPE_p_wxPCXHandler swig_types[95] -#define SWIGTYPE_p_wxPNGHandler swig_types[96] -#define SWIGTYPE_p_wxPNMHandler swig_types[97] -#define SWIGTYPE_p_wxPaintDC swig_types[98] -#define SWIGTYPE_p_wxPaintEvent swig_types[99] -#define SWIGTYPE_p_wxPalette swig_types[100] -#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[101] -#define SWIGTYPE_p_wxPaperSize swig_types[102] -#define SWIGTYPE_p_wxPen swig_types[103] -#define SWIGTYPE_p_wxPenList swig_types[104] -#define SWIGTYPE_p_wxPixelDataBase swig_types[105] -#define SWIGTYPE_p_wxPoint swig_types[106] -#define SWIGTYPE_p_wxPostScriptDC swig_types[107] -#define SWIGTYPE_p_wxPrintData swig_types[108] -#define SWIGTYPE_p_wxPrinterDC swig_types[109] -#define SWIGTYPE_p_wxPseudoDC swig_types[110] -#define SWIGTYPE_p_wxPyApp swig_types[111] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[112] -#define SWIGTYPE_p_wxPyEvent swig_types[113] -#define SWIGTYPE_p_wxPyFontEnumerator swig_types[114] -#define SWIGTYPE_p_wxPyImageHandler swig_types[115] -#define SWIGTYPE_p_wxPyLocale swig_types[116] -#define SWIGTYPE_p_wxPySizer swig_types[117] -#define SWIGTYPE_p_wxPyValidator swig_types[118] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[119] -#define SWIGTYPE_p_wxRect swig_types[120] -#define SWIGTYPE_p_wxRegion swig_types[121] -#define SWIGTYPE_p_wxRegionIterator swig_types[122] -#define SWIGTYPE_p_wxRendererNative swig_types[123] -#define SWIGTYPE_p_wxRendererVersion swig_types[124] -#define SWIGTYPE_p_wxScreenDC swig_types[125] -#define SWIGTYPE_p_wxScrollEvent swig_types[126] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[127] -#define SWIGTYPE_p_wxSetCursorEvent swig_types[128] -#define SWIGTYPE_p_wxShowEvent swig_types[129] -#define SWIGTYPE_p_wxSize swig_types[130] -#define SWIGTYPE_p_wxSizeEvent swig_types[131] -#define SWIGTYPE_p_wxSizer swig_types[132] -#define SWIGTYPE_p_wxSizerItem swig_types[133] -#define SWIGTYPE_p_wxSplitterRenderParams swig_types[134] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[135] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[136] -#define SWIGTYPE_p_wxStockGDI swig_types[137] -#define SWIGTYPE_p_wxString swig_types[138] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[139] -#define SWIGTYPE_p_wxTIFFHandler swig_types[140] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[141] -#define SWIGTYPE_p_wxValidator swig_types[142] -#define SWIGTYPE_p_wxWindow swig_types[143] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[144] -#define SWIGTYPE_p_wxWindowDC swig_types[145] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[146] -#define SWIGTYPE_p_wxXPMHandler swig_types[147] -static swig_type_info *swig_types[149]; -static swig_module_info swig_module = {swig_types, 148, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxHeaderButtonParams swig_types[57] +#define SWIGTYPE_p_wxICOHandler swig_types[58] +#define SWIGTYPE_p_wxIcon swig_types[59] +#define SWIGTYPE_p_wxIconBundle swig_types[60] +#define SWIGTYPE_p_wxIconLocation swig_types[61] +#define SWIGTYPE_p_wxIconizeEvent swig_types[62] +#define SWIGTYPE_p_wxIdleEvent swig_types[63] +#define SWIGTYPE_p_wxImage swig_types[64] +#define SWIGTYPE_p_wxImageHandler swig_types[65] +#define SWIGTYPE_p_wxImageList swig_types[66] +#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[67] +#define SWIGTYPE_p_wxInitDialogEvent swig_types[68] +#define SWIGTYPE_p_wxJPEGHandler swig_types[69] +#define SWIGTYPE_p_wxKeyEvent swig_types[70] +#define SWIGTYPE_p_wxLanguageInfo swig_types[71] +#define SWIGTYPE_p_wxLayoutConstraints swig_types[72] +#define SWIGTYPE_p_wxLocale swig_types[73] +#define SWIGTYPE_p_wxMask swig_types[74] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[75] +#define SWIGTYPE_p_wxMemoryDC swig_types[76] +#define SWIGTYPE_p_wxMenu swig_types[77] +#define SWIGTYPE_p_wxMenuBar swig_types[78] +#define SWIGTYPE_p_wxMenuEvent swig_types[79] +#define SWIGTYPE_p_wxMenuItem swig_types[80] +#define SWIGTYPE_p_wxMetaFile swig_types[81] +#define SWIGTYPE_p_wxMetaFileDC swig_types[82] +#define SWIGTYPE_p_wxMirrorDC swig_types[83] +#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[84] +#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[85] +#define SWIGTYPE_p_wxMouseEvent swig_types[86] +#define SWIGTYPE_p_wxMoveEvent swig_types[87] +#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[88] +#define SWIGTYPE_p_wxNativeFontInfo swig_types[89] +#define SWIGTYPE_p_wxNativePixelData swig_types[90] +#define SWIGTYPE_p_wxNativePixelData_Accessor swig_types[91] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[92] +#define SWIGTYPE_p_wxNcPaintEvent swig_types[93] +#define SWIGTYPE_p_wxNotifyEvent swig_types[94] +#define SWIGTYPE_p_wxObject swig_types[95] +#define SWIGTYPE_p_wxPCXHandler swig_types[96] +#define SWIGTYPE_p_wxPNGHandler swig_types[97] +#define SWIGTYPE_p_wxPNMHandler swig_types[98] +#define SWIGTYPE_p_wxPaintDC swig_types[99] +#define SWIGTYPE_p_wxPaintEvent swig_types[100] +#define SWIGTYPE_p_wxPalette swig_types[101] +#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[102] +#define SWIGTYPE_p_wxPaperSize swig_types[103] +#define SWIGTYPE_p_wxPen swig_types[104] +#define SWIGTYPE_p_wxPenList swig_types[105] +#define SWIGTYPE_p_wxPixelDataBase swig_types[106] +#define SWIGTYPE_p_wxPoint swig_types[107] +#define SWIGTYPE_p_wxPostScriptDC swig_types[108] +#define SWIGTYPE_p_wxPrintData swig_types[109] +#define SWIGTYPE_p_wxPrinterDC swig_types[110] +#define SWIGTYPE_p_wxPseudoDC swig_types[111] +#define SWIGTYPE_p_wxPyApp swig_types[112] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[113] +#define SWIGTYPE_p_wxPyEvent swig_types[114] +#define SWIGTYPE_p_wxPyFontEnumerator swig_types[115] +#define SWIGTYPE_p_wxPyImageHandler swig_types[116] +#define SWIGTYPE_p_wxPyLocale swig_types[117] +#define SWIGTYPE_p_wxPySizer swig_types[118] +#define SWIGTYPE_p_wxPyValidator swig_types[119] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[120] +#define SWIGTYPE_p_wxRect swig_types[121] +#define SWIGTYPE_p_wxRegion swig_types[122] +#define SWIGTYPE_p_wxRegionIterator swig_types[123] +#define SWIGTYPE_p_wxRendererNative swig_types[124] +#define SWIGTYPE_p_wxRendererVersion swig_types[125] +#define SWIGTYPE_p_wxScreenDC swig_types[126] +#define SWIGTYPE_p_wxScrollEvent swig_types[127] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[128] +#define SWIGTYPE_p_wxSetCursorEvent swig_types[129] +#define SWIGTYPE_p_wxShowEvent swig_types[130] +#define SWIGTYPE_p_wxSize swig_types[131] +#define SWIGTYPE_p_wxSizeEvent swig_types[132] +#define SWIGTYPE_p_wxSizer swig_types[133] +#define SWIGTYPE_p_wxSizerItem swig_types[134] +#define SWIGTYPE_p_wxSplitterRenderParams swig_types[135] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[136] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[137] +#define SWIGTYPE_p_wxStockGDI swig_types[138] +#define SWIGTYPE_p_wxString swig_types[139] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[140] +#define SWIGTYPE_p_wxTIFFHandler swig_types[141] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[142] +#define SWIGTYPE_p_wxValidator swig_types[143] +#define SWIGTYPE_p_wxWindow swig_types[144] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[145] +#define SWIGTYPE_p_wxWindowDC swig_types[146] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[147] +#define SWIGTYPE_p_wxXPMHandler swig_types[148] +static swig_type_info *swig_types[150]; +static swig_module_info swig_module = {swig_types, 149, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -15874,6 +15875,38 @@ fail: } +SWIGINTERN PyObject *_wrap_Locale_IsAvailable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + int arg1 ; + bool result; + int val1 ; + int ecode1 = 0 ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "lang", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_IsAvailable",kwnames,&obj0)) SWIG_fail; + ecode1 = SWIG_AsVal_int(obj0, &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "Locale_IsAvailable" "', expected argument " "1"" of type '" "int""'"); + } + arg1 = static_cast< int >(val1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)wxLocale::IsAvailable(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Locale_IsLoaded(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxLocale *arg1 = (wxLocale *) 0 ; @@ -26421,6 +26454,441 @@ SWIGINTERN PyObject *SplitterRenderParams_swiginit(PyObject *SWIGUNUSEDPARM(self return SWIG_Python_InitShadowInstance(args); } +SWIGINTERN PyObject *_wrap_new_HeaderButtonParams(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *result = 0 ; + + if (!SWIG_Python_UnpackTuple(args,"new_HeaderButtonParams",0,0,0)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxHeaderButtonParams *)new wxHeaderButtonParams(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxHeaderButtonParams, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_delete_HeaderButtonParams(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_HeaderButtonParams" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_arrowColour_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxColour *arg2 = (wxColour *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + wxColour temp2 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_arrowColour_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_arrowColour_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + { + arg2 = &temp2; + if ( ! wxColour_helper(swig_obj[1], &arg2)) SWIG_fail; + } + if (arg1) (arg1)->m_arrowColour = *arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_arrowColour_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxColour *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_arrowColour_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (wxColour *)& ((arg1)->m_arrowColour); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_selectionColour_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxColour *arg2 = (wxColour *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + wxColour temp2 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_selectionColour_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_selectionColour_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + { + arg2 = &temp2; + if ( ! wxColour_helper(swig_obj[1], &arg2)) SWIG_fail; + } + if (arg1) (arg1)->m_selectionColour = *arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_selectionColour_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxColour *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_selectionColour_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (wxColour *)& ((arg1)->m_selectionColour); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelText_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxString *arg2 = (wxString *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + bool temp2 = false ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelText_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelText_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + { + arg2 = wxString_in_helper(swig_obj[1]); + if (arg2 == NULL) SWIG_fail; + temp2 = true; + } + if (arg1) (arg1)->m_labelText = *arg2; + + resultobj = SWIG_Py_Void(); + { + if (temp2) + delete arg2; + } + return resultobj; +fail: + { + if (temp2) + delete arg2; + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelText_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxString *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelText_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (wxString *)& ((arg1)->m_labelText); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelFont_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxFont *arg2 = (wxFont *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelFont_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelFont_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxFont, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HeaderButtonParams_m_labelFont_set" "', expected argument " "2"" of type '" "wxFont *""'"); + } + arg2 = reinterpret_cast< wxFont * >(argp2); + if (arg1) (arg1)->m_labelFont = *arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelFont_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxFont *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelFont_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (wxFont *)& ((arg1)->m_labelFont); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelColour_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxColour *arg2 = (wxColour *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + wxColour temp2 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelColour_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelColour_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + { + arg2 = &temp2; + if ( ! wxColour_helper(swig_obj[1], &arg2)) SWIG_fail; + } + if (arg1) (arg1)->m_labelColour = *arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelColour_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxColour *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelColour_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (wxColour *)& ((arg1)->m_labelColour); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelBitmap_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxBitmap *arg2 = (wxBitmap *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelBitmap_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelBitmap_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxBitmap, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HeaderButtonParams_m_labelBitmap_set" "', expected argument " "2"" of type '" "wxBitmap *""'"); + } + arg2 = reinterpret_cast< wxBitmap * >(argp2); + if (arg1) (arg1)->m_labelBitmap = *arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelBitmap_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxBitmap *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelBitmap_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (wxBitmap *)& ((arg1)->m_labelBitmap); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBitmap, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelAlignment_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + int arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelAlignment_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelAlignment_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + ecode2 = SWIG_AsVal_int(swig_obj[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HeaderButtonParams_m_labelAlignment_set" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + if (arg1) (arg1)->m_labelAlignment = arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelAlignment_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelAlignment_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (int) ((arg1)->m_labelAlignment); + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *HeaderButtonParams_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_wxHeaderButtonParams, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *HeaderButtonParams_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + return SWIG_Python_InitShadowInstance(args); +} + SWIGINTERN PyObject *_wrap_new_RendererVersion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; int arg1 ; @@ -26587,6 +27055,8 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButton(PyObject *SWIGUNUSEDP wxDC *arg3 = 0 ; wxRect *arg4 = 0 ; int arg5 = (int) 0 ; + wxHeaderSortIconType arg6 = (wxHeaderSortIconType) wxHDR_SORT_ICON_NONE ; + wxHeaderButtonParams *arg7 = (wxHeaderButtonParams *) NULL ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; @@ -26596,16 +27066,22 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButton(PyObject *SWIGUNUSEDP wxRect temp4 ; int val5 ; int ecode5 = 0 ; + int val6 ; + int ecode6 = 0 ; + void *argp7 = 0 ; + int res7 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "win",(char *) "dc",(char *) "rect",(char *) "flags", NULL + (char *) "self",(char *) "win",(char *) "dc",(char *) "rect",(char *) "flags",(char *) "sortArrow",(char *) "params", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:RendererNative_DrawHeaderButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:RendererNative_DrawHeaderButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRendererNative, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_DrawHeaderButton" "', expected argument " "1"" of type '" "wxRendererNative *""'"); @@ -26635,9 +27111,113 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButton(PyObject *SWIGUNUSEDP } arg5 = static_cast< int >(val5); } + if (obj5) { + ecode6 = SWIG_AsVal_int(obj5, &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "RendererNative_DrawHeaderButton" "', expected argument " "6"" of type '" "wxHeaderSortIconType""'"); + } + arg6 = static_cast< wxHeaderSortIconType >(val6); + } + if (obj6) { + res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "RendererNative_DrawHeaderButton" "', expected argument " "7"" of type '" "wxHeaderButtonParams *""'"); + } + arg7 = reinterpret_cast< wxHeaderButtonParams * >(argp7); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->DrawHeaderButton(arg2,*arg3,(wxRect const &)*arg4,arg5,arg6,arg7); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButtonContents(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxRendererNative *arg1 = (wxRendererNative *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + wxDC *arg3 = 0 ; + wxRect *arg4 = 0 ; + int arg5 = (int) 0 ; + wxHeaderSortIconType arg6 = (wxHeaderSortIconType) wxHDR_SORT_ICON_NONE ; + wxHeaderButtonParams *arg7 = (wxHeaderButtonParams *) NULL ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + wxRect temp4 ; + int val5 ; + int ecode5 = 0 ; + int val6 ; + int ecode6 = 0 ; + void *argp7 = 0 ; + int res7 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "win",(char *) "dc",(char *) "rect",(char *) "flags",(char *) "sortArrow",(char *) "params", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:RendererNative_DrawHeaderButtonContents",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRendererNative, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "1"" of type '" "wxRendererNative *""'"); + } + arg1 = reinterpret_cast< wxRendererNative * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "2"" of type '" "wxWindow *""'"); + } + arg2 = reinterpret_cast< wxWindow * >(argp2); + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxDC, 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "3"" of type '" "wxDC &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "3"" of type '" "wxDC &""'"); + } + arg3 = reinterpret_cast< wxDC * >(argp3); + { + arg4 = &temp4; + if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail; + } + if (obj4) { + ecode5 = SWIG_AsVal_int(obj4, &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "5"" of type '" "int""'"); + } + arg5 = static_cast< int >(val5); + } + if (obj5) { + ecode6 = SWIG_AsVal_int(obj5, &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "6"" of type '" "wxHeaderSortIconType""'"); + } + arg6 = static_cast< wxHeaderSortIconType >(val6); + } + if (obj6) { + res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "7"" of type '" "wxHeaderButtonParams *""'"); + } + arg7 = reinterpret_cast< wxHeaderButtonParams * >(argp7); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawHeaderButton(arg2,*arg3,(wxRect const &)*arg4,arg5); + (arg1)->DrawHeaderButtonContents(arg2,*arg3,(wxRect const &)*arg4,arg5,arg6,arg7); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -26648,6 +27228,45 @@ fail: } +SWIGINTERN PyObject *_wrap_RendererNative_GetHeaderButtonHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxRendererNative *arg1 = (wxRendererNative *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "win", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RendererNative_GetHeaderButtonHeight",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRendererNative, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_GetHeaderButtonHeight" "', expected argument " "1"" of type '" "wxRendererNative *""'"); + } + arg1 = reinterpret_cast< wxRendererNative * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RendererNative_GetHeaderButtonHeight" "', expected argument " "2"" of type '" "wxWindow *""'"); + } + arg2 = reinterpret_cast< wxWindow * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetHeaderButtonHeight(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_RendererNative_DrawTreeItemButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxRendererNative *arg1 = (wxRendererNative *) 0 ; @@ -30883,6 +31502,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Locale_GetCanonicalName", (PyCFunction)_wrap_Locale_GetCanonicalName, METH_O, NULL}, { (char *)"Locale_AddCatalogLookupPathPrefix", (PyCFunction) _wrap_Locale_AddCatalogLookupPathPrefix, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Locale_AddCatalog", (PyCFunction) _wrap_Locale_AddCatalog, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Locale_IsAvailable", (PyCFunction) _wrap_Locale_IsAvailable, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Locale_IsLoaded", (PyCFunction) _wrap_Locale_IsLoaded, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Locale_GetLanguageInfo", (PyCFunction) _wrap_Locale_GetLanguageInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Locale_GetLanguageName", (PyCFunction) _wrap_Locale_GetLanguageName, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -31162,6 +31782,24 @@ static PyMethodDef SwigMethods[] = { { (char *)"SplitterRenderParams_isHotSensitive_get", (PyCFunction)_wrap_SplitterRenderParams_isHotSensitive_get, METH_O, NULL}, { (char *)"SplitterRenderParams_swigregister", SplitterRenderParams_swigregister, METH_VARARGS, NULL}, { (char *)"SplitterRenderParams_swiginit", SplitterRenderParams_swiginit, METH_VARARGS, NULL}, + { (char *)"new_HeaderButtonParams", (PyCFunction)_wrap_new_HeaderButtonParams, METH_NOARGS, NULL}, + { (char *)"delete_HeaderButtonParams", (PyCFunction)_wrap_delete_HeaderButtonParams, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_arrowColour_set", _wrap_HeaderButtonParams_m_arrowColour_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_arrowColour_get", (PyCFunction)_wrap_HeaderButtonParams_m_arrowColour_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_selectionColour_set", _wrap_HeaderButtonParams_m_selectionColour_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_selectionColour_get", (PyCFunction)_wrap_HeaderButtonParams_m_selectionColour_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_labelText_set", _wrap_HeaderButtonParams_m_labelText_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_labelText_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelText_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_labelFont_set", _wrap_HeaderButtonParams_m_labelFont_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_labelFont_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelFont_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_labelColour_set", _wrap_HeaderButtonParams_m_labelColour_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_labelColour_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelColour_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_labelBitmap_set", _wrap_HeaderButtonParams_m_labelBitmap_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_labelBitmap_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelBitmap_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_labelAlignment_set", _wrap_HeaderButtonParams_m_labelAlignment_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_labelAlignment_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelAlignment_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_swigregister", HeaderButtonParams_swigregister, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_swiginit", HeaderButtonParams_swiginit, METH_VARARGS, NULL}, { (char *)"new_RendererVersion", (PyCFunction) _wrap_new_RendererVersion, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_RendererVersion", (PyCFunction)_wrap_delete_RendererVersion, METH_O, NULL}, { (char *)"RendererVersion_IsCompatible", (PyCFunction) _wrap_RendererVersion_IsCompatible, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -31170,6 +31808,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"RendererVersion_swigregister", RendererVersion_swigregister, METH_VARARGS, NULL}, { (char *)"RendererVersion_swiginit", RendererVersion_swiginit, METH_VARARGS, NULL}, { (char *)"RendererNative_DrawHeaderButton", (PyCFunction) _wrap_RendererNative_DrawHeaderButton, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"RendererNative_DrawHeaderButtonContents", (PyCFunction) _wrap_RendererNative_DrawHeaderButtonContents, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"RendererNative_GetHeaderButtonHeight", (PyCFunction) _wrap_RendererNative_GetHeaderButtonHeight, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RendererNative_DrawTreeItemButton", (PyCFunction) _wrap_RendererNative_DrawTreeItemButton, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RendererNative_DrawSplitterBorder", (PyCFunction) _wrap_RendererNative_DrawSplitterBorder, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RendererNative_DrawSplitterSash", (PyCFunction) _wrap_RendererNative_DrawSplitterSash, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -31701,6 +32341,7 @@ static swig_type_info _swigt__p_wxFontList = {"_p_wxFontList", "wxFontList *", 0 static swig_type_info _swigt__p_wxFontMapper = {"_p_wxFontMapper", "wxFontMapper *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxGDIObjListBase = {"_p_wxGDIObjListBase", "wxGDIObjListBase *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxGDIObject = {"_p_wxGDIObject", "wxGDIObject *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_wxHeaderButtonParams = {"_p_wxHeaderButtonParams", "wxHeaderButtonParams *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxIcon = {"_p_wxIcon", "wxIcon *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxIconBundle = {"_p_wxIconBundle", "wxIconBundle *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxIconLocation = {"_p_wxIconLocation", "wxIconLocation *", 0, 0, (void*)0, 0}; @@ -31878,6 +32519,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxGIFHandler, &_swigt__p_wxGridBagSizer, &_swigt__p_wxGridSizer, + &_swigt__p_wxHeaderButtonParams, &_swigt__p_wxICOHandler, &_swigt__p_wxIcon, &_swigt__p_wxIconBundle, @@ -32001,6 +32643,7 @@ static swig_cast_info _swigc__p_wxFontList[] = { {&_swigt__p_wxFontList, 0, 0, static swig_cast_info _swigc__p_wxFontMapper[] = { {&_swigt__p_wxFontMapper, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGDIObjListBase[] = { {&_swigt__p_wxGDIObjListBase, 0, 0, 0}, {&_swigt__p_wxBrushList, _p_wxBrushListTo_p_wxGDIObjListBase, 0, 0}, {&_swigt__p_wxFontList, _p_wxFontListTo_p_wxGDIObjListBase, 0, 0}, {&_swigt__p_wxPenList, _p_wxPenListTo_p_wxGDIObjListBase, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGDIObject[] = { {&_swigt__p_wxIcon, _p_wxIconTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxPen, _p_wxPenTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxFont, _p_wxFontTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxPalette, _p_wxPaletteTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxGDIObject, 0, 0, 0}, {&_swigt__p_wxCursor, _p_wxCursorTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxBitmap, _p_wxBitmapTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxRegion, _p_wxRegionTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxBrush, _p_wxBrushTo_p_wxGDIObject, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxHeaderButtonParams[] = { {&_swigt__p_wxHeaderButtonParams, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxIcon[] = { {&_swigt__p_wxIcon, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxIconBundle[] = { {&_swigt__p_wxIconBundle, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxIconLocation[] = { {&_swigt__p_wxIconLocation, 0, 0, 0},{0, 0, 0, 0}}; @@ -32178,6 +32821,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxGIFHandler, _swigc__p_wxGridBagSizer, _swigc__p_wxGridSizer, + _swigc__p_wxHeaderButtonParams, _swigc__p_wxICOHandler, _swigc__p_wxIcon, _swigc__p_wxIconBundle, @@ -33222,6 +33866,9 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "CONTROL_UNDETERMINED",SWIG_From_int(static_cast< int >(wxCONTROL_UNDETERMINED))); SWIG_Python_SetConstant(d, "CONTROL_FLAGS_MASK",SWIG_From_int(static_cast< int >(wxCONTROL_FLAGS_MASK))); SWIG_Python_SetConstant(d, "CONTROL_DIRTY",SWIG_From_int(static_cast< int >(wxCONTROL_DIRTY))); + SWIG_Python_SetConstant(d, "HDR_SORT_ICON_NONE",SWIG_From_int(static_cast< int >(wxHDR_SORT_ICON_NONE))); + SWIG_Python_SetConstant(d, "HDR_SORT_ICON_UP",SWIG_From_int(static_cast< int >(wxHDR_SORT_ICON_UP))); + SWIG_Python_SetConstant(d, "HDR_SORT_ICON_DOWN",SWIG_From_int(static_cast< int >(wxHDR_SORT_ICON_DOWN))); SWIG_Python_SetConstant(d, "RendererVersion_Current_Version",SWIG_From_int(static_cast< int >(wxRendererVersion::Current_Version))); SWIG_Python_SetConstant(d, "RendererVersion_Current_Age",SWIG_From_int(static_cast< int >(wxRendererVersion::Current_Age))); diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py index 60efcf8476..ccee8ff4eb 100644 --- a/wxPython/src/gtk/_misc.py +++ b/wxPython/src/gtk/_misc.py @@ -1186,6 +1186,20 @@ class PlatformInformation(object): """IsOk(self) -> bool""" return _misc_.PlatformInformation_IsOk(*args, **kwargs) + ArchName = property(GetArchName,doc="See `GetArchName`") + Architecture = property(GetArchitecture,SetArchitecture,doc="See `GetArchitecture` and `SetArchitecture`") + Endianness = property(GetEndianness,SetEndianness,doc="See `GetEndianness` and `SetEndianness`") + EndiannessName = property(GetEndiannessName,doc="See `GetEndiannessName`") + OSMajorVersion = property(GetOSMajorVersion,doc="See `GetOSMajorVersion`") + OSMinorVersion = property(GetOSMinorVersion,doc="See `GetOSMinorVersion`") + OperatingSystemFamilyName = property(GetOperatingSystemFamilyName,doc="See `GetOperatingSystemFamilyName`") + OperatingSystemId = property(GetOperatingSystemId,SetOperatingSystemId,doc="See `GetOperatingSystemId` and `SetOperatingSystemId`") + OperatingSystemIdName = property(GetOperatingSystemIdName,doc="See `GetOperatingSystemIdName`") + PortId = property(GetPortId,SetPortId,doc="See `GetPortId` and `SetPortId`") + PortIdName = property(GetPortIdName,doc="See `GetPortIdName`") + PortIdShortName = property(GetPortIdShortName,doc="See `GetPortIdShortName`") + ToolkitMajorVersion = property(GetToolkitMajorVersion,doc="See `GetToolkitMajorVersion`") + ToolkitMinorVersion = property(GetToolkitMinorVersion,doc="See `GetToolkitMinorVersion`") _misc_.PlatformInformation_swigregister(PlatformInformation) @@ -1906,6 +1920,12 @@ class Process(_core.EvtHandler): """IsErrorAvailable(self) -> bool""" return _misc_.Process_IsErrorAvailable(*args, **kwargs) + ErrorStream = property(GetErrorStream,doc="See `GetErrorStream`") + InputStream = property(GetInputStream,doc="See `GetInputStream`") + OutputStream = property(GetOutputStream,doc="See `GetOutputStream`") + InputOpened = property(IsInputOpened) + InputAvailable = property(IsInputAvailable) + ErrorAvailable = property(IsErrorAvailable) _misc_.Process_swigregister(Process) def Process_Kill(*args, **kwargs): @@ -1937,6 +1957,8 @@ class ProcessEvent(_core.Event): m_pid = property(_misc_.ProcessEvent_m_pid_get, _misc_.ProcessEvent_m_pid_set) m_exitcode = property(_misc_.ProcessEvent_m_exitcode_get, _misc_.ProcessEvent_m_exitcode_set) + ExitCode = property(GetExitCode,doc="See `GetExitCode`") + Pid = property(GetPid,doc="See `GetPid`") _misc_.ProcessEvent_swigregister(ProcessEvent) wxEVT_END_PROCESS = _misc_.wxEVT_END_PROCESS diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py index 018e16ac5a..eba3873d8b 100644 --- a/wxPython/src/gtk/_windows.py +++ b/wxPython/src/gtk/_windows.py @@ -270,6 +270,10 @@ class ScrolledWindow(Panel): return _windows_.ScrolledWindow_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + ScaleX = property(GetScaleX,doc="See `GetScaleX`") + ScaleY = property(GetScaleY,doc="See `GetScaleY`") + TargetWindow = property(GetTargetWindow,SetTargetWindow,doc="See `GetTargetWindow` and `SetTargetWindow`") + ViewStart = property(GetViewStart,doc="See `GetViewStart`") _windows_.ScrolledWindow_swigregister(ScrolledWindow) def PreScrolledWindow(*args, **kwargs): @@ -785,6 +789,7 @@ class SplashScreenWindow(_core.Window): """GetBitmap(self) -> Bitmap""" return _windows_.SplashScreenWindow_GetBitmap(*args, **kwargs) + Bitmap = property(GetBitmap,SetBitmap,doc="See `GetBitmap` and `SetBitmap`") _windows_.SplashScreenWindow_swigregister(SplashScreenWindow) class SplashScreen(Frame): @@ -812,6 +817,9 @@ class SplashScreen(Frame): """GetTimeout(self) -> int""" return _windows_.SplashScreen_GetTimeout(*args, **kwargs) + SplashStyle = property(GetSplashStyle,doc="See `GetSplashStyle`") + SplashWindow = property(GetSplashWindow,doc="See `GetSplashWindow`") + Timeout = property(GetTimeout,doc="See `GetTimeout`") _windows_.SplashScreen_swigregister(SplashScreen) #--------------------------------------------------------------------------- @@ -911,7 +919,12 @@ class StatusBar(_core.Window): for i in range(len(items)): self.SetStatusText(items[i], i) - Fields = property(GetFields,SetFields) + BorderX = property(GetBorderX,doc="See `GetBorderX`") + BorderY = property(GetBorderY,doc="See `GetBorderY`") + FieldRect = property(GetFieldRect,doc="See `GetFieldRect`") + Fields = property(GetFields,SetFields,doc="See `GetFields` and `SetFields`") + FieldsCount = property(GetFieldsCount,SetFieldsCount,doc="See `GetFieldsCount` and `SetFieldsCount`") + StatusText = property(GetStatusText,SetStatusText,doc="See `GetStatusText` and `SetStatusText`") _windows_.StatusBar_swigregister(StatusBar) def PreStatusBar(*args, **kwargs): @@ -1235,6 +1248,15 @@ class SplitterWindow(_core.Window): return _windows_.SplitterWindow_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + BorderSize = property(GetBorderSize,SetBorderSize,doc="See `GetBorderSize` and `SetBorderSize`") + MinimumPaneSize = property(GetMinimumPaneSize,SetMinimumPaneSize,doc="See `GetMinimumPaneSize` and `SetMinimumPaneSize`") + NeedUpdating = property(GetNeedUpdating,SetNeedUpdating,doc="See `GetNeedUpdating` and `SetNeedUpdating`") + SashGravity = property(GetSashGravity,SetSashGravity,doc="See `GetSashGravity` and `SetSashGravity`") + SashPosition = property(GetSashPosition,SetSashPosition,doc="See `GetSashPosition` and `SetSashPosition`") + SashSize = property(GetSashSize,SetSashSize,doc="See `GetSashSize` and `SetSashSize`") + SplitMode = property(GetSplitMode,SetSplitMode,doc="See `GetSplitMode` and `SetSplitMode`") + Window1 = property(GetWindow1,doc="See `GetWindow1`") + Window2 = property(GetWindow2,doc="See `GetWindow2`") _windows_.SplitterWindow_swigregister(SplitterWindow) SplitterNameStr = cvar.SplitterNameStr @@ -1324,6 +1346,10 @@ class SplitterEvent(_core.NotifyEvent): """ return _windows_.SplitterEvent_GetY(*args, **kwargs) + SashPosition = property(GetSashPosition,SetSashPosition,doc="See `GetSashPosition` and `SetSashPosition`") + WindowBeingRemoved = property(GetWindowBeingRemoved,doc="See `GetWindowBeingRemoved`") + X = property(GetX,doc="See `GetX`") + Y = property(GetY,doc="See `GetY`") _windows_.SplitterEvent_swigregister(SplitterEvent) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = _windows_.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED @@ -1448,6 +1474,12 @@ class SashWindow(_core.Window): """SizeWindows(self)""" return _windows_.SashWindow_SizeWindows(*args, **kwargs) + DefaultBorderSize = property(GetDefaultBorderSize,SetDefaultBorderSize,doc="See `GetDefaultBorderSize` and `SetDefaultBorderSize`") + ExtraBorderSize = property(GetExtraBorderSize,SetExtraBorderSize,doc="See `GetExtraBorderSize` and `SetExtraBorderSize`") + MaximumSizeX = property(GetMaximumSizeX,SetMaximumSizeX,doc="See `GetMaximumSizeX` and `SetMaximumSizeX`") + MaximumSizeY = property(GetMaximumSizeY,SetMaximumSizeY,doc="See `GetMaximumSizeY` and `SetMaximumSizeY`") + MinimumSizeX = property(GetMinimumSizeX,SetMinimumSizeX,doc="See `GetMinimumSizeX` and `SetMinimumSizeX`") + MinimumSizeY = property(GetMinimumSizeY,SetMinimumSizeY,doc="See `GetMinimumSizeY` and `SetMinimumSizeY`") _windows_.SashWindow_swigregister(SashWindow) SashNameStr = cvar.SashNameStr SashLayoutNameStr = cvar.SashLayoutNameStr @@ -1490,6 +1522,9 @@ class SashEvent(_core.CommandEvent): """GetDragStatus(self) -> int""" return _windows_.SashEvent_GetDragStatus(*args, **kwargs) + DragRect = property(GetDragRect,SetDragRect,doc="See `GetDragRect` and `SetDragRect`") + DragStatus = property(GetDragStatus,SetDragStatus,doc="See `GetDragStatus` and `SetDragStatus`") + Edge = property(GetEdge,SetEdge,doc="See `GetEdge` and `SetEdge`") _windows_.SashEvent_swigregister(SashEvent) wxEVT_SASH_DRAGGED = _windows_.wxEVT_SASH_DRAGGED @@ -1558,6 +1593,11 @@ class QueryLayoutInfoEvent(_core.Event): """GetAlignment(self) -> int""" return _windows_.QueryLayoutInfoEvent_GetAlignment(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") + Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") + RequestedLength = property(GetRequestedLength,SetRequestedLength,doc="See `GetRequestedLength` and `SetRequestedLength`") + Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") _windows_.QueryLayoutInfoEvent_swigregister(QueryLayoutInfoEvent) class CalculateLayoutEvent(_core.Event): @@ -1631,6 +1671,8 @@ class SashLayoutWindow(SashWindow): """SetOrientation(self, int orientation)""" return _windows_.SashLayoutWindow_SetOrientation(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") _windows_.SashLayoutWindow_swigregister(SashLayoutWindow) def PreSashLayoutWindow(*args, **kwargs): @@ -2519,6 +2561,8 @@ class SingleChoiceDialog(Dialog): """ return _windows_.SingleChoiceDialog_SetSelection(*args, **kwargs) + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + StringSelection = property(GetStringSelection,doc="See `GetStringSelection`") _windows_.SingleChoiceDialog_swigregister(SingleChoiceDialog) TextEntryDialogStyle = _windows_.TextEntryDialogStyle @@ -3889,6 +3933,19 @@ class PrintData(_core.Object): """SetPrivData(self, PyObject data)""" return _windows_.PrintData_SetPrivData(*args, **kwargs) + Bin = property(GetBin,SetBin,doc="See `GetBin` and `SetBin`") + Collate = property(GetCollate,SetCollate,doc="See `GetCollate` and `SetCollate`") + Colour = property(GetColour,SetColour,doc="See `GetColour` and `SetColour`") + Duplex = property(GetDuplex,SetDuplex,doc="See `GetDuplex` and `SetDuplex`") + Filename = property(GetFilename,SetFilename,doc="See `GetFilename` and `SetFilename`") + NoCopies = property(GetNoCopies,SetNoCopies,doc="See `GetNoCopies` and `SetNoCopies`") + Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") + PaperId = property(GetPaperId,SetPaperId,doc="See `GetPaperId` and `SetPaperId`") + PaperSize = property(GetPaperSize,SetPaperSize,doc="See `GetPaperSize` and `SetPaperSize`") + PrintMode = property(GetPrintMode,SetPrintMode,doc="See `GetPrintMode` and `SetPrintMode`") + PrinterName = property(GetPrinterName,SetPrinterName,doc="See `GetPrinterName` and `SetPrinterName`") + PrivData = property(GetPrivData,SetPrivData,doc="See `GetPrivData` and `SetPrivData`") + Quality = property(GetQuality,SetQuality,doc="See `GetQuality` and `SetQuality`") _windows_.PrintData_swigregister(PrintData) PrintoutTitleStr = cvar.PrintoutTitleStr PreviewCanvasNameStr = cvar.PreviewCanvasNameStr @@ -4031,6 +4088,15 @@ class PageSetupDialogData(_core.Object): return _windows_.PageSetupDialogData_CalculatePaperSizeFromId(*args, **kwargs) def __nonzero__(self): return self.Ok() + DefaultInfo = property(GetDefaultInfo,SetDefaultInfo,doc="See `GetDefaultInfo` and `SetDefaultInfo`") + DefaultMinMargins = property(GetDefaultMinMargins,SetDefaultMinMargins,doc="See `GetDefaultMinMargins` and `SetDefaultMinMargins`") + MarginBottomRight = property(GetMarginBottomRight,SetMarginBottomRight,doc="See `GetMarginBottomRight` and `SetMarginBottomRight`") + MarginTopLeft = property(GetMarginTopLeft,SetMarginTopLeft,doc="See `GetMarginTopLeft` and `SetMarginTopLeft`") + MinMarginBottomRight = property(GetMinMarginBottomRight,SetMinMarginBottomRight,doc="See `GetMinMarginBottomRight` and `SetMinMarginBottomRight`") + MinMarginTopLeft = property(GetMinMarginTopLeft,SetMinMarginTopLeft,doc="See `GetMinMarginTopLeft` and `SetMinMarginTopLeft`") + PaperId = property(GetPaperId,SetPaperId,doc="See `GetPaperId` and `SetPaperId`") + PaperSize = property(GetPaperSize,SetPaperSize,doc="See `GetPaperSize` and `SetPaperSize`") + PrintData = property(GetPrintData,SetPrintData,doc="See `GetPrintData` and `SetPrintData`") _windows_.PageSetupDialogData_swigregister(PageSetupDialogData) class PageSetupDialog(_core.Object): @@ -4055,6 +4121,8 @@ class PageSetupDialog(_core.Object): return _windows_.PageSetupDialog_ShowModal(*args, **kwargs) def Destroy(self): pass + PageSetupData = property(GetPageSetupData,doc="See `GetPageSetupData`") + PageSetupDialogData = property(GetPageSetupDialogData,doc="See `GetPageSetupDialogData`") _windows_.PageSetupDialog_swigregister(PageSetupDialog) class PrintDialogData(_core.Object): @@ -4187,6 +4255,16 @@ class PrintDialogData(_core.Object): return _windows_.PrintDialogData_SetPrintData(*args, **kwargs) def __nonzero__(self): return self.Ok() + AllPages = property(GetAllPages,SetAllPages,doc="See `GetAllPages` and `SetAllPages`") + Collate = property(GetCollate,SetCollate,doc="See `GetCollate` and `SetCollate`") + FromPage = property(GetFromPage,SetFromPage,doc="See `GetFromPage` and `SetFromPage`") + MaxPage = property(GetMaxPage,SetMaxPage,doc="See `GetMaxPage` and `SetMaxPage`") + MinPage = property(GetMinPage,SetMinPage,doc="See `GetMinPage` and `SetMinPage`") + NoCopies = property(GetNoCopies,SetNoCopies,doc="See `GetNoCopies` and `SetNoCopies`") + PrintData = property(GetPrintData,SetPrintData,doc="See `GetPrintData` and `SetPrintData`") + PrintToFile = property(GetPrintToFile,SetPrintToFile,doc="See `GetPrintToFile` and `SetPrintToFile`") + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + ToPage = property(GetToPage,SetToPage,doc="See `GetToPage` and `SetToPage`") _windows_.PrintDialogData_swigregister(PrintDialogData) class PrintDialog(_core.Object): @@ -4215,6 +4293,9 @@ class PrintDialog(_core.Object): return _windows_.PrintDialog_GetPrintDC(*args, **kwargs) def Destroy(self): pass + PrintDC = property(GetPrintDC,doc="See `GetPrintDC`") + PrintData = property(GetPrintData,doc="See `GetPrintData`") + PrintDialogData = property(GetPrintDialogData,doc="See `GetPrintDialogData`") _windows_.PrintDialog_swigregister(PrintDialog) PRINTER_NO_ERROR = _windows_.PRINTER_NO_ERROR @@ -4262,6 +4343,8 @@ class Printer(_core.Object): return _windows_.Printer_GetLastError(*args, **kwargs) GetLastError = staticmethod(GetLastError) + Abort = property(GetAbort,doc="See `GetAbort`") + PrintDialogData = property(GetPrintDialogData,doc="See `GetPrintDialogData`") _windows_.Printer_swigregister(Printer) def Printer_GetLastError(*args): @@ -4393,6 +4476,12 @@ class Printout(_core.Object): base_GetPageInfo = wx._deprecated(base_GetPageInfo, "Please use Printout.GetPageInfo instead.") + DC = property(GetDC,SetDC,doc="See `GetDC` and `SetDC`") + PPIPrinter = property(GetPPIPrinter,SetPPIPrinter,doc="See `GetPPIPrinter` and `SetPPIPrinter`") + PPIScreen = property(GetPPIScreen,SetPPIScreen,doc="See `GetPPIScreen` and `SetPPIScreen`") + PageSizeMM = property(GetPageSizeMM,SetPageSizeMM,doc="See `GetPageSizeMM` and `SetPageSizeMM`") + PageSizePixels = property(GetPageSizePixels,SetPageSizePixels,doc="See `GetPageSizePixels` and `SetPageSizePixels`") + Title = property(GetTitle,doc="See `GetTitle`") _windows_.Printout_swigregister(Printout) class PreviewCanvas(ScrolledWindow): @@ -4439,6 +4528,7 @@ class PreviewFrame(Frame): """GetControlBar(self) -> PreviewControlBar""" return _windows_.PreviewFrame_GetControlBar(*args, **kwargs) + ControlBar = property(GetControlBar,doc="See `GetControlBar`") _windows_.PreviewFrame_swigregister(PreviewFrame) PREVIEW_PRINT = _windows_.PREVIEW_PRINT @@ -4502,6 +4592,8 @@ class PreviewControlBar(Panel): """OnGoto(self)""" return _windows_.PreviewControlBar_OnGoto(*args, **kwargs) + PrintPreview = property(GetPrintPreview,doc="See `GetPrintPreview`") + ZoomControl = property(GetZoomControl,SetZoomControl,doc="See `GetZoomControl` and `SetZoomControl`") _windows_.PreviewControlBar_swigregister(PreviewControlBar) class PrintPreview(_core.Object): @@ -4605,6 +4697,15 @@ class PrintPreview(_core.Object): return _windows_.PrintPreview_DetermineScaling(*args, **kwargs) def __nonzero__(self): return self.Ok() + Canvas = property(GetCanvas,SetCanvas,doc="See `GetCanvas` and `SetCanvas`") + CurrentPage = property(GetCurrentPage,SetCurrentPage,doc="See `GetCurrentPage` and `SetCurrentPage`") + Frame = property(GetFrame,SetFrame,doc="See `GetFrame` and `SetFrame`") + MaxPage = property(GetMaxPage,doc="See `GetMaxPage`") + MinPage = property(GetMinPage,doc="See `GetMinPage`") + PrintDialogData = property(GetPrintDialogData,doc="See `GetPrintDialogData`") + Printout = property(GetPrintout,SetPrintout,doc="See `GetPrintout` and `SetPrintout`") + PrintoutForPrinting = property(GetPrintoutForPrinting,doc="See `GetPrintoutForPrinting`") + Zoom = property(GetZoom,SetZoom,doc="See `GetZoom` and `SetZoom`") _windows_.PrintPreview_swigregister(PrintPreview) class PyPrintPreview(PrintPreview): diff --git a/wxPython/src/gtk/xrc.py b/wxPython/src/gtk/xrc.py index ecac915e01..c90dd9a978 100644 --- a/wxPython/src/gtk/xrc.py +++ b/wxPython/src/gtk/xrc.py @@ -366,6 +366,18 @@ class XmlNode(object): """GetContent(self) -> String""" return _xrc.XmlNode_GetContent(*args, **kwargs) + def IsWhitespaceOnly(*args, **kwargs): + """IsWhitespaceOnly(self) -> bool""" + return _xrc.XmlNode_IsWhitespaceOnly(*args, **kwargs) + + def GetDepth(*args, **kwargs): + """GetDepth(self, XmlNode grandparent=None) -> int""" + return _xrc.XmlNode_GetDepth(*args, **kwargs) + + def GetNodeContent(*args, **kwargs): + """GetNodeContent(self) -> String""" + return _xrc.XmlNode_GetNodeContent(*args, **kwargs) + def GetParent(*args, **kwargs): """GetParent(self) -> XmlNode""" return _xrc.XmlNode_GetParent(*args, **kwargs) @@ -425,6 +437,9 @@ def XmlNodeEasy(*args, **kwargs): val = _xrc.new_XmlNodeEasy(*args, **kwargs) return val +XML_NO_INDENTATION = _xrc.XML_NO_INDENTATION +XMLDOC_NONE = _xrc.XMLDOC_NONE +XMLDOC_KEEP_WHITESPACE_NODES = _xrc.XMLDOC_KEEP_WHITESPACE_NODES class XmlDocument(_core.Object): """Proxy of C++ XmlDocument class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') @@ -435,19 +450,19 @@ class XmlDocument(_core.Object): __swig_destroy__ = _xrc.delete_XmlDocument __del__ = lambda self : None; def Load(*args, **kwargs): - """Load(self, String filename, String encoding=UTF8String) -> bool""" + """Load(self, String filename, String encoding=UTF8String, int flags=XMLDOC_NONE) -> bool""" return _xrc.XmlDocument_Load(*args, **kwargs) def LoadFromStream(*args, **kwargs): - """LoadFromStream(self, InputStream stream, String encoding=UTF8String) -> bool""" + """LoadFromStream(self, InputStream stream, String encoding=UTF8String, int flags=XMLDOC_NONE) -> bool""" return _xrc.XmlDocument_LoadFromStream(*args, **kwargs) def Save(*args, **kwargs): - """Save(self, String filename) -> bool""" + """Save(self, String filename, int indentstep=1) -> bool""" return _xrc.XmlDocument_Save(*args, **kwargs) def SaveToStream(*args, **kwargs): - """SaveToStream(self, OutputStream stream) -> bool""" + """SaveToStream(self, OutputStream stream, int indentstep=1) -> bool""" return _xrc.XmlDocument_SaveToStream(*args, **kwargs) def IsOk(*args, **kwargs): diff --git a/wxPython/src/gtk/xrc_wrap.cpp b/wxPython/src/gtk/xrc_wrap.cpp index b16bbb0b07..d7c29b364d 100644 --- a/wxPython/src/gtk/xrc_wrap.cpp +++ b/wxPython/src/gtk/xrc_wrap.cpp @@ -5668,6 +5668,111 @@ fail: } +SWIGINTERN PyObject *_wrap_XmlNode_IsWhitespaceOnly(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxXmlNode *arg1 = (wxXmlNode *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxXmlNode, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlNode_IsWhitespaceOnly" "', expected argument " "1"" of type '" "wxXmlNode const *""'"); + } + arg1 = reinterpret_cast< wxXmlNode * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxXmlNode const *)arg1)->IsWhitespaceOnly(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_XmlNode_GetDepth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxXmlNode *arg1 = (wxXmlNode *) 0 ; + wxXmlNode *arg2 = (wxXmlNode *) NULL ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "grandparent", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:XmlNode_GetDepth",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxXmlNode, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlNode_GetDepth" "', expected argument " "1"" of type '" "wxXmlNode const *""'"); + } + arg1 = reinterpret_cast< wxXmlNode * >(argp1); + if (obj1) { + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxXmlNode, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "XmlNode_GetDepth" "', expected argument " "2"" of type '" "wxXmlNode *""'"); + } + arg2 = reinterpret_cast< wxXmlNode * >(argp2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxXmlNode const *)arg1)->GetDepth(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_XmlNode_GetNodeContent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxXmlNode *arg1 = (wxXmlNode *) 0 ; + wxString result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxXmlNode, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlNode_GetNodeContent" "', expected argument " "1"" of type '" "wxXmlNode const *""'"); + } + arg1 = reinterpret_cast< wxXmlNode * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxXmlNode const *)arg1)->GetNodeContent(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_XmlNode_GetParent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxXmlNode *arg1 = (wxXmlNode *) 0 ; @@ -6359,19 +6464,23 @@ SWIGINTERN PyObject *_wrap_XmlDocument_Load(PyObject *SWIGUNUSEDPARM(self), PyOb wxString *arg2 = 0 ; wxString const &arg3_defvalue = wxPyUTF8String ; wxString *arg3 = (wxString *) &arg3_defvalue ; + int arg4 = (int) wxXMLDOC_NONE ; bool result; void *argp1 = 0 ; int res1 = 0 ; bool temp2 = false ; bool temp3 = false ; + int val4 ; + int ecode4 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "filename",(char *) "encoding", NULL + (char *) "self",(char *) "filename",(char *) "encoding",(char *) "flags", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:XmlDocument_Load",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:XmlDocument_Load",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxXmlDocument, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlDocument_Load" "', expected argument " "1"" of type '" "wxXmlDocument *""'"); @@ -6389,9 +6498,16 @@ SWIGINTERN PyObject *_wrap_XmlDocument_Load(PyObject *SWIGUNUSEDPARM(self), PyOb temp3 = true; } } + if (obj3) { + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "XmlDocument_Load" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Load((wxString const &)*arg2,(wxString const &)*arg3); + result = (bool)(arg1)->Load((wxString const &)*arg2,(wxString const &)*arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6426,20 +6542,24 @@ SWIGINTERN PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *SWIGUNUSEDPARM(s wxInputStream *arg2 = 0 ; wxString const &arg3_defvalue = wxPyUTF8String ; wxString *arg3 = (wxString *) &arg3_defvalue ; + int arg4 = (int) wxXMLDOC_NONE ; bool result; void *argp1 = 0 ; int res1 = 0 ; wxPyInputStream *temp2 ; bool created2 ; bool temp3 = false ; + int val4 ; + int ecode4 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "stream",(char *) "encoding", NULL + (char *) "self",(char *) "stream",(char *) "encoding",(char *) "flags", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:XmlDocument_LoadFromStream",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:XmlDocument_LoadFromStream",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxXmlDocument, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlDocument_LoadFromStream" "', expected argument " "1"" of type '" "wxXmlDocument *""'"); @@ -6466,9 +6586,16 @@ SWIGINTERN PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *SWIGUNUSEDPARM(s temp3 = true; } } + if (obj3) { + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "XmlDocument_LoadFromStream" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Load(*arg2,(wxString const &)*arg3); + result = (bool)(arg1)->Load(*arg2,(wxString const &)*arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6499,17 +6626,21 @@ SWIGINTERN PyObject *_wrap_XmlDocument_Save(PyObject *SWIGUNUSEDPARM(self), PyOb PyObject *resultobj = 0; wxXmlDocument *arg1 = (wxXmlDocument *) 0 ; wxString *arg2 = 0 ; + int arg3 = (int) 1 ; bool result; void *argp1 = 0 ; int res1 = 0 ; bool temp2 = false ; + int val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "filename", NULL + (char *) "self",(char *) "filename",(char *) "indentstep", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:XmlDocument_Save",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:XmlDocument_Save",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxXmlDocument, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlDocument_Save" "', expected argument " "1"" of type '" "wxXmlDocument const *""'"); @@ -6520,9 +6651,16 @@ SWIGINTERN PyObject *_wrap_XmlDocument_Save(PyObject *SWIGUNUSEDPARM(self), PyOb if (arg2 == NULL) SWIG_fail; temp2 = true; } + if (obj2) { + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "XmlDocument_Save" "', expected argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxXmlDocument const *)arg1)->Save((wxString const &)*arg2); + result = (bool)((wxXmlDocument const *)arg1)->Save((wxString const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6547,18 +6685,22 @@ SWIGINTERN PyObject *_wrap_XmlDocument_SaveToStream(PyObject *SWIGUNUSEDPARM(sel PyObject *resultobj = 0; wxXmlDocument *arg1 = (wxXmlDocument *) 0 ; wxOutputStream *arg2 = 0 ; + int arg3 = (int) 1 ; bool result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + int val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "stream", NULL + (char *) "self",(char *) "stream",(char *) "indentstep", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:XmlDocument_SaveToStream",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:XmlDocument_SaveToStream",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxXmlDocument, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlDocument_SaveToStream" "', expected argument " "1"" of type '" "wxXmlDocument const *""'"); @@ -6572,9 +6714,16 @@ SWIGINTERN PyObject *_wrap_XmlDocument_SaveToStream(PyObject *SWIGUNUSEDPARM(sel SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "XmlDocument_SaveToStream" "', expected argument " "2"" of type '" "wxOutputStream &""'"); } arg2 = reinterpret_cast< wxOutputStream * >(argp2); + if (obj2) { + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "XmlDocument_SaveToStream" "', expected argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxXmlDocument const *)arg1)->Save(*arg2); + result = (bool)((wxXmlDocument const *)arg1)->Save(*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8558,6 +8707,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"XmlNode_GetType", (PyCFunction)_wrap_XmlNode_GetType, METH_O, NULL}, { (char *)"XmlNode_GetName", (PyCFunction)_wrap_XmlNode_GetName, METH_O, NULL}, { (char *)"XmlNode_GetContent", (PyCFunction)_wrap_XmlNode_GetContent, METH_O, NULL}, + { (char *)"XmlNode_IsWhitespaceOnly", (PyCFunction)_wrap_XmlNode_IsWhitespaceOnly, METH_O, NULL}, + { (char *)"XmlNode_GetDepth", (PyCFunction) _wrap_XmlNode_GetDepth, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"XmlNode_GetNodeContent", (PyCFunction)_wrap_XmlNode_GetNodeContent, METH_O, NULL}, { (char *)"XmlNode_GetParent", (PyCFunction)_wrap_XmlNode_GetParent, METH_O, NULL}, { (char *)"XmlNode_GetNext", (PyCFunction)_wrap_XmlNode_GetNext, METH_O, NULL}, { (char *)"XmlNode_GetChildren", (PyCFunction)_wrap_XmlNode_GetChildren, METH_O, NULL}, @@ -9843,6 +9995,9 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "XML_DOCUMENT_FRAG_NODE",SWIG_From_int(static_cast< int >(wxXML_DOCUMENT_FRAG_NODE))); SWIG_Python_SetConstant(d, "XML_NOTATION_NODE",SWIG_From_int(static_cast< int >(wxXML_NOTATION_NODE))); SWIG_Python_SetConstant(d, "XML_HTML_DOCUMENT_NODE",SWIG_From_int(static_cast< int >(wxXML_HTML_DOCUMENT_NODE))); + SWIG_Python_SetConstant(d, "XML_NO_INDENTATION",SWIG_From_int(static_cast< int >(wxXML_NO_INDENTATION))); + SWIG_Python_SetConstant(d, "XMLDOC_NONE",SWIG_From_int(static_cast< int >(wxXMLDOC_NONE))); + SWIG_Python_SetConstant(d, "XMLDOC_KEEP_WHITESPACE_NODES",SWIG_From_int(static_cast< int >(wxXMLDOC_KEEP_WHITESPACE_NODES))); wxXmlInitResourceModule(); diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py index 10bf1310b1..616cc0206d 100644 --- a/wxPython/src/mac/_controls.py +++ b/wxPython/src/mac/_controls.py @@ -2053,6 +2053,10 @@ class ScrollBar(_core.Control): return _controls_.ScrollBar_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + PageSize = property(GetPageSize,doc="See `GetPageSize`") + Range = property(GetRange,doc="See `GetRange`") + ThumbPosition = property(GetThumbPosition,SetThumbPosition,doc="See `GetThumbPosition` and `SetThumbPosition`") + ThumbSize = property(GetThumbSize,doc="See `GetThumbSize`") _controls_.ScrollBar_swigregister(ScrollBar) ScrollBarNameStr = cvar.ScrollBarNameStr @@ -2155,6 +2159,9 @@ class SpinButton(_core.Control): return _controls_.SpinButton_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + Max = property(GetMax,SetMax,doc="See `GetMax` and `SetMax`") + Min = property(GetMin,SetMin,doc="See `GetMin` and `SetMin`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _controls_.SpinButton_swigregister(SpinButton) SPIN_BUTTON_NAME = cvar.SPIN_BUTTON_NAME SpinCtrlNameStr = cvar.SpinCtrlNameStr @@ -2250,6 +2257,9 @@ class SpinCtrl(_core.Control): return _controls_.SpinCtrl_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + Max = property(GetMax,doc="See `GetMax`") + Min = property(GetMin,doc="See `GetMin`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _controls_.SpinCtrl_swigregister(SpinCtrl) def PreSpinCtrl(*args, **kwargs): @@ -2289,6 +2299,7 @@ class SpinEvent(_core.NotifyEvent): """SetPosition(self, int pos)""" return _controls_.SpinEvent_SetPosition(*args, **kwargs) + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") _controls_.SpinEvent_swigregister(SpinEvent) wxEVT_COMMAND_SPINCTRL_UPDATED = _controls_.wxEVT_COMMAND_SPINCTRL_UPDATED @@ -2423,6 +2434,11 @@ class RadioBox(_core.Control): return _controls_.RadioBox_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + ColumnCount = property(GetColumnCount,doc="See `GetColumnCount`") + Count = property(GetCount,doc="See `GetCount`") + RowCount = property(GetRowCount,doc="See `GetRowCount`") + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + StringSelection = property(GetStringSelection,SetStringSelection,doc="See `GetStringSelection` and `SetStringSelection`") _controls_.RadioBox_swigregister(RadioBox) RadioBoxNameStr = cvar.RadioBoxNameStr RadioButtonNameStr = cvar.RadioButtonNameStr @@ -2500,6 +2516,7 @@ class RadioButton(_core.Control): return _controls_.RadioButton_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _controls_.RadioButton_swigregister(RadioButton) def PreRadioButton(*args, **kwargs): @@ -2666,6 +2683,15 @@ class Slider(_core.Control): return _controls_.Slider_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + LineSize = property(GetLineSize,SetLineSize,doc="See `GetLineSize` and `SetLineSize`") + Max = property(GetMax,SetMax,doc="See `GetMax` and `SetMax`") + Min = property(GetMin,SetMin,doc="See `GetMin` and `SetMin`") + PageSize = property(GetPageSize,SetPageSize,doc="See `GetPageSize` and `SetPageSize`") + SelEnd = property(GetSelEnd,doc="See `GetSelEnd`") + SelStart = property(GetSelStart,doc="See `GetSelStart`") + ThumbLength = property(GetThumbLength,SetThumbLength,doc="See `GetThumbLength` and `SetThumbLength`") + TickFreq = property(GetTickFreq,SetTickFreq,doc="See `GetTickFreq` and `SetTickFreq`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _controls_.Slider_swigregister(Slider) SliderNameStr = cvar.SliderNameStr @@ -6318,6 +6344,9 @@ def PreDatePickerCtrl(*args, **kwargs): return val HL_CONTEXTMENU = _controls_.HL_CONTEXTMENU +HL_ALIGN_LEFT = _controls_.HL_ALIGN_LEFT +HL_ALIGN_RIGHT = _controls_.HL_ALIGN_RIGHT +HL_ALIGN_CENTRE = _controls_.HL_ALIGN_CENTRE HL_DEFAULT_STYLE = _controls_.HL_DEFAULT_STYLE #--------------------------------------------------------------------------- @@ -6569,6 +6598,13 @@ class PickerBase(_core.Control): """GetPickerCtrl(self) -> Control""" return _controls_.PickerBase_GetPickerCtrl(*args, **kwargs) + InternalMargin = property(GetInternalMargin,SetInternalMargin,doc="See `GetInternalMargin` and `SetInternalMargin`") + PickerCtrl = property(GetPickerCtrl,doc="See `GetPickerCtrl`") + PickerCtrlProportion = property(GetPickerCtrlProportion,SetPickerCtrlProportion,doc="See `GetPickerCtrlProportion` and `SetPickerCtrlProportion`") + TextCtrl = property(GetTextCtrl,doc="See `GetTextCtrl`") + TextCtrlProportion = property(GetTextCtrlProportion,SetTextCtrlProportion,doc="See `GetTextCtrlProportion` and `SetTextCtrlProportion`") + TextCtrlGrowable = property(IsTextCtrlGrowable,SetTextCtrlGrowable,doc="See `IsTextCtrlGrowable` and `SetTextCtrlGrowable`") + PickerCtrlGrowable = property(IsPickerCtrlGrowable,SetPickerCtrlGrowable,doc="See `IsPickerCtrlGrowable` and `SetPickerCtrlGrowable`") _controls_.PickerBase_swigregister(PickerBase) #--------------------------------------------------------------------------- diff --git a/wxPython/src/mac/_controls_wrap.cpp b/wxPython/src/mac/_controls_wrap.cpp index 5db7a6c0e9..4181f29bfa 100644 --- a/wxPython/src/mac/_controls_wrap.cpp +++ b/wxPython/src/mac/_controls_wrap.cpp @@ -48902,6 +48902,9 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "DP_ALLOWNONE",SWIG_From_int(static_cast< int >(wxDP_ALLOWNONE))); SWIG_addvarlink(SWIG_globals(),(char*)"HyperlinkCtrlNameStr",HyperlinkCtrlNameStr_get, HyperlinkCtrlNameStr_set); SWIG_Python_SetConstant(d, "HL_CONTEXTMENU",SWIG_From_int(static_cast< int >(wxHL_CONTEXTMENU))); + SWIG_Python_SetConstant(d, "HL_ALIGN_LEFT",SWIG_From_int(static_cast< int >(wxHL_ALIGN_LEFT))); + SWIG_Python_SetConstant(d, "HL_ALIGN_RIGHT",SWIG_From_int(static_cast< int >(wxHL_ALIGN_RIGHT))); + SWIG_Python_SetConstant(d, "HL_ALIGN_CENTRE",SWIG_From_int(static_cast< int >(wxHL_ALIGN_CENTRE))); SWIG_Python_SetConstant(d, "HL_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxHL_DEFAULT_STYLE))); PyDict_SetItemString(d, "wxEVT_COMMAND_HYPERLINK", PyInt_FromLong(wxEVT_COMMAND_HYPERLINK)); SWIG_Python_SetConstant(d, "PB_USE_TEXTCTRL",SWIG_From_int(static_cast< int >(wxPB_USE_TEXTCTRL))); diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index ff15cd415f..d28b51d65f 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -706,6 +706,7 @@ class Object(object): args[0].thisown = 0 return val + ClassName = property(GetClassName,doc="See `GetClassName`") _core_.Object_swigregister(Object) _wxPySetDictionary = _core_._wxPySetDictionary cvar = _core_.cvar @@ -1320,30 +1321,34 @@ class Rect(object): """ return _core_.Rect___ne__(*args, **kwargs) - def InsideXY(*args, **kwargs): + def ContainsXY(*args, **kwargs): """ - InsideXY(self, int x, int y) -> bool + ContainsXY(self, int x, int y) -> bool - Return True if the point is (not strcitly) inside the rect. + Return True if the point is inside the rect. """ - return _core_.Rect_InsideXY(*args, **kwargs) + return _core_.Rect_ContainsXY(*args, **kwargs) - def Inside(*args, **kwargs): + def Contains(*args, **kwargs): """ - Inside(self, Point pt) -> bool + Contains(self, Point pt) -> bool - Return True if the point is (not strcitly) inside the rect. + Return True if the point is inside the rect. """ - return _core_.Rect_Inside(*args, **kwargs) + return _core_.Rect_Contains(*args, **kwargs) - def InsideRect(*args, **kwargs): + def ContainsRect(*args, **kwargs): """ - InsideRect(self, Rect rect) -> bool + ContainsRect(self, Rect rect) -> bool Returns ``True`` if the given rectangle is completely inside this rectangle or touches its boundary. """ - return _core_.Rect_InsideRect(*args, **kwargs) + return _core_.Rect_ContainsRect(*args, **kwargs) + + Inside = wx._deprecated(Contains, "Use `Contains` instead.") + InsideXY = wx._deprecated(ContainsXY, "Use `ContainsXY` instead.") + InsideRect = wx._deprecated(ContainsRect, "Use `ContainsRect` instead.") def Intersects(*args, **kwargs): """ @@ -1398,6 +1403,19 @@ class Rect(object): __safe_for_unpickling__ = True def __reduce__(self): return (wx.Rect, self.Get()) + Bottom = property(GetBottom,SetBottom,doc="See `GetBottom` and `SetBottom`") + BottomRight = property(GetBottomRight,SetBottomRight,doc="See `GetBottomRight` and `SetBottomRight`") + Height = property(GetHeight,SetHeight,doc="See `GetHeight` and `SetHeight`") + Left = property(GetLeft,SetLeft,doc="See `GetLeft` and `SetLeft`") + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") + Right = property(GetRight,SetRight,doc="See `GetRight` and `SetRight`") + Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") + Top = property(GetTop,SetTop,doc="See `GetTop` and `SetTop`") + TopLeft = property(GetTopLeft,SetTopLeft,doc="See `GetTopLeft` and `SetTopLeft`") + Width = property(GetWidth,SetWidth,doc="See `GetWidth` and `SetWidth`") + X = property(GetX,SetX,doc="See `GetX` and `SetX`") + Y = property(GetY,SetY,doc="See `GetY` and `SetY`") + Empty = property(IsEmpty,doc="See `IsEmpty`") _core_.Rect_swigregister(Rect) def RectPP(*args, **kwargs): @@ -1572,6 +1590,10 @@ class Point2D(object): __safe_for_unpickling__ = True def __reduce__(self): return (wx.Point2D, self.Get()) + Floor = property(GetFloor,doc="See `GetFloor`") + Rounded = property(GetRounded,doc="See `GetRounded`") + VectorAngle = property(GetVectorAngle,SetVectorAngle,doc="See `GetVectorAngle` and `SetVectorAngle`") + VectorLength = property(GetVectorLength,SetVectorLength,doc="See `GetVectorLength` and `SetVectorLength`") _core_.Point2D_swigregister(Point2D) def Point2DCopy(*args, **kwargs): @@ -4230,6 +4252,8 @@ class ScrollEvent(CommandEvent): """SetPosition(self, int pos)""" return _core_.ScrollEvent_SetPosition(*args, **kwargs) + Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") _core_.ScrollEvent_swigregister(ScrollEvent) #--------------------------------------------------------------------------- @@ -4276,6 +4300,8 @@ class ScrollWinEvent(Event): """SetPosition(self, int pos)""" return _core_.ScrollWinEvent_SetPosition(*args, **kwargs) + Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") _core_.ScrollWinEvent_swigregister(ScrollWinEvent) #--------------------------------------------------------------------------- @@ -4760,6 +4786,9 @@ class SetCursorEvent(Event): """ return _core_.SetCursorEvent_HasCursor(*args, **kwargs) + Cursor = property(GetCursor,SetCursor,doc="See `GetCursor` and `SetCursor`") + X = property(GetX,doc="See `GetX`") + Y = property(GetY,doc="See `GetY`") _core_.SetCursorEvent_swigregister(SetCursorEvent) #--------------------------------------------------------------------------- @@ -5073,6 +5102,8 @@ class SizeEvent(Event): m_size = property(_core_.SizeEvent_m_size_get, _core_.SizeEvent_m_size_set) m_rect = property(_core_.SizeEvent_m_rect_get, _core_.SizeEvent_m_rect_set) + Rect = property(GetRect,SetRect,doc="See `GetRect` and `SetRect`") + Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") _core_.SizeEvent_swigregister(SizeEvent) #--------------------------------------------------------------------------- @@ -5233,9 +5264,14 @@ _core_.FocusEvent_swigregister(FocusEvent) class ChildFocusEvent(CommandEvent): """ - wx.ChildFocusEvent notifies the parent that a child has received the - focus. Unlike `wx.FocusEvent` it is propagated up the window - heirarchy. + A child focus event is sent to a (parent-)window when one of its child + windows gains focus, so that the window could restore the focus back + to its corresponding child if it loses it now and regains later. + + Notice that child window is the direct child of the window receiving + the event, and so may not be the actual widget recieving focus if it + is further down the containment heirarchy. Use `wx.Window.FindFocus` + to get the widget that is actually receiving focus. """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr @@ -5250,7 +5286,8 @@ class ChildFocusEvent(CommandEvent): """ GetWindow(self) -> Window - The window which has just received the focus. + The window, or (grand)parent of the window which has just received the + focus. """ return _core_.ChildFocusEvent_GetWindow(*args, **kwargs) @@ -5481,6 +5518,7 @@ class ShowEvent(Event): """GetShow(self) -> bool""" return _core_.ShowEvent_GetShow(*args, **kwargs) + Show = property(GetShow,SetShow,doc="See `GetShow` and `SetShow`") _core_.ShowEvent_swigregister(ShowEvent) #--------------------------------------------------------------------------- @@ -6067,6 +6105,7 @@ class PaletteChangedEvent(Event): """GetChangedWindow(self) -> Window""" return _core_.PaletteChangedEvent_GetChangedWindow(*args, **kwargs) + ChangedWindow = property(GetChangedWindow,SetChangedWindow,doc="See `GetChangedWindow` and `SetChangedWindow`") _core_.PaletteChangedEvent_swigregister(PaletteChangedEvent) #--------------------------------------------------------------------------- @@ -6099,6 +6138,7 @@ class QueryNewPaletteEvent(Event): """GetPaletteRealized(self) -> bool""" return _core_.QueryNewPaletteEvent_GetPaletteRealized(*args, **kwargs) + PaletteRealized = property(GetPaletteRealized,SetPaletteRealized,doc="See `GetPaletteRealized` and `SetPaletteRealized`") _core_.QueryNewPaletteEvent_swigregister(QueryNewPaletteEvent) #--------------------------------------------------------------------------- @@ -6954,9 +6994,9 @@ class PyApp(EvtHandler): return _core_.PyApp_GetComCtl32Version(*args, **kwargs) GetComCtl32Version = staticmethod(GetComCtl32Version) - def DisplayAvailable(*args, **kwargs): + def IsDisplayAvailable(*args, **kwargs): """ - DisplayAvailable() -> bool + IsDisplayAvailable() -> bool Tests if it is possible to create a GUI in the current environment. This will mean different things on the different platforms. @@ -6973,9 +7013,20 @@ class PyApp(EvtHandler): * On MS Windows... """ - return _core_.PyApp_DisplayAvailable(*args, **kwargs) - - DisplayAvailable = staticmethod(DisplayAvailable) + return _core_.PyApp_IsDisplayAvailable(*args, **kwargs) + + IsDisplayAvailable = staticmethod(IsDisplayAvailable) + AppName = property(GetAppName,SetAppName,doc="See `GetAppName` and `SetAppName`") + AssertMode = property(GetAssertMode,SetAssertMode,doc="See `GetAssertMode` and `SetAssertMode`") + ClassName = property(GetClassName,SetClassName,doc="See `GetClassName` and `SetClassName`") + ExitOnFrameDelete = property(GetExitOnFrameDelete,SetExitOnFrameDelete,doc="See `GetExitOnFrameDelete` and `SetExitOnFrameDelete`") + LayoutDirection = property(GetLayoutDirection,doc="See `GetLayoutDirection`") + PrintMode = property(GetPrintMode,SetPrintMode,doc="See `GetPrintMode` and `SetPrintMode`") + TopWindow = property(GetTopWindow,SetTopWindow,doc="See `GetTopWindow` and `SetTopWindow`") + Traits = property(GetTraits,doc="See `GetTraits`") + UseBestVisual = property(GetUseBestVisual,SetUseBestVisual,doc="See `GetUseBestVisual` and `SetUseBestVisual`") + VendorName = property(GetVendorName,SetVendorName,doc="See `GetVendorName` and `SetVendorName`") + Active = property(IsActive) _core_.PyApp_swigregister(PyApp) def PyApp_IsMainLoopRunning(*args): @@ -7036,9 +7087,9 @@ def PyApp_GetComCtl32Version(*args): """ return _core_.PyApp_GetComCtl32Version(*args) -def PyApp_DisplayAvailable(*args): +def PyApp_IsDisplayAvailable(*args): """ - PyApp_DisplayAvailable() -> bool + PyApp_IsDisplayAvailable() -> bool Tests if it is possible to create a GUI in the current environment. This will mean different things on the different platforms. @@ -7055,7 +7106,7 @@ def PyApp_DisplayAvailable(*args): * On MS Windows... """ - return _core_.PyApp_DisplayAvailable(*args) + return _core_.PyApp_IsDisplayAvailable(*args) #--------------------------------------------------------------------------- @@ -7288,7 +7339,7 @@ class App(wx.PyApp): wx.PyApp.__init__(self) # make sure we can create a GUI - if not self.DisplayAvailable(): + if not self.IsDisplayAvailable(): if wx.Platform == "__WXMAC__": msg = """This program needs access to the screen. @@ -8456,6 +8507,16 @@ class Window(EvtHandler): """ return _core_.Window_IsEnabled(*args, **kwargs) + def IsShownOnScreen(*args, **kwargs): + """ + IsShownOnScreen(self) -> bool + + Returns ``True`` if the window is physically visible on the screen, + i.e. it is shown and all its parents up to the toplevel window are + shown as well. + """ + return _core_.Window_IsShownOnScreen(*args, **kwargs) + def SetWindowStyleFlag(*args, **kwargs): """ SetWindowStyleFlag(self, long style) @@ -9058,6 +9119,16 @@ class Window(EvtHandler): """ return _core_.Window_Freeze(*args, **kwargs) + def IsFrozen(*args, **kwargs): + """ + IsFrozen(self) -> bool + + Returns ``True`` if the window has been frozen and not thawed yet. + + :see: `Freeze` and `Thaw` + """ + return _core_.Window_IsFrozen(*args, **kwargs) + def Thaw(*args, **kwargs): """ Thaw(self) @@ -11411,6 +11482,19 @@ class SizerItem(Object): """ return _core_.SizerItem_SetUserData(*args, **kwargs) + Border = property(GetBorder,SetBorder,doc="See `GetBorder` and `SetBorder`") + Flag = property(GetFlag,SetFlag,doc="See `GetFlag` and `SetFlag`") + MinSize = property(GetMinSize,doc="See `GetMinSize`") + MinSizeWithBorder = property(GetMinSizeWithBorder,doc="See `GetMinSizeWithBorder`") + Position = property(GetPosition,doc="See `GetPosition`") + Proportion = property(GetProportion,SetProportion,doc="See `GetProportion` and `SetProportion`") + Ratio = property(GetRatio,SetRatio,doc="See `GetRatio` and `SetRatio`") + Rect = property(GetRect,doc="See `GetRect`") + Size = property(GetSize,doc="See `GetSize`") + Sizer = property(GetSizer,SetSizer,doc="See `GetSizer` and `SetSizer`") + Spacer = property(GetSpacer,SetSpacer,doc="See `GetSpacer` and `SetSpacer`") + UserData = property(GetUserData,SetUserData,doc="See `GetUserData` and `SetUserData`") + Window = property(GetWindow,SetWindow,doc="See `GetWindow` and `SetWindow`") _core_.SizerItem_swigregister(SizerItem) def SizerItemWindow(*args, **kwargs): @@ -11933,6 +12017,11 @@ class Sizer(Object): """ return _core_.Sizer_ShowItems(*args, **kwargs) + Children = property(GetChildren,doc="See `GetChildren`") + ContainingWindow = property(GetContainingWindow,SetContainingWindow,doc="See `GetContainingWindow` and `SetContainingWindow`") + MinSize = property(GetMinSize,SetMinSize,doc="See `GetMinSize` and `SetMinSize`") + Position = property(GetPosition,doc="See `GetPosition`") + Size = property(GetSize,doc="See `GetSize`") _core_.Sizer_swigregister(Sizer) class PySizer(Sizer): @@ -12067,6 +12156,7 @@ class StaticBoxSizer(BoxSizer): """ return _core_.StaticBoxSizer_GetStaticBox(*args, **kwargs) + StaticBox = property(GetStaticBox,doc="See `GetStaticBox`") _core_.StaticBoxSizer_swigregister(StaticBoxSizer) #--------------------------------------------------------------------------- @@ -12424,6 +12514,11 @@ class StdDialogButtonSizer(BoxSizer): """GetHelpButton(self) -> wxButton""" return _core_.StdDialogButtonSizer_GetHelpButton(*args, **kwargs) + AffirmativeButton = property(GetAffirmativeButton,SetAffirmativeButton,doc="See `GetAffirmativeButton` and `SetAffirmativeButton`") + ApplyButton = property(GetApplyButton,doc="See `GetApplyButton`") + CancelButton = property(GetCancelButton,SetCancelButton,doc="See `GetCancelButton` and `SetCancelButton`") + HelpButton = property(GetHelpButton,doc="See `GetHelpButton`") + NegativeButton = property(GetNegativeButton,SetNegativeButton,doc="See `GetNegativeButton` and `SetNegativeButton`") _core_.StdDialogButtonSizer_swigregister(StdDialogButtonSizer) #--------------------------------------------------------------------------- diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp index 1cae14ad01..f084e45042 100644 --- a/wxPython/src/mac/_core_wrap.cpp +++ b/wxPython/src/mac/_core_wrap.cpp @@ -3788,7 +3788,7 @@ SWIGINTERN wxPyApp *new_wxPyApp(){ return wxPythonApp; } SWIGINTERN int wxPyApp_GetComCtl32Version(){ wxPyRaiseNotImplemented(); return 0; } -SWIGINTERN bool wxPyApp_DisplayAvailable(){ +SWIGINTERN bool wxPyApp_IsDisplayAvailable(){ return wxPyTestDisplayAvailable(); } @@ -7491,7 +7491,7 @@ fail: } -SWIGINTERN PyObject *_wrap_Rect_InsideXY(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_Rect_ContainsXY(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxRect *arg1 = (wxRect *) 0 ; int arg2 ; @@ -7510,25 +7510,25 @@ SWIGINTERN PyObject *_wrap_Rect_InsideXY(PyObject *SWIGUNUSEDPARM(self), PyObjec (char *) "self",(char *) "x",(char *) "y", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_InsideXY",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_ContainsXY",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect_InsideXY" "', expected argument " "1"" of type '" "wxRect const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect_ContainsXY" "', expected argument " "1"" of type '" "wxRect const *""'"); } arg1 = reinterpret_cast< wxRect * >(argp1); ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Rect_InsideXY" "', expected argument " "2"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Rect_ContainsXY" "', expected argument " "2"" of type '" "int""'"); } arg2 = static_cast< int >(val2); ecode3 = SWIG_AsVal_int(obj2, &val3); if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Rect_InsideXY" "', expected argument " "3"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Rect_ContainsXY" "', expected argument " "3"" of type '" "int""'"); } arg3 = static_cast< int >(val3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxRect const *)arg1)->Inside(arg2,arg3); + result = (bool)((wxRect const *)arg1)->Contains(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -7541,7 +7541,7 @@ fail: } -SWIGINTERN PyObject *_wrap_Rect_Inside(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_Rect_Contains(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxRect *arg1 = (wxRect *) 0 ; wxPoint *arg2 = 0 ; @@ -7555,10 +7555,10 @@ SWIGINTERN PyObject *_wrap_Rect_Inside(PyObject *SWIGUNUSEDPARM(self), PyObject (char *) "self",(char *) "pt", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_Inside",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_Contains",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect_Inside" "', expected argument " "1"" of type '" "wxRect const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect_Contains" "', expected argument " "1"" of type '" "wxRect const *""'"); } arg1 = reinterpret_cast< wxRect * >(argp1); { @@ -7567,7 +7567,7 @@ SWIGINTERN PyObject *_wrap_Rect_Inside(PyObject *SWIGUNUSEDPARM(self), PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxRect const *)arg1)->Inside((wxPoint const &)*arg2); + result = (bool)((wxRect const *)arg1)->Contains((wxPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -7580,7 +7580,7 @@ fail: } -SWIGINTERN PyObject *_wrap_Rect_InsideRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_Rect_ContainsRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxRect *arg1 = (wxRect *) 0 ; wxRect *arg2 = 0 ; @@ -7594,10 +7594,10 @@ SWIGINTERN PyObject *_wrap_Rect_InsideRect(PyObject *SWIGUNUSEDPARM(self), PyObj (char *) "self",(char *) "rect", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_InsideRect",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_ContainsRect",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect_InsideRect" "', expected argument " "1"" of type '" "wxRect const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect_ContainsRect" "', expected argument " "1"" of type '" "wxRect const *""'"); } arg1 = reinterpret_cast< wxRect * >(argp1); { @@ -7606,7 +7606,7 @@ SWIGINTERN PyObject *_wrap_Rect_InsideRect(PyObject *SWIGUNUSEDPARM(self), PyObj } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxRect const *)arg1)->Inside((wxRect const &)*arg2); + result = (bool)((wxRect const *)arg1)->Contains((wxRect const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -28628,14 +28628,14 @@ fail: } -SWIGINTERN PyObject *_wrap_PyApp_DisplayAvailable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_PyApp_IsDisplayAvailable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; bool result; - if (!SWIG_Python_UnpackTuple(args,"PyApp_DisplayAvailable",0,0,0)) SWIG_fail; + if (!SWIG_Python_UnpackTuple(args,"PyApp_IsDisplayAvailable",0,0,0)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxPyApp_DisplayAvailable(); + result = (bool)wxPyApp_IsDisplayAvailable(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -33006,6 +33006,36 @@ fail: } +SWIGINTERN PyObject *_wrap_Window_IsShownOnScreen(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxWindow *arg1 = (wxWindow *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_IsShownOnScreen" "', expected argument " "1"" of type '" "wxWindow const *""'"); + } + arg1 = reinterpret_cast< wxWindow * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxWindow const *)arg1)->IsShownOnScreen(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Window_SetWindowStyleFlag(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxWindow *arg1 = (wxWindow *) 0 ; @@ -35033,6 +35063,36 @@ fail: } +SWIGINTERN PyObject *_wrap_Window_IsFrozen(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxWindow *arg1 = (wxWindow *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_IsFrozen" "', expected argument " "1"" of type '" "wxWindow const *""'"); + } + arg1 = reinterpret_cast< wxWindow * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxWindow const *)arg1)->IsFrozen(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Window_Thaw(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxWindow *arg1 = (wxWindow *) 0 ; @@ -53767,9 +53827,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"Rect___iadd__", (PyCFunction) _wrap_Rect___iadd__, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Rect___eq__", (PyCFunction) _wrap_Rect___eq__, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Rect___ne__", (PyCFunction) _wrap_Rect___ne__, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Rect_InsideXY", (PyCFunction) _wrap_Rect_InsideXY, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Rect_Inside", (PyCFunction) _wrap_Rect_Inside, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Rect_InsideRect", (PyCFunction) _wrap_Rect_InsideRect, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Rect_ContainsXY", (PyCFunction) _wrap_Rect_ContainsXY, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Rect_Contains", (PyCFunction) _wrap_Rect_Contains, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Rect_ContainsRect", (PyCFunction) _wrap_Rect_ContainsRect, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Rect_Intersects", (PyCFunction) _wrap_Rect_Intersects, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Rect_CenterIn", (PyCFunction) _wrap_Rect_CenterIn, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Rect_x_set", _wrap_Rect_x_set, METH_VARARGS, NULL}, @@ -54465,7 +54525,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"PyApp_SetMacHelpMenuTitleName", (PyCFunction) _wrap_PyApp_SetMacHelpMenuTitleName, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyApp__BootstrapApp", (PyCFunction)_wrap_PyApp__BootstrapApp, METH_O, NULL}, { (char *)"PyApp_GetComCtl32Version", (PyCFunction)_wrap_PyApp_GetComCtl32Version, METH_NOARGS, NULL}, - { (char *)"PyApp_DisplayAvailable", (PyCFunction)_wrap_PyApp_DisplayAvailable, METH_NOARGS, NULL}, + { (char *)"PyApp_IsDisplayAvailable", (PyCFunction)_wrap_PyApp_IsDisplayAvailable, METH_NOARGS, NULL}, { (char *)"PyApp_swigregister", PyApp_swigregister, METH_VARARGS, NULL}, { (char *)"PyApp_swiginit", PyApp_swiginit, METH_VARARGS, NULL}, { (char *)"Exit", (PyCFunction)_wrap_Exit, METH_NOARGS, NULL}, @@ -54599,6 +54659,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_Disable", (PyCFunction)_wrap_Window_Disable, METH_O, NULL}, { (char *)"Window_IsShown", (PyCFunction)_wrap_Window_IsShown, METH_O, NULL}, { (char *)"Window_IsEnabled", (PyCFunction)_wrap_Window_IsEnabled, METH_O, NULL}, + { (char *)"Window_IsShownOnScreen", (PyCFunction)_wrap_Window_IsShownOnScreen, METH_O, NULL}, { (char *)"Window_SetWindowStyleFlag", (PyCFunction) _wrap_Window_SetWindowStyleFlag, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_GetWindowStyleFlag", (PyCFunction)_wrap_Window_GetWindowStyleFlag, METH_O, NULL}, { (char *)"Window_HasFlag", (PyCFunction) _wrap_Window_HasFlag, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -54657,6 +54718,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_Update", (PyCFunction)_wrap_Window_Update, METH_O, NULL}, { (char *)"Window_ClearBackground", (PyCFunction)_wrap_Window_ClearBackground, METH_O, NULL}, { (char *)"Window_Freeze", (PyCFunction)_wrap_Window_Freeze, METH_O, NULL}, + { (char *)"Window_IsFrozen", (PyCFunction)_wrap_Window_IsFrozen, METH_O, NULL}, { (char *)"Window_Thaw", (PyCFunction)_wrap_Window_Thaw, METH_O, NULL}, { (char *)"Window_PrepareDC", (PyCFunction) _wrap_Window_PrepareDC, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_GetUpdateRegion", (PyCFunction)_wrap_Window_GetUpdateRegion, METH_O, NULL}, diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py index 70eb01d0a2..459db06ec3 100644 --- a/wxPython/src/mac/_gdi.py +++ b/wxPython/src/mac/_gdi.py @@ -296,6 +296,7 @@ class Palette(GDIObject): return _gdi_.Palette_Ok(*args, **kwargs) def __nonzero__(self): return self.Ok() + ColoursCount = property(GetColoursCount,doc="See `GetColoursCount`") _gdi_.Palette_swigregister(Palette) #--------------------------------------------------------------------------- @@ -380,6 +381,12 @@ class Pen(GDIObject): return _gdi_.Pen___ne__(*args, **kwargs) def __nonzero__(self): return self.Ok() + Cap = property(GetCap,SetCap,doc="See `GetCap` and `SetCap`") + Colour = property(GetColour,SetColour,doc="See `GetColour` and `SetColour`") + Dashes = property(GetDashes,SetDashes,doc="See `GetDashes` and `SetDashes`") + Join = property(GetJoin,SetJoin,doc="See `GetJoin` and `SetJoin`") + Style = property(GetStyle,SetStyle,doc="See `GetStyle` and `SetStyle`") + Width = property(GetWidth,SetWidth,doc="See `GetWidth` and `SetWidth`") _gdi_.Pen_swigregister(Pen) #--------------------------------------------------------------------------- @@ -817,6 +824,11 @@ class PixelDataBase(object): """GetRowStride(self) -> int""" return _gdi_.PixelDataBase_GetRowStride(*args, **kwargs) + Height = property(GetHeight,doc="See `GetHeight`") + Origin = property(GetOrigin,doc="See `GetOrigin`") + RowStride = property(GetRowStride,doc="See `GetRowStride`") + Size = property(GetSize,doc="See `GetSize`") + Width = property(GetWidth,doc="See `GetWidth`") _gdi_.PixelDataBase_swigregister(PixelDataBase) class NativePixelData(PixelDataBase): @@ -1374,6 +1386,7 @@ class Region(GDIObject): """UnionBitmapColour(self, Bitmap bmp, Colour transColour, int tolerance=0) -> bool""" return _gdi_.Region_UnionBitmapColour(*args, **kwargs) + Box = property(GetBox,doc="See `GetBox`") _gdi_.Region_swigregister(Region) def RegionFromBitmap(*args, **kwargs): @@ -1444,6 +1457,13 @@ class RegionIterator(_core.Object): """__nonzero__(self) -> bool""" return _gdi_.RegionIterator___nonzero__(*args, **kwargs) + H = property(GetH,doc="See `GetH`") + Height = property(GetHeight,doc="See `GetHeight`") + Rect = property(GetRect,doc="See `GetRect`") + W = property(GetW,doc="See `GetW`") + Width = property(GetWidth,doc="See `GetWidth`") + X = property(GetX,doc="See `GetX`") + Y = property(GetY,doc="See `GetY`") _gdi_.RegionIterator_swigregister(RegionIterator) #--------------------------------------------------------------------------- @@ -2646,6 +2666,11 @@ class Locale(object): """AddCatalog(self, String szDomain) -> bool""" return _gdi_.Locale_AddCatalog(*args, **kwargs) + def IsAvailable(*args, **kwargs): + """IsAvailable(int lang) -> bool""" + return _gdi_.Locale_IsAvailable(*args, **kwargs) + + IsAvailable = staticmethod(IsAvailable) def IsLoaded(*args, **kwargs): """IsLoaded(self, String szDomain) -> bool""" return _gdi_.Locale_IsLoaded(*args, **kwargs) @@ -2702,6 +2727,10 @@ def Locale_AddCatalogLookupPathPrefix(*args, **kwargs): """Locale_AddCatalogLookupPathPrefix(String prefix)""" return _gdi_.Locale_AddCatalogLookupPathPrefix(*args, **kwargs) +def Locale_IsAvailable(*args, **kwargs): + """Locale_IsAvailable(int lang) -> bool""" + return _gdi_.Locale_IsAvailable(*args, **kwargs) + def Locale_GetLanguageInfo(*args, **kwargs): """Locale_GetLanguageInfo(int lang) -> LanguageInfo""" return _gdi_.Locale_GetLanguageInfo(*args, **kwargs) @@ -4664,6 +4693,7 @@ class PostScriptDC(DC): return _gdi_.PostScriptDC_GetResolution(*args, **kwargs) GetResolution = staticmethod(GetResolution) + PrintData = property(GetPrintData,SetPrintData,doc="See `GetPrintData` and `SetPrintData`") _gdi_.PostScriptDC_swigregister(PostScriptDC) def PostScriptDC_SetResolution(*args, **kwargs): @@ -5275,6 +5305,31 @@ class SplitterRenderParams(object): isHotSensitive = property(_gdi_.SplitterRenderParams_isHotSensitive_get) _gdi_.SplitterRenderParams_swigregister(SplitterRenderParams) +class HeaderButtonParams(object): + """Extra (optional) parameters for `wx.RendererNative.DrawHeaderButton`""" + thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') + __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """ + __init__(self) -> HeaderButtonParams + + Extra (optional) parameters for `wx.RendererNative.DrawHeaderButton` + """ + _gdi_.HeaderButtonParams_swiginit(self,_gdi_.new_HeaderButtonParams(*args, **kwargs)) + __swig_destroy__ = _gdi_.delete_HeaderButtonParams + __del__ = lambda self : None; + m_arrowColour = property(_gdi_.HeaderButtonParams_m_arrowColour_get, _gdi_.HeaderButtonParams_m_arrowColour_set) + m_selectionColour = property(_gdi_.HeaderButtonParams_m_selectionColour_get, _gdi_.HeaderButtonParams_m_selectionColour_set) + m_labelText = property(_gdi_.HeaderButtonParams_m_labelText_get, _gdi_.HeaderButtonParams_m_labelText_set) + m_labelFont = property(_gdi_.HeaderButtonParams_m_labelFont_get, _gdi_.HeaderButtonParams_m_labelFont_set) + m_labelColour = property(_gdi_.HeaderButtonParams_m_labelColour_get, _gdi_.HeaderButtonParams_m_labelColour_set) + m_labelBitmap = property(_gdi_.HeaderButtonParams_m_labelBitmap_get, _gdi_.HeaderButtonParams_m_labelBitmap_set) + m_labelAlignment = property(_gdi_.HeaderButtonParams_m_labelAlignment_get, _gdi_.HeaderButtonParams_m_labelAlignment_set) +_gdi_.HeaderButtonParams_swigregister(HeaderButtonParams) + +HDR_SORT_ICON_NONE = _gdi_.HDR_SORT_ICON_NONE +HDR_SORT_ICON_UP = _gdi_.HDR_SORT_ICON_UP +HDR_SORT_ICON_DOWN = _gdi_.HDR_SORT_ICON_DOWN class RendererVersion(object): """ This simple struct represents the `wx.RendererNative` interface @@ -5311,11 +5366,12 @@ def RendererVersion_IsCompatible(*args, **kwargs): class RendererNative(object): """ - One of the design principles of wxWidgets is to use the native widgets - on every platform in order to be as close to the native look and feel - on every platform. However there are still cases when some generic - widgets are needed for various reasons, but it can sometimes take a - lot of messy work to make them conform to the native LnF. + One of the design principles of wxWidgets is to use the native + widgets on every platform in order to be as close as possible to + the native look and feel on every platform. However there are + still cases when some generic widgets are needed for various + reasons, but it can sometimes take a lot of messy work to make + them conform to the native LnF. The wx.RendererNative class is a collection of functions that have platform-specific implementations for drawing certain parts of @@ -5333,13 +5389,33 @@ class RendererNative(object): __repr__ = _swig_repr def DrawHeaderButton(*args, **kwargs): """ - DrawHeaderButton(self, Window win, DC dc, Rect rect, int flags=0) + DrawHeaderButton(self, Window win, DC dc, Rect rect, int flags=0, int sortArrow=HDR_SORT_ICON_NONE, + HeaderButtonParams params=None) Draw the header control button (such as what is used by `wx.ListCtrl` in report mode.) """ return _gdi_.RendererNative_DrawHeaderButton(*args, **kwargs) + def DrawHeaderButtonContents(*args, **kwargs): + """ + DrawHeaderButtonContents(self, Window win, DC dc, Rect rect, int flags=0, int sortArrow=HDR_SORT_ICON_NONE, + HeaderButtonParams params=None) + + Draw the contents of a header control button, (label, sort + arrows, etc.) Normally this is only called by `DrawHeaderButton`. + """ + return _gdi_.RendererNative_DrawHeaderButtonContents(*args, **kwargs) + + def GetHeaderButtonHeight(*args, **kwargs): + """ + GetHeaderButtonHeight(self, Window win) -> int + + Returns the default height of a header button, either a fixed platform + height if available, or a generic height based on the window's font. + """ + return _gdi_.RendererNative_GetHeaderButtonHeight(*args, **kwargs) + def DrawTreeItemButton(*args, **kwargs): """ DrawTreeItemButton(self, Window win, DC dc, Rect rect, int flags=0) @@ -5490,6 +5566,8 @@ class RendererNative(object): """ return _gdi_.RendererNative_GetVersion(*args, **kwargs) + SplitterParams = property(GetSplitterParams,doc="See `GetSplitterParams`") + Version = property(GetVersion,doc="See `GetVersion`") _gdi_.RendererNative_swigregister(RendererNative) def RendererNative_Get(*args): @@ -6269,6 +6347,8 @@ class PseudoDC(_core.Object): """ return _gdi_.PseudoDC_SetLogicalFunction(*args, **kwargs) + IdBounds = property(GetIdBounds,SetIdBounds,doc="See `GetIdBounds` and `SetIdBounds`") + Len = property(GetLen,doc="See `GetLen`") _gdi_.PseudoDC_swigregister(PseudoDC) diff --git a/wxPython/src/mac/_gdi_wrap.cpp b/wxPython/src/mac/_gdi_wrap.cpp index e0abb640fc..681676d7ad 100644 --- a/wxPython/src/mac/_gdi_wrap.cpp +++ b/wxPython/src/mac/_gdi_wrap.cpp @@ -2520,99 +2520,100 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_wxGIFHandler swig_types[54] #define SWIGTYPE_p_wxGridBagSizer swig_types[55] #define SWIGTYPE_p_wxGridSizer swig_types[56] -#define SWIGTYPE_p_wxICOHandler swig_types[57] -#define SWIGTYPE_p_wxIcon swig_types[58] -#define SWIGTYPE_p_wxIconBundle swig_types[59] -#define SWIGTYPE_p_wxIconLocation swig_types[60] -#define SWIGTYPE_p_wxIconizeEvent swig_types[61] -#define SWIGTYPE_p_wxIdleEvent swig_types[62] -#define SWIGTYPE_p_wxImage swig_types[63] -#define SWIGTYPE_p_wxImageHandler swig_types[64] -#define SWIGTYPE_p_wxImageList swig_types[65] -#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[66] -#define SWIGTYPE_p_wxInitDialogEvent swig_types[67] -#define SWIGTYPE_p_wxJPEGHandler swig_types[68] -#define SWIGTYPE_p_wxKeyEvent swig_types[69] -#define SWIGTYPE_p_wxLanguageInfo swig_types[70] -#define SWIGTYPE_p_wxLayoutConstraints swig_types[71] -#define SWIGTYPE_p_wxLocale swig_types[72] -#define SWIGTYPE_p_wxMask swig_types[73] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[74] -#define SWIGTYPE_p_wxMemoryDC swig_types[75] -#define SWIGTYPE_p_wxMenu swig_types[76] -#define SWIGTYPE_p_wxMenuBar swig_types[77] -#define SWIGTYPE_p_wxMenuEvent swig_types[78] -#define SWIGTYPE_p_wxMenuItem swig_types[79] -#define SWIGTYPE_p_wxMetaFile swig_types[80] -#define SWIGTYPE_p_wxMetaFileDC swig_types[81] -#define SWIGTYPE_p_wxMirrorDC swig_types[82] -#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[83] -#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[84] -#define SWIGTYPE_p_wxMouseEvent swig_types[85] -#define SWIGTYPE_p_wxMoveEvent swig_types[86] -#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[87] -#define SWIGTYPE_p_wxNativeFontInfo swig_types[88] -#define SWIGTYPE_p_wxNativePixelData swig_types[89] -#define SWIGTYPE_p_wxNativePixelData_Accessor swig_types[90] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[91] -#define SWIGTYPE_p_wxNcPaintEvent swig_types[92] -#define SWIGTYPE_p_wxNotifyEvent swig_types[93] -#define SWIGTYPE_p_wxObject swig_types[94] -#define SWIGTYPE_p_wxPCXHandler swig_types[95] -#define SWIGTYPE_p_wxPNGHandler swig_types[96] -#define SWIGTYPE_p_wxPNMHandler swig_types[97] -#define SWIGTYPE_p_wxPaintDC swig_types[98] -#define SWIGTYPE_p_wxPaintEvent swig_types[99] -#define SWIGTYPE_p_wxPalette swig_types[100] -#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[101] -#define SWIGTYPE_p_wxPaperSize swig_types[102] -#define SWIGTYPE_p_wxPen swig_types[103] -#define SWIGTYPE_p_wxPenList swig_types[104] -#define SWIGTYPE_p_wxPixelDataBase swig_types[105] -#define SWIGTYPE_p_wxPoint swig_types[106] -#define SWIGTYPE_p_wxPostScriptDC swig_types[107] -#define SWIGTYPE_p_wxPrintData swig_types[108] -#define SWIGTYPE_p_wxPrinterDC swig_types[109] -#define SWIGTYPE_p_wxPseudoDC swig_types[110] -#define SWIGTYPE_p_wxPyApp swig_types[111] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[112] -#define SWIGTYPE_p_wxPyEvent swig_types[113] -#define SWIGTYPE_p_wxPyFontEnumerator swig_types[114] -#define SWIGTYPE_p_wxPyImageHandler swig_types[115] -#define SWIGTYPE_p_wxPyLocale swig_types[116] -#define SWIGTYPE_p_wxPySizer swig_types[117] -#define SWIGTYPE_p_wxPyValidator swig_types[118] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[119] -#define SWIGTYPE_p_wxRect swig_types[120] -#define SWIGTYPE_p_wxRegion swig_types[121] -#define SWIGTYPE_p_wxRegionIterator swig_types[122] -#define SWIGTYPE_p_wxRendererNative swig_types[123] -#define SWIGTYPE_p_wxRendererVersion swig_types[124] -#define SWIGTYPE_p_wxScreenDC swig_types[125] -#define SWIGTYPE_p_wxScrollEvent swig_types[126] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[127] -#define SWIGTYPE_p_wxSetCursorEvent swig_types[128] -#define SWIGTYPE_p_wxShowEvent swig_types[129] -#define SWIGTYPE_p_wxSize swig_types[130] -#define SWIGTYPE_p_wxSizeEvent swig_types[131] -#define SWIGTYPE_p_wxSizer swig_types[132] -#define SWIGTYPE_p_wxSizerItem swig_types[133] -#define SWIGTYPE_p_wxSplitterRenderParams swig_types[134] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[135] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[136] -#define SWIGTYPE_p_wxStockGDI swig_types[137] -#define SWIGTYPE_p_wxString swig_types[138] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[139] -#define SWIGTYPE_p_wxTIFFHandler swig_types[140] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[141] -#define SWIGTYPE_p_wxValidator swig_types[142] -#define SWIGTYPE_p_wxWindow swig_types[143] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[144] -#define SWIGTYPE_p_wxWindowDC swig_types[145] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[146] -#define SWIGTYPE_p_wxXPMHandler swig_types[147] -static swig_type_info *swig_types[149]; -static swig_module_info swig_module = {swig_types, 148, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxHeaderButtonParams swig_types[57] +#define SWIGTYPE_p_wxICOHandler swig_types[58] +#define SWIGTYPE_p_wxIcon swig_types[59] +#define SWIGTYPE_p_wxIconBundle swig_types[60] +#define SWIGTYPE_p_wxIconLocation swig_types[61] +#define SWIGTYPE_p_wxIconizeEvent swig_types[62] +#define SWIGTYPE_p_wxIdleEvent swig_types[63] +#define SWIGTYPE_p_wxImage swig_types[64] +#define SWIGTYPE_p_wxImageHandler swig_types[65] +#define SWIGTYPE_p_wxImageList swig_types[66] +#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[67] +#define SWIGTYPE_p_wxInitDialogEvent swig_types[68] +#define SWIGTYPE_p_wxJPEGHandler swig_types[69] +#define SWIGTYPE_p_wxKeyEvent swig_types[70] +#define SWIGTYPE_p_wxLanguageInfo swig_types[71] +#define SWIGTYPE_p_wxLayoutConstraints swig_types[72] +#define SWIGTYPE_p_wxLocale swig_types[73] +#define SWIGTYPE_p_wxMask swig_types[74] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[75] +#define SWIGTYPE_p_wxMemoryDC swig_types[76] +#define SWIGTYPE_p_wxMenu swig_types[77] +#define SWIGTYPE_p_wxMenuBar swig_types[78] +#define SWIGTYPE_p_wxMenuEvent swig_types[79] +#define SWIGTYPE_p_wxMenuItem swig_types[80] +#define SWIGTYPE_p_wxMetaFile swig_types[81] +#define SWIGTYPE_p_wxMetaFileDC swig_types[82] +#define SWIGTYPE_p_wxMirrorDC swig_types[83] +#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[84] +#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[85] +#define SWIGTYPE_p_wxMouseEvent swig_types[86] +#define SWIGTYPE_p_wxMoveEvent swig_types[87] +#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[88] +#define SWIGTYPE_p_wxNativeFontInfo swig_types[89] +#define SWIGTYPE_p_wxNativePixelData swig_types[90] +#define SWIGTYPE_p_wxNativePixelData_Accessor swig_types[91] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[92] +#define SWIGTYPE_p_wxNcPaintEvent swig_types[93] +#define SWIGTYPE_p_wxNotifyEvent swig_types[94] +#define SWIGTYPE_p_wxObject swig_types[95] +#define SWIGTYPE_p_wxPCXHandler swig_types[96] +#define SWIGTYPE_p_wxPNGHandler swig_types[97] +#define SWIGTYPE_p_wxPNMHandler swig_types[98] +#define SWIGTYPE_p_wxPaintDC swig_types[99] +#define SWIGTYPE_p_wxPaintEvent swig_types[100] +#define SWIGTYPE_p_wxPalette swig_types[101] +#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[102] +#define SWIGTYPE_p_wxPaperSize swig_types[103] +#define SWIGTYPE_p_wxPen swig_types[104] +#define SWIGTYPE_p_wxPenList swig_types[105] +#define SWIGTYPE_p_wxPixelDataBase swig_types[106] +#define SWIGTYPE_p_wxPoint swig_types[107] +#define SWIGTYPE_p_wxPostScriptDC swig_types[108] +#define SWIGTYPE_p_wxPrintData swig_types[109] +#define SWIGTYPE_p_wxPrinterDC swig_types[110] +#define SWIGTYPE_p_wxPseudoDC swig_types[111] +#define SWIGTYPE_p_wxPyApp swig_types[112] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[113] +#define SWIGTYPE_p_wxPyEvent swig_types[114] +#define SWIGTYPE_p_wxPyFontEnumerator swig_types[115] +#define SWIGTYPE_p_wxPyImageHandler swig_types[116] +#define SWIGTYPE_p_wxPyLocale swig_types[117] +#define SWIGTYPE_p_wxPySizer swig_types[118] +#define SWIGTYPE_p_wxPyValidator swig_types[119] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[120] +#define SWIGTYPE_p_wxRect swig_types[121] +#define SWIGTYPE_p_wxRegion swig_types[122] +#define SWIGTYPE_p_wxRegionIterator swig_types[123] +#define SWIGTYPE_p_wxRendererNative swig_types[124] +#define SWIGTYPE_p_wxRendererVersion swig_types[125] +#define SWIGTYPE_p_wxScreenDC swig_types[126] +#define SWIGTYPE_p_wxScrollEvent swig_types[127] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[128] +#define SWIGTYPE_p_wxSetCursorEvent swig_types[129] +#define SWIGTYPE_p_wxShowEvent swig_types[130] +#define SWIGTYPE_p_wxSize swig_types[131] +#define SWIGTYPE_p_wxSizeEvent swig_types[132] +#define SWIGTYPE_p_wxSizer swig_types[133] +#define SWIGTYPE_p_wxSizerItem swig_types[134] +#define SWIGTYPE_p_wxSplitterRenderParams swig_types[135] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[136] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[137] +#define SWIGTYPE_p_wxStockGDI swig_types[138] +#define SWIGTYPE_p_wxString swig_types[139] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[140] +#define SWIGTYPE_p_wxTIFFHandler swig_types[141] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[142] +#define SWIGTYPE_p_wxValidator swig_types[143] +#define SWIGTYPE_p_wxWindow swig_types[144] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[145] +#define SWIGTYPE_p_wxWindowDC swig_types[146] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[147] +#define SWIGTYPE_p_wxXPMHandler swig_types[148] +static swig_type_info *swig_types[150]; +static swig_module_info swig_module = {swig_types, 149, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -15859,6 +15860,38 @@ fail: } +SWIGINTERN PyObject *_wrap_Locale_IsAvailable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + int arg1 ; + bool result; + int val1 ; + int ecode1 = 0 ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "lang", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_IsAvailable",kwnames,&obj0)) SWIG_fail; + ecode1 = SWIG_AsVal_int(obj0, &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "Locale_IsAvailable" "', expected argument " "1"" of type '" "int""'"); + } + arg1 = static_cast< int >(val1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)wxLocale::IsAvailable(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Locale_IsLoaded(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxLocale *arg1 = (wxLocale *) 0 ; @@ -26630,6 +26663,441 @@ SWIGINTERN PyObject *SplitterRenderParams_swiginit(PyObject *SWIGUNUSEDPARM(self return SWIG_Python_InitShadowInstance(args); } +SWIGINTERN PyObject *_wrap_new_HeaderButtonParams(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *result = 0 ; + + if (!SWIG_Python_UnpackTuple(args,"new_HeaderButtonParams",0,0,0)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxHeaderButtonParams *)new wxHeaderButtonParams(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxHeaderButtonParams, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_delete_HeaderButtonParams(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_HeaderButtonParams" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_arrowColour_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxColour *arg2 = (wxColour *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + wxColour temp2 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_arrowColour_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_arrowColour_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + { + arg2 = &temp2; + if ( ! wxColour_helper(swig_obj[1], &arg2)) SWIG_fail; + } + if (arg1) (arg1)->m_arrowColour = *arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_arrowColour_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxColour *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_arrowColour_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (wxColour *)& ((arg1)->m_arrowColour); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_selectionColour_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxColour *arg2 = (wxColour *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + wxColour temp2 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_selectionColour_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_selectionColour_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + { + arg2 = &temp2; + if ( ! wxColour_helper(swig_obj[1], &arg2)) SWIG_fail; + } + if (arg1) (arg1)->m_selectionColour = *arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_selectionColour_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxColour *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_selectionColour_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (wxColour *)& ((arg1)->m_selectionColour); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelText_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxString *arg2 = (wxString *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + bool temp2 = false ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelText_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelText_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + { + arg2 = wxString_in_helper(swig_obj[1]); + if (arg2 == NULL) SWIG_fail; + temp2 = true; + } + if (arg1) (arg1)->m_labelText = *arg2; + + resultobj = SWIG_Py_Void(); + { + if (temp2) + delete arg2; + } + return resultobj; +fail: + { + if (temp2) + delete arg2; + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelText_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxString *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelText_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (wxString *)& ((arg1)->m_labelText); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelFont_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxFont *arg2 = (wxFont *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelFont_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelFont_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxFont, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HeaderButtonParams_m_labelFont_set" "', expected argument " "2"" of type '" "wxFont *""'"); + } + arg2 = reinterpret_cast< wxFont * >(argp2); + if (arg1) (arg1)->m_labelFont = *arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelFont_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxFont *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelFont_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (wxFont *)& ((arg1)->m_labelFont); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelColour_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxColour *arg2 = (wxColour *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + wxColour temp2 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelColour_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelColour_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + { + arg2 = &temp2; + if ( ! wxColour_helper(swig_obj[1], &arg2)) SWIG_fail; + } + if (arg1) (arg1)->m_labelColour = *arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelColour_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxColour *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelColour_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (wxColour *)& ((arg1)->m_labelColour); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelBitmap_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxBitmap *arg2 = (wxBitmap *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelBitmap_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelBitmap_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxBitmap, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HeaderButtonParams_m_labelBitmap_set" "', expected argument " "2"" of type '" "wxBitmap *""'"); + } + arg2 = reinterpret_cast< wxBitmap * >(argp2); + if (arg1) (arg1)->m_labelBitmap = *arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelBitmap_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxBitmap *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelBitmap_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (wxBitmap *)& ((arg1)->m_labelBitmap); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBitmap, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelAlignment_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + int arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelAlignment_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelAlignment_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + ecode2 = SWIG_AsVal_int(swig_obj[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HeaderButtonParams_m_labelAlignment_set" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + if (arg1) (arg1)->m_labelAlignment = arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelAlignment_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelAlignment_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (int) ((arg1)->m_labelAlignment); + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *HeaderButtonParams_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_wxHeaderButtonParams, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *HeaderButtonParams_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + return SWIG_Python_InitShadowInstance(args); +} + SWIGINTERN PyObject *_wrap_new_RendererVersion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; int arg1 ; @@ -26796,6 +27264,8 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButton(PyObject *SWIGUNUSEDP wxDC *arg3 = 0 ; wxRect *arg4 = 0 ; int arg5 = (int) 0 ; + wxHeaderSortIconType arg6 = (wxHeaderSortIconType) wxHDR_SORT_ICON_NONE ; + wxHeaderButtonParams *arg7 = (wxHeaderButtonParams *) NULL ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; @@ -26805,16 +27275,22 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButton(PyObject *SWIGUNUSEDP wxRect temp4 ; int val5 ; int ecode5 = 0 ; + int val6 ; + int ecode6 = 0 ; + void *argp7 = 0 ; + int res7 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "win",(char *) "dc",(char *) "rect",(char *) "flags", NULL + (char *) "self",(char *) "win",(char *) "dc",(char *) "rect",(char *) "flags",(char *) "sortArrow",(char *) "params", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:RendererNative_DrawHeaderButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:RendererNative_DrawHeaderButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRendererNative, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_DrawHeaderButton" "', expected argument " "1"" of type '" "wxRendererNative *""'"); @@ -26844,9 +27320,113 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButton(PyObject *SWIGUNUSEDP } arg5 = static_cast< int >(val5); } + if (obj5) { + ecode6 = SWIG_AsVal_int(obj5, &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "RendererNative_DrawHeaderButton" "', expected argument " "6"" of type '" "wxHeaderSortIconType""'"); + } + arg6 = static_cast< wxHeaderSortIconType >(val6); + } + if (obj6) { + res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "RendererNative_DrawHeaderButton" "', expected argument " "7"" of type '" "wxHeaderButtonParams *""'"); + } + arg7 = reinterpret_cast< wxHeaderButtonParams * >(argp7); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->DrawHeaderButton(arg2,*arg3,(wxRect const &)*arg4,arg5,arg6,arg7); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButtonContents(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxRendererNative *arg1 = (wxRendererNative *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + wxDC *arg3 = 0 ; + wxRect *arg4 = 0 ; + int arg5 = (int) 0 ; + wxHeaderSortIconType arg6 = (wxHeaderSortIconType) wxHDR_SORT_ICON_NONE ; + wxHeaderButtonParams *arg7 = (wxHeaderButtonParams *) NULL ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + wxRect temp4 ; + int val5 ; + int ecode5 = 0 ; + int val6 ; + int ecode6 = 0 ; + void *argp7 = 0 ; + int res7 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "win",(char *) "dc",(char *) "rect",(char *) "flags",(char *) "sortArrow",(char *) "params", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:RendererNative_DrawHeaderButtonContents",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRendererNative, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "1"" of type '" "wxRendererNative *""'"); + } + arg1 = reinterpret_cast< wxRendererNative * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "2"" of type '" "wxWindow *""'"); + } + arg2 = reinterpret_cast< wxWindow * >(argp2); + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxDC, 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "3"" of type '" "wxDC &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "3"" of type '" "wxDC &""'"); + } + arg3 = reinterpret_cast< wxDC * >(argp3); + { + arg4 = &temp4; + if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail; + } + if (obj4) { + ecode5 = SWIG_AsVal_int(obj4, &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "5"" of type '" "int""'"); + } + arg5 = static_cast< int >(val5); + } + if (obj5) { + ecode6 = SWIG_AsVal_int(obj5, &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "6"" of type '" "wxHeaderSortIconType""'"); + } + arg6 = static_cast< wxHeaderSortIconType >(val6); + } + if (obj6) { + res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "7"" of type '" "wxHeaderButtonParams *""'"); + } + arg7 = reinterpret_cast< wxHeaderButtonParams * >(argp7); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawHeaderButton(arg2,*arg3,(wxRect const &)*arg4,arg5); + (arg1)->DrawHeaderButtonContents(arg2,*arg3,(wxRect const &)*arg4,arg5,arg6,arg7); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -26857,6 +27437,45 @@ fail: } +SWIGINTERN PyObject *_wrap_RendererNative_GetHeaderButtonHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxRendererNative *arg1 = (wxRendererNative *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "win", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RendererNative_GetHeaderButtonHeight",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRendererNative, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_GetHeaderButtonHeight" "', expected argument " "1"" of type '" "wxRendererNative *""'"); + } + arg1 = reinterpret_cast< wxRendererNative * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RendererNative_GetHeaderButtonHeight" "', expected argument " "2"" of type '" "wxWindow *""'"); + } + arg2 = reinterpret_cast< wxWindow * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetHeaderButtonHeight(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_RendererNative_DrawTreeItemButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxRendererNative *arg1 = (wxRendererNative *) 0 ; @@ -31092,6 +31711,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Locale_GetCanonicalName", (PyCFunction)_wrap_Locale_GetCanonicalName, METH_O, NULL}, { (char *)"Locale_AddCatalogLookupPathPrefix", (PyCFunction) _wrap_Locale_AddCatalogLookupPathPrefix, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Locale_AddCatalog", (PyCFunction) _wrap_Locale_AddCatalog, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Locale_IsAvailable", (PyCFunction) _wrap_Locale_IsAvailable, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Locale_IsLoaded", (PyCFunction) _wrap_Locale_IsLoaded, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Locale_GetLanguageInfo", (PyCFunction) _wrap_Locale_GetLanguageInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Locale_GetLanguageName", (PyCFunction) _wrap_Locale_GetLanguageName, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -31378,6 +31998,24 @@ static PyMethodDef SwigMethods[] = { { (char *)"SplitterRenderParams_isHotSensitive_get", (PyCFunction)_wrap_SplitterRenderParams_isHotSensitive_get, METH_O, NULL}, { (char *)"SplitterRenderParams_swigregister", SplitterRenderParams_swigregister, METH_VARARGS, NULL}, { (char *)"SplitterRenderParams_swiginit", SplitterRenderParams_swiginit, METH_VARARGS, NULL}, + { (char *)"new_HeaderButtonParams", (PyCFunction)_wrap_new_HeaderButtonParams, METH_NOARGS, NULL}, + { (char *)"delete_HeaderButtonParams", (PyCFunction)_wrap_delete_HeaderButtonParams, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_arrowColour_set", _wrap_HeaderButtonParams_m_arrowColour_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_arrowColour_get", (PyCFunction)_wrap_HeaderButtonParams_m_arrowColour_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_selectionColour_set", _wrap_HeaderButtonParams_m_selectionColour_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_selectionColour_get", (PyCFunction)_wrap_HeaderButtonParams_m_selectionColour_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_labelText_set", _wrap_HeaderButtonParams_m_labelText_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_labelText_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelText_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_labelFont_set", _wrap_HeaderButtonParams_m_labelFont_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_labelFont_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelFont_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_labelColour_set", _wrap_HeaderButtonParams_m_labelColour_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_labelColour_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelColour_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_labelBitmap_set", _wrap_HeaderButtonParams_m_labelBitmap_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_labelBitmap_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelBitmap_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_labelAlignment_set", _wrap_HeaderButtonParams_m_labelAlignment_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_labelAlignment_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelAlignment_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_swigregister", HeaderButtonParams_swigregister, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_swiginit", HeaderButtonParams_swiginit, METH_VARARGS, NULL}, { (char *)"new_RendererVersion", (PyCFunction) _wrap_new_RendererVersion, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_RendererVersion", (PyCFunction)_wrap_delete_RendererVersion, METH_O, NULL}, { (char *)"RendererVersion_IsCompatible", (PyCFunction) _wrap_RendererVersion_IsCompatible, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -31386,6 +32024,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"RendererVersion_swigregister", RendererVersion_swigregister, METH_VARARGS, NULL}, { (char *)"RendererVersion_swiginit", RendererVersion_swiginit, METH_VARARGS, NULL}, { (char *)"RendererNative_DrawHeaderButton", (PyCFunction) _wrap_RendererNative_DrawHeaderButton, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"RendererNative_DrawHeaderButtonContents", (PyCFunction) _wrap_RendererNative_DrawHeaderButtonContents, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"RendererNative_GetHeaderButtonHeight", (PyCFunction) _wrap_RendererNative_GetHeaderButtonHeight, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RendererNative_DrawTreeItemButton", (PyCFunction) _wrap_RendererNative_DrawTreeItemButton, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RendererNative_DrawSplitterBorder", (PyCFunction) _wrap_RendererNative_DrawSplitterBorder, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RendererNative_DrawSplitterSash", (PyCFunction) _wrap_RendererNative_DrawSplitterSash, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -31917,6 +32557,7 @@ static swig_type_info _swigt__p_wxFontList = {"_p_wxFontList", "wxFontList *", 0 static swig_type_info _swigt__p_wxFontMapper = {"_p_wxFontMapper", "wxFontMapper *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxGDIObjListBase = {"_p_wxGDIObjListBase", "wxGDIObjListBase *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxGDIObject = {"_p_wxGDIObject", "wxGDIObject *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_wxHeaderButtonParams = {"_p_wxHeaderButtonParams", "wxHeaderButtonParams *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxIcon = {"_p_wxIcon", "wxIcon *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxIconBundle = {"_p_wxIconBundle", "wxIconBundle *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxIconLocation = {"_p_wxIconLocation", "wxIconLocation *", 0, 0, (void*)0, 0}; @@ -32094,6 +32735,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxGIFHandler, &_swigt__p_wxGridBagSizer, &_swigt__p_wxGridSizer, + &_swigt__p_wxHeaderButtonParams, &_swigt__p_wxICOHandler, &_swigt__p_wxIcon, &_swigt__p_wxIconBundle, @@ -32217,6 +32859,7 @@ static swig_cast_info _swigc__p_wxFontList[] = { {&_swigt__p_wxFontList, 0, 0, static swig_cast_info _swigc__p_wxFontMapper[] = { {&_swigt__p_wxFontMapper, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGDIObjListBase[] = { {&_swigt__p_wxGDIObjListBase, 0, 0, 0}, {&_swigt__p_wxBrushList, _p_wxBrushListTo_p_wxGDIObjListBase, 0, 0}, {&_swigt__p_wxFontList, _p_wxFontListTo_p_wxGDIObjListBase, 0, 0}, {&_swigt__p_wxPenList, _p_wxPenListTo_p_wxGDIObjListBase, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGDIObject[] = { {&_swigt__p_wxIcon, _p_wxIconTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxPen, _p_wxPenTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxFont, _p_wxFontTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxPalette, _p_wxPaletteTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxGDIObject, 0, 0, 0}, {&_swigt__p_wxCursor, _p_wxCursorTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxBitmap, _p_wxBitmapTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxRegion, _p_wxRegionTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxBrush, _p_wxBrushTo_p_wxGDIObject, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxHeaderButtonParams[] = { {&_swigt__p_wxHeaderButtonParams, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxIcon[] = { {&_swigt__p_wxIcon, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxIconBundle[] = { {&_swigt__p_wxIconBundle, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxIconLocation[] = { {&_swigt__p_wxIconLocation, 0, 0, 0},{0, 0, 0, 0}}; @@ -32394,6 +33037,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxGIFHandler, _swigc__p_wxGridBagSizer, _swigc__p_wxGridSizer, + _swigc__p_wxHeaderButtonParams, _swigc__p_wxICOHandler, _swigc__p_wxIcon, _swigc__p_wxIconBundle, @@ -33438,6 +34082,9 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "CONTROL_UNDETERMINED",SWIG_From_int(static_cast< int >(wxCONTROL_UNDETERMINED))); SWIG_Python_SetConstant(d, "CONTROL_FLAGS_MASK",SWIG_From_int(static_cast< int >(wxCONTROL_FLAGS_MASK))); SWIG_Python_SetConstant(d, "CONTROL_DIRTY",SWIG_From_int(static_cast< int >(wxCONTROL_DIRTY))); + SWIG_Python_SetConstant(d, "HDR_SORT_ICON_NONE",SWIG_From_int(static_cast< int >(wxHDR_SORT_ICON_NONE))); + SWIG_Python_SetConstant(d, "HDR_SORT_ICON_UP",SWIG_From_int(static_cast< int >(wxHDR_SORT_ICON_UP))); + SWIG_Python_SetConstant(d, "HDR_SORT_ICON_DOWN",SWIG_From_int(static_cast< int >(wxHDR_SORT_ICON_DOWN))); SWIG_Python_SetConstant(d, "RendererVersion_Current_Version",SWIG_From_int(static_cast< int >(wxRendererVersion::Current_Version))); SWIG_Python_SetConstant(d, "RendererVersion_Current_Age",SWIG_From_int(static_cast< int >(wxRendererVersion::Current_Age))); diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py index edeab7b2ca..a978b3cd4c 100644 --- a/wxPython/src/mac/_misc.py +++ b/wxPython/src/mac/_misc.py @@ -1186,6 +1186,20 @@ class PlatformInformation(object): """IsOk(self) -> bool""" return _misc_.PlatformInformation_IsOk(*args, **kwargs) + ArchName = property(GetArchName,doc="See `GetArchName`") + Architecture = property(GetArchitecture,SetArchitecture,doc="See `GetArchitecture` and `SetArchitecture`") + Endianness = property(GetEndianness,SetEndianness,doc="See `GetEndianness` and `SetEndianness`") + EndiannessName = property(GetEndiannessName,doc="See `GetEndiannessName`") + OSMajorVersion = property(GetOSMajorVersion,doc="See `GetOSMajorVersion`") + OSMinorVersion = property(GetOSMinorVersion,doc="See `GetOSMinorVersion`") + OperatingSystemFamilyName = property(GetOperatingSystemFamilyName,doc="See `GetOperatingSystemFamilyName`") + OperatingSystemId = property(GetOperatingSystemId,SetOperatingSystemId,doc="See `GetOperatingSystemId` and `SetOperatingSystemId`") + OperatingSystemIdName = property(GetOperatingSystemIdName,doc="See `GetOperatingSystemIdName`") + PortId = property(GetPortId,SetPortId,doc="See `GetPortId` and `SetPortId`") + PortIdName = property(GetPortIdName,doc="See `GetPortIdName`") + PortIdShortName = property(GetPortIdShortName,doc="See `GetPortIdShortName`") + ToolkitMajorVersion = property(GetToolkitMajorVersion,doc="See `GetToolkitMajorVersion`") + ToolkitMinorVersion = property(GetToolkitMinorVersion,doc="See `GetToolkitMinorVersion`") _misc_.PlatformInformation_swigregister(PlatformInformation) @@ -1906,6 +1920,12 @@ class Process(_core.EvtHandler): """IsErrorAvailable(self) -> bool""" return _misc_.Process_IsErrorAvailable(*args, **kwargs) + ErrorStream = property(GetErrorStream,doc="See `GetErrorStream`") + InputStream = property(GetInputStream,doc="See `GetInputStream`") + OutputStream = property(GetOutputStream,doc="See `GetOutputStream`") + InputOpened = property(IsInputOpened) + InputAvailable = property(IsInputAvailable) + ErrorAvailable = property(IsErrorAvailable) _misc_.Process_swigregister(Process) def Process_Kill(*args, **kwargs): @@ -1937,6 +1957,8 @@ class ProcessEvent(_core.Event): m_pid = property(_misc_.ProcessEvent_m_pid_get, _misc_.ProcessEvent_m_pid_set) m_exitcode = property(_misc_.ProcessEvent_m_exitcode_get, _misc_.ProcessEvent_m_exitcode_set) + ExitCode = property(GetExitCode,doc="See `GetExitCode`") + Pid = property(GetPid,doc="See `GetPid`") _misc_.ProcessEvent_swigregister(ProcessEvent) wxEVT_END_PROCESS = _misc_.wxEVT_END_PROCESS diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py index 7bc3793f47..57fc2b6ea1 100644 --- a/wxPython/src/mac/_windows.py +++ b/wxPython/src/mac/_windows.py @@ -278,6 +278,10 @@ class ScrolledWindow(Panel): return _windows_.ScrolledWindow_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + ScaleX = property(GetScaleX,doc="See `GetScaleX`") + ScaleY = property(GetScaleY,doc="See `GetScaleY`") + TargetWindow = property(GetTargetWindow,SetTargetWindow,doc="See `GetTargetWindow` and `SetTargetWindow`") + ViewStart = property(GetViewStart,doc="See `GetViewStart`") _windows_.ScrolledWindow_swigregister(ScrolledWindow) def PreScrolledWindow(*args, **kwargs): @@ -793,6 +797,7 @@ class SplashScreenWindow(_core.Window): """GetBitmap(self) -> Bitmap""" return _windows_.SplashScreenWindow_GetBitmap(*args, **kwargs) + Bitmap = property(GetBitmap,SetBitmap,doc="See `GetBitmap` and `SetBitmap`") _windows_.SplashScreenWindow_swigregister(SplashScreenWindow) class SplashScreen(Frame): @@ -820,6 +825,9 @@ class SplashScreen(Frame): """GetTimeout(self) -> int""" return _windows_.SplashScreen_GetTimeout(*args, **kwargs) + SplashStyle = property(GetSplashStyle,doc="See `GetSplashStyle`") + SplashWindow = property(GetSplashWindow,doc="See `GetSplashWindow`") + Timeout = property(GetTimeout,doc="See `GetTimeout`") _windows_.SplashScreen_swigregister(SplashScreen) #--------------------------------------------------------------------------- @@ -919,7 +927,12 @@ class StatusBar(_core.Window): for i in range(len(items)): self.SetStatusText(items[i], i) - Fields = property(GetFields,SetFields) + BorderX = property(GetBorderX,doc="See `GetBorderX`") + BorderY = property(GetBorderY,doc="See `GetBorderY`") + FieldRect = property(GetFieldRect,doc="See `GetFieldRect`") + Fields = property(GetFields,SetFields,doc="See `GetFields` and `SetFields`") + FieldsCount = property(GetFieldsCount,SetFieldsCount,doc="See `GetFieldsCount` and `SetFieldsCount`") + StatusText = property(GetStatusText,SetStatusText,doc="See `GetStatusText` and `SetStatusText`") _windows_.StatusBar_swigregister(StatusBar) def PreStatusBar(*args, **kwargs): @@ -1243,6 +1256,15 @@ class SplitterWindow(_core.Window): return _windows_.SplitterWindow_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + BorderSize = property(GetBorderSize,SetBorderSize,doc="See `GetBorderSize` and `SetBorderSize`") + MinimumPaneSize = property(GetMinimumPaneSize,SetMinimumPaneSize,doc="See `GetMinimumPaneSize` and `SetMinimumPaneSize`") + NeedUpdating = property(GetNeedUpdating,SetNeedUpdating,doc="See `GetNeedUpdating` and `SetNeedUpdating`") + SashGravity = property(GetSashGravity,SetSashGravity,doc="See `GetSashGravity` and `SetSashGravity`") + SashPosition = property(GetSashPosition,SetSashPosition,doc="See `GetSashPosition` and `SetSashPosition`") + SashSize = property(GetSashSize,SetSashSize,doc="See `GetSashSize` and `SetSashSize`") + SplitMode = property(GetSplitMode,SetSplitMode,doc="See `GetSplitMode` and `SetSplitMode`") + Window1 = property(GetWindow1,doc="See `GetWindow1`") + Window2 = property(GetWindow2,doc="See `GetWindow2`") _windows_.SplitterWindow_swigregister(SplitterWindow) SplitterNameStr = cvar.SplitterNameStr @@ -1332,6 +1354,10 @@ class SplitterEvent(_core.NotifyEvent): """ return _windows_.SplitterEvent_GetY(*args, **kwargs) + SashPosition = property(GetSashPosition,SetSashPosition,doc="See `GetSashPosition` and `SetSashPosition`") + WindowBeingRemoved = property(GetWindowBeingRemoved,doc="See `GetWindowBeingRemoved`") + X = property(GetX,doc="See `GetX`") + Y = property(GetY,doc="See `GetY`") _windows_.SplitterEvent_swigregister(SplitterEvent) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = _windows_.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED @@ -1456,6 +1482,12 @@ class SashWindow(_core.Window): """SizeWindows(self)""" return _windows_.SashWindow_SizeWindows(*args, **kwargs) + DefaultBorderSize = property(GetDefaultBorderSize,SetDefaultBorderSize,doc="See `GetDefaultBorderSize` and `SetDefaultBorderSize`") + ExtraBorderSize = property(GetExtraBorderSize,SetExtraBorderSize,doc="See `GetExtraBorderSize` and `SetExtraBorderSize`") + MaximumSizeX = property(GetMaximumSizeX,SetMaximumSizeX,doc="See `GetMaximumSizeX` and `SetMaximumSizeX`") + MaximumSizeY = property(GetMaximumSizeY,SetMaximumSizeY,doc="See `GetMaximumSizeY` and `SetMaximumSizeY`") + MinimumSizeX = property(GetMinimumSizeX,SetMinimumSizeX,doc="See `GetMinimumSizeX` and `SetMinimumSizeX`") + MinimumSizeY = property(GetMinimumSizeY,SetMinimumSizeY,doc="See `GetMinimumSizeY` and `SetMinimumSizeY`") _windows_.SashWindow_swigregister(SashWindow) SashNameStr = cvar.SashNameStr SashLayoutNameStr = cvar.SashLayoutNameStr @@ -1498,6 +1530,9 @@ class SashEvent(_core.CommandEvent): """GetDragStatus(self) -> int""" return _windows_.SashEvent_GetDragStatus(*args, **kwargs) + DragRect = property(GetDragRect,SetDragRect,doc="See `GetDragRect` and `SetDragRect`") + DragStatus = property(GetDragStatus,SetDragStatus,doc="See `GetDragStatus` and `SetDragStatus`") + Edge = property(GetEdge,SetEdge,doc="See `GetEdge` and `SetEdge`") _windows_.SashEvent_swigregister(SashEvent) wxEVT_SASH_DRAGGED = _windows_.wxEVT_SASH_DRAGGED @@ -1566,6 +1601,11 @@ class QueryLayoutInfoEvent(_core.Event): """GetAlignment(self) -> int""" return _windows_.QueryLayoutInfoEvent_GetAlignment(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") + Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") + RequestedLength = property(GetRequestedLength,SetRequestedLength,doc="See `GetRequestedLength` and `SetRequestedLength`") + Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") _windows_.QueryLayoutInfoEvent_swigregister(QueryLayoutInfoEvent) class CalculateLayoutEvent(_core.Event): @@ -1639,6 +1679,8 @@ class SashLayoutWindow(SashWindow): """SetOrientation(self, int orientation)""" return _windows_.SashLayoutWindow_SetOrientation(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") _windows_.SashLayoutWindow_swigregister(SashLayoutWindow) def PreSashLayoutWindow(*args, **kwargs): @@ -2499,6 +2541,8 @@ class SingleChoiceDialog(Dialog): """ return _windows_.SingleChoiceDialog_SetSelection(*args, **kwargs) + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + StringSelection = property(GetStringSelection,doc="See `GetStringSelection`") _windows_.SingleChoiceDialog_swigregister(SingleChoiceDialog) TextEntryDialogStyle = _windows_.TextEntryDialogStyle @@ -3869,6 +3913,19 @@ class PrintData(_core.Object): """SetPrivData(self, PyObject data)""" return _windows_.PrintData_SetPrivData(*args, **kwargs) + Bin = property(GetBin,SetBin,doc="See `GetBin` and `SetBin`") + Collate = property(GetCollate,SetCollate,doc="See `GetCollate` and `SetCollate`") + Colour = property(GetColour,SetColour,doc="See `GetColour` and `SetColour`") + Duplex = property(GetDuplex,SetDuplex,doc="See `GetDuplex` and `SetDuplex`") + Filename = property(GetFilename,SetFilename,doc="See `GetFilename` and `SetFilename`") + NoCopies = property(GetNoCopies,SetNoCopies,doc="See `GetNoCopies` and `SetNoCopies`") + Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") + PaperId = property(GetPaperId,SetPaperId,doc="See `GetPaperId` and `SetPaperId`") + PaperSize = property(GetPaperSize,SetPaperSize,doc="See `GetPaperSize` and `SetPaperSize`") + PrintMode = property(GetPrintMode,SetPrintMode,doc="See `GetPrintMode` and `SetPrintMode`") + PrinterName = property(GetPrinterName,SetPrinterName,doc="See `GetPrinterName` and `SetPrinterName`") + PrivData = property(GetPrivData,SetPrivData,doc="See `GetPrivData` and `SetPrivData`") + Quality = property(GetQuality,SetQuality,doc="See `GetQuality` and `SetQuality`") _windows_.PrintData_swigregister(PrintData) PrintoutTitleStr = cvar.PrintoutTitleStr PreviewCanvasNameStr = cvar.PreviewCanvasNameStr @@ -4011,6 +4068,15 @@ class PageSetupDialogData(_core.Object): return _windows_.PageSetupDialogData_CalculatePaperSizeFromId(*args, **kwargs) def __nonzero__(self): return self.Ok() + DefaultInfo = property(GetDefaultInfo,SetDefaultInfo,doc="See `GetDefaultInfo` and `SetDefaultInfo`") + DefaultMinMargins = property(GetDefaultMinMargins,SetDefaultMinMargins,doc="See `GetDefaultMinMargins` and `SetDefaultMinMargins`") + MarginBottomRight = property(GetMarginBottomRight,SetMarginBottomRight,doc="See `GetMarginBottomRight` and `SetMarginBottomRight`") + MarginTopLeft = property(GetMarginTopLeft,SetMarginTopLeft,doc="See `GetMarginTopLeft` and `SetMarginTopLeft`") + MinMarginBottomRight = property(GetMinMarginBottomRight,SetMinMarginBottomRight,doc="See `GetMinMarginBottomRight` and `SetMinMarginBottomRight`") + MinMarginTopLeft = property(GetMinMarginTopLeft,SetMinMarginTopLeft,doc="See `GetMinMarginTopLeft` and `SetMinMarginTopLeft`") + PaperId = property(GetPaperId,SetPaperId,doc="See `GetPaperId` and `SetPaperId`") + PaperSize = property(GetPaperSize,SetPaperSize,doc="See `GetPaperSize` and `SetPaperSize`") + PrintData = property(GetPrintData,SetPrintData,doc="See `GetPrintData` and `SetPrintData`") _windows_.PageSetupDialogData_swigregister(PageSetupDialogData) class PageSetupDialog(_core.Object): @@ -4035,6 +4101,8 @@ class PageSetupDialog(_core.Object): return _windows_.PageSetupDialog_ShowModal(*args, **kwargs) def Destroy(self): pass + PageSetupData = property(GetPageSetupData,doc="See `GetPageSetupData`") + PageSetupDialogData = property(GetPageSetupDialogData,doc="See `GetPageSetupDialogData`") _windows_.PageSetupDialog_swigregister(PageSetupDialog) class PrintDialogData(_core.Object): @@ -4167,6 +4235,16 @@ class PrintDialogData(_core.Object): return _windows_.PrintDialogData_SetPrintData(*args, **kwargs) def __nonzero__(self): return self.Ok() + AllPages = property(GetAllPages,SetAllPages,doc="See `GetAllPages` and `SetAllPages`") + Collate = property(GetCollate,SetCollate,doc="See `GetCollate` and `SetCollate`") + FromPage = property(GetFromPage,SetFromPage,doc="See `GetFromPage` and `SetFromPage`") + MaxPage = property(GetMaxPage,SetMaxPage,doc="See `GetMaxPage` and `SetMaxPage`") + MinPage = property(GetMinPage,SetMinPage,doc="See `GetMinPage` and `SetMinPage`") + NoCopies = property(GetNoCopies,SetNoCopies,doc="See `GetNoCopies` and `SetNoCopies`") + PrintData = property(GetPrintData,SetPrintData,doc="See `GetPrintData` and `SetPrintData`") + PrintToFile = property(GetPrintToFile,SetPrintToFile,doc="See `GetPrintToFile` and `SetPrintToFile`") + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + ToPage = property(GetToPage,SetToPage,doc="See `GetToPage` and `SetToPage`") _windows_.PrintDialogData_swigregister(PrintDialogData) class PrintDialog(_core.Object): @@ -4195,6 +4273,9 @@ class PrintDialog(_core.Object): return _windows_.PrintDialog_GetPrintDC(*args, **kwargs) def Destroy(self): pass + PrintDC = property(GetPrintDC,doc="See `GetPrintDC`") + PrintData = property(GetPrintData,doc="See `GetPrintData`") + PrintDialogData = property(GetPrintDialogData,doc="See `GetPrintDialogData`") _windows_.PrintDialog_swigregister(PrintDialog) PRINTER_NO_ERROR = _windows_.PRINTER_NO_ERROR @@ -4242,6 +4323,8 @@ class Printer(_core.Object): return _windows_.Printer_GetLastError(*args, **kwargs) GetLastError = staticmethod(GetLastError) + Abort = property(GetAbort,doc="See `GetAbort`") + PrintDialogData = property(GetPrintDialogData,doc="See `GetPrintDialogData`") _windows_.Printer_swigregister(Printer) def Printer_GetLastError(*args): @@ -4373,6 +4456,12 @@ class Printout(_core.Object): base_GetPageInfo = wx._deprecated(base_GetPageInfo, "Please use Printout.GetPageInfo instead.") + DC = property(GetDC,SetDC,doc="See `GetDC` and `SetDC`") + PPIPrinter = property(GetPPIPrinter,SetPPIPrinter,doc="See `GetPPIPrinter` and `SetPPIPrinter`") + PPIScreen = property(GetPPIScreen,SetPPIScreen,doc="See `GetPPIScreen` and `SetPPIScreen`") + PageSizeMM = property(GetPageSizeMM,SetPageSizeMM,doc="See `GetPageSizeMM` and `SetPageSizeMM`") + PageSizePixels = property(GetPageSizePixels,SetPageSizePixels,doc="See `GetPageSizePixels` and `SetPageSizePixels`") + Title = property(GetTitle,doc="See `GetTitle`") _windows_.Printout_swigregister(Printout) class PreviewCanvas(ScrolledWindow): @@ -4419,6 +4508,7 @@ class PreviewFrame(Frame): """GetControlBar(self) -> PreviewControlBar""" return _windows_.PreviewFrame_GetControlBar(*args, **kwargs) + ControlBar = property(GetControlBar,doc="See `GetControlBar`") _windows_.PreviewFrame_swigregister(PreviewFrame) PREVIEW_PRINT = _windows_.PREVIEW_PRINT @@ -4482,6 +4572,8 @@ class PreviewControlBar(Panel): """OnGoto(self)""" return _windows_.PreviewControlBar_OnGoto(*args, **kwargs) + PrintPreview = property(GetPrintPreview,doc="See `GetPrintPreview`") + ZoomControl = property(GetZoomControl,SetZoomControl,doc="See `GetZoomControl` and `SetZoomControl`") _windows_.PreviewControlBar_swigregister(PreviewControlBar) class PrintPreview(_core.Object): @@ -4585,6 +4677,15 @@ class PrintPreview(_core.Object): return _windows_.PrintPreview_DetermineScaling(*args, **kwargs) def __nonzero__(self): return self.Ok() + Canvas = property(GetCanvas,SetCanvas,doc="See `GetCanvas` and `SetCanvas`") + CurrentPage = property(GetCurrentPage,SetCurrentPage,doc="See `GetCurrentPage` and `SetCurrentPage`") + Frame = property(GetFrame,SetFrame,doc="See `GetFrame` and `SetFrame`") + MaxPage = property(GetMaxPage,doc="See `GetMaxPage`") + MinPage = property(GetMinPage,doc="See `GetMinPage`") + PrintDialogData = property(GetPrintDialogData,doc="See `GetPrintDialogData`") + Printout = property(GetPrintout,SetPrintout,doc="See `GetPrintout` and `SetPrintout`") + PrintoutForPrinting = property(GetPrintoutForPrinting,doc="See `GetPrintoutForPrinting`") + Zoom = property(GetZoom,SetZoom,doc="See `GetZoom` and `SetZoom`") _windows_.PrintPreview_swigregister(PrintPreview) class PyPrintPreview(PrintPreview): diff --git a/wxPython/src/mac/xrc.py b/wxPython/src/mac/xrc.py index ecac915e01..c90dd9a978 100644 --- a/wxPython/src/mac/xrc.py +++ b/wxPython/src/mac/xrc.py @@ -366,6 +366,18 @@ class XmlNode(object): """GetContent(self) -> String""" return _xrc.XmlNode_GetContent(*args, **kwargs) + def IsWhitespaceOnly(*args, **kwargs): + """IsWhitespaceOnly(self) -> bool""" + return _xrc.XmlNode_IsWhitespaceOnly(*args, **kwargs) + + def GetDepth(*args, **kwargs): + """GetDepth(self, XmlNode grandparent=None) -> int""" + return _xrc.XmlNode_GetDepth(*args, **kwargs) + + def GetNodeContent(*args, **kwargs): + """GetNodeContent(self) -> String""" + return _xrc.XmlNode_GetNodeContent(*args, **kwargs) + def GetParent(*args, **kwargs): """GetParent(self) -> XmlNode""" return _xrc.XmlNode_GetParent(*args, **kwargs) @@ -425,6 +437,9 @@ def XmlNodeEasy(*args, **kwargs): val = _xrc.new_XmlNodeEasy(*args, **kwargs) return val +XML_NO_INDENTATION = _xrc.XML_NO_INDENTATION +XMLDOC_NONE = _xrc.XMLDOC_NONE +XMLDOC_KEEP_WHITESPACE_NODES = _xrc.XMLDOC_KEEP_WHITESPACE_NODES class XmlDocument(_core.Object): """Proxy of C++ XmlDocument class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') @@ -435,19 +450,19 @@ class XmlDocument(_core.Object): __swig_destroy__ = _xrc.delete_XmlDocument __del__ = lambda self : None; def Load(*args, **kwargs): - """Load(self, String filename, String encoding=UTF8String) -> bool""" + """Load(self, String filename, String encoding=UTF8String, int flags=XMLDOC_NONE) -> bool""" return _xrc.XmlDocument_Load(*args, **kwargs) def LoadFromStream(*args, **kwargs): - """LoadFromStream(self, InputStream stream, String encoding=UTF8String) -> bool""" + """LoadFromStream(self, InputStream stream, String encoding=UTF8String, int flags=XMLDOC_NONE) -> bool""" return _xrc.XmlDocument_LoadFromStream(*args, **kwargs) def Save(*args, **kwargs): - """Save(self, String filename) -> bool""" + """Save(self, String filename, int indentstep=1) -> bool""" return _xrc.XmlDocument_Save(*args, **kwargs) def SaveToStream(*args, **kwargs): - """SaveToStream(self, OutputStream stream) -> bool""" + """SaveToStream(self, OutputStream stream, int indentstep=1) -> bool""" return _xrc.XmlDocument_SaveToStream(*args, **kwargs) def IsOk(*args, **kwargs): diff --git a/wxPython/src/mac/xrc_wrap.cpp b/wxPython/src/mac/xrc_wrap.cpp index b16bbb0b07..d7c29b364d 100644 --- a/wxPython/src/mac/xrc_wrap.cpp +++ b/wxPython/src/mac/xrc_wrap.cpp @@ -5668,6 +5668,111 @@ fail: } +SWIGINTERN PyObject *_wrap_XmlNode_IsWhitespaceOnly(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxXmlNode *arg1 = (wxXmlNode *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxXmlNode, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlNode_IsWhitespaceOnly" "', expected argument " "1"" of type '" "wxXmlNode const *""'"); + } + arg1 = reinterpret_cast< wxXmlNode * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxXmlNode const *)arg1)->IsWhitespaceOnly(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_XmlNode_GetDepth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxXmlNode *arg1 = (wxXmlNode *) 0 ; + wxXmlNode *arg2 = (wxXmlNode *) NULL ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "grandparent", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:XmlNode_GetDepth",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxXmlNode, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlNode_GetDepth" "', expected argument " "1"" of type '" "wxXmlNode const *""'"); + } + arg1 = reinterpret_cast< wxXmlNode * >(argp1); + if (obj1) { + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxXmlNode, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "XmlNode_GetDepth" "', expected argument " "2"" of type '" "wxXmlNode *""'"); + } + arg2 = reinterpret_cast< wxXmlNode * >(argp2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxXmlNode const *)arg1)->GetDepth(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_XmlNode_GetNodeContent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxXmlNode *arg1 = (wxXmlNode *) 0 ; + wxString result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxXmlNode, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlNode_GetNodeContent" "', expected argument " "1"" of type '" "wxXmlNode const *""'"); + } + arg1 = reinterpret_cast< wxXmlNode * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxXmlNode const *)arg1)->GetNodeContent(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_XmlNode_GetParent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxXmlNode *arg1 = (wxXmlNode *) 0 ; @@ -6359,19 +6464,23 @@ SWIGINTERN PyObject *_wrap_XmlDocument_Load(PyObject *SWIGUNUSEDPARM(self), PyOb wxString *arg2 = 0 ; wxString const &arg3_defvalue = wxPyUTF8String ; wxString *arg3 = (wxString *) &arg3_defvalue ; + int arg4 = (int) wxXMLDOC_NONE ; bool result; void *argp1 = 0 ; int res1 = 0 ; bool temp2 = false ; bool temp3 = false ; + int val4 ; + int ecode4 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "filename",(char *) "encoding", NULL + (char *) "self",(char *) "filename",(char *) "encoding",(char *) "flags", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:XmlDocument_Load",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:XmlDocument_Load",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxXmlDocument, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlDocument_Load" "', expected argument " "1"" of type '" "wxXmlDocument *""'"); @@ -6389,9 +6498,16 @@ SWIGINTERN PyObject *_wrap_XmlDocument_Load(PyObject *SWIGUNUSEDPARM(self), PyOb temp3 = true; } } + if (obj3) { + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "XmlDocument_Load" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Load((wxString const &)*arg2,(wxString const &)*arg3); + result = (bool)(arg1)->Load((wxString const &)*arg2,(wxString const &)*arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6426,20 +6542,24 @@ SWIGINTERN PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *SWIGUNUSEDPARM(s wxInputStream *arg2 = 0 ; wxString const &arg3_defvalue = wxPyUTF8String ; wxString *arg3 = (wxString *) &arg3_defvalue ; + int arg4 = (int) wxXMLDOC_NONE ; bool result; void *argp1 = 0 ; int res1 = 0 ; wxPyInputStream *temp2 ; bool created2 ; bool temp3 = false ; + int val4 ; + int ecode4 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "stream",(char *) "encoding", NULL + (char *) "self",(char *) "stream",(char *) "encoding",(char *) "flags", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:XmlDocument_LoadFromStream",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:XmlDocument_LoadFromStream",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxXmlDocument, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlDocument_LoadFromStream" "', expected argument " "1"" of type '" "wxXmlDocument *""'"); @@ -6466,9 +6586,16 @@ SWIGINTERN PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *SWIGUNUSEDPARM(s temp3 = true; } } + if (obj3) { + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "XmlDocument_LoadFromStream" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Load(*arg2,(wxString const &)*arg3); + result = (bool)(arg1)->Load(*arg2,(wxString const &)*arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6499,17 +6626,21 @@ SWIGINTERN PyObject *_wrap_XmlDocument_Save(PyObject *SWIGUNUSEDPARM(self), PyOb PyObject *resultobj = 0; wxXmlDocument *arg1 = (wxXmlDocument *) 0 ; wxString *arg2 = 0 ; + int arg3 = (int) 1 ; bool result; void *argp1 = 0 ; int res1 = 0 ; bool temp2 = false ; + int val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "filename", NULL + (char *) "self",(char *) "filename",(char *) "indentstep", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:XmlDocument_Save",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:XmlDocument_Save",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxXmlDocument, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlDocument_Save" "', expected argument " "1"" of type '" "wxXmlDocument const *""'"); @@ -6520,9 +6651,16 @@ SWIGINTERN PyObject *_wrap_XmlDocument_Save(PyObject *SWIGUNUSEDPARM(self), PyOb if (arg2 == NULL) SWIG_fail; temp2 = true; } + if (obj2) { + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "XmlDocument_Save" "', expected argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxXmlDocument const *)arg1)->Save((wxString const &)*arg2); + result = (bool)((wxXmlDocument const *)arg1)->Save((wxString const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6547,18 +6685,22 @@ SWIGINTERN PyObject *_wrap_XmlDocument_SaveToStream(PyObject *SWIGUNUSEDPARM(sel PyObject *resultobj = 0; wxXmlDocument *arg1 = (wxXmlDocument *) 0 ; wxOutputStream *arg2 = 0 ; + int arg3 = (int) 1 ; bool result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + int val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "stream", NULL + (char *) "self",(char *) "stream",(char *) "indentstep", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:XmlDocument_SaveToStream",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:XmlDocument_SaveToStream",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxXmlDocument, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlDocument_SaveToStream" "', expected argument " "1"" of type '" "wxXmlDocument const *""'"); @@ -6572,9 +6714,16 @@ SWIGINTERN PyObject *_wrap_XmlDocument_SaveToStream(PyObject *SWIGUNUSEDPARM(sel SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "XmlDocument_SaveToStream" "', expected argument " "2"" of type '" "wxOutputStream &""'"); } arg2 = reinterpret_cast< wxOutputStream * >(argp2); + if (obj2) { + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "XmlDocument_SaveToStream" "', expected argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxXmlDocument const *)arg1)->Save(*arg2); + result = (bool)((wxXmlDocument const *)arg1)->Save(*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8558,6 +8707,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"XmlNode_GetType", (PyCFunction)_wrap_XmlNode_GetType, METH_O, NULL}, { (char *)"XmlNode_GetName", (PyCFunction)_wrap_XmlNode_GetName, METH_O, NULL}, { (char *)"XmlNode_GetContent", (PyCFunction)_wrap_XmlNode_GetContent, METH_O, NULL}, + { (char *)"XmlNode_IsWhitespaceOnly", (PyCFunction)_wrap_XmlNode_IsWhitespaceOnly, METH_O, NULL}, + { (char *)"XmlNode_GetDepth", (PyCFunction) _wrap_XmlNode_GetDepth, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"XmlNode_GetNodeContent", (PyCFunction)_wrap_XmlNode_GetNodeContent, METH_O, NULL}, { (char *)"XmlNode_GetParent", (PyCFunction)_wrap_XmlNode_GetParent, METH_O, NULL}, { (char *)"XmlNode_GetNext", (PyCFunction)_wrap_XmlNode_GetNext, METH_O, NULL}, { (char *)"XmlNode_GetChildren", (PyCFunction)_wrap_XmlNode_GetChildren, METH_O, NULL}, @@ -9843,6 +9995,9 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "XML_DOCUMENT_FRAG_NODE",SWIG_From_int(static_cast< int >(wxXML_DOCUMENT_FRAG_NODE))); SWIG_Python_SetConstant(d, "XML_NOTATION_NODE",SWIG_From_int(static_cast< int >(wxXML_NOTATION_NODE))); SWIG_Python_SetConstant(d, "XML_HTML_DOCUMENT_NODE",SWIG_From_int(static_cast< int >(wxXML_HTML_DOCUMENT_NODE))); + SWIG_Python_SetConstant(d, "XML_NO_INDENTATION",SWIG_From_int(static_cast< int >(wxXML_NO_INDENTATION))); + SWIG_Python_SetConstant(d, "XMLDOC_NONE",SWIG_From_int(static_cast< int >(wxXMLDOC_NONE))); + SWIG_Python_SetConstant(d, "XMLDOC_KEEP_WHITESPACE_NODES",SWIG_From_int(static_cast< int >(wxXMLDOC_KEEP_WHITESPACE_NODES))); wxXmlInitResourceModule(); diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py index cfd85af1e4..afa7ea4797 100644 --- a/wxPython/src/msw/_controls.py +++ b/wxPython/src/msw/_controls.py @@ -2068,6 +2068,10 @@ class ScrollBar(_core.Control): return _controls_.ScrollBar_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + PageSize = property(GetPageSize,doc="See `GetPageSize`") + Range = property(GetRange,doc="See `GetRange`") + ThumbPosition = property(GetThumbPosition,SetThumbPosition,doc="See `GetThumbPosition` and `SetThumbPosition`") + ThumbSize = property(GetThumbSize,doc="See `GetThumbSize`") _controls_.ScrollBar_swigregister(ScrollBar) ScrollBarNameStr = cvar.ScrollBarNameStr @@ -2170,6 +2174,9 @@ class SpinButton(_core.Control): return _controls_.SpinButton_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + Max = property(GetMax,SetMax,doc="See `GetMax` and `SetMax`") + Min = property(GetMin,SetMin,doc="See `GetMin` and `SetMin`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _controls_.SpinButton_swigregister(SpinButton) SPIN_BUTTON_NAME = cvar.SPIN_BUTTON_NAME SpinCtrlNameStr = cvar.SpinCtrlNameStr @@ -2265,6 +2272,9 @@ class SpinCtrl(_core.Control): return _controls_.SpinCtrl_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + Max = property(GetMax,doc="See `GetMax`") + Min = property(GetMin,doc="See `GetMin`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _controls_.SpinCtrl_swigregister(SpinCtrl) def PreSpinCtrl(*args, **kwargs): @@ -2304,6 +2314,7 @@ class SpinEvent(_core.NotifyEvent): """SetPosition(self, int pos)""" return _controls_.SpinEvent_SetPosition(*args, **kwargs) + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") _controls_.SpinEvent_swigregister(SpinEvent) wxEVT_COMMAND_SPINCTRL_UPDATED = _controls_.wxEVT_COMMAND_SPINCTRL_UPDATED @@ -2438,6 +2449,11 @@ class RadioBox(_core.Control): return _controls_.RadioBox_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + ColumnCount = property(GetColumnCount,doc="See `GetColumnCount`") + Count = property(GetCount,doc="See `GetCount`") + RowCount = property(GetRowCount,doc="See `GetRowCount`") + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + StringSelection = property(GetStringSelection,SetStringSelection,doc="See `GetStringSelection` and `SetStringSelection`") _controls_.RadioBox_swigregister(RadioBox) RadioBoxNameStr = cvar.RadioBoxNameStr RadioButtonNameStr = cvar.RadioButtonNameStr @@ -2515,6 +2531,7 @@ class RadioButton(_core.Control): return _controls_.RadioButton_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _controls_.RadioButton_swigregister(RadioButton) def PreRadioButton(*args, **kwargs): @@ -2681,6 +2698,15 @@ class Slider(_core.Control): return _controls_.Slider_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + LineSize = property(GetLineSize,SetLineSize,doc="See `GetLineSize` and `SetLineSize`") + Max = property(GetMax,SetMax,doc="See `GetMax` and `SetMax`") + Min = property(GetMin,SetMin,doc="See `GetMin` and `SetMin`") + PageSize = property(GetPageSize,SetPageSize,doc="See `GetPageSize` and `SetPageSize`") + SelEnd = property(GetSelEnd,doc="See `GetSelEnd`") + SelStart = property(GetSelStart,doc="See `GetSelStart`") + ThumbLength = property(GetThumbLength,SetThumbLength,doc="See `GetThumbLength` and `SetThumbLength`") + TickFreq = property(GetTickFreq,SetTickFreq,doc="See `GetTickFreq` and `SetTickFreq`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _controls_.Slider_swigregister(Slider) SliderNameStr = cvar.SliderNameStr @@ -6344,6 +6370,9 @@ def PreDatePickerCtrl(*args, **kwargs): return val HL_CONTEXTMENU = _controls_.HL_CONTEXTMENU +HL_ALIGN_LEFT = _controls_.HL_ALIGN_LEFT +HL_ALIGN_RIGHT = _controls_.HL_ALIGN_RIGHT +HL_ALIGN_CENTRE = _controls_.HL_ALIGN_CENTRE HL_DEFAULT_STYLE = _controls_.HL_DEFAULT_STYLE #--------------------------------------------------------------------------- @@ -6595,6 +6624,13 @@ class PickerBase(_core.Control): """GetPickerCtrl(self) -> Control""" return _controls_.PickerBase_GetPickerCtrl(*args, **kwargs) + InternalMargin = property(GetInternalMargin,SetInternalMargin,doc="See `GetInternalMargin` and `SetInternalMargin`") + PickerCtrl = property(GetPickerCtrl,doc="See `GetPickerCtrl`") + PickerCtrlProportion = property(GetPickerCtrlProportion,SetPickerCtrlProportion,doc="See `GetPickerCtrlProportion` and `SetPickerCtrlProportion`") + TextCtrl = property(GetTextCtrl,doc="See `GetTextCtrl`") + TextCtrlProportion = property(GetTextCtrlProportion,SetTextCtrlProportion,doc="See `GetTextCtrlProportion` and `SetTextCtrlProportion`") + TextCtrlGrowable = property(IsTextCtrlGrowable,SetTextCtrlGrowable,doc="See `IsTextCtrlGrowable` and `SetTextCtrlGrowable`") + PickerCtrlGrowable = property(IsPickerCtrlGrowable,SetPickerCtrlGrowable,doc="See `IsPickerCtrlGrowable` and `SetPickerCtrlGrowable`") _controls_.PickerBase_swigregister(PickerBase) #--------------------------------------------------------------------------- diff --git a/wxPython/src/msw/_controls_wrap.cpp b/wxPython/src/msw/_controls_wrap.cpp index 981f2aef49..5da76c00e6 100644 --- a/wxPython/src/msw/_controls_wrap.cpp +++ b/wxPython/src/msw/_controls_wrap.cpp @@ -49202,6 +49202,9 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "DP_ALLOWNONE",SWIG_From_int(static_cast< int >(wxDP_ALLOWNONE))); SWIG_addvarlink(SWIG_globals(),(char*)"HyperlinkCtrlNameStr",HyperlinkCtrlNameStr_get, HyperlinkCtrlNameStr_set); SWIG_Python_SetConstant(d, "HL_CONTEXTMENU",SWIG_From_int(static_cast< int >(wxHL_CONTEXTMENU))); + SWIG_Python_SetConstant(d, "HL_ALIGN_LEFT",SWIG_From_int(static_cast< int >(wxHL_ALIGN_LEFT))); + SWIG_Python_SetConstant(d, "HL_ALIGN_RIGHT",SWIG_From_int(static_cast< int >(wxHL_ALIGN_RIGHT))); + SWIG_Python_SetConstant(d, "HL_ALIGN_CENTRE",SWIG_From_int(static_cast< int >(wxHL_ALIGN_CENTRE))); SWIG_Python_SetConstant(d, "HL_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxHL_DEFAULT_STYLE))); PyDict_SetItemString(d, "wxEVT_COMMAND_HYPERLINK", PyInt_FromLong(wxEVT_COMMAND_HYPERLINK)); SWIG_Python_SetConstant(d, "PB_USE_TEXTCTRL",SWIG_From_int(static_cast< int >(wxPB_USE_TEXTCTRL))); diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index db0c8723be..27a932ec39 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -706,6 +706,7 @@ class Object(object): args[0].thisown = 0 return val + ClassName = property(GetClassName,doc="See `GetClassName`") _core_.Object_swigregister(Object) _wxPySetDictionary = _core_._wxPySetDictionary cvar = _core_.cvar @@ -1320,30 +1321,34 @@ class Rect(object): """ return _core_.Rect___ne__(*args, **kwargs) - def InsideXY(*args, **kwargs): + def ContainsXY(*args, **kwargs): """ - InsideXY(self, int x, int y) -> bool + ContainsXY(self, int x, int y) -> bool - Return True if the point is (not strcitly) inside the rect. + Return True if the point is inside the rect. """ - return _core_.Rect_InsideXY(*args, **kwargs) + return _core_.Rect_ContainsXY(*args, **kwargs) - def Inside(*args, **kwargs): + def Contains(*args, **kwargs): """ - Inside(self, Point pt) -> bool + Contains(self, Point pt) -> bool - Return True if the point is (not strcitly) inside the rect. + Return True if the point is inside the rect. """ - return _core_.Rect_Inside(*args, **kwargs) + return _core_.Rect_Contains(*args, **kwargs) - def InsideRect(*args, **kwargs): + def ContainsRect(*args, **kwargs): """ - InsideRect(self, Rect rect) -> bool + ContainsRect(self, Rect rect) -> bool Returns ``True`` if the given rectangle is completely inside this rectangle or touches its boundary. """ - return _core_.Rect_InsideRect(*args, **kwargs) + return _core_.Rect_ContainsRect(*args, **kwargs) + + Inside = wx._deprecated(Contains, "Use `Contains` instead.") + InsideXY = wx._deprecated(ContainsXY, "Use `ContainsXY` instead.") + InsideRect = wx._deprecated(ContainsRect, "Use `ContainsRect` instead.") def Intersects(*args, **kwargs): """ @@ -1398,6 +1403,19 @@ class Rect(object): __safe_for_unpickling__ = True def __reduce__(self): return (wx.Rect, self.Get()) + Bottom = property(GetBottom,SetBottom,doc="See `GetBottom` and `SetBottom`") + BottomRight = property(GetBottomRight,SetBottomRight,doc="See `GetBottomRight` and `SetBottomRight`") + Height = property(GetHeight,SetHeight,doc="See `GetHeight` and `SetHeight`") + Left = property(GetLeft,SetLeft,doc="See `GetLeft` and `SetLeft`") + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") + Right = property(GetRight,SetRight,doc="See `GetRight` and `SetRight`") + Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") + Top = property(GetTop,SetTop,doc="See `GetTop` and `SetTop`") + TopLeft = property(GetTopLeft,SetTopLeft,doc="See `GetTopLeft` and `SetTopLeft`") + Width = property(GetWidth,SetWidth,doc="See `GetWidth` and `SetWidth`") + X = property(GetX,SetX,doc="See `GetX` and `SetX`") + Y = property(GetY,SetY,doc="See `GetY` and `SetY`") + Empty = property(IsEmpty,doc="See `IsEmpty`") _core_.Rect_swigregister(Rect) def RectPP(*args, **kwargs): @@ -1572,6 +1590,10 @@ class Point2D(object): __safe_for_unpickling__ = True def __reduce__(self): return (wx.Point2D, self.Get()) + Floor = property(GetFloor,doc="See `GetFloor`") + Rounded = property(GetRounded,doc="See `GetRounded`") + VectorAngle = property(GetVectorAngle,SetVectorAngle,doc="See `GetVectorAngle` and `SetVectorAngle`") + VectorLength = property(GetVectorLength,SetVectorLength,doc="See `GetVectorLength` and `SetVectorLength`") _core_.Point2D_swigregister(Point2D) def Point2DCopy(*args, **kwargs): @@ -4230,6 +4252,8 @@ class ScrollEvent(CommandEvent): """SetPosition(self, int pos)""" return _core_.ScrollEvent_SetPosition(*args, **kwargs) + Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") _core_.ScrollEvent_swigregister(ScrollEvent) #--------------------------------------------------------------------------- @@ -4276,6 +4300,8 @@ class ScrollWinEvent(Event): """SetPosition(self, int pos)""" return _core_.ScrollWinEvent_SetPosition(*args, **kwargs) + Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") _core_.ScrollWinEvent_swigregister(ScrollWinEvent) #--------------------------------------------------------------------------- @@ -4760,6 +4786,9 @@ class SetCursorEvent(Event): """ return _core_.SetCursorEvent_HasCursor(*args, **kwargs) + Cursor = property(GetCursor,SetCursor,doc="See `GetCursor` and `SetCursor`") + X = property(GetX,doc="See `GetX`") + Y = property(GetY,doc="See `GetY`") _core_.SetCursorEvent_swigregister(SetCursorEvent) #--------------------------------------------------------------------------- @@ -5073,6 +5102,8 @@ class SizeEvent(Event): m_size = property(_core_.SizeEvent_m_size_get, _core_.SizeEvent_m_size_set) m_rect = property(_core_.SizeEvent_m_rect_get, _core_.SizeEvent_m_rect_set) + Rect = property(GetRect,SetRect,doc="See `GetRect` and `SetRect`") + Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") _core_.SizeEvent_swigregister(SizeEvent) #--------------------------------------------------------------------------- @@ -5233,9 +5264,14 @@ _core_.FocusEvent_swigregister(FocusEvent) class ChildFocusEvent(CommandEvent): """ - wx.ChildFocusEvent notifies the parent that a child has received the - focus. Unlike `wx.FocusEvent` it is propagated up the window - heirarchy. + A child focus event is sent to a (parent-)window when one of its child + windows gains focus, so that the window could restore the focus back + to its corresponding child if it loses it now and regains later. + + Notice that child window is the direct child of the window receiving + the event, and so may not be the actual widget recieving focus if it + is further down the containment heirarchy. Use `wx.Window.FindFocus` + to get the widget that is actually receiving focus. """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr @@ -5250,7 +5286,8 @@ class ChildFocusEvent(CommandEvent): """ GetWindow(self) -> Window - The window which has just received the focus. + The window, or (grand)parent of the window which has just received the + focus. """ return _core_.ChildFocusEvent_GetWindow(*args, **kwargs) @@ -5481,6 +5518,7 @@ class ShowEvent(Event): """GetShow(self) -> bool""" return _core_.ShowEvent_GetShow(*args, **kwargs) + Show = property(GetShow,SetShow,doc="See `GetShow` and `SetShow`") _core_.ShowEvent_swigregister(ShowEvent) #--------------------------------------------------------------------------- @@ -6067,6 +6105,7 @@ class PaletteChangedEvent(Event): """GetChangedWindow(self) -> Window""" return _core_.PaletteChangedEvent_GetChangedWindow(*args, **kwargs) + ChangedWindow = property(GetChangedWindow,SetChangedWindow,doc="See `GetChangedWindow` and `SetChangedWindow`") _core_.PaletteChangedEvent_swigregister(PaletteChangedEvent) #--------------------------------------------------------------------------- @@ -6099,6 +6138,7 @@ class QueryNewPaletteEvent(Event): """GetPaletteRealized(self) -> bool""" return _core_.QueryNewPaletteEvent_GetPaletteRealized(*args, **kwargs) + PaletteRealized = property(GetPaletteRealized,SetPaletteRealized,doc="See `GetPaletteRealized` and `SetPaletteRealized`") _core_.QueryNewPaletteEvent_swigregister(QueryNewPaletteEvent) #--------------------------------------------------------------------------- @@ -6954,9 +6994,9 @@ class PyApp(EvtHandler): return _core_.PyApp_GetComCtl32Version(*args, **kwargs) GetComCtl32Version = staticmethod(GetComCtl32Version) - def DisplayAvailable(*args, **kwargs): + def IsDisplayAvailable(*args, **kwargs): """ - DisplayAvailable() -> bool + IsDisplayAvailable() -> bool Tests if it is possible to create a GUI in the current environment. This will mean different things on the different platforms. @@ -6973,9 +7013,20 @@ class PyApp(EvtHandler): * On MS Windows... """ - return _core_.PyApp_DisplayAvailable(*args, **kwargs) - - DisplayAvailable = staticmethod(DisplayAvailable) + return _core_.PyApp_IsDisplayAvailable(*args, **kwargs) + + IsDisplayAvailable = staticmethod(IsDisplayAvailable) + AppName = property(GetAppName,SetAppName,doc="See `GetAppName` and `SetAppName`") + AssertMode = property(GetAssertMode,SetAssertMode,doc="See `GetAssertMode` and `SetAssertMode`") + ClassName = property(GetClassName,SetClassName,doc="See `GetClassName` and `SetClassName`") + ExitOnFrameDelete = property(GetExitOnFrameDelete,SetExitOnFrameDelete,doc="See `GetExitOnFrameDelete` and `SetExitOnFrameDelete`") + LayoutDirection = property(GetLayoutDirection,doc="See `GetLayoutDirection`") + PrintMode = property(GetPrintMode,SetPrintMode,doc="See `GetPrintMode` and `SetPrintMode`") + TopWindow = property(GetTopWindow,SetTopWindow,doc="See `GetTopWindow` and `SetTopWindow`") + Traits = property(GetTraits,doc="See `GetTraits`") + UseBestVisual = property(GetUseBestVisual,SetUseBestVisual,doc="See `GetUseBestVisual` and `SetUseBestVisual`") + VendorName = property(GetVendorName,SetVendorName,doc="See `GetVendorName` and `SetVendorName`") + Active = property(IsActive) _core_.PyApp_swigregister(PyApp) def PyApp_IsMainLoopRunning(*args): @@ -7036,9 +7087,9 @@ def PyApp_GetComCtl32Version(*args): """ return _core_.PyApp_GetComCtl32Version(*args) -def PyApp_DisplayAvailable(*args): +def PyApp_IsDisplayAvailable(*args): """ - PyApp_DisplayAvailable() -> bool + PyApp_IsDisplayAvailable() -> bool Tests if it is possible to create a GUI in the current environment. This will mean different things on the different platforms. @@ -7055,7 +7106,7 @@ def PyApp_DisplayAvailable(*args): * On MS Windows... """ - return _core_.PyApp_DisplayAvailable(*args) + return _core_.PyApp_IsDisplayAvailable(*args) #--------------------------------------------------------------------------- @@ -7288,7 +7339,7 @@ class App(wx.PyApp): wx.PyApp.__init__(self) # make sure we can create a GUI - if not self.DisplayAvailable(): + if not self.IsDisplayAvailable(): if wx.Platform == "__WXMAC__": msg = """This program needs access to the screen. @@ -8456,6 +8507,16 @@ class Window(EvtHandler): """ return _core_.Window_IsEnabled(*args, **kwargs) + def IsShownOnScreen(*args, **kwargs): + """ + IsShownOnScreen(self) -> bool + + Returns ``True`` if the window is physically visible on the screen, + i.e. it is shown and all its parents up to the toplevel window are + shown as well. + """ + return _core_.Window_IsShownOnScreen(*args, **kwargs) + def SetWindowStyleFlag(*args, **kwargs): """ SetWindowStyleFlag(self, long style) @@ -9058,6 +9119,16 @@ class Window(EvtHandler): """ return _core_.Window_Freeze(*args, **kwargs) + def IsFrozen(*args, **kwargs): + """ + IsFrozen(self) -> bool + + Returns ``True`` if the window has been frozen and not thawed yet. + + :see: `Freeze` and `Thaw` + """ + return _core_.Window_IsFrozen(*args, **kwargs) + def Thaw(*args, **kwargs): """ Thaw(self) @@ -11415,6 +11486,19 @@ class SizerItem(Object): """ return _core_.SizerItem_SetUserData(*args, **kwargs) + Border = property(GetBorder,SetBorder,doc="See `GetBorder` and `SetBorder`") + Flag = property(GetFlag,SetFlag,doc="See `GetFlag` and `SetFlag`") + MinSize = property(GetMinSize,doc="See `GetMinSize`") + MinSizeWithBorder = property(GetMinSizeWithBorder,doc="See `GetMinSizeWithBorder`") + Position = property(GetPosition,doc="See `GetPosition`") + Proportion = property(GetProportion,SetProportion,doc="See `GetProportion` and `SetProportion`") + Ratio = property(GetRatio,SetRatio,doc="See `GetRatio` and `SetRatio`") + Rect = property(GetRect,doc="See `GetRect`") + Size = property(GetSize,doc="See `GetSize`") + Sizer = property(GetSizer,SetSizer,doc="See `GetSizer` and `SetSizer`") + Spacer = property(GetSpacer,SetSpacer,doc="See `GetSpacer` and `SetSpacer`") + UserData = property(GetUserData,SetUserData,doc="See `GetUserData` and `SetUserData`") + Window = property(GetWindow,SetWindow,doc="See `GetWindow` and `SetWindow`") _core_.SizerItem_swigregister(SizerItem) def SizerItemWindow(*args, **kwargs): @@ -11937,6 +12021,11 @@ class Sizer(Object): """ return _core_.Sizer_ShowItems(*args, **kwargs) + Children = property(GetChildren,doc="See `GetChildren`") + ContainingWindow = property(GetContainingWindow,SetContainingWindow,doc="See `GetContainingWindow` and `SetContainingWindow`") + MinSize = property(GetMinSize,SetMinSize,doc="See `GetMinSize` and `SetMinSize`") + Position = property(GetPosition,doc="See `GetPosition`") + Size = property(GetSize,doc="See `GetSize`") _core_.Sizer_swigregister(Sizer) class PySizer(Sizer): @@ -12071,6 +12160,7 @@ class StaticBoxSizer(BoxSizer): """ return _core_.StaticBoxSizer_GetStaticBox(*args, **kwargs) + StaticBox = property(GetStaticBox,doc="See `GetStaticBox`") _core_.StaticBoxSizer_swigregister(StaticBoxSizer) #--------------------------------------------------------------------------- @@ -12428,6 +12518,11 @@ class StdDialogButtonSizer(BoxSizer): """GetHelpButton(self) -> wxButton""" return _core_.StdDialogButtonSizer_GetHelpButton(*args, **kwargs) + AffirmativeButton = property(GetAffirmativeButton,SetAffirmativeButton,doc="See `GetAffirmativeButton` and `SetAffirmativeButton`") + ApplyButton = property(GetApplyButton,doc="See `GetApplyButton`") + CancelButton = property(GetCancelButton,SetCancelButton,doc="See `GetCancelButton` and `SetCancelButton`") + HelpButton = property(GetHelpButton,doc="See `GetHelpButton`") + NegativeButton = property(GetNegativeButton,SetNegativeButton,doc="See `GetNegativeButton` and `SetNegativeButton`") _core_.StdDialogButtonSizer_swigregister(StdDialogButtonSizer) #--------------------------------------------------------------------------- diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index ec26a8c32f..fe6cd15ba5 100644 --- a/wxPython/src/msw/_core_wrap.cpp +++ b/wxPython/src/msw/_core_wrap.cpp @@ -3787,7 +3787,7 @@ SWIGINTERN wxPyApp *new_wxPyApp(){ wxPythonApp = new wxPyApp(); return wxPythonApp; } -SWIGINTERN bool wxPyApp_DisplayAvailable(){ +SWIGINTERN bool wxPyApp_IsDisplayAvailable(){ return wxPyTestDisplayAvailable(); } @@ -7476,7 +7476,7 @@ fail: } -SWIGINTERN PyObject *_wrap_Rect_InsideXY(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_Rect_ContainsXY(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxRect *arg1 = (wxRect *) 0 ; int arg2 ; @@ -7495,25 +7495,25 @@ SWIGINTERN PyObject *_wrap_Rect_InsideXY(PyObject *SWIGUNUSEDPARM(self), PyObjec (char *) "self",(char *) "x",(char *) "y", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_InsideXY",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_ContainsXY",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect_InsideXY" "', expected argument " "1"" of type '" "wxRect const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect_ContainsXY" "', expected argument " "1"" of type '" "wxRect const *""'"); } arg1 = reinterpret_cast< wxRect * >(argp1); ecode2 = SWIG_AsVal_int(obj1, &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Rect_InsideXY" "', expected argument " "2"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Rect_ContainsXY" "', expected argument " "2"" of type '" "int""'"); } arg2 = static_cast< int >(val2); ecode3 = SWIG_AsVal_int(obj2, &val3); if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Rect_InsideXY" "', expected argument " "3"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Rect_ContainsXY" "', expected argument " "3"" of type '" "int""'"); } arg3 = static_cast< int >(val3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxRect const *)arg1)->Inside(arg2,arg3); + result = (bool)((wxRect const *)arg1)->Contains(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -7526,7 +7526,7 @@ fail: } -SWIGINTERN PyObject *_wrap_Rect_Inside(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_Rect_Contains(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxRect *arg1 = (wxRect *) 0 ; wxPoint *arg2 = 0 ; @@ -7540,10 +7540,10 @@ SWIGINTERN PyObject *_wrap_Rect_Inside(PyObject *SWIGUNUSEDPARM(self), PyObject (char *) "self",(char *) "pt", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_Inside",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_Contains",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect_Inside" "', expected argument " "1"" of type '" "wxRect const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect_Contains" "', expected argument " "1"" of type '" "wxRect const *""'"); } arg1 = reinterpret_cast< wxRect * >(argp1); { @@ -7552,7 +7552,7 @@ SWIGINTERN PyObject *_wrap_Rect_Inside(PyObject *SWIGUNUSEDPARM(self), PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxRect const *)arg1)->Inside((wxPoint const &)*arg2); + result = (bool)((wxRect const *)arg1)->Contains((wxPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -7565,7 +7565,7 @@ fail: } -SWIGINTERN PyObject *_wrap_Rect_InsideRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_Rect_ContainsRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxRect *arg1 = (wxRect *) 0 ; wxRect *arg2 = 0 ; @@ -7579,10 +7579,10 @@ SWIGINTERN PyObject *_wrap_Rect_InsideRect(PyObject *SWIGUNUSEDPARM(self), PyObj (char *) "self",(char *) "rect", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_InsideRect",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_ContainsRect",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect_InsideRect" "', expected argument " "1"" of type '" "wxRect const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect_ContainsRect" "', expected argument " "1"" of type '" "wxRect const *""'"); } arg1 = reinterpret_cast< wxRect * >(argp1); { @@ -7591,7 +7591,7 @@ SWIGINTERN PyObject *_wrap_Rect_InsideRect(PyObject *SWIGUNUSEDPARM(self), PyObj } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxRect const *)arg1)->Inside((wxRect const &)*arg2); + result = (bool)((wxRect const *)arg1)->Contains((wxRect const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -28613,14 +28613,14 @@ fail: } -SWIGINTERN PyObject *_wrap_PyApp_DisplayAvailable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_PyApp_IsDisplayAvailable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; bool result; - if (!SWIG_Python_UnpackTuple(args,"PyApp_DisplayAvailable",0,0,0)) SWIG_fail; + if (!SWIG_Python_UnpackTuple(args,"PyApp_IsDisplayAvailable",0,0,0)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)wxPyApp_DisplayAvailable(); + result = (bool)wxPyApp_IsDisplayAvailable(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -32991,6 +32991,36 @@ fail: } +SWIGINTERN PyObject *_wrap_Window_IsShownOnScreen(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxWindow *arg1 = (wxWindow *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_IsShownOnScreen" "', expected argument " "1"" of type '" "wxWindow const *""'"); + } + arg1 = reinterpret_cast< wxWindow * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxWindow const *)arg1)->IsShownOnScreen(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Window_SetWindowStyleFlag(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxWindow *arg1 = (wxWindow *) 0 ; @@ -35018,6 +35048,36 @@ fail: } +SWIGINTERN PyObject *_wrap_Window_IsFrozen(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxWindow *arg1 = (wxWindow *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_IsFrozen" "', expected argument " "1"" of type '" "wxWindow const *""'"); + } + arg1 = reinterpret_cast< wxWindow * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxWindow const *)arg1)->IsFrozen(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Window_Thaw(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxWindow *arg1 = (wxWindow *) 0 ; @@ -53793,9 +53853,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"Rect___iadd__", (PyCFunction) _wrap_Rect___iadd__, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Rect___eq__", (PyCFunction) _wrap_Rect___eq__, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Rect___ne__", (PyCFunction) _wrap_Rect___ne__, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Rect_InsideXY", (PyCFunction) _wrap_Rect_InsideXY, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Rect_Inside", (PyCFunction) _wrap_Rect_Inside, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Rect_InsideRect", (PyCFunction) _wrap_Rect_InsideRect, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Rect_ContainsXY", (PyCFunction) _wrap_Rect_ContainsXY, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Rect_Contains", (PyCFunction) _wrap_Rect_Contains, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Rect_ContainsRect", (PyCFunction) _wrap_Rect_ContainsRect, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Rect_Intersects", (PyCFunction) _wrap_Rect_Intersects, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Rect_CenterIn", (PyCFunction) _wrap_Rect_CenterIn, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Rect_x_set", _wrap_Rect_x_set, METH_VARARGS, NULL}, @@ -54491,7 +54551,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"PyApp_SetMacHelpMenuTitleName", (PyCFunction) _wrap_PyApp_SetMacHelpMenuTitleName, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyApp__BootstrapApp", (PyCFunction)_wrap_PyApp__BootstrapApp, METH_O, NULL}, { (char *)"PyApp_GetComCtl32Version", (PyCFunction)_wrap_PyApp_GetComCtl32Version, METH_NOARGS, NULL}, - { (char *)"PyApp_DisplayAvailable", (PyCFunction)_wrap_PyApp_DisplayAvailable, METH_NOARGS, NULL}, + { (char *)"PyApp_IsDisplayAvailable", (PyCFunction)_wrap_PyApp_IsDisplayAvailable, METH_NOARGS, NULL}, { (char *)"PyApp_swigregister", PyApp_swigregister, METH_VARARGS, NULL}, { (char *)"PyApp_swiginit", PyApp_swiginit, METH_VARARGS, NULL}, { (char *)"Exit", (PyCFunction)_wrap_Exit, METH_NOARGS, NULL}, @@ -54625,6 +54685,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_Disable", (PyCFunction)_wrap_Window_Disable, METH_O, NULL}, { (char *)"Window_IsShown", (PyCFunction)_wrap_Window_IsShown, METH_O, NULL}, { (char *)"Window_IsEnabled", (PyCFunction)_wrap_Window_IsEnabled, METH_O, NULL}, + { (char *)"Window_IsShownOnScreen", (PyCFunction)_wrap_Window_IsShownOnScreen, METH_O, NULL}, { (char *)"Window_SetWindowStyleFlag", (PyCFunction) _wrap_Window_SetWindowStyleFlag, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_GetWindowStyleFlag", (PyCFunction)_wrap_Window_GetWindowStyleFlag, METH_O, NULL}, { (char *)"Window_HasFlag", (PyCFunction) _wrap_Window_HasFlag, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -54683,6 +54744,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_Update", (PyCFunction)_wrap_Window_Update, METH_O, NULL}, { (char *)"Window_ClearBackground", (PyCFunction)_wrap_Window_ClearBackground, METH_O, NULL}, { (char *)"Window_Freeze", (PyCFunction)_wrap_Window_Freeze, METH_O, NULL}, + { (char *)"Window_IsFrozen", (PyCFunction)_wrap_Window_IsFrozen, METH_O, NULL}, { (char *)"Window_Thaw", (PyCFunction)_wrap_Window_Thaw, METH_O, NULL}, { (char *)"Window_PrepareDC", (PyCFunction) _wrap_Window_PrepareDC, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_GetUpdateRegion", (PyCFunction)_wrap_Window_GetUpdateRegion, METH_O, NULL}, diff --git a/wxPython/src/msw/_gdi.py b/wxPython/src/msw/_gdi.py index 70139b4fde..7334761ce7 100644 --- a/wxPython/src/msw/_gdi.py +++ b/wxPython/src/msw/_gdi.py @@ -296,6 +296,7 @@ class Palette(GDIObject): return _gdi_.Palette_Ok(*args, **kwargs) def __nonzero__(self): return self.Ok() + ColoursCount = property(GetColoursCount,doc="See `GetColoursCount`") _gdi_.Palette_swigregister(Palette) #--------------------------------------------------------------------------- @@ -375,6 +376,7 @@ class Pen(GDIObject): """GetDashCount(self) -> int""" return _gdi_.Pen_GetDashCount(*args, **kwargs) + DashCount = property(GetDashCount,doc="See `GetDashCount`") def GetStipple(*args, **kwargs): """GetStipple(self) -> Bitmap""" return _gdi_.Pen_GetStipple(*args, **kwargs) @@ -383,6 +385,7 @@ class Pen(GDIObject): """SetStipple(self, Bitmap stipple)""" return _gdi_.Pen_SetStipple(*args, **kwargs) + Stipple = property(GetStipple,SetStipple,doc="See `GetStipple` and `SetStipple`") def __eq__(*args, **kwargs): """__eq__(self, Pen other) -> bool""" return _gdi_.Pen___eq__(*args, **kwargs) @@ -392,6 +395,12 @@ class Pen(GDIObject): return _gdi_.Pen___ne__(*args, **kwargs) def __nonzero__(self): return self.Ok() + Cap = property(GetCap,SetCap,doc="See `GetCap` and `SetCap`") + Colour = property(GetColour,SetColour,doc="See `GetColour` and `SetColour`") + Dashes = property(GetDashes,SetDashes,doc="See `GetDashes` and `SetDashes`") + Join = property(GetJoin,SetJoin,doc="See `GetJoin` and `SetJoin`") + Style = property(GetStyle,SetStyle,doc="See `GetStyle` and `SetStyle`") + Width = property(GetWidth,SetWidth,doc="See `GetWidth` and `SetWidth`") _gdi_.Pen_swigregister(Pen) #--------------------------------------------------------------------------- @@ -837,6 +846,11 @@ class PixelDataBase(object): """GetRowStride(self) -> int""" return _gdi_.PixelDataBase_GetRowStride(*args, **kwargs) + Height = property(GetHeight,doc="See `GetHeight`") + Origin = property(GetOrigin,doc="See `GetOrigin`") + RowStride = property(GetRowStride,doc="See `GetRowStride`") + Size = property(GetSize,doc="See `GetSize`") + Width = property(GetWidth,doc="See `GetWidth`") _gdi_.PixelDataBase_swigregister(PixelDataBase) class NativePixelData(PixelDataBase): @@ -1454,6 +1468,7 @@ class Region(GDIObject): """UnionBitmapColour(self, Bitmap bmp, Colour transColour, int tolerance=0) -> bool""" return _gdi_.Region_UnionBitmapColour(*args, **kwargs) + Box = property(GetBox,doc="See `GetBox`") _gdi_.Region_swigregister(Region) def RegionFromBitmap(*args, **kwargs): @@ -1524,6 +1539,13 @@ class RegionIterator(_core.Object): """__nonzero__(self) -> bool""" return _gdi_.RegionIterator___nonzero__(*args, **kwargs) + H = property(GetH,doc="See `GetH`") + Height = property(GetHeight,doc="See `GetHeight`") + Rect = property(GetRect,doc="See `GetRect`") + W = property(GetW,doc="See `GetW`") + Width = property(GetWidth,doc="See `GetWidth`") + X = property(GetX,doc="See `GetX`") + Y = property(GetY,doc="See `GetY`") _gdi_.RegionIterator_swigregister(RegionIterator) #--------------------------------------------------------------------------- @@ -2734,6 +2756,11 @@ class Locale(object): """AddCatalog(self, String szDomain) -> bool""" return _gdi_.Locale_AddCatalog(*args, **kwargs) + def IsAvailable(*args, **kwargs): + """IsAvailable(int lang) -> bool""" + return _gdi_.Locale_IsAvailable(*args, **kwargs) + + IsAvailable = staticmethod(IsAvailable) def IsLoaded(*args, **kwargs): """IsLoaded(self, String szDomain) -> bool""" return _gdi_.Locale_IsLoaded(*args, **kwargs) @@ -2790,6 +2817,10 @@ def Locale_AddCatalogLookupPathPrefix(*args, **kwargs): """Locale_AddCatalogLookupPathPrefix(String prefix)""" return _gdi_.Locale_AddCatalogLookupPathPrefix(*args, **kwargs) +def Locale_IsAvailable(*args, **kwargs): + """Locale_IsAvailable(int lang) -> bool""" + return _gdi_.Locale_IsAvailable(*args, **kwargs) + def Locale_GetLanguageInfo(*args, **kwargs): """Locale_GetLanguageInfo(int lang) -> LanguageInfo""" return _gdi_.Locale_GetLanguageInfo(*args, **kwargs) @@ -4756,6 +4787,7 @@ class PostScriptDC(DC): return _gdi_.PostScriptDC_GetResolution(*args, **kwargs) GetResolution = staticmethod(GetResolution) + PrintData = property(GetPrintData,SetPrintData,doc="See `GetPrintData` and `SetPrintData`") _gdi_.PostScriptDC_swigregister(PostScriptDC) def PostScriptDC_SetResolution(*args, **kwargs): @@ -5371,6 +5403,31 @@ class SplitterRenderParams(object): isHotSensitive = property(_gdi_.SplitterRenderParams_isHotSensitive_get) _gdi_.SplitterRenderParams_swigregister(SplitterRenderParams) +class HeaderButtonParams(object): + """Extra (optional) parameters for `wx.RendererNative.DrawHeaderButton`""" + thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') + __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """ + __init__(self) -> HeaderButtonParams + + Extra (optional) parameters for `wx.RendererNative.DrawHeaderButton` + """ + _gdi_.HeaderButtonParams_swiginit(self,_gdi_.new_HeaderButtonParams(*args, **kwargs)) + __swig_destroy__ = _gdi_.delete_HeaderButtonParams + __del__ = lambda self : None; + m_arrowColour = property(_gdi_.HeaderButtonParams_m_arrowColour_get, _gdi_.HeaderButtonParams_m_arrowColour_set) + m_selectionColour = property(_gdi_.HeaderButtonParams_m_selectionColour_get, _gdi_.HeaderButtonParams_m_selectionColour_set) + m_labelText = property(_gdi_.HeaderButtonParams_m_labelText_get, _gdi_.HeaderButtonParams_m_labelText_set) + m_labelFont = property(_gdi_.HeaderButtonParams_m_labelFont_get, _gdi_.HeaderButtonParams_m_labelFont_set) + m_labelColour = property(_gdi_.HeaderButtonParams_m_labelColour_get, _gdi_.HeaderButtonParams_m_labelColour_set) + m_labelBitmap = property(_gdi_.HeaderButtonParams_m_labelBitmap_get, _gdi_.HeaderButtonParams_m_labelBitmap_set) + m_labelAlignment = property(_gdi_.HeaderButtonParams_m_labelAlignment_get, _gdi_.HeaderButtonParams_m_labelAlignment_set) +_gdi_.HeaderButtonParams_swigregister(HeaderButtonParams) + +HDR_SORT_ICON_NONE = _gdi_.HDR_SORT_ICON_NONE +HDR_SORT_ICON_UP = _gdi_.HDR_SORT_ICON_UP +HDR_SORT_ICON_DOWN = _gdi_.HDR_SORT_ICON_DOWN class RendererVersion(object): """ This simple struct represents the `wx.RendererNative` interface @@ -5407,11 +5464,12 @@ def RendererVersion_IsCompatible(*args, **kwargs): class RendererNative(object): """ - One of the design principles of wxWidgets is to use the native widgets - on every platform in order to be as close to the native look and feel - on every platform. However there are still cases when some generic - widgets are needed for various reasons, but it can sometimes take a - lot of messy work to make them conform to the native LnF. + One of the design principles of wxWidgets is to use the native + widgets on every platform in order to be as close as possible to + the native look and feel on every platform. However there are + still cases when some generic widgets are needed for various + reasons, but it can sometimes take a lot of messy work to make + them conform to the native LnF. The wx.RendererNative class is a collection of functions that have platform-specific implementations for drawing certain parts of @@ -5429,13 +5487,33 @@ class RendererNative(object): __repr__ = _swig_repr def DrawHeaderButton(*args, **kwargs): """ - DrawHeaderButton(self, Window win, DC dc, Rect rect, int flags=0) + DrawHeaderButton(self, Window win, DC dc, Rect rect, int flags=0, int sortArrow=HDR_SORT_ICON_NONE, + HeaderButtonParams params=None) Draw the header control button (such as what is used by `wx.ListCtrl` in report mode.) """ return _gdi_.RendererNative_DrawHeaderButton(*args, **kwargs) + def DrawHeaderButtonContents(*args, **kwargs): + """ + DrawHeaderButtonContents(self, Window win, DC dc, Rect rect, int flags=0, int sortArrow=HDR_SORT_ICON_NONE, + HeaderButtonParams params=None) + + Draw the contents of a header control button, (label, sort + arrows, etc.) Normally this is only called by `DrawHeaderButton`. + """ + return _gdi_.RendererNative_DrawHeaderButtonContents(*args, **kwargs) + + def GetHeaderButtonHeight(*args, **kwargs): + """ + GetHeaderButtonHeight(self, Window win) -> int + + Returns the default height of a header button, either a fixed platform + height if available, or a generic height based on the window's font. + """ + return _gdi_.RendererNative_GetHeaderButtonHeight(*args, **kwargs) + def DrawTreeItemButton(*args, **kwargs): """ DrawTreeItemButton(self, Window win, DC dc, Rect rect, int flags=0) @@ -5586,6 +5664,8 @@ class RendererNative(object): """ return _gdi_.RendererNative_GetVersion(*args, **kwargs) + SplitterParams = property(GetSplitterParams,doc="See `GetSplitterParams`") + Version = property(GetVersion,doc="See `GetVersion`") _gdi_.RendererNative_swigregister(RendererNative) def RendererNative_Get(*args): @@ -6365,6 +6445,8 @@ class PseudoDC(_core.Object): """ return _gdi_.PseudoDC_SetLogicalFunction(*args, **kwargs) + IdBounds = property(GetIdBounds,SetIdBounds,doc="See `GetIdBounds` and `SetIdBounds`") + Len = property(GetLen,doc="See `GetLen`") _gdi_.PseudoDC_swigregister(PseudoDC) diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp index db32340b76..dee1295c07 100644 --- a/wxPython/src/msw/_gdi_wrap.cpp +++ b/wxPython/src/msw/_gdi_wrap.cpp @@ -2520,99 +2520,100 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_wxGIFHandler swig_types[54] #define SWIGTYPE_p_wxGridBagSizer swig_types[55] #define SWIGTYPE_p_wxGridSizer swig_types[56] -#define SWIGTYPE_p_wxICOHandler swig_types[57] -#define SWIGTYPE_p_wxIcon swig_types[58] -#define SWIGTYPE_p_wxIconBundle swig_types[59] -#define SWIGTYPE_p_wxIconLocation swig_types[60] -#define SWIGTYPE_p_wxIconizeEvent swig_types[61] -#define SWIGTYPE_p_wxIdleEvent swig_types[62] -#define SWIGTYPE_p_wxImage swig_types[63] -#define SWIGTYPE_p_wxImageHandler swig_types[64] -#define SWIGTYPE_p_wxImageList swig_types[65] -#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[66] -#define SWIGTYPE_p_wxInitDialogEvent swig_types[67] -#define SWIGTYPE_p_wxJPEGHandler swig_types[68] -#define SWIGTYPE_p_wxKeyEvent swig_types[69] -#define SWIGTYPE_p_wxLanguageInfo swig_types[70] -#define SWIGTYPE_p_wxLayoutConstraints swig_types[71] -#define SWIGTYPE_p_wxLocale swig_types[72] -#define SWIGTYPE_p_wxMask swig_types[73] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[74] -#define SWIGTYPE_p_wxMemoryDC swig_types[75] -#define SWIGTYPE_p_wxMenu swig_types[76] -#define SWIGTYPE_p_wxMenuBar swig_types[77] -#define SWIGTYPE_p_wxMenuEvent swig_types[78] -#define SWIGTYPE_p_wxMenuItem swig_types[79] -#define SWIGTYPE_p_wxMetaFile swig_types[80] -#define SWIGTYPE_p_wxMetaFileDC swig_types[81] -#define SWIGTYPE_p_wxMirrorDC swig_types[82] -#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[83] -#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[84] -#define SWIGTYPE_p_wxMouseEvent swig_types[85] -#define SWIGTYPE_p_wxMoveEvent swig_types[86] -#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[87] -#define SWIGTYPE_p_wxNativeFontInfo swig_types[88] -#define SWIGTYPE_p_wxNativePixelData swig_types[89] -#define SWIGTYPE_p_wxNativePixelData_Accessor swig_types[90] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[91] -#define SWIGTYPE_p_wxNcPaintEvent swig_types[92] -#define SWIGTYPE_p_wxNotifyEvent swig_types[93] -#define SWIGTYPE_p_wxObject swig_types[94] -#define SWIGTYPE_p_wxPCXHandler swig_types[95] -#define SWIGTYPE_p_wxPNGHandler swig_types[96] -#define SWIGTYPE_p_wxPNMHandler swig_types[97] -#define SWIGTYPE_p_wxPaintDC swig_types[98] -#define SWIGTYPE_p_wxPaintEvent swig_types[99] -#define SWIGTYPE_p_wxPalette swig_types[100] -#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[101] -#define SWIGTYPE_p_wxPaperSize swig_types[102] -#define SWIGTYPE_p_wxPen swig_types[103] -#define SWIGTYPE_p_wxPenList swig_types[104] -#define SWIGTYPE_p_wxPixelDataBase swig_types[105] -#define SWIGTYPE_p_wxPoint swig_types[106] -#define SWIGTYPE_p_wxPostScriptDC swig_types[107] -#define SWIGTYPE_p_wxPrintData swig_types[108] -#define SWIGTYPE_p_wxPrinterDC swig_types[109] -#define SWIGTYPE_p_wxPseudoDC swig_types[110] -#define SWIGTYPE_p_wxPyApp swig_types[111] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[112] -#define SWIGTYPE_p_wxPyEvent swig_types[113] -#define SWIGTYPE_p_wxPyFontEnumerator swig_types[114] -#define SWIGTYPE_p_wxPyImageHandler swig_types[115] -#define SWIGTYPE_p_wxPyLocale swig_types[116] -#define SWIGTYPE_p_wxPySizer swig_types[117] -#define SWIGTYPE_p_wxPyValidator swig_types[118] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[119] -#define SWIGTYPE_p_wxRect swig_types[120] -#define SWIGTYPE_p_wxRegion swig_types[121] -#define SWIGTYPE_p_wxRegionIterator swig_types[122] -#define SWIGTYPE_p_wxRendererNative swig_types[123] -#define SWIGTYPE_p_wxRendererVersion swig_types[124] -#define SWIGTYPE_p_wxScreenDC swig_types[125] -#define SWIGTYPE_p_wxScrollEvent swig_types[126] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[127] -#define SWIGTYPE_p_wxSetCursorEvent swig_types[128] -#define SWIGTYPE_p_wxShowEvent swig_types[129] -#define SWIGTYPE_p_wxSize swig_types[130] -#define SWIGTYPE_p_wxSizeEvent swig_types[131] -#define SWIGTYPE_p_wxSizer swig_types[132] -#define SWIGTYPE_p_wxSizerItem swig_types[133] -#define SWIGTYPE_p_wxSplitterRenderParams swig_types[134] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[135] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[136] -#define SWIGTYPE_p_wxStockGDI swig_types[137] -#define SWIGTYPE_p_wxString swig_types[138] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[139] -#define SWIGTYPE_p_wxTIFFHandler swig_types[140] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[141] -#define SWIGTYPE_p_wxValidator swig_types[142] -#define SWIGTYPE_p_wxWindow swig_types[143] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[144] -#define SWIGTYPE_p_wxWindowDC swig_types[145] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[146] -#define SWIGTYPE_p_wxXPMHandler swig_types[147] -static swig_type_info *swig_types[149]; -static swig_module_info swig_module = {swig_types, 148, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxHeaderButtonParams swig_types[57] +#define SWIGTYPE_p_wxICOHandler swig_types[58] +#define SWIGTYPE_p_wxIcon swig_types[59] +#define SWIGTYPE_p_wxIconBundle swig_types[60] +#define SWIGTYPE_p_wxIconLocation swig_types[61] +#define SWIGTYPE_p_wxIconizeEvent swig_types[62] +#define SWIGTYPE_p_wxIdleEvent swig_types[63] +#define SWIGTYPE_p_wxImage swig_types[64] +#define SWIGTYPE_p_wxImageHandler swig_types[65] +#define SWIGTYPE_p_wxImageList swig_types[66] +#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[67] +#define SWIGTYPE_p_wxInitDialogEvent swig_types[68] +#define SWIGTYPE_p_wxJPEGHandler swig_types[69] +#define SWIGTYPE_p_wxKeyEvent swig_types[70] +#define SWIGTYPE_p_wxLanguageInfo swig_types[71] +#define SWIGTYPE_p_wxLayoutConstraints swig_types[72] +#define SWIGTYPE_p_wxLocale swig_types[73] +#define SWIGTYPE_p_wxMask swig_types[74] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[75] +#define SWIGTYPE_p_wxMemoryDC swig_types[76] +#define SWIGTYPE_p_wxMenu swig_types[77] +#define SWIGTYPE_p_wxMenuBar swig_types[78] +#define SWIGTYPE_p_wxMenuEvent swig_types[79] +#define SWIGTYPE_p_wxMenuItem swig_types[80] +#define SWIGTYPE_p_wxMetaFile swig_types[81] +#define SWIGTYPE_p_wxMetaFileDC swig_types[82] +#define SWIGTYPE_p_wxMirrorDC swig_types[83] +#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[84] +#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[85] +#define SWIGTYPE_p_wxMouseEvent swig_types[86] +#define SWIGTYPE_p_wxMoveEvent swig_types[87] +#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[88] +#define SWIGTYPE_p_wxNativeFontInfo swig_types[89] +#define SWIGTYPE_p_wxNativePixelData swig_types[90] +#define SWIGTYPE_p_wxNativePixelData_Accessor swig_types[91] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[92] +#define SWIGTYPE_p_wxNcPaintEvent swig_types[93] +#define SWIGTYPE_p_wxNotifyEvent swig_types[94] +#define SWIGTYPE_p_wxObject swig_types[95] +#define SWIGTYPE_p_wxPCXHandler swig_types[96] +#define SWIGTYPE_p_wxPNGHandler swig_types[97] +#define SWIGTYPE_p_wxPNMHandler swig_types[98] +#define SWIGTYPE_p_wxPaintDC swig_types[99] +#define SWIGTYPE_p_wxPaintEvent swig_types[100] +#define SWIGTYPE_p_wxPalette swig_types[101] +#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[102] +#define SWIGTYPE_p_wxPaperSize swig_types[103] +#define SWIGTYPE_p_wxPen swig_types[104] +#define SWIGTYPE_p_wxPenList swig_types[105] +#define SWIGTYPE_p_wxPixelDataBase swig_types[106] +#define SWIGTYPE_p_wxPoint swig_types[107] +#define SWIGTYPE_p_wxPostScriptDC swig_types[108] +#define SWIGTYPE_p_wxPrintData swig_types[109] +#define SWIGTYPE_p_wxPrinterDC swig_types[110] +#define SWIGTYPE_p_wxPseudoDC swig_types[111] +#define SWIGTYPE_p_wxPyApp swig_types[112] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[113] +#define SWIGTYPE_p_wxPyEvent swig_types[114] +#define SWIGTYPE_p_wxPyFontEnumerator swig_types[115] +#define SWIGTYPE_p_wxPyImageHandler swig_types[116] +#define SWIGTYPE_p_wxPyLocale swig_types[117] +#define SWIGTYPE_p_wxPySizer swig_types[118] +#define SWIGTYPE_p_wxPyValidator swig_types[119] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[120] +#define SWIGTYPE_p_wxRect swig_types[121] +#define SWIGTYPE_p_wxRegion swig_types[122] +#define SWIGTYPE_p_wxRegionIterator swig_types[123] +#define SWIGTYPE_p_wxRendererNative swig_types[124] +#define SWIGTYPE_p_wxRendererVersion swig_types[125] +#define SWIGTYPE_p_wxScreenDC swig_types[126] +#define SWIGTYPE_p_wxScrollEvent swig_types[127] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[128] +#define SWIGTYPE_p_wxSetCursorEvent swig_types[129] +#define SWIGTYPE_p_wxShowEvent swig_types[130] +#define SWIGTYPE_p_wxSize swig_types[131] +#define SWIGTYPE_p_wxSizeEvent swig_types[132] +#define SWIGTYPE_p_wxSizer swig_types[133] +#define SWIGTYPE_p_wxSizerItem swig_types[134] +#define SWIGTYPE_p_wxSplitterRenderParams swig_types[135] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[136] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[137] +#define SWIGTYPE_p_wxStockGDI swig_types[138] +#define SWIGTYPE_p_wxString swig_types[139] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[140] +#define SWIGTYPE_p_wxTIFFHandler swig_types[141] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[142] +#define SWIGTYPE_p_wxValidator swig_types[143] +#define SWIGTYPE_p_wxWindow swig_types[144] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[145] +#define SWIGTYPE_p_wxWindowDC swig_types[146] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[147] +#define SWIGTYPE_p_wxXPMHandler swig_types[148] +static swig_type_info *swig_types[150]; +static swig_module_info swig_module = {swig_types, 149, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -16534,6 +16535,38 @@ fail: } +SWIGINTERN PyObject *_wrap_Locale_IsAvailable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + int arg1 ; + bool result; + int val1 ; + int ecode1 = 0 ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "lang", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_IsAvailable",kwnames,&obj0)) SWIG_fail; + ecode1 = SWIG_AsVal_int(obj0, &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "Locale_IsAvailable" "', expected argument " "1"" of type '" "int""'"); + } + arg1 = static_cast< int >(val1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)wxLocale::IsAvailable(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Locale_IsLoaded(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxLocale *arg1 = (wxLocale *) 0 ; @@ -27370,6 +27403,441 @@ SWIGINTERN PyObject *SplitterRenderParams_swiginit(PyObject *SWIGUNUSEDPARM(self return SWIG_Python_InitShadowInstance(args); } +SWIGINTERN PyObject *_wrap_new_HeaderButtonParams(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *result = 0 ; + + if (!SWIG_Python_UnpackTuple(args,"new_HeaderButtonParams",0,0,0)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxHeaderButtonParams *)new wxHeaderButtonParams(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxHeaderButtonParams, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_delete_HeaderButtonParams(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_HeaderButtonParams" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_arrowColour_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxColour *arg2 = (wxColour *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + wxColour temp2 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_arrowColour_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_arrowColour_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + { + arg2 = &temp2; + if ( ! wxColour_helper(swig_obj[1], &arg2)) SWIG_fail; + } + if (arg1) (arg1)->m_arrowColour = *arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_arrowColour_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxColour *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_arrowColour_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (wxColour *)& ((arg1)->m_arrowColour); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_selectionColour_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxColour *arg2 = (wxColour *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + wxColour temp2 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_selectionColour_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_selectionColour_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + { + arg2 = &temp2; + if ( ! wxColour_helper(swig_obj[1], &arg2)) SWIG_fail; + } + if (arg1) (arg1)->m_selectionColour = *arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_selectionColour_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxColour *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_selectionColour_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (wxColour *)& ((arg1)->m_selectionColour); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelText_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxString *arg2 = (wxString *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + bool temp2 = false ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelText_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelText_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + { + arg2 = wxString_in_helper(swig_obj[1]); + if (arg2 == NULL) SWIG_fail; + temp2 = true; + } + if (arg1) (arg1)->m_labelText = *arg2; + + resultobj = SWIG_Py_Void(); + { + if (temp2) + delete arg2; + } + return resultobj; +fail: + { + if (temp2) + delete arg2; + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelText_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxString *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelText_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (wxString *)& ((arg1)->m_labelText); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelFont_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxFont *arg2 = (wxFont *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelFont_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelFont_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxFont, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HeaderButtonParams_m_labelFont_set" "', expected argument " "2"" of type '" "wxFont *""'"); + } + arg2 = reinterpret_cast< wxFont * >(argp2); + if (arg1) (arg1)->m_labelFont = *arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelFont_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxFont *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelFont_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (wxFont *)& ((arg1)->m_labelFont); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelColour_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxColour *arg2 = (wxColour *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + wxColour temp2 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelColour_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelColour_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + { + arg2 = &temp2; + if ( ! wxColour_helper(swig_obj[1], &arg2)) SWIG_fail; + } + if (arg1) (arg1)->m_labelColour = *arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelColour_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxColour *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelColour_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (wxColour *)& ((arg1)->m_labelColour); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelBitmap_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxBitmap *arg2 = (wxBitmap *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelBitmap_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelBitmap_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxBitmap, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HeaderButtonParams_m_labelBitmap_set" "', expected argument " "2"" of type '" "wxBitmap *""'"); + } + arg2 = reinterpret_cast< wxBitmap * >(argp2); + if (arg1) (arg1)->m_labelBitmap = *arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelBitmap_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + wxBitmap *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelBitmap_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (wxBitmap *)& ((arg1)->m_labelBitmap); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxBitmap, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelAlignment_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + int arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"HeaderButtonParams_m_labelAlignment_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelAlignment_set" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + ecode2 = SWIG_AsVal_int(swig_obj[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HeaderButtonParams_m_labelAlignment_set" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + if (arg1) (arg1)->m_labelAlignment = arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_HeaderButtonParams_m_labelAlignment_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxHeaderButtonParams *arg1 = (wxHeaderButtonParams *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HeaderButtonParams_m_labelAlignment_get" "', expected argument " "1"" of type '" "wxHeaderButtonParams *""'"); + } + arg1 = reinterpret_cast< wxHeaderButtonParams * >(argp1); + result = (int) ((arg1)->m_labelAlignment); + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *HeaderButtonParams_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_wxHeaderButtonParams, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *HeaderButtonParams_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + return SWIG_Python_InitShadowInstance(args); +} + SWIGINTERN PyObject *_wrap_new_RendererVersion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; int arg1 ; @@ -27536,6 +28004,8 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButton(PyObject *SWIGUNUSEDP wxDC *arg3 = 0 ; wxRect *arg4 = 0 ; int arg5 = (int) 0 ; + wxHeaderSortIconType arg6 = (wxHeaderSortIconType) wxHDR_SORT_ICON_NONE ; + wxHeaderButtonParams *arg7 = (wxHeaderButtonParams *) NULL ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; @@ -27545,16 +28015,22 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButton(PyObject *SWIGUNUSEDP wxRect temp4 ; int val5 ; int ecode5 = 0 ; + int val6 ; + int ecode6 = 0 ; + void *argp7 = 0 ; + int res7 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "win",(char *) "dc",(char *) "rect",(char *) "flags", NULL + (char *) "self",(char *) "win",(char *) "dc",(char *) "rect",(char *) "flags",(char *) "sortArrow",(char *) "params", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:RendererNative_DrawHeaderButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:RendererNative_DrawHeaderButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRendererNative, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_DrawHeaderButton" "', expected argument " "1"" of type '" "wxRendererNative *""'"); @@ -27584,9 +28060,113 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButton(PyObject *SWIGUNUSEDP } arg5 = static_cast< int >(val5); } + if (obj5) { + ecode6 = SWIG_AsVal_int(obj5, &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "RendererNative_DrawHeaderButton" "', expected argument " "6"" of type '" "wxHeaderSortIconType""'"); + } + arg6 = static_cast< wxHeaderSortIconType >(val6); + } + if (obj6) { + res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "RendererNative_DrawHeaderButton" "', expected argument " "7"" of type '" "wxHeaderButtonParams *""'"); + } + arg7 = reinterpret_cast< wxHeaderButtonParams * >(argp7); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->DrawHeaderButton(arg2,*arg3,(wxRect const &)*arg4,arg5,arg6,arg7); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButtonContents(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxRendererNative *arg1 = (wxRendererNative *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + wxDC *arg3 = 0 ; + wxRect *arg4 = 0 ; + int arg5 = (int) 0 ; + wxHeaderSortIconType arg6 = (wxHeaderSortIconType) wxHDR_SORT_ICON_NONE ; + wxHeaderButtonParams *arg7 = (wxHeaderButtonParams *) NULL ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + wxRect temp4 ; + int val5 ; + int ecode5 = 0 ; + int val6 ; + int ecode6 = 0 ; + void *argp7 = 0 ; + int res7 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "win",(char *) "dc",(char *) "rect",(char *) "flags",(char *) "sortArrow",(char *) "params", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:RendererNative_DrawHeaderButtonContents",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRendererNative, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "1"" of type '" "wxRendererNative *""'"); + } + arg1 = reinterpret_cast< wxRendererNative * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "2"" of type '" "wxWindow *""'"); + } + arg2 = reinterpret_cast< wxWindow * >(argp2); + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxDC, 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "3"" of type '" "wxDC &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "3"" of type '" "wxDC &""'"); + } + arg3 = reinterpret_cast< wxDC * >(argp3); + { + arg4 = &temp4; + if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail; + } + if (obj4) { + ecode5 = SWIG_AsVal_int(obj4, &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "5"" of type '" "int""'"); + } + arg5 = static_cast< int >(val5); + } + if (obj5) { + ecode6 = SWIG_AsVal_int(obj5, &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "6"" of type '" "wxHeaderSortIconType""'"); + } + arg6 = static_cast< wxHeaderSortIconType >(val6); + } + if (obj6) { + res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_wxHeaderButtonParams, 0 | 0 ); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "RendererNative_DrawHeaderButtonContents" "', expected argument " "7"" of type '" "wxHeaderButtonParams *""'"); + } + arg7 = reinterpret_cast< wxHeaderButtonParams * >(argp7); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawHeaderButton(arg2,*arg3,(wxRect const &)*arg4,arg5); + (arg1)->DrawHeaderButtonContents(arg2,*arg3,(wxRect const &)*arg4,arg5,arg6,arg7); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -27597,6 +28177,45 @@ fail: } +SWIGINTERN PyObject *_wrap_RendererNative_GetHeaderButtonHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxRendererNative *arg1 = (wxRendererNative *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "win", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RendererNative_GetHeaderButtonHeight",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRendererNative, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_GetHeaderButtonHeight" "', expected argument " "1"" of type '" "wxRendererNative *""'"); + } + arg1 = reinterpret_cast< wxRendererNative * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RendererNative_GetHeaderButtonHeight" "', expected argument " "2"" of type '" "wxWindow *""'"); + } + arg2 = reinterpret_cast< wxWindow * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetHeaderButtonHeight(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_RendererNative_DrawTreeItemButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxRendererNative *arg1 = (wxRendererNative *) 0 ; @@ -31852,6 +32471,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Locale_GetCanonicalName", (PyCFunction)_wrap_Locale_GetCanonicalName, METH_O, NULL}, { (char *)"Locale_AddCatalogLookupPathPrefix", (PyCFunction) _wrap_Locale_AddCatalogLookupPathPrefix, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Locale_AddCatalog", (PyCFunction) _wrap_Locale_AddCatalog, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Locale_IsAvailable", (PyCFunction) _wrap_Locale_IsAvailable, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Locale_IsLoaded", (PyCFunction) _wrap_Locale_IsLoaded, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Locale_GetLanguageInfo", (PyCFunction) _wrap_Locale_GetLanguageInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Locale_GetLanguageName", (PyCFunction) _wrap_Locale_GetLanguageName, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -32140,6 +32760,24 @@ static PyMethodDef SwigMethods[] = { { (char *)"SplitterRenderParams_isHotSensitive_get", (PyCFunction)_wrap_SplitterRenderParams_isHotSensitive_get, METH_O, NULL}, { (char *)"SplitterRenderParams_swigregister", SplitterRenderParams_swigregister, METH_VARARGS, NULL}, { (char *)"SplitterRenderParams_swiginit", SplitterRenderParams_swiginit, METH_VARARGS, NULL}, + { (char *)"new_HeaderButtonParams", (PyCFunction)_wrap_new_HeaderButtonParams, METH_NOARGS, NULL}, + { (char *)"delete_HeaderButtonParams", (PyCFunction)_wrap_delete_HeaderButtonParams, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_arrowColour_set", _wrap_HeaderButtonParams_m_arrowColour_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_arrowColour_get", (PyCFunction)_wrap_HeaderButtonParams_m_arrowColour_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_selectionColour_set", _wrap_HeaderButtonParams_m_selectionColour_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_selectionColour_get", (PyCFunction)_wrap_HeaderButtonParams_m_selectionColour_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_labelText_set", _wrap_HeaderButtonParams_m_labelText_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_labelText_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelText_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_labelFont_set", _wrap_HeaderButtonParams_m_labelFont_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_labelFont_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelFont_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_labelColour_set", _wrap_HeaderButtonParams_m_labelColour_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_labelColour_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelColour_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_labelBitmap_set", _wrap_HeaderButtonParams_m_labelBitmap_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_labelBitmap_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelBitmap_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_m_labelAlignment_set", _wrap_HeaderButtonParams_m_labelAlignment_set, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_m_labelAlignment_get", (PyCFunction)_wrap_HeaderButtonParams_m_labelAlignment_get, METH_O, NULL}, + { (char *)"HeaderButtonParams_swigregister", HeaderButtonParams_swigregister, METH_VARARGS, NULL}, + { (char *)"HeaderButtonParams_swiginit", HeaderButtonParams_swiginit, METH_VARARGS, NULL}, { (char *)"new_RendererVersion", (PyCFunction) _wrap_new_RendererVersion, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_RendererVersion", (PyCFunction)_wrap_delete_RendererVersion, METH_O, NULL}, { (char *)"RendererVersion_IsCompatible", (PyCFunction) _wrap_RendererVersion_IsCompatible, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -32148,6 +32786,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"RendererVersion_swigregister", RendererVersion_swigregister, METH_VARARGS, NULL}, { (char *)"RendererVersion_swiginit", RendererVersion_swiginit, METH_VARARGS, NULL}, { (char *)"RendererNative_DrawHeaderButton", (PyCFunction) _wrap_RendererNative_DrawHeaderButton, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"RendererNative_DrawHeaderButtonContents", (PyCFunction) _wrap_RendererNative_DrawHeaderButtonContents, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"RendererNative_GetHeaderButtonHeight", (PyCFunction) _wrap_RendererNative_GetHeaderButtonHeight, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RendererNative_DrawTreeItemButton", (PyCFunction) _wrap_RendererNative_DrawTreeItemButton, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RendererNative_DrawSplitterBorder", (PyCFunction) _wrap_RendererNative_DrawSplitterBorder, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RendererNative_DrawSplitterSash", (PyCFunction) _wrap_RendererNative_DrawSplitterSash, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -32679,6 +33319,7 @@ static swig_type_info _swigt__p_wxFontList = {"_p_wxFontList", "wxFontList *", 0 static swig_type_info _swigt__p_wxFontMapper = {"_p_wxFontMapper", "wxFontMapper *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxGDIObjListBase = {"_p_wxGDIObjListBase", "wxGDIObjListBase *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxGDIObject = {"_p_wxGDIObject", "wxGDIObject *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_wxHeaderButtonParams = {"_p_wxHeaderButtonParams", "wxHeaderButtonParams *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxIcon = {"_p_wxIcon", "wxIcon *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxIconBundle = {"_p_wxIconBundle", "wxIconBundle *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxIconLocation = {"_p_wxIconLocation", "wxIconLocation *", 0, 0, (void*)0, 0}; @@ -32856,6 +33497,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxGIFHandler, &_swigt__p_wxGridBagSizer, &_swigt__p_wxGridSizer, + &_swigt__p_wxHeaderButtonParams, &_swigt__p_wxICOHandler, &_swigt__p_wxIcon, &_swigt__p_wxIconBundle, @@ -32979,6 +33621,7 @@ static swig_cast_info _swigc__p_wxFontList[] = { {&_swigt__p_wxFontList, 0, 0, static swig_cast_info _swigc__p_wxFontMapper[] = { {&_swigt__p_wxFontMapper, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGDIObjListBase[] = { {&_swigt__p_wxGDIObjListBase, 0, 0, 0}, {&_swigt__p_wxBrushList, _p_wxBrushListTo_p_wxGDIObjListBase, 0, 0}, {&_swigt__p_wxFontList, _p_wxFontListTo_p_wxGDIObjListBase, 0, 0}, {&_swigt__p_wxPenList, _p_wxPenListTo_p_wxGDIObjListBase, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGDIObject[] = { {&_swigt__p_wxIcon, _p_wxIconTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxPen, _p_wxPenTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxFont, _p_wxFontTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxPalette, _p_wxPaletteTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxGDIObject, 0, 0, 0}, {&_swigt__p_wxCursor, _p_wxCursorTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxBitmap, _p_wxBitmapTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxRegion, _p_wxRegionTo_p_wxGDIObject, 0, 0}, {&_swigt__p_wxBrush, _p_wxBrushTo_p_wxGDIObject, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxHeaderButtonParams[] = { {&_swigt__p_wxHeaderButtonParams, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxIcon[] = { {&_swigt__p_wxIcon, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxIconBundle[] = { {&_swigt__p_wxIconBundle, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxIconLocation[] = { {&_swigt__p_wxIconLocation, 0, 0, 0},{0, 0, 0, 0}}; @@ -33156,6 +33799,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxGIFHandler, _swigc__p_wxGridBagSizer, _swigc__p_wxGridSizer, + _swigc__p_wxHeaderButtonParams, _swigc__p_wxICOHandler, _swigc__p_wxIcon, _swigc__p_wxIconBundle, @@ -34200,6 +34844,9 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "CONTROL_UNDETERMINED",SWIG_From_int(static_cast< int >(wxCONTROL_UNDETERMINED))); SWIG_Python_SetConstant(d, "CONTROL_FLAGS_MASK",SWIG_From_int(static_cast< int >(wxCONTROL_FLAGS_MASK))); SWIG_Python_SetConstant(d, "CONTROL_DIRTY",SWIG_From_int(static_cast< int >(wxCONTROL_DIRTY))); + SWIG_Python_SetConstant(d, "HDR_SORT_ICON_NONE",SWIG_From_int(static_cast< int >(wxHDR_SORT_ICON_NONE))); + SWIG_Python_SetConstant(d, "HDR_SORT_ICON_UP",SWIG_From_int(static_cast< int >(wxHDR_SORT_ICON_UP))); + SWIG_Python_SetConstant(d, "HDR_SORT_ICON_DOWN",SWIG_From_int(static_cast< int >(wxHDR_SORT_ICON_DOWN))); SWIG_Python_SetConstant(d, "RendererVersion_Current_Version",SWIG_From_int(static_cast< int >(wxRendererVersion::Current_Version))); SWIG_Python_SetConstant(d, "RendererVersion_Current_Age",SWIG_From_int(static_cast< int >(wxRendererVersion::Current_Age))); diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py index edeab7b2ca..a978b3cd4c 100644 --- a/wxPython/src/msw/_misc.py +++ b/wxPython/src/msw/_misc.py @@ -1186,6 +1186,20 @@ class PlatformInformation(object): """IsOk(self) -> bool""" return _misc_.PlatformInformation_IsOk(*args, **kwargs) + ArchName = property(GetArchName,doc="See `GetArchName`") + Architecture = property(GetArchitecture,SetArchitecture,doc="See `GetArchitecture` and `SetArchitecture`") + Endianness = property(GetEndianness,SetEndianness,doc="See `GetEndianness` and `SetEndianness`") + EndiannessName = property(GetEndiannessName,doc="See `GetEndiannessName`") + OSMajorVersion = property(GetOSMajorVersion,doc="See `GetOSMajorVersion`") + OSMinorVersion = property(GetOSMinorVersion,doc="See `GetOSMinorVersion`") + OperatingSystemFamilyName = property(GetOperatingSystemFamilyName,doc="See `GetOperatingSystemFamilyName`") + OperatingSystemId = property(GetOperatingSystemId,SetOperatingSystemId,doc="See `GetOperatingSystemId` and `SetOperatingSystemId`") + OperatingSystemIdName = property(GetOperatingSystemIdName,doc="See `GetOperatingSystemIdName`") + PortId = property(GetPortId,SetPortId,doc="See `GetPortId` and `SetPortId`") + PortIdName = property(GetPortIdName,doc="See `GetPortIdName`") + PortIdShortName = property(GetPortIdShortName,doc="See `GetPortIdShortName`") + ToolkitMajorVersion = property(GetToolkitMajorVersion,doc="See `GetToolkitMajorVersion`") + ToolkitMinorVersion = property(GetToolkitMinorVersion,doc="See `GetToolkitMinorVersion`") _misc_.PlatformInformation_swigregister(PlatformInformation) @@ -1906,6 +1920,12 @@ class Process(_core.EvtHandler): """IsErrorAvailable(self) -> bool""" return _misc_.Process_IsErrorAvailable(*args, **kwargs) + ErrorStream = property(GetErrorStream,doc="See `GetErrorStream`") + InputStream = property(GetInputStream,doc="See `GetInputStream`") + OutputStream = property(GetOutputStream,doc="See `GetOutputStream`") + InputOpened = property(IsInputOpened) + InputAvailable = property(IsInputAvailable) + ErrorAvailable = property(IsErrorAvailable) _misc_.Process_swigregister(Process) def Process_Kill(*args, **kwargs): @@ -1937,6 +1957,8 @@ class ProcessEvent(_core.Event): m_pid = property(_misc_.ProcessEvent_m_pid_get, _misc_.ProcessEvent_m_pid_set) m_exitcode = property(_misc_.ProcessEvent_m_exitcode_get, _misc_.ProcessEvent_m_exitcode_set) + ExitCode = property(GetExitCode,doc="See `GetExitCode`") + Pid = property(GetPid,doc="See `GetPid`") _misc_.ProcessEvent_swigregister(ProcessEvent) wxEVT_END_PROCESS = _misc_.wxEVT_END_PROCESS diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py index 96633a43a2..34b7fadab0 100644 --- a/wxPython/src/msw/_windows.py +++ b/wxPython/src/msw/_windows.py @@ -278,6 +278,10 @@ class ScrolledWindow(Panel): return _windows_.ScrolledWindow_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + ScaleX = property(GetScaleX,doc="See `GetScaleX`") + ScaleY = property(GetScaleY,doc="See `GetScaleY`") + TargetWindow = property(GetTargetWindow,SetTargetWindow,doc="See `GetTargetWindow` and `SetTargetWindow`") + ViewStart = property(GetViewStart,doc="See `GetViewStart`") _windows_.ScrolledWindow_swigregister(ScrolledWindow) def PreScrolledWindow(*args, **kwargs): @@ -793,6 +797,7 @@ class SplashScreenWindow(_core.Window): """GetBitmap(self) -> Bitmap""" return _windows_.SplashScreenWindow_GetBitmap(*args, **kwargs) + Bitmap = property(GetBitmap,SetBitmap,doc="See `GetBitmap` and `SetBitmap`") _windows_.SplashScreenWindow_swigregister(SplashScreenWindow) class SplashScreen(Frame): @@ -820,6 +825,9 @@ class SplashScreen(Frame): """GetTimeout(self) -> int""" return _windows_.SplashScreen_GetTimeout(*args, **kwargs) + SplashStyle = property(GetSplashStyle,doc="See `GetSplashStyle`") + SplashWindow = property(GetSplashWindow,doc="See `GetSplashWindow`") + Timeout = property(GetTimeout,doc="See `GetTimeout`") _windows_.SplashScreen_swigregister(SplashScreen) #--------------------------------------------------------------------------- @@ -919,7 +927,12 @@ class StatusBar(_core.Window): for i in range(len(items)): self.SetStatusText(items[i], i) - Fields = property(GetFields,SetFields) + BorderX = property(GetBorderX,doc="See `GetBorderX`") + BorderY = property(GetBorderY,doc="See `GetBorderY`") + FieldRect = property(GetFieldRect,doc="See `GetFieldRect`") + Fields = property(GetFields,SetFields,doc="See `GetFields` and `SetFields`") + FieldsCount = property(GetFieldsCount,SetFieldsCount,doc="See `GetFieldsCount` and `SetFieldsCount`") + StatusText = property(GetStatusText,SetStatusText,doc="See `GetStatusText` and `SetStatusText`") _windows_.StatusBar_swigregister(StatusBar) def PreStatusBar(*args, **kwargs): @@ -1243,6 +1256,15 @@ class SplitterWindow(_core.Window): return _windows_.SplitterWindow_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + BorderSize = property(GetBorderSize,SetBorderSize,doc="See `GetBorderSize` and `SetBorderSize`") + MinimumPaneSize = property(GetMinimumPaneSize,SetMinimumPaneSize,doc="See `GetMinimumPaneSize` and `SetMinimumPaneSize`") + NeedUpdating = property(GetNeedUpdating,SetNeedUpdating,doc="See `GetNeedUpdating` and `SetNeedUpdating`") + SashGravity = property(GetSashGravity,SetSashGravity,doc="See `GetSashGravity` and `SetSashGravity`") + SashPosition = property(GetSashPosition,SetSashPosition,doc="See `GetSashPosition` and `SetSashPosition`") + SashSize = property(GetSashSize,SetSashSize,doc="See `GetSashSize` and `SetSashSize`") + SplitMode = property(GetSplitMode,SetSplitMode,doc="See `GetSplitMode` and `SetSplitMode`") + Window1 = property(GetWindow1,doc="See `GetWindow1`") + Window2 = property(GetWindow2,doc="See `GetWindow2`") _windows_.SplitterWindow_swigregister(SplitterWindow) SplitterNameStr = cvar.SplitterNameStr @@ -1332,6 +1354,10 @@ class SplitterEvent(_core.NotifyEvent): """ return _windows_.SplitterEvent_GetY(*args, **kwargs) + SashPosition = property(GetSashPosition,SetSashPosition,doc="See `GetSashPosition` and `SetSashPosition`") + WindowBeingRemoved = property(GetWindowBeingRemoved,doc="See `GetWindowBeingRemoved`") + X = property(GetX,doc="See `GetX`") + Y = property(GetY,doc="See `GetY`") _windows_.SplitterEvent_swigregister(SplitterEvent) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = _windows_.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED @@ -1456,6 +1482,12 @@ class SashWindow(_core.Window): """SizeWindows(self)""" return _windows_.SashWindow_SizeWindows(*args, **kwargs) + DefaultBorderSize = property(GetDefaultBorderSize,SetDefaultBorderSize,doc="See `GetDefaultBorderSize` and `SetDefaultBorderSize`") + ExtraBorderSize = property(GetExtraBorderSize,SetExtraBorderSize,doc="See `GetExtraBorderSize` and `SetExtraBorderSize`") + MaximumSizeX = property(GetMaximumSizeX,SetMaximumSizeX,doc="See `GetMaximumSizeX` and `SetMaximumSizeX`") + MaximumSizeY = property(GetMaximumSizeY,SetMaximumSizeY,doc="See `GetMaximumSizeY` and `SetMaximumSizeY`") + MinimumSizeX = property(GetMinimumSizeX,SetMinimumSizeX,doc="See `GetMinimumSizeX` and `SetMinimumSizeX`") + MinimumSizeY = property(GetMinimumSizeY,SetMinimumSizeY,doc="See `GetMinimumSizeY` and `SetMinimumSizeY`") _windows_.SashWindow_swigregister(SashWindow) SashNameStr = cvar.SashNameStr SashLayoutNameStr = cvar.SashLayoutNameStr @@ -1498,6 +1530,9 @@ class SashEvent(_core.CommandEvent): """GetDragStatus(self) -> int""" return _windows_.SashEvent_GetDragStatus(*args, **kwargs) + DragRect = property(GetDragRect,SetDragRect,doc="See `GetDragRect` and `SetDragRect`") + DragStatus = property(GetDragStatus,SetDragStatus,doc="See `GetDragStatus` and `SetDragStatus`") + Edge = property(GetEdge,SetEdge,doc="See `GetEdge` and `SetEdge`") _windows_.SashEvent_swigregister(SashEvent) wxEVT_SASH_DRAGGED = _windows_.wxEVT_SASH_DRAGGED @@ -1566,6 +1601,11 @@ class QueryLayoutInfoEvent(_core.Event): """GetAlignment(self) -> int""" return _windows_.QueryLayoutInfoEvent_GetAlignment(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") + Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") + RequestedLength = property(GetRequestedLength,SetRequestedLength,doc="See `GetRequestedLength` and `SetRequestedLength`") + Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") _windows_.QueryLayoutInfoEvent_swigregister(QueryLayoutInfoEvent) class CalculateLayoutEvent(_core.Event): @@ -1639,6 +1679,8 @@ class SashLayoutWindow(SashWindow): """SetOrientation(self, int orientation)""" return _windows_.SashLayoutWindow_SetOrientation(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") _windows_.SashLayoutWindow_swigregister(SashLayoutWindow) def PreSashLayoutWindow(*args, **kwargs): @@ -2527,6 +2569,8 @@ class SingleChoiceDialog(Dialog): """ return _windows_.SingleChoiceDialog_SetSelection(*args, **kwargs) + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + StringSelection = property(GetStringSelection,doc="See `GetStringSelection`") _windows_.SingleChoiceDialog_swigregister(SingleChoiceDialog) TextEntryDialogStyle = _windows_.TextEntryDialogStyle @@ -3905,6 +3949,19 @@ class PrintData(_core.Object): """SetPrivData(self, PyObject data)""" return _windows_.PrintData_SetPrivData(*args, **kwargs) + Bin = property(GetBin,SetBin,doc="See `GetBin` and `SetBin`") + Collate = property(GetCollate,SetCollate,doc="See `GetCollate` and `SetCollate`") + Colour = property(GetColour,SetColour,doc="See `GetColour` and `SetColour`") + Duplex = property(GetDuplex,SetDuplex,doc="See `GetDuplex` and `SetDuplex`") + Filename = property(GetFilename,SetFilename,doc="See `GetFilename` and `SetFilename`") + NoCopies = property(GetNoCopies,SetNoCopies,doc="See `GetNoCopies` and `SetNoCopies`") + Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") + PaperId = property(GetPaperId,SetPaperId,doc="See `GetPaperId` and `SetPaperId`") + PaperSize = property(GetPaperSize,SetPaperSize,doc="See `GetPaperSize` and `SetPaperSize`") + PrintMode = property(GetPrintMode,SetPrintMode,doc="See `GetPrintMode` and `SetPrintMode`") + PrinterName = property(GetPrinterName,SetPrinterName,doc="See `GetPrinterName` and `SetPrinterName`") + PrivData = property(GetPrivData,SetPrivData,doc="See `GetPrivData` and `SetPrivData`") + Quality = property(GetQuality,SetQuality,doc="See `GetQuality` and `SetQuality`") _windows_.PrintData_swigregister(PrintData) PrintoutTitleStr = cvar.PrintoutTitleStr PreviewCanvasNameStr = cvar.PreviewCanvasNameStr @@ -4047,6 +4104,15 @@ class PageSetupDialogData(_core.Object): return _windows_.PageSetupDialogData_CalculatePaperSizeFromId(*args, **kwargs) def __nonzero__(self): return self.Ok() + DefaultInfo = property(GetDefaultInfo,SetDefaultInfo,doc="See `GetDefaultInfo` and `SetDefaultInfo`") + DefaultMinMargins = property(GetDefaultMinMargins,SetDefaultMinMargins,doc="See `GetDefaultMinMargins` and `SetDefaultMinMargins`") + MarginBottomRight = property(GetMarginBottomRight,SetMarginBottomRight,doc="See `GetMarginBottomRight` and `SetMarginBottomRight`") + MarginTopLeft = property(GetMarginTopLeft,SetMarginTopLeft,doc="See `GetMarginTopLeft` and `SetMarginTopLeft`") + MinMarginBottomRight = property(GetMinMarginBottomRight,SetMinMarginBottomRight,doc="See `GetMinMarginBottomRight` and `SetMinMarginBottomRight`") + MinMarginTopLeft = property(GetMinMarginTopLeft,SetMinMarginTopLeft,doc="See `GetMinMarginTopLeft` and `SetMinMarginTopLeft`") + PaperId = property(GetPaperId,SetPaperId,doc="See `GetPaperId` and `SetPaperId`") + PaperSize = property(GetPaperSize,SetPaperSize,doc="See `GetPaperSize` and `SetPaperSize`") + PrintData = property(GetPrintData,SetPrintData,doc="See `GetPrintData` and `SetPrintData`") _windows_.PageSetupDialogData_swigregister(PageSetupDialogData) class PageSetupDialog(_core.Object): @@ -4071,6 +4137,8 @@ class PageSetupDialog(_core.Object): return _windows_.PageSetupDialog_ShowModal(*args, **kwargs) def Destroy(self): pass + PageSetupData = property(GetPageSetupData,doc="See `GetPageSetupData`") + PageSetupDialogData = property(GetPageSetupDialogData,doc="See `GetPageSetupDialogData`") _windows_.PageSetupDialog_swigregister(PageSetupDialog) class PrintDialogData(_core.Object): @@ -4203,6 +4271,16 @@ class PrintDialogData(_core.Object): return _windows_.PrintDialogData_SetPrintData(*args, **kwargs) def __nonzero__(self): return self.Ok() + AllPages = property(GetAllPages,SetAllPages,doc="See `GetAllPages` and `SetAllPages`") + Collate = property(GetCollate,SetCollate,doc="See `GetCollate` and `SetCollate`") + FromPage = property(GetFromPage,SetFromPage,doc="See `GetFromPage` and `SetFromPage`") + MaxPage = property(GetMaxPage,SetMaxPage,doc="See `GetMaxPage` and `SetMaxPage`") + MinPage = property(GetMinPage,SetMinPage,doc="See `GetMinPage` and `SetMinPage`") + NoCopies = property(GetNoCopies,SetNoCopies,doc="See `GetNoCopies` and `SetNoCopies`") + PrintData = property(GetPrintData,SetPrintData,doc="See `GetPrintData` and `SetPrintData`") + PrintToFile = property(GetPrintToFile,SetPrintToFile,doc="See `GetPrintToFile` and `SetPrintToFile`") + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + ToPage = property(GetToPage,SetToPage,doc="See `GetToPage` and `SetToPage`") _windows_.PrintDialogData_swigregister(PrintDialogData) class PrintDialog(_core.Object): @@ -4231,6 +4309,9 @@ class PrintDialog(_core.Object): return _windows_.PrintDialog_GetPrintDC(*args, **kwargs) def Destroy(self): pass + PrintDC = property(GetPrintDC,doc="See `GetPrintDC`") + PrintData = property(GetPrintData,doc="See `GetPrintData`") + PrintDialogData = property(GetPrintDialogData,doc="See `GetPrintDialogData`") _windows_.PrintDialog_swigregister(PrintDialog) PRINTER_NO_ERROR = _windows_.PRINTER_NO_ERROR @@ -4278,6 +4359,8 @@ class Printer(_core.Object): return _windows_.Printer_GetLastError(*args, **kwargs) GetLastError = staticmethod(GetLastError) + Abort = property(GetAbort,doc="See `GetAbort`") + PrintDialogData = property(GetPrintDialogData,doc="See `GetPrintDialogData`") _windows_.Printer_swigregister(Printer) def Printer_GetLastError(*args): @@ -4409,6 +4492,12 @@ class Printout(_core.Object): base_GetPageInfo = wx._deprecated(base_GetPageInfo, "Please use Printout.GetPageInfo instead.") + DC = property(GetDC,SetDC,doc="See `GetDC` and `SetDC`") + PPIPrinter = property(GetPPIPrinter,SetPPIPrinter,doc="See `GetPPIPrinter` and `SetPPIPrinter`") + PPIScreen = property(GetPPIScreen,SetPPIScreen,doc="See `GetPPIScreen` and `SetPPIScreen`") + PageSizeMM = property(GetPageSizeMM,SetPageSizeMM,doc="See `GetPageSizeMM` and `SetPageSizeMM`") + PageSizePixels = property(GetPageSizePixels,SetPageSizePixels,doc="See `GetPageSizePixels` and `SetPageSizePixels`") + Title = property(GetTitle,doc="See `GetTitle`") _windows_.Printout_swigregister(Printout) class PreviewCanvas(ScrolledWindow): @@ -4455,6 +4544,7 @@ class PreviewFrame(Frame): """GetControlBar(self) -> PreviewControlBar""" return _windows_.PreviewFrame_GetControlBar(*args, **kwargs) + ControlBar = property(GetControlBar,doc="See `GetControlBar`") _windows_.PreviewFrame_swigregister(PreviewFrame) PREVIEW_PRINT = _windows_.PREVIEW_PRINT @@ -4518,6 +4608,8 @@ class PreviewControlBar(Panel): """OnGoto(self)""" return _windows_.PreviewControlBar_OnGoto(*args, **kwargs) + PrintPreview = property(GetPrintPreview,doc="See `GetPrintPreview`") + ZoomControl = property(GetZoomControl,SetZoomControl,doc="See `GetZoomControl` and `SetZoomControl`") _windows_.PreviewControlBar_swigregister(PreviewControlBar) class PrintPreview(_core.Object): @@ -4621,6 +4713,15 @@ class PrintPreview(_core.Object): return _windows_.PrintPreview_DetermineScaling(*args, **kwargs) def __nonzero__(self): return self.Ok() + Canvas = property(GetCanvas,SetCanvas,doc="See `GetCanvas` and `SetCanvas`") + CurrentPage = property(GetCurrentPage,SetCurrentPage,doc="See `GetCurrentPage` and `SetCurrentPage`") + Frame = property(GetFrame,SetFrame,doc="See `GetFrame` and `SetFrame`") + MaxPage = property(GetMaxPage,doc="See `GetMaxPage`") + MinPage = property(GetMinPage,doc="See `GetMinPage`") + PrintDialogData = property(GetPrintDialogData,doc="See `GetPrintDialogData`") + Printout = property(GetPrintout,SetPrintout,doc="See `GetPrintout` and `SetPrintout`") + PrintoutForPrinting = property(GetPrintoutForPrinting,doc="See `GetPrintoutForPrinting`") + Zoom = property(GetZoom,SetZoom,doc="See `GetZoom` and `SetZoom`") _windows_.PrintPreview_swigregister(PrintPreview) class PyPrintPreview(PrintPreview): diff --git a/wxPython/src/msw/xrc.py b/wxPython/src/msw/xrc.py index ecac915e01..c90dd9a978 100644 --- a/wxPython/src/msw/xrc.py +++ b/wxPython/src/msw/xrc.py @@ -366,6 +366,18 @@ class XmlNode(object): """GetContent(self) -> String""" return _xrc.XmlNode_GetContent(*args, **kwargs) + def IsWhitespaceOnly(*args, **kwargs): + """IsWhitespaceOnly(self) -> bool""" + return _xrc.XmlNode_IsWhitespaceOnly(*args, **kwargs) + + def GetDepth(*args, **kwargs): + """GetDepth(self, XmlNode grandparent=None) -> int""" + return _xrc.XmlNode_GetDepth(*args, **kwargs) + + def GetNodeContent(*args, **kwargs): + """GetNodeContent(self) -> String""" + return _xrc.XmlNode_GetNodeContent(*args, **kwargs) + def GetParent(*args, **kwargs): """GetParent(self) -> XmlNode""" return _xrc.XmlNode_GetParent(*args, **kwargs) @@ -425,6 +437,9 @@ def XmlNodeEasy(*args, **kwargs): val = _xrc.new_XmlNodeEasy(*args, **kwargs) return val +XML_NO_INDENTATION = _xrc.XML_NO_INDENTATION +XMLDOC_NONE = _xrc.XMLDOC_NONE +XMLDOC_KEEP_WHITESPACE_NODES = _xrc.XMLDOC_KEEP_WHITESPACE_NODES class XmlDocument(_core.Object): """Proxy of C++ XmlDocument class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') @@ -435,19 +450,19 @@ class XmlDocument(_core.Object): __swig_destroy__ = _xrc.delete_XmlDocument __del__ = lambda self : None; def Load(*args, **kwargs): - """Load(self, String filename, String encoding=UTF8String) -> bool""" + """Load(self, String filename, String encoding=UTF8String, int flags=XMLDOC_NONE) -> bool""" return _xrc.XmlDocument_Load(*args, **kwargs) def LoadFromStream(*args, **kwargs): - """LoadFromStream(self, InputStream stream, String encoding=UTF8String) -> bool""" + """LoadFromStream(self, InputStream stream, String encoding=UTF8String, int flags=XMLDOC_NONE) -> bool""" return _xrc.XmlDocument_LoadFromStream(*args, **kwargs) def Save(*args, **kwargs): - """Save(self, String filename) -> bool""" + """Save(self, String filename, int indentstep=1) -> bool""" return _xrc.XmlDocument_Save(*args, **kwargs) def SaveToStream(*args, **kwargs): - """SaveToStream(self, OutputStream stream) -> bool""" + """SaveToStream(self, OutputStream stream, int indentstep=1) -> bool""" return _xrc.XmlDocument_SaveToStream(*args, **kwargs) def IsOk(*args, **kwargs): diff --git a/wxPython/src/msw/xrc_wrap.cpp b/wxPython/src/msw/xrc_wrap.cpp index b16bbb0b07..d7c29b364d 100644 --- a/wxPython/src/msw/xrc_wrap.cpp +++ b/wxPython/src/msw/xrc_wrap.cpp @@ -5668,6 +5668,111 @@ fail: } +SWIGINTERN PyObject *_wrap_XmlNode_IsWhitespaceOnly(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxXmlNode *arg1 = (wxXmlNode *) 0 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxXmlNode, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlNode_IsWhitespaceOnly" "', expected argument " "1"" of type '" "wxXmlNode const *""'"); + } + arg1 = reinterpret_cast< wxXmlNode * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxXmlNode const *)arg1)->IsWhitespaceOnly(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_XmlNode_GetDepth(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxXmlNode *arg1 = (wxXmlNode *) 0 ; + wxXmlNode *arg2 = (wxXmlNode *) NULL ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "grandparent", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:XmlNode_GetDepth",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxXmlNode, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlNode_GetDepth" "', expected argument " "1"" of type '" "wxXmlNode const *""'"); + } + arg1 = reinterpret_cast< wxXmlNode * >(argp1); + if (obj1) { + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxXmlNode, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "XmlNode_GetDepth" "', expected argument " "2"" of type '" "wxXmlNode *""'"); + } + arg2 = reinterpret_cast< wxXmlNode * >(argp2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxXmlNode const *)arg1)->GetDepth(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_XmlNode_GetNodeContent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxXmlNode *arg1 = (wxXmlNode *) 0 ; + wxString result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxXmlNode, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlNode_GetNodeContent" "', expected argument " "1"" of type '" "wxXmlNode const *""'"); + } + arg1 = reinterpret_cast< wxXmlNode * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxXmlNode const *)arg1)->GetNodeContent(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_XmlNode_GetParent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxXmlNode *arg1 = (wxXmlNode *) 0 ; @@ -6359,19 +6464,23 @@ SWIGINTERN PyObject *_wrap_XmlDocument_Load(PyObject *SWIGUNUSEDPARM(self), PyOb wxString *arg2 = 0 ; wxString const &arg3_defvalue = wxPyUTF8String ; wxString *arg3 = (wxString *) &arg3_defvalue ; + int arg4 = (int) wxXMLDOC_NONE ; bool result; void *argp1 = 0 ; int res1 = 0 ; bool temp2 = false ; bool temp3 = false ; + int val4 ; + int ecode4 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "filename",(char *) "encoding", NULL + (char *) "self",(char *) "filename",(char *) "encoding",(char *) "flags", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:XmlDocument_Load",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:XmlDocument_Load",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxXmlDocument, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlDocument_Load" "', expected argument " "1"" of type '" "wxXmlDocument *""'"); @@ -6389,9 +6498,16 @@ SWIGINTERN PyObject *_wrap_XmlDocument_Load(PyObject *SWIGUNUSEDPARM(self), PyOb temp3 = true; } } + if (obj3) { + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "XmlDocument_Load" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Load((wxString const &)*arg2,(wxString const &)*arg3); + result = (bool)(arg1)->Load((wxString const &)*arg2,(wxString const &)*arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6426,20 +6542,24 @@ SWIGINTERN PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *SWIGUNUSEDPARM(s wxInputStream *arg2 = 0 ; wxString const &arg3_defvalue = wxPyUTF8String ; wxString *arg3 = (wxString *) &arg3_defvalue ; + int arg4 = (int) wxXMLDOC_NONE ; bool result; void *argp1 = 0 ; int res1 = 0 ; wxPyInputStream *temp2 ; bool created2 ; bool temp3 = false ; + int val4 ; + int ecode4 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "stream",(char *) "encoding", NULL + (char *) "self",(char *) "stream",(char *) "encoding",(char *) "flags", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:XmlDocument_LoadFromStream",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:XmlDocument_LoadFromStream",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxXmlDocument, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlDocument_LoadFromStream" "', expected argument " "1"" of type '" "wxXmlDocument *""'"); @@ -6466,9 +6586,16 @@ SWIGINTERN PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *SWIGUNUSEDPARM(s temp3 = true; } } + if (obj3) { + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "XmlDocument_LoadFromStream" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Load(*arg2,(wxString const &)*arg3); + result = (bool)(arg1)->Load(*arg2,(wxString const &)*arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6499,17 +6626,21 @@ SWIGINTERN PyObject *_wrap_XmlDocument_Save(PyObject *SWIGUNUSEDPARM(self), PyOb PyObject *resultobj = 0; wxXmlDocument *arg1 = (wxXmlDocument *) 0 ; wxString *arg2 = 0 ; + int arg3 = (int) 1 ; bool result; void *argp1 = 0 ; int res1 = 0 ; bool temp2 = false ; + int val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "filename", NULL + (char *) "self",(char *) "filename",(char *) "indentstep", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:XmlDocument_Save",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:XmlDocument_Save",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxXmlDocument, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlDocument_Save" "', expected argument " "1"" of type '" "wxXmlDocument const *""'"); @@ -6520,9 +6651,16 @@ SWIGINTERN PyObject *_wrap_XmlDocument_Save(PyObject *SWIGUNUSEDPARM(self), PyOb if (arg2 == NULL) SWIG_fail; temp2 = true; } + if (obj2) { + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "XmlDocument_Save" "', expected argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxXmlDocument const *)arg1)->Save((wxString const &)*arg2); + result = (bool)((wxXmlDocument const *)arg1)->Save((wxString const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -6547,18 +6685,22 @@ SWIGINTERN PyObject *_wrap_XmlDocument_SaveToStream(PyObject *SWIGUNUSEDPARM(sel PyObject *resultobj = 0; wxXmlDocument *arg1 = (wxXmlDocument *) 0 ; wxOutputStream *arg2 = 0 ; + int arg3 = (int) 1 ; bool result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; + int val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "stream", NULL + (char *) "self",(char *) "stream",(char *) "indentstep", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:XmlDocument_SaveToStream",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:XmlDocument_SaveToStream",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxXmlDocument, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlDocument_SaveToStream" "', expected argument " "1"" of type '" "wxXmlDocument const *""'"); @@ -6572,9 +6714,16 @@ SWIGINTERN PyObject *_wrap_XmlDocument_SaveToStream(PyObject *SWIGUNUSEDPARM(sel SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "XmlDocument_SaveToStream" "', expected argument " "2"" of type '" "wxOutputStream &""'"); } arg2 = reinterpret_cast< wxOutputStream * >(argp2); + if (obj2) { + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "XmlDocument_SaveToStream" "', expected argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxXmlDocument const *)arg1)->Save(*arg2); + result = (bool)((wxXmlDocument const *)arg1)->Save(*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -8558,6 +8707,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"XmlNode_GetType", (PyCFunction)_wrap_XmlNode_GetType, METH_O, NULL}, { (char *)"XmlNode_GetName", (PyCFunction)_wrap_XmlNode_GetName, METH_O, NULL}, { (char *)"XmlNode_GetContent", (PyCFunction)_wrap_XmlNode_GetContent, METH_O, NULL}, + { (char *)"XmlNode_IsWhitespaceOnly", (PyCFunction)_wrap_XmlNode_IsWhitespaceOnly, METH_O, NULL}, + { (char *)"XmlNode_GetDepth", (PyCFunction) _wrap_XmlNode_GetDepth, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"XmlNode_GetNodeContent", (PyCFunction)_wrap_XmlNode_GetNodeContent, METH_O, NULL}, { (char *)"XmlNode_GetParent", (PyCFunction)_wrap_XmlNode_GetParent, METH_O, NULL}, { (char *)"XmlNode_GetNext", (PyCFunction)_wrap_XmlNode_GetNext, METH_O, NULL}, { (char *)"XmlNode_GetChildren", (PyCFunction)_wrap_XmlNode_GetChildren, METH_O, NULL}, @@ -9843,6 +9995,9 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "XML_DOCUMENT_FRAG_NODE",SWIG_From_int(static_cast< int >(wxXML_DOCUMENT_FRAG_NODE))); SWIG_Python_SetConstant(d, "XML_NOTATION_NODE",SWIG_From_int(static_cast< int >(wxXML_NOTATION_NODE))); SWIG_Python_SetConstant(d, "XML_HTML_DOCUMENT_NODE",SWIG_From_int(static_cast< int >(wxXML_HTML_DOCUMENT_NODE))); + SWIG_Python_SetConstant(d, "XML_NO_INDENTATION",SWIG_From_int(static_cast< int >(wxXML_NO_INDENTATION))); + SWIG_Python_SetConstant(d, "XMLDOC_NONE",SWIG_From_int(static_cast< int >(wxXMLDOC_NONE))); + SWIG_Python_SetConstant(d, "XMLDOC_KEEP_WHITESPACE_NODES",SWIG_From_int(static_cast< int >(wxXMLDOC_KEEP_WHITESPACE_NODES))); wxXmlInitResourceModule(); -- 2.45.2