From d5c9047acf66ae7ee2aed4778832b6887095ce7a Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 20 Oct 1998 06:45:33 +0000 Subject: [PATCH] New wxTreeCtrl wrappers (untested) some changes in helpers etc. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/wxPython/src/_defs.i | 7 + utils/wxPython/src/_extras.py | 52 +- utils/wxPython/src/controls2.i | 149 ++- utils/wxPython/src/events.i | 7 +- utils/wxPython/src/gdi.i | 8 + utils/wxPython/src/helpers.cpp | 15 +- utils/wxPython/src/misc.i | 9 +- utils/wxPython/src/msw/cmndlgs.cpp | 2 - utils/wxPython/src/msw/controls.cpp | 2 - utils/wxPython/src/msw/controls2.cpp | 1693 +++++++++++++++++--------- utils/wxPython/src/msw/controls2.py | 389 +++--- utils/wxPython/src/msw/events.cpp | 22 - utils/wxPython/src/msw/events.py | 3 - utils/wxPython/src/msw/frames.cpp | 6 - utils/wxPython/src/msw/gdi.cpp | 54 - utils/wxPython/src/msw/gdi.py | 18 - utils/wxPython/src/msw/mdi.cpp | 6 - utils/wxPython/src/msw/misc.cpp | 8 +- utils/wxPython/src/msw/misc.py | 2 + utils/wxPython/src/msw/stattool.cpp | 623 ++++------ utils/wxPython/src/msw/stattool.py | 86 +- utils/wxPython/src/msw/windows.cpp | 2 - utils/wxPython/src/msw/windows2.cpp | 2 - utils/wxPython/src/msw/wxp.cpp | 21 +- utils/wxPython/src/msw/wxp.py | 55 +- utils/wxPython/tests/test4.py | 10 +- 26 files changed, 1870 insertions(+), 1381 deletions(-) diff --git a/utils/wxPython/src/_defs.i b/utils/wxPython/src/_defs.i index bff71c0680..40404a1256 100644 --- a/utils/wxPython/src/_defs.i +++ b/utils/wxPython/src/_defs.i @@ -204,6 +204,7 @@ enum { wxBU_NOAUTODRAW, wxTR_HAS_BUTTONS, wxTR_EDIT_LABELS, + wxTR_LINES_AT_ROOT, wxLC_ICON, wxLC_SMALL_ICON, wxLC_LIST, @@ -698,7 +699,13 @@ enum wxEventType { ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.6 1998/10/20 06:43:53 RD +// New wxTreeCtrl wrappers (untested) +// some changes in helpers +// etc. +// // Revision 1.5 1998/10/02 06:40:32 RD +// // Version 0.4 of wxPython for MSW. // // Revision 1.4 1998/08/18 19:48:11 RD diff --git a/utils/wxPython/src/_extras.py b/utils/wxPython/src/_extras.py index 2060f59f63..acc81d5ce1 100644 --- a/utils/wxPython/src/_extras.py +++ b/utils/wxPython/src/_extras.py @@ -339,7 +339,7 @@ def EVT_COMMAND_ENTER(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_ENTER, func) - +# wxNotebook events def EVT_NOTEBOOK_PAGE_CHANGED(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, func) @@ -347,6 +347,50 @@ def EVT_NOTEBOOK_PAGE_CHANGING(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, func) +#wxTreeCtrl events +def EVT_TREE_BEGIN_DRAG(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_BEGIN_DRAG, func) + +def EVT_TREE_BEGIN_RDRAG(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_BEGIN_RDRAG, func) + +def EVT_TREE_BEGIN_LABEL_EDIT(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, func) + +def EVT_TREE_END_LABEL_EDIT(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_END_LABEL_EDIT, func) + +def EVT_TREE_GET_INFO(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_GET_INFO, func) + +def EVT_TREE_SET_INFO(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_SET_INFO, func) + +def EVT_TREE_ITEM_EXPANDED(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_ITEM_EXPANDED, func) + +def EVT_TREE_ITEM_EXPANDING(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_ITEM_EXPANDING, func) + +def EVT_TREE_ITEM_COLLAPSED(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_ITEM_COLLAPSED, func) + +def EVT_TREE_ITEM_COLLAPSING(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_ITEM_COLLAPSING, func) + +def EVT_TREE_SEL_CHANGED(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_SEL_CHANGED, func) + +def EVT_TREE_SEL_CHANGING(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_SEL_CHANGING, func) + +def EVT_TREE_KEY_DOWN(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_KEY_DOWN, func) + +def EVT_TREE_DELETE_ITEM(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_DELETE_ITEM, func) + + #---------------------------------------------------------------------- @@ -443,7 +487,13 @@ class wxApp(wxPyApp): #---------------------------------------------------------------------------- # # $Log$ +# Revision 1.4 1998/10/20 06:43:54 RD +# New wxTreeCtrl wrappers (untested) +# some changes in helpers +# etc. +# # Revision 1.3 1998/10/02 06:40:33 RD +# # Version 0.4 of wxPython for MSW. # # Revision 1.2 1998/08/18 19:48:12 RD diff --git a/utils/wxPython/src/controls2.i b/utils/wxPython/src/controls2.i index 1a4d475fa3..fa7489ddac 100644 --- a/utils/wxPython/src/controls2.i +++ b/utils/wxPython/src/controls2.i @@ -189,6 +189,9 @@ public: //---------------------------------------------------------------------- +#ifdef SKIPTHIS + + enum { wxTREE_MASK_HANDLE, wxTREE_MASK_STATE, @@ -250,9 +253,6 @@ enum { - - - class wxTreeItem { public: long m_mask; @@ -370,6 +370,144 @@ public: #endif }; +#endif + + +//---------------------------------------------------------------------- + +#ifdef __WXMSW__ +class wxTreeItemId { +public: + wxTreeItemId(); + ~wxTreeItemId(); + bool IsOk() const { return m_itemId != 0; } + + %addmethods { + long GetId() { return (long)(*self); } + } +}; + + + +// **** This isn't very useful yet. This needs to be specialized to enable +// derived Python classes... +class wxTreeItemData { +public: + wxTreeItemData(); + ~wxTreeItemData(); + + const wxTreeItemId& GetItemId(); +}; + + + + +class wxTreeEvent : public wxCommandEvent { +public: + wxTreeItemId GetItem(); + wxTreeItemId GetOldItem(); + wxPoint GetPoint(); + int GetCode(); + void Veto(); +}; + + +// These are for the GetFirstChild/GetNextChild methods below +%typemap(python, in) long& INOUT = long* INOUT; +%typemap(python, argout) long& INOUT = long* INOUT; + + +class wxTreeCtrl : public wxControl { +public: + wxTreeCtrl(wxWindow *parent, wxWindowID id = -1, + const wxPoint& pos = wxPyDefaultPosition, + const wxSize& size = wxPyDefaultSize, + long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT, + const wxValidator& validator = wxPyDefaultValidator, + char* name = "wxTreeCtrl"); + + %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)" + + size_t GetCount(); + unsigned int GetIndent(); + void SetIndent(unsigned int indent); + wxImageList *GetImageList(); + wxImageList *GetStateImageList(); + void SetImageList(wxImageList *imageList); + void SetStateImageList(wxImageList *imageList); + + wxString GetItemText(const wxTreeItemId& item); + int GetItemImage(const wxTreeItemId& item); + int GetItemSelectedImage(const wxTreeItemId& item); + wxTreeItemData *GetItemData(const wxTreeItemId& item); + + void SetItemText(const wxTreeItemId& item, const wxString& text); + void SetItemImage(const wxTreeItemId& item, int image); + void SetItemSelectedImage(const wxTreeItemId& item, int image); + void SetItemData(const wxTreeItemId& item, wxTreeItemData *data); + + bool IsVisible(const wxTreeItemId& item); + bool ItemHasChildren(const wxTreeItemId& item); + bool IsExpanded(const wxTreeItemId& item); + bool IsSelected(const wxTreeItemId& item); + + wxTreeItemId GetRootItem(); + wxTreeItemId GetSelection(); + wxTreeItemId GetParent(const wxTreeItemId& item); + + wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& INOUT); + wxTreeItemId GetNextChild(const wxTreeItemId& item, long& INOUT); + wxTreeItemId GetNextSibling(const wxTreeItemId& item); + wxTreeItemId GetPrevSibling(const wxTreeItemId& item); + wxTreeItemId GetFirstVisibleItem(); + wxTreeItemId GetNextVisible(const wxTreeItemId& item); + wxTreeItemId GetPrevVisible(const wxTreeItemId& item); + + + wxTreeItemId AddRoot(const wxString& text, + int image = -1, int selectedImage = -1, + wxTreeItemData *data = NULL); + wxTreeItemId PrependItem(const wxTreeItemId& parent, + const wxString& text, + int image = -1, int selectedImage = -1, + wxTreeItemData *data = NULL); + wxTreeItemId InsertItem(const wxTreeItemId& parent, + const wxTreeItemId& idPrevious, + const wxString& text, + int image = -1, int selectedImage = -1, + wxTreeItemData *data = NULL); + wxTreeItemId AppendItem(const wxTreeItemId& parent, + const wxString& text, + int image = -1, int selectedImage = -1, + wxTreeItemData *data = NULL); + + void Delete(const wxTreeItemId& item); + void DeleteAllItems(); + + void Expand(const wxTreeItemId& item); + void Collapse(const wxTreeItemId& item); + void CollapseAndReset(const wxTreeItemId& item); + void Toggle(const wxTreeItemId& item); + + void Unselect(); + void SelectItem(const wxTreeItemId& item); + void EnsureVisible(const wxTreeItemId& item); + void ScrollTo(const wxTreeItemId& item); + + wxTextCtrl* EditLabel(const wxTreeItemId& item); + // **** figure out how to do this + // wxClassInfo* textCtrlClass = CLASSINFO(wxTextCtrl)); + wxTextCtrl* GetEditControl(); + void EndEditLabel(const wxTreeItemId& item, bool discardChanges = FALSE); + + void SortChildren(const wxTreeItemId& item); + // **** And this too + // wxTreeItemCmpFunc *cmpFunction = NULL); + +}; + +#endif + //---------------------------------------------------------------------- #ifdef SKIPTHIS @@ -430,6 +568,11 @@ public: ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.6 1998/10/20 06:43:55 RD +// New wxTreeCtrl wrappers (untested) +// some changes in helpers +// etc. +// // Revision 1.5 1998/10/07 07:34:33 RD // Version 0.4.1 for wxGTK // diff --git a/utils/wxPython/src/events.i b/utils/wxPython/src/events.i index 39f7e4417c..c0b1586ea2 100644 --- a/utils/wxPython/src/events.i +++ b/utils/wxPython/src/events.i @@ -53,7 +53,7 @@ public: class wxCloseEvent : public wxEvent { public: - bool GetSessionEnding(); +// ??? it's in the docs ??? bool GetSessionEnding(); bool GetLoggingOff(); void Veto(bool veto = TRUE); bool GetVeto(); @@ -289,6 +289,11 @@ public: ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.3 1998/10/20 06:43:56 RD +// New wxTreeCtrl wrappers (untested) +// some changes in helpers +// etc. +// // Revision 1.2 1998/08/15 07:36:33 RD // - Moved the header in the .i files out of the code that gets put into // the .cpp files. It caused CVS conflicts because of the RCS ID being diff --git a/utils/wxPython/src/gdi.i b/utils/wxPython/src/gdi.i index e54659d1a3..5750c6a26e 100644 --- a/utils/wxPython/src/gdi.i +++ b/utils/wxPython/src/gdi.i @@ -402,10 +402,12 @@ public: //--------------------------------------------------------------------------- +#ifndef __WXMSW__ class wxPostScriptDC : public wxDC { public: wxPostScriptDC(const wxString& output, bool interactive = TRUE, wxWindow* win = NULL); }; +#endif //--------------------------------------------------------------------------- @@ -485,7 +487,13 @@ extern wxColour wxNullColour; ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.5 1998/10/20 06:43:57 RD +// New wxTreeCtrl wrappers (untested) +// some changes in helpers +// etc. +// // Revision 1.4 1998/10/02 06:40:38 RD +// // Version 0.4 of wxPython for MSW. // // Revision 1.3 1998/08/18 19:48:16 RD diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp index 13c94c45d8..4c76dc1abd 100644 --- a/utils/wxPython/src/helpers.cpp +++ b/utils/wxPython/src/helpers.cpp @@ -291,7 +291,6 @@ void wxPyCallback::EventThunker(wxEvent& event) { tuple = PyTuple_New(1); PyTuple_SET_ITEM(tuple, 0, arg); result = PyEval_CallObject(func, tuple); - Py_DECREF(arg); Py_DECREF(tuple); if (result) { Py_DECREF(result); @@ -329,12 +328,12 @@ void wxPyMenu::MenuCallback(wxMenu& menu, wxCommandEvent& evt) { } // Now call the callback... PyObject* func = ((wxPyMenu*)&menu)->func; - PyObject* args = Py_BuildValue("(OO)", menuobj, evtobj); + PyObject* args = PyTuple_New(2); + PyTuple_SET_ITEM(args, 0, menuobj); + PyTuple_SET_ITEM(args, 1, evtobj); PyObject* res = PyEval_CallObject(func, args); Py_DECREF(args); - Py_DECREF(res); - Py_DECREF(evtobj); - Py_DECREF(menuobj); + Py_XDECREF(res); /* In case res is a NULL pointer */ } @@ -651,7 +650,13 @@ wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) { ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.11 1998/10/20 06:43:58 RD +// New wxTreeCtrl wrappers (untested) +// some changes in helpers +// etc. +// // Revision 1.10 1998/10/02 06:40:39 RD +// // Version 0.4 of wxPython for MSW. // // Revision 1.9 1998/09/25 13:28:52 VZ diff --git a/utils/wxPython/src/misc.i b/utils/wxPython/src/misc.i index 7b96bac70a..dd7c6bedea 100644 --- a/utils/wxPython/src/misc.i +++ b/utils/wxPython/src/misc.i @@ -208,8 +208,8 @@ bool wxYield(); bool wxResourceAddIdentifier(char *name, int value); void wxResourceClear(void); -wxBitmap * wxResourceCreateBitmap(char *resource); -wxIcon * wxResourceCreateIcon(char *resource); +wxBitmap wxResourceCreateBitmap(char *resource); +wxIcon wxResourceCreateIcon(char *resource); wxMenuBar * wxResourceCreateMenuBar(char *resource); int wxResourceGetIdentifier(char *name); bool wxResourceParseData(char *resource, wxResourceTable *table = NULL); @@ -307,6 +307,11 @@ public: ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.5 1998/10/20 06:43:59 RD +// New wxTreeCtrl wrappers (untested) +// some changes in helpers +// etc. +// // Revision 1.4 1998/08/18 19:48:19 RD // more wxGTK compatibility things. // diff --git a/utils/wxPython/src/msw/cmndlgs.cpp b/utils/wxPython/src/msw/cmndlgs.cpp index e916a54f74..d361c9796f 100644 --- a/utils/wxPython/src/msw/cmndlgs.cpp +++ b/utils/wxPython/src/msw/cmndlgs.cpp @@ -3583,7 +3583,6 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); - SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0); SWIG_RegisterMapping("_wxPanel","_class_wxMessageDialog",SwigwxMessageDialogTowxPanel); SWIG_RegisterMapping("_wxPanel","_wxMessageDialog",SwigwxMessageDialogTowxPanel); SWIG_RegisterMapping("_wxPanel","_class_wxPrintDialog",SwigwxPrintDialogTowxPanel); @@ -3717,7 +3716,6 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0); SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0); - SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0); SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0); SWIG_RegisterMapping("_unsigned_char","_byte",0); SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0); diff --git a/utils/wxPython/src/msw/controls.cpp b/utils/wxPython/src/msw/controls.cpp index f530d32a0f..c96dd022e0 100644 --- a/utils/wxPython/src/msw/controls.cpp +++ b/utils/wxPython/src/msw/controls.cpp @@ -5514,7 +5514,6 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0); - SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0); SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0); SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0); SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0); @@ -5640,7 +5639,6 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0); SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0); - SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0); SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0); SWIG_RegisterMapping("_unsigned_char","_byte",0); SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0); diff --git a/utils/wxPython/src/msw/controls2.cpp b/utils/wxPython/src/msw/controls2.cpp index 7bf09f53b9..26fadf336d 100644 --- a/utils/wxPython/src/msw/controls2.cpp +++ b/utils/wxPython/src/msw/controls2.cpp @@ -1953,230 +1953,141 @@ static PyObject *_wrap_wxListCtrl_SetWindowStyleFlag(PyObject *self, PyObject *a return _resultobj; } -#define wxTreeItem_m_mask_get(_swigobj) ((long ) _swigobj->m_mask) -static PyObject *_wrap_wxTreeItem_m_mask_get(PyObject *self, PyObject *args) { +#define new_wxTreeItemId() (new wxTreeItemId()) +static PyObject *_wrap_new_wxTreeItemId(PyObject *self, PyObject *args) { PyObject * _resultobj; - long _result; - wxTreeItem * _arg0; - char * _argc0 = 0; + wxTreeItemId * _result; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeItem_m_mask_get",&_argc0)) - return NULL; - if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeItem_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItem_m_mask_get. Expected _wxTreeItem_p."); + if(!PyArg_ParseTuple(args,":new_wxTreeItemId")) return NULL; - } - } - _result = (long )wxTreeItem_m_mask_get(_arg0); - _resultobj = Py_BuildValue("l",_result); + _result = (wxTreeItemId *)new_wxTreeItemId(); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxTreeItemId_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxTreeItem_m_itemId_get(_swigobj) ((long ) _swigobj->m_itemId) -static PyObject *_wrap_wxTreeItem_m_itemId_get(PyObject *self, PyObject *args) { +#define delete_wxTreeItemId(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxTreeItemId(PyObject *self, PyObject *args) { PyObject * _resultobj; - long _result; - wxTreeItem * _arg0; + wxTreeItemId * _arg0; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeItem_m_itemId_get",&_argc0)) + if(!PyArg_ParseTuple(args,"s:delete_wxTreeItemId",&_argc0)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeItem_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItem_m_itemId_get. Expected _wxTreeItem_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxTreeItemId. Expected _wxTreeItemId_p."); return NULL; } } - _result = (long )wxTreeItem_m_itemId_get(_arg0); - _resultobj = Py_BuildValue("l",_result); + delete_wxTreeItemId(_arg0); + Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxTreeItem_m_state_get(_swigobj) ((long ) _swigobj->m_state) -static PyObject *_wrap_wxTreeItem_m_state_get(PyObject *self, PyObject *args) { +#define wxTreeItemId_IsOk(_swigobj) (_swigobj->IsOk()) +static PyObject *_wrap_wxTreeItemId_IsOk(PyObject *self, PyObject *args) { PyObject * _resultobj; - long _result; - wxTreeItem * _arg0; + bool _result; + wxTreeItemId * _arg0; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeItem_m_state_get",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxTreeItemId_IsOk",&_argc0)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeItem_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItem_m_state_get. Expected _wxTreeItem_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItemId_IsOk. Expected _wxTreeItemId_p."); return NULL; } } - _result = (long )wxTreeItem_m_state_get(_arg0); - _resultobj = Py_BuildValue("l",_result); + _result = (bool )wxTreeItemId_IsOk(_arg0); + _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxTreeItem_m_stateMask_get(_swigobj) ((long ) _swigobj->m_stateMask) -static PyObject *_wrap_wxTreeItem_m_stateMask_get(PyObject *self, PyObject *args) { +static long wxTreeItemId_GetId(wxTreeItemId *self) { return (long)(*self); } +static PyObject *_wrap_wxTreeItemId_GetId(PyObject *self, PyObject *args) { PyObject * _resultobj; long _result; - wxTreeItem * _arg0; + wxTreeItemId * _arg0; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeItem_m_stateMask_get",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxTreeItemId_GetId",&_argc0)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeItem_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItem_m_stateMask_get. Expected _wxTreeItem_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItemId_GetId. Expected _wxTreeItemId_p."); return NULL; } } - _result = (long )wxTreeItem_m_stateMask_get(_arg0); + _result = (long )wxTreeItemId_GetId(_arg0); _resultobj = Py_BuildValue("l",_result); return _resultobj; } -#define wxTreeItem_m_text_get(_swigobj) (&_swigobj->m_text) -static PyObject *_wrap_wxTreeItem_m_text_get(PyObject *self, PyObject *args) { - PyObject * _resultobj; - wxString * _result; - wxTreeItem * _arg0; - char * _argc0 = 0; - - self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeItem_m_text_get",&_argc0)) - return NULL; - if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeItem_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItem_m_text_get. Expected _wxTreeItem_p."); - return NULL; - } - } - _result = (wxString *)wxTreeItem_m_text_get(_arg0); -{ - _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); -} - return _resultobj; -} - -#define wxTreeItem_m_image_get(_swigobj) ((int ) _swigobj->m_image) -static PyObject *_wrap_wxTreeItem_m_image_get(PyObject *self, PyObject *args) { - PyObject * _resultobj; - int _result; - wxTreeItem * _arg0; - char * _argc0 = 0; - - self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeItem_m_image_get",&_argc0)) - return NULL; - if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeItem_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItem_m_image_get. Expected _wxTreeItem_p."); - return NULL; - } - } - _result = (int )wxTreeItem_m_image_get(_arg0); - _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - -#define wxTreeItem_m_selectedImage_get(_swigobj) ((int ) _swigobj->m_selectedImage) -static PyObject *_wrap_wxTreeItem_m_selectedImage_get(PyObject *self, PyObject *args) { +#define new_wxTreeItemData() (new wxTreeItemData()) +static PyObject *_wrap_new_wxTreeItemData(PyObject *self, PyObject *args) { PyObject * _resultobj; - int _result; - wxTreeItem * _arg0; - char * _argc0 = 0; + wxTreeItemData * _result; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeItem_m_selectedImage_get",&_argc0)) - return NULL; - if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeItem_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItem_m_selectedImage_get. Expected _wxTreeItem_p."); + if(!PyArg_ParseTuple(args,":new_wxTreeItemData")) return NULL; - } - } - _result = (int )wxTreeItem_m_selectedImage_get(_arg0); - _resultobj = Py_BuildValue("i",_result); + _result = (wxTreeItemData *)new_wxTreeItemData(); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxTreeItemData_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxTreeItem_m_children_get(_swigobj) ((int ) _swigobj->m_children) -static PyObject *_wrap_wxTreeItem_m_children_get(PyObject *self, PyObject *args) { +#define delete_wxTreeItemData(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxTreeItemData(PyObject *self, PyObject *args) { PyObject * _resultobj; - int _result; - wxTreeItem * _arg0; + wxTreeItemData * _arg0; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeItem_m_children_get",&_argc0)) + if(!PyArg_ParseTuple(args,"s:delete_wxTreeItemData",&_argc0)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeItem_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItem_m_children_get. Expected _wxTreeItem_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeItemData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxTreeItemData. Expected _wxTreeItemData_p."); return NULL; } } - _result = (int )wxTreeItem_m_children_get(_arg0); - _resultobj = Py_BuildValue("i",_result); + delete_wxTreeItemData(_arg0); + Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxTreeItem_m_data_get(_swigobj) ((long ) _swigobj->m_data) -static PyObject *_wrap_wxTreeItem_m_data_get(PyObject *self, PyObject *args) { +#define wxTreeItemData_GetItemId(_swigobj) (_swigobj->GetItemId()) +static PyObject *_wrap_wxTreeItemData_GetItemId(PyObject *self, PyObject *args) { PyObject * _resultobj; - long _result; - wxTreeItem * _arg0; + wxTreeItemId * _result; + wxTreeItemData * _arg0; char * _argc0 = 0; - - self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeItem_m_data_get",&_argc0)) - return NULL; - if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeItem_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItem_m_data_get. Expected _wxTreeItem_p."); - return NULL; - } - } - _result = (long )wxTreeItem_m_data_get(_arg0); - _resultobj = Py_BuildValue("l",_result); - return _resultobj; -} - -#define new_wxTreeItem() (new wxTreeItem()) -static PyObject *_wrap_new_wxTreeItem(PyObject *self, PyObject *args) { - PyObject * _resultobj; - wxTreeItem * _result; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,":new_wxTreeItem")) - return NULL; - _result = (wxTreeItem *)new_wxTreeItem(); - SWIG_MakePtr(_ptemp, (char *) _result,"_wxTreeItem_p"); - _resultobj = Py_BuildValue("s",_ptemp); - return _resultobj; -} - -#define delete_wxTreeItem(_swigobj) (delete _swigobj) -static PyObject *_wrap_delete_wxTreeItem(PyObject *self, PyObject *args) { - PyObject * _resultobj; - wxTreeItem * _arg0; - char * _argc0 = 0; - - self = self; - if(!PyArg_ParseTuple(args,"s:delete_wxTreeItem",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxTreeItemData_GetItemId",&_argc0)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeItem_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxTreeItem. Expected _wxTreeItem_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeItemData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItemData_GetItemId. Expected _wxTreeItemData_p."); return NULL; } } - delete_wxTreeItem(_arg0); - Py_INCREF(Py_None); - _resultobj = Py_None; + const wxTreeItemId & _result_ref = wxTreeItemData_GetItemId(_arg0); + _result = (wxTreeItemId *) &_result_ref; + SWIG_MakePtr(_ptemp, (char *) _result,"_wxTreeItemId_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } @@ -2196,91 +2107,114 @@ static void *SwigwxTreeEventTowxEvent(void *ptr) { return (void *) dest; } -#define wxTreeEvent_m_code_get(_swigobj) ((int ) _swigobj->m_code) -static PyObject *_wrap_wxTreeEvent_m_code_get(PyObject *self, PyObject *args) { +#define wxTreeEvent_GetItem(_swigobj) (_swigobj->GetItem()) +static PyObject *_wrap_wxTreeEvent_GetItem(PyObject *self, PyObject *args) { PyObject * _resultobj; - int _result; + wxTreeItemId * _result; wxTreeEvent * _arg0; char * _argc0 = 0; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeEvent_m_code_get",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxTreeEvent_GetItem",&_argc0)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_m_code_get. Expected _wxTreeEvent_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_GetItem. Expected _wxTreeEvent_p."); return NULL; } } - _result = (int )wxTreeEvent_m_code_get(_arg0); - _resultobj = Py_BuildValue("i",_result); + _result = new wxTreeItemId (wxTreeEvent_GetItem(_arg0)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxTreeItemId_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxTreeEvent_m_item_get(_swigobj) (&_swigobj->m_item) -static PyObject *_wrap_wxTreeEvent_m_item_get(PyObject *self, PyObject *args) { +#define wxTreeEvent_GetOldItem(_swigobj) (_swigobj->GetOldItem()) +static PyObject *_wrap_wxTreeEvent_GetOldItem(PyObject *self, PyObject *args) { PyObject * _resultobj; - wxTreeItem * _result; + wxTreeItemId * _result; wxTreeEvent * _arg0; char * _argc0 = 0; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeEvent_m_item_get",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxTreeEvent_GetOldItem",&_argc0)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_m_item_get. Expected _wxTreeEvent_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_GetOldItem. Expected _wxTreeEvent_p."); return NULL; } } - _result = (wxTreeItem *)wxTreeEvent_m_item_get(_arg0); - SWIG_MakePtr(_ptemp, (char *) _result,"_wxTreeItem_p"); + _result = new wxTreeItemId (wxTreeEvent_GetOldItem(_arg0)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxTreeItemId_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxTreeEvent_m_oldItem_get(_swigobj) ((long ) _swigobj->m_oldItem) -static PyObject *_wrap_wxTreeEvent_m_oldItem_get(PyObject *self, PyObject *args) { +#define wxTreeEvent_GetPoint(_swigobj) (_swigobj->GetPoint()) +static PyObject *_wrap_wxTreeEvent_GetPoint(PyObject *self, PyObject *args) { PyObject * _resultobj; - long _result; + wxPoint * _result; wxTreeEvent * _arg0; char * _argc0 = 0; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeEvent_m_oldItem_get",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxTreeEvent_GetPoint",&_argc0)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_m_oldItem_get. Expected _wxTreeEvent_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_GetPoint. Expected _wxTreeEvent_p."); return NULL; } } - _result = (long )wxTreeEvent_m_oldItem_get(_arg0); - _resultobj = Py_BuildValue("l",_result); + _result = new wxPoint (wxTreeEvent_GetPoint(_arg0)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxTreeEvent_m_pointDrag_get(_swigobj) (&_swigobj->m_pointDrag) -static PyObject *_wrap_wxTreeEvent_m_pointDrag_get(PyObject *self, PyObject *args) { +#define wxTreeEvent_GetCode(_swigobj) (_swigobj->GetCode()) +static PyObject *_wrap_wxTreeEvent_GetCode(PyObject *self, PyObject *args) { PyObject * _resultobj; - wxPoint * _result; + int _result; wxTreeEvent * _arg0; char * _argc0 = 0; - char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeEvent_m_pointDrag_get",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxTreeEvent_GetCode",&_argc0)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_m_pointDrag_get. Expected _wxTreeEvent_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_GetCode. Expected _wxTreeEvent_p."); return NULL; } } - _result = (wxPoint *)wxTreeEvent_m_pointDrag_get(_arg0); - SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p"); - _resultobj = Py_BuildValue("s",_ptemp); + _result = (int )wxTreeEvent_GetCode(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxTreeEvent_Veto(_swigobj) (_swigobj->Veto()) +static PyObject *_wrap_wxTreeEvent_Veto(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxTreeEvent * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxTreeEvent_Veto",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_Veto. Expected _wxTreeEvent_p."); + return NULL; + } + } + wxTreeEvent_Veto(_arg0); + Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } @@ -2316,7 +2250,7 @@ static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args) { wxWindowID _arg1 = -1; wxPoint * _arg2 = &wxPyDefaultPosition; wxSize * _arg3 = &wxPyDefaultSize; - long _arg4 = (wxTR_HAS_BUTTONS); + long _arg4 = (wxTR_HAS_BUTTONS)|(wxTR_LINES_AT_ROOT); wxValidator * _arg5 = &wxPyDefaultValidator; char * _arg6 = "wxTreeCtrl"; char * _argc0 = 0; @@ -2358,451 +2292,561 @@ static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args) { return _resultobj; } -#define wxTreeCtrl_DeleteAllItems(_swigobj) (_swigobj->DeleteAllItems()) -static PyObject *_wrap_wxTreeCtrl_DeleteAllItems(PyObject *self, PyObject *args) { +#define wxTreeCtrl_GetCount(_swigobj) (_swigobj->GetCount()) +static PyObject *_wrap_wxTreeCtrl_GetCount(PyObject *self, PyObject *args) { PyObject * _resultobj; - bool _result; + size_t * _result; wxTreeCtrl * _arg0; char * _argc0 = 0; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_DeleteAllItems",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetCount",&_argc0)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_DeleteAllItems. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetCount. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (bool )wxTreeCtrl_DeleteAllItems(_arg0); - _resultobj = Py_BuildValue("i",_result); + _result = new size_t (wxTreeCtrl_GetCount(_arg0)); + SWIG_MakePtr(_ptemp, (void *) _result,"_size_t_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxTreeCtrl_DeleteItem(_swigobj,_swigarg0) (_swigobj->DeleteItem(_swigarg0)) -static PyObject *_wrap_wxTreeCtrl_DeleteItem(PyObject *self, PyObject *args) { +#define wxTreeCtrl_GetIndent(_swigobj) (_swigobj->GetIndent()) +static PyObject *_wrap_wxTreeCtrl_GetIndent(PyObject *self, PyObject *args) { PyObject * _resultobj; - bool _result; + unsigned int _result; wxTreeCtrl * _arg0; - long _arg1; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"sl:wxTreeCtrl_DeleteItem",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetIndent",&_argc0)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_DeleteItem. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetIndent. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (bool )wxTreeCtrl_DeleteItem(_arg0,_arg1); + _result = (unsigned int )wxTreeCtrl_GetIndent(_arg0); _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxTreeCtrl_EditLabel(_swigobj,_swigarg0) (_swigobj->EditLabel(_swigarg0)) -static PyObject *_wrap_wxTreeCtrl_EditLabel(PyObject *self, PyObject *args) { +#define wxTreeCtrl_SetIndent(_swigobj,_swigarg0) (_swigobj->SetIndent(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_SetIndent(PyObject *self, PyObject *args) { PyObject * _resultobj; - wxTextCtrl * _result; wxTreeCtrl * _arg0; - long _arg1; + unsigned int _arg1; char * _argc0 = 0; - char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"sl:wxTreeCtrl_EditLabel",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"si:wxTreeCtrl_SetIndent",&_argc0,&_arg1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_EditLabel. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetIndent. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (wxTextCtrl *)wxTreeCtrl_EditLabel(_arg0,_arg1); - SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p"); - _resultobj = Py_BuildValue("s",_ptemp); + wxTreeCtrl_SetIndent(_arg0,_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxTreeCtrl_EnsureVisible(_swigobj,_swigarg0) (_swigobj->EnsureVisible(_swigarg0)) -static PyObject *_wrap_wxTreeCtrl_EnsureVisible(PyObject *self, PyObject *args) { +#define wxTreeCtrl_GetImageList(_swigobj) (_swigobj->GetImageList()) +static PyObject *_wrap_wxTreeCtrl_GetImageList(PyObject *self, PyObject *args) { PyObject * _resultobj; - bool _result; + wxImageList * _result; wxTreeCtrl * _arg0; - long _arg1; char * _argc0 = 0; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"sl:wxTreeCtrl_EnsureVisible",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetImageList",&_argc0)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_EnsureVisible. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetImageList. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (bool )wxTreeCtrl_EnsureVisible(_arg0,_arg1); - _resultobj = Py_BuildValue("i",_result); + _result = (wxImageList *)wxTreeCtrl_GetImageList(_arg0); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxTreeCtrl_ExpandItem(_swigobj,_swigarg0,_swigarg1) (_swigobj->ExpandItem(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxTreeCtrl_ExpandItem(PyObject *self, PyObject *args) { +#define wxTreeCtrl_GetStateImageList(_swigobj) (_swigobj->GetStateImageList()) +static PyObject *_wrap_wxTreeCtrl_GetStateImageList(PyObject *self, PyObject *args) { PyObject * _resultobj; - bool _result; + wxImageList * _result; wxTreeCtrl * _arg0; - long _arg1; - int _arg2; char * _argc0 = 0; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"sli:wxTreeCtrl_ExpandItem",&_argc0,&_arg1,&_arg2)) + if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetStateImageList",&_argc0)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_ExpandItem. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetStateImageList. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (bool )wxTreeCtrl_ExpandItem(_arg0,_arg1,_arg2); - _resultobj = Py_BuildValue("i",_result); + _result = (wxImageList *)wxTreeCtrl_GetStateImageList(_arg0); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxTreeCtrl_GetChild(_swigobj,_swigarg0) (_swigobj->GetChild(_swigarg0)) -static PyObject *_wrap_wxTreeCtrl_GetChild(PyObject *self, PyObject *args) { +#define wxTreeCtrl_SetImageList(_swigobj,_swigarg0) (_swigobj->SetImageList(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_SetImageList(PyObject *self, PyObject *args) { PyObject * _resultobj; - long _result; wxTreeCtrl * _arg0; - long _arg1; + wxImageList * _arg1; char * _argc0 = 0; + char * _argc1 = 0; self = self; - if(!PyArg_ParseTuple(args,"sl:wxTreeCtrl_GetChild",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_SetImageList",&_argc0,&_argc1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetChild. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetImageList. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (long )wxTreeCtrl_GetChild(_arg0,_arg1); - _resultobj = Py_BuildValue("l",_result); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxImageList_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetImageList. Expected _wxImageList_p."); + return NULL; + } + } + wxTreeCtrl_SetImageList(_arg0,_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxTreeCtrl_GetCount(_swigobj) (_swigobj->GetCount()) -static PyObject *_wrap_wxTreeCtrl_GetCount(PyObject *self, PyObject *args) { +#define wxTreeCtrl_SetStateImageList(_swigobj,_swigarg0) (_swigobj->SetStateImageList(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_SetStateImageList(PyObject *self, PyObject *args) { PyObject * _resultobj; - int _result; wxTreeCtrl * _arg0; + wxImageList * _arg1; char * _argc0 = 0; + char * _argc1 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetCount",&_argc0)) + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_SetStateImageList",&_argc0,&_argc1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetCount. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetStateImageList. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (int )wxTreeCtrl_GetCount(_arg0); - _resultobj = Py_BuildValue("i",_result); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxImageList_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetStateImageList. Expected _wxImageList_p."); + return NULL; + } + } + wxTreeCtrl_SetStateImageList(_arg0,_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxTreeCtrl_GetEditControl(_swigobj) (_swigobj->GetEditControl()) -static PyObject *_wrap_wxTreeCtrl_GetEditControl(PyObject *self, PyObject *args) { +#define wxTreeCtrl_GetItemText(_swigobj,_swigarg0) (_swigobj->GetItemText(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_GetItemText(PyObject *self, PyObject *args) { PyObject * _resultobj; - wxTextCtrl * _result; + wxString * _result; wxTreeCtrl * _arg0; + wxTreeItemId * _arg1; char * _argc0 = 0; - char _ptemp[128]; + char * _argc1 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetEditControl",&_argc0)) + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_GetItemText",&_argc0,&_argc1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetEditControl. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetItemText. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (wxTextCtrl *)wxTreeCtrl_GetEditControl(_arg0); - SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p"); - _resultobj = Py_BuildValue("s",_ptemp); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetItemText. Expected _wxTreeItemId_p."); + return NULL; + } + } + _result = new wxString (wxTreeCtrl_GetItemText(_arg0,*_arg1)); +{ + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); +} +{ + delete _result; +} return _resultobj; } -#define wxTreeCtrl_GetFirstVisibleItem(_swigobj) (_swigobj->GetFirstVisibleItem()) -static PyObject *_wrap_wxTreeCtrl_GetFirstVisibleItem(PyObject *self, PyObject *args) { +#define wxTreeCtrl_GetItemImage(_swigobj,_swigarg0) (_swigobj->GetItemImage(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_GetItemImage(PyObject *self, PyObject *args) { PyObject * _resultobj; - long _result; + int _result; wxTreeCtrl * _arg0; + wxTreeItemId * _arg1; char * _argc0 = 0; + char * _argc1 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetFirstVisibleItem",&_argc0)) + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_GetItemImage",&_argc0,&_argc1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetFirstVisibleItem. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetItemImage. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (long )wxTreeCtrl_GetFirstVisibleItem(_arg0); - _resultobj = Py_BuildValue("l",_result); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetItemImage. Expected _wxTreeItemId_p."); + return NULL; + } + } + _result = (int )wxTreeCtrl_GetItemImage(_arg0,*_arg1); + _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxTreeCtrl_GetImageList(_swigobj,_swigarg0) (_swigobj->GetImageList(_swigarg0)) -static PyObject *_wrap_wxTreeCtrl_GetImageList(PyObject *self, PyObject *args) { +#define wxTreeCtrl_GetItemSelectedImage(_swigobj,_swigarg0) (_swigobj->GetItemSelectedImage(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_GetItemSelectedImage(PyObject *self, PyObject *args) { PyObject * _resultobj; - wxImageList * _result; + int _result; wxTreeCtrl * _arg0; - int _arg1 = wxIMAGE_LIST_NORMAL; + wxTreeItemId * _arg1; char * _argc0 = 0; - char _ptemp[128]; + char * _argc1 = 0; self = self; - if(!PyArg_ParseTuple(args,"s|i:wxTreeCtrl_GetImageList",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_GetItemSelectedImage",&_argc0,&_argc1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetImageList. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetItemSelectedImage. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (wxImageList *)wxTreeCtrl_GetImageList(_arg0,_arg1); - SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p"); - _resultobj = Py_BuildValue("s",_ptemp); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetItemSelectedImage. Expected _wxTreeItemId_p."); + return NULL; + } + } + _result = (int )wxTreeCtrl_GetItemSelectedImage(_arg0,*_arg1); + _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxTreeCtrl_GetIndent(_swigobj) (_swigobj->GetIndent()) -static PyObject *_wrap_wxTreeCtrl_GetIndent(PyObject *self, PyObject *args) { +#define wxTreeCtrl_GetItemData(_swigobj,_swigarg0) (_swigobj->GetItemData(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_GetItemData(PyObject *self, PyObject *args) { PyObject * _resultobj; - int _result; + wxTreeItemData * _result; wxTreeCtrl * _arg0; + wxTreeItemId * _arg1; char * _argc0 = 0; + char * _argc1 = 0; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetIndent",&_argc0)) + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_GetItemData",&_argc0,&_argc1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetIndent. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetItemData. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (int )wxTreeCtrl_GetIndent(_arg0); - _resultobj = Py_BuildValue("i",_result); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetItemData. Expected _wxTreeItemId_p."); + return NULL; + } + } + _result = (wxTreeItemData *)wxTreeCtrl_GetItemData(_arg0,*_arg1); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxTreeItemData_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxTreeCtrl_GetItemData(_swigobj,_swigarg0) (_swigobj->GetItemData(_swigarg0)) -static PyObject *_wrap_wxTreeCtrl_GetItemData(PyObject *self, PyObject *args) { +#define wxTreeCtrl_SetItemText(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetItemText(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxTreeCtrl_SetItemText(PyObject *self, PyObject *args) { PyObject * _resultobj; - long _result; wxTreeCtrl * _arg0; - long _arg1; + wxTreeItemId * _arg1; + wxString * _arg2; char * _argc0 = 0; + char * _argc1 = 0; + PyObject * _obj2 = 0; self = self; - if(!PyArg_ParseTuple(args,"sl:wxTreeCtrl_GetItemData",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"ssO:wxTreeCtrl_SetItemText",&_argc0,&_argc1,&_obj2)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetItemData. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemText. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (long )wxTreeCtrl_GetItemData(_arg0,_arg1); - _resultobj = Py_BuildValue("l",_result); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItemText. Expected _wxTreeItemId_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj2)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg2 = new wxString(PyString_AsString(_obj2)); +} + wxTreeCtrl_SetItemText(_arg0,*_arg1,*_arg2); + Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj2) + delete _arg2; +} return _resultobj; } -static wxTreeItem * wxTreeCtrl_GetItem(wxTreeCtrl *self) { - wxTreeItem* info = new wxTreeItem; - self->GetItem(*info); - return info; - } -static PyObject *_wrap_wxTreeCtrl_GetItem(PyObject *self, PyObject *args) { +#define wxTreeCtrl_SetItemImage(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetItemImage(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxTreeCtrl_SetItemImage(PyObject *self, PyObject *args) { PyObject * _resultobj; - wxTreeItem * _result; wxTreeCtrl * _arg0; + wxTreeItemId * _arg1; + int _arg2; char * _argc0 = 0; - char _ptemp[128]; + char * _argc1 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetItem",&_argc0)) + if(!PyArg_ParseTuple(args,"ssi:wxTreeCtrl_SetItemImage",&_argc0,&_argc1,&_arg2)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetItem. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemImage. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (wxTreeItem *)wxTreeCtrl_GetItem(_arg0); - SWIG_MakePtr(_ptemp, (char *) _result,"_wxTreeItem_p"); - _resultobj = Py_BuildValue("s",_ptemp); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItemImage. Expected _wxTreeItemId_p."); + return NULL; + } + } + wxTreeCtrl_SetItemImage(_arg0,*_arg1,_arg2); + Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -static wxRect * wxTreeCtrl_GetItemRect(wxTreeCtrl *self,long item,int textOnly) { - wxRect* rect = new wxRect; - self->GetItemRect(item, *rect, textOnly); - return rect; - } -static PyObject *_wrap_wxTreeCtrl_GetItemRect(PyObject *self, PyObject *args) { +#define wxTreeCtrl_SetItemSelectedImage(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetItemSelectedImage(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxTreeCtrl_SetItemSelectedImage(PyObject *self, PyObject *args) { PyObject * _resultobj; - wxRect * _result; wxTreeCtrl * _arg0; - long _arg1; - int _arg2 = (0); + wxTreeItemId * _arg1; + int _arg2; char * _argc0 = 0; - char _ptemp[128]; + char * _argc1 = 0; self = self; - if(!PyArg_ParseTuple(args,"sl|i:wxTreeCtrl_GetItemRect",&_argc0,&_arg1,&_arg2)) + if(!PyArg_ParseTuple(args,"ssi:wxTreeCtrl_SetItemSelectedImage",&_argc0,&_argc1,&_arg2)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetItemRect. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemSelectedImage. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (wxRect *)wxTreeCtrl_GetItemRect(_arg0,_arg1,_arg2); - SWIG_MakePtr(_ptemp, (char *) _result,"_wxRect_p"); - _resultobj = Py_BuildValue("s",_ptemp); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItemSelectedImage. Expected _wxTreeItemId_p."); + return NULL; + } + } + wxTreeCtrl_SetItemSelectedImage(_arg0,*_arg1,_arg2); + Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxTreeCtrl_GetItemState(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetItemState(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxTreeCtrl_GetItemState(PyObject *self, PyObject *args) { +#define wxTreeCtrl_SetItemData(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetItemData(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxTreeCtrl_SetItemData(PyObject *self, PyObject *args) { PyObject * _resultobj; - int _result; wxTreeCtrl * _arg0; - long _arg1; - long _arg2; + wxTreeItemId * _arg1; + wxTreeItemData * _arg2; char * _argc0 = 0; + char * _argc1 = 0; + char * _argc2 = 0; self = self; - if(!PyArg_ParseTuple(args,"sll:wxTreeCtrl_GetItemState",&_argc0,&_arg1,&_arg2)) + if(!PyArg_ParseTuple(args,"sss:wxTreeCtrl_SetItemData",&_argc0,&_argc1,&_argc2)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetItemState. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemData. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (int )wxTreeCtrl_GetItemState(_arg0,_arg1,_arg2); - _resultobj = Py_BuildValue("i",_result); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItemData. Expected _wxTreeItemId_p."); + return NULL; + } + } + if (_argc2) { + if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxTreeItemData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxTreeCtrl_SetItemData. Expected _wxTreeItemData_p."); + return NULL; + } + } + wxTreeCtrl_SetItemData(_arg0,*_arg1,_arg2); + Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxTreeCtrl_GetItemText(_swigobj,_swigarg0) (_swigobj->GetItemText(_swigarg0)) -static PyObject *_wrap_wxTreeCtrl_GetItemText(PyObject *self, PyObject *args) { +#define wxTreeCtrl_IsVisible(_swigobj,_swigarg0) (_swigobj->IsVisible(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_IsVisible(PyObject *self, PyObject *args) { PyObject * _resultobj; - wxString * _result; + bool _result; wxTreeCtrl * _arg0; - long _arg1; + wxTreeItemId * _arg1; char * _argc0 = 0; + char * _argc1 = 0; self = self; - if(!PyArg_ParseTuple(args,"sl:wxTreeCtrl_GetItemText",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_IsVisible",&_argc0,&_argc1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetItemText. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_IsVisible. Expected _wxTreeCtrl_p."); return NULL; } } - _result = new wxString (wxTreeCtrl_GetItemText(_arg0,_arg1)); -{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); -} -{ - delete _result; -} + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_IsVisible. Expected _wxTreeItemId_p."); + return NULL; + } + } + _result = (bool )wxTreeCtrl_IsVisible(_arg0,*_arg1); + _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxTreeCtrl_GetNextItem(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetNextItem(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxTreeCtrl_GetNextItem(PyObject *self, PyObject *args) { +#define wxTreeCtrl_ItemHasChildren(_swigobj,_swigarg0) (_swigobj->ItemHasChildren(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_ItemHasChildren(PyObject *self, PyObject *args) { PyObject * _resultobj; - long _result; + bool _result; wxTreeCtrl * _arg0; - long _arg1; - int _arg2; + wxTreeItemId * _arg1; char * _argc0 = 0; + char * _argc1 = 0; self = self; - if(!PyArg_ParseTuple(args,"sli:wxTreeCtrl_GetNextItem",&_argc0,&_arg1,&_arg2)) + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_ItemHasChildren",&_argc0,&_argc1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetNextItem. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_ItemHasChildren. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (long )wxTreeCtrl_GetNextItem(_arg0,_arg1,_arg2); - _resultobj = Py_BuildValue("l",_result); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_ItemHasChildren. Expected _wxTreeItemId_p."); + return NULL; + } + } + _result = (bool )wxTreeCtrl_ItemHasChildren(_arg0,*_arg1); + _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxTreeCtrl_GetNextVisibleItem(_swigobj,_swigarg0) (_swigobj->GetNextVisibleItem(_swigarg0)) -static PyObject *_wrap_wxTreeCtrl_GetNextVisibleItem(PyObject *self, PyObject *args) { +#define wxTreeCtrl_IsExpanded(_swigobj,_swigarg0) (_swigobj->IsExpanded(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_IsExpanded(PyObject *self, PyObject *args) { PyObject * _resultobj; - long _result; + bool _result; wxTreeCtrl * _arg0; - long _arg1; + wxTreeItemId * _arg1; char * _argc0 = 0; + char * _argc1 = 0; self = self; - if(!PyArg_ParseTuple(args,"sl:wxTreeCtrl_GetNextVisibleItem",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_IsExpanded",&_argc0,&_argc1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetNextVisibleItem. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_IsExpanded. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (long )wxTreeCtrl_GetNextVisibleItem(_arg0,_arg1); - _resultobj = Py_BuildValue("l",_result); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_IsExpanded. Expected _wxTreeItemId_p."); + return NULL; + } + } + _result = (bool )wxTreeCtrl_IsExpanded(_arg0,*_arg1); + _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxTreeCtrl_GetParent(_swigobj,_swigarg0) (_swigobj->GetParent(_swigarg0)) -static PyObject *_wrap_wxTreeCtrl_GetParent(PyObject *self, PyObject *args) { +#define wxTreeCtrl_IsSelected(_swigobj,_swigarg0) (_swigobj->IsSelected(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_IsSelected(PyObject *self, PyObject *args) { PyObject * _resultobj; - long _result; + bool _result; wxTreeCtrl * _arg0; - long _arg1; + wxTreeItemId * _arg1; char * _argc0 = 0; + char * _argc1 = 0; self = self; - if(!PyArg_ParseTuple(args,"sl:wxTreeCtrl_GetParent",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_IsSelected",&_argc0,&_argc1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetParent. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_IsSelected. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (long )wxTreeCtrl_GetParent(_arg0,_arg1); - _resultobj = Py_BuildValue("l",_result); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_IsSelected. Expected _wxTreeItemId_p."); + return NULL; + } + } + _result = (bool )wxTreeCtrl_IsSelected(_arg0,*_arg1); + _resultobj = Py_BuildValue("i",_result); return _resultobj; } #define wxTreeCtrl_GetRootItem(_swigobj) (_swigobj->GetRootItem()) static PyObject *_wrap_wxTreeCtrl_GetRootItem(PyObject *self, PyObject *args) { PyObject * _resultobj; - long _result; + wxTreeItemId * _result; wxTreeCtrl * _arg0; char * _argc0 = 0; + char _ptemp[128]; self = self; if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetRootItem",&_argc0)) @@ -2813,17 +2857,19 @@ static PyObject *_wrap_wxTreeCtrl_GetRootItem(PyObject *self, PyObject *args) { return NULL; } } - _result = (long )wxTreeCtrl_GetRootItem(_arg0); - _resultobj = Py_BuildValue("l",_result); + _result = new wxTreeItemId (wxTreeCtrl_GetRootItem(_arg0)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxTreeItemId_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } #define wxTreeCtrl_GetSelection(_swigobj) (_swigobj->GetSelection()) static PyObject *_wrap_wxTreeCtrl_GetSelection(PyObject *self, PyObject *args) { PyObject * _resultobj; - long _result; + wxTreeItemId * _result; wxTreeCtrl * _arg0; char * _argc0 = 0; + char _ptemp[128]; self = self; if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetSelection",&_argc0)) @@ -2834,329 +2880,466 @@ static PyObject *_wrap_wxTreeCtrl_GetSelection(PyObject *self, PyObject *args) { return NULL; } } - _result = (long )wxTreeCtrl_GetSelection(_arg0); - _resultobj = Py_BuildValue("l",_result); + _result = new wxTreeItemId (wxTreeCtrl_GetSelection(_arg0)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxTreeItemId_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxTreeCtrl_HitTest(_swigobj,_swigarg0,_swigarg1) (_swigobj->HitTest(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxTreeCtrl_HitTest(PyObject *self, PyObject *args) { +#define wxTreeCtrl_GetParent(_swigobj,_swigarg0) (_swigobj->GetParent(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_GetParent(PyObject *self, PyObject *args) { PyObject * _resultobj; - long _result; + wxTreeItemId * _result; wxTreeCtrl * _arg0; - wxPoint * _arg1; - int * _arg2; - int temp; + wxTreeItemId * _arg1; char * _argc0 = 0; char * _argc1 = 0; + char _ptemp[128]; self = self; -{ - _arg2 = &temp; -} - if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_HitTest",&_argc0,&_argc1)) + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_GetParent",&_argc0,&_argc1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_HitTest. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetParent. Expected _wxTreeCtrl_p."); return NULL; } } if (_argc1) { - if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_HitTest. Expected _wxPoint_p."); + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetParent. Expected _wxTreeItemId_p."); return NULL; } } - _result = (long )wxTreeCtrl_HitTest(_arg0,*_arg1,*_arg2); - _resultobj = Py_BuildValue("l",_result); -{ - PyObject *o; - o = PyInt_FromLong((long) (*_arg2)); - _resultobj = t_output_helper(_resultobj, o); -} + _result = new wxTreeItemId (wxTreeCtrl_GetParent(_arg0,*_arg1)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxTreeItemId_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxTreeCtrl_InsertItem(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->InsertItem(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxTreeCtrl_InsertItem(PyObject *self, PyObject *args) { +#define wxTreeCtrl_GetFirstChild(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetFirstChild(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxTreeCtrl_GetFirstChild(PyObject *self, PyObject *args) { PyObject * _resultobj; - long _result; + wxTreeItemId * _result; wxTreeCtrl * _arg0; - long _arg1; - wxTreeItem * _arg2; - long _arg3 = (wxTREE_INSERT_LAST); + wxTreeItemId * _arg1; + long * _arg2; char * _argc0 = 0; - char * _argc2 = 0; + char * _argc1 = 0; + long temp; + PyObject * _obj2 = 0; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"sls|l:wxTreeCtrl_InsertItem",&_argc0,&_arg1,&_argc2,&_arg3)) + if(!PyArg_ParseTuple(args,"ssO:wxTreeCtrl_GetFirstChild",&_argc0,&_argc1,&_obj2)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_InsertItem. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetFirstChild. Expected _wxTreeCtrl_p."); return NULL; } } - if (_argc2) { - if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxTreeItem_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxTreeCtrl_InsertItem. Expected _wxTreeItem_p."); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetFirstChild. Expected _wxTreeItemId_p."); return NULL; } } - _result = (long )wxTreeCtrl_InsertItem(_arg0,_arg1,*_arg2,_arg3); - _resultobj = Py_BuildValue("l",_result); +{ + temp = (long) PyInt_AsLong(_obj2); + _arg2 = &temp; +} + _result = new wxTreeItemId (wxTreeCtrl_GetFirstChild(_arg0,*_arg1,*_arg2)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxTreeItemId_p"); + _resultobj = Py_BuildValue("s",_ptemp); +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} return _resultobj; } -#define wxTreeCtrl_InsertItemString(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->InsertItem(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) -static PyObject *_wrap_wxTreeCtrl_InsertItemString(PyObject *self, PyObject *args) { +#define wxTreeCtrl_GetNextChild(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetNextChild(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxTreeCtrl_GetNextChild(PyObject *self, PyObject *args) { PyObject * _resultobj; - long _result; + wxTreeItemId * _result; wxTreeCtrl * _arg0; - long _arg1; - wxString * _arg2; - int _arg3 = -1; - int _arg4 = -1; - long _arg5 = (wxTREE_INSERT_LAST); + wxTreeItemId * _arg1; + long * _arg2; char * _argc0 = 0; + char * _argc1 = 0; + long temp; PyObject * _obj2 = 0; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"slO|iil:wxTreeCtrl_InsertItemString",&_argc0,&_arg1,&_obj2,&_arg3,&_arg4,&_arg5)) + if(!PyArg_ParseTuple(args,"ssO:wxTreeCtrl_GetNextChild",&_argc0,&_argc1,&_obj2)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_InsertItemString. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetNextChild. Expected _wxTreeCtrl_p."); return NULL; } } -{ - if (!PyString_Check(_obj2)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetNextChild. Expected _wxTreeItemId_p."); return NULL; + } } - _arg2 = new wxString(PyString_AsString(_obj2)); +{ + temp = (long) PyInt_AsLong(_obj2); + _arg2 = &temp; } - _result = (long )wxTreeCtrl_InsertItemString(_arg0,_arg1,*_arg2,_arg3,_arg4,_arg5); - _resultobj = Py_BuildValue("l",_result); + _result = new wxTreeItemId (wxTreeCtrl_GetNextChild(_arg0,*_arg1,*_arg2)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxTreeItemId_p"); + _resultobj = Py_BuildValue("s",_ptemp); { - if (_obj2) - delete _arg2; + PyObject *o; + o = PyInt_FromLong((long) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); } return _resultobj; } -#define wxTreeCtrl_ItemHasChildren(_swigobj,_swigarg0) (_swigobj->ItemHasChildren(_swigarg0)) -static PyObject *_wrap_wxTreeCtrl_ItemHasChildren(PyObject *self, PyObject *args) { +#define wxTreeCtrl_GetNextSibling(_swigobj,_swigarg0) (_swigobj->GetNextSibling(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_GetNextSibling(PyObject *self, PyObject *args) { PyObject * _resultobj; - bool _result; + wxTreeItemId * _result; wxTreeCtrl * _arg0; - long _arg1; + wxTreeItemId * _arg1; char * _argc0 = 0; + char * _argc1 = 0; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"sl:wxTreeCtrl_ItemHasChildren",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_GetNextSibling",&_argc0,&_argc1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_ItemHasChildren. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetNextSibling. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (bool )wxTreeCtrl_ItemHasChildren(_arg0,_arg1); - _resultobj = Py_BuildValue("i",_result); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetNextSibling. Expected _wxTreeItemId_p."); + return NULL; + } + } + _result = new wxTreeItemId (wxTreeCtrl_GetNextSibling(_arg0,*_arg1)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxTreeItemId_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxTreeCtrl_ScrollTo(_swigobj,_swigarg0) (_swigobj->ScrollTo(_swigarg0)) -static PyObject *_wrap_wxTreeCtrl_ScrollTo(PyObject *self, PyObject *args) { +#define wxTreeCtrl_GetPrevSibling(_swigobj,_swigarg0) (_swigobj->GetPrevSibling(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_GetPrevSibling(PyObject *self, PyObject *args) { PyObject * _resultobj; - bool _result; + wxTreeItemId * _result; wxTreeCtrl * _arg0; - long _arg1; + wxTreeItemId * _arg1; char * _argc0 = 0; + char * _argc1 = 0; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"sl:wxTreeCtrl_ScrollTo",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_GetPrevSibling",&_argc0,&_argc1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_ScrollTo. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetPrevSibling. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (bool )wxTreeCtrl_ScrollTo(_arg0,_arg1); - _resultobj = Py_BuildValue("i",_result); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetPrevSibling. Expected _wxTreeItemId_p."); + return NULL; + } + } + _result = new wxTreeItemId (wxTreeCtrl_GetPrevSibling(_arg0,*_arg1)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxTreeItemId_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxTreeCtrl_SelectItem(_swigobj,_swigarg0) (_swigobj->SelectItem(_swigarg0)) -static PyObject *_wrap_wxTreeCtrl_SelectItem(PyObject *self, PyObject *args) { +#define wxTreeCtrl_GetFirstVisibleItem(_swigobj) (_swigobj->GetFirstVisibleItem()) +static PyObject *_wrap_wxTreeCtrl_GetFirstVisibleItem(PyObject *self, PyObject *args) { PyObject * _resultobj; - bool _result; + wxTreeItemId * _result; wxTreeCtrl * _arg0; - long _arg1; char * _argc0 = 0; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"sl:wxTreeCtrl_SelectItem",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetFirstVisibleItem",&_argc0)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SelectItem. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetFirstVisibleItem. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (bool )wxTreeCtrl_SelectItem(_arg0,_arg1); - _resultobj = Py_BuildValue("i",_result); + _result = new wxTreeItemId (wxTreeCtrl_GetFirstVisibleItem(_arg0)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxTreeItemId_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxTreeCtrl_SetIndent(_swigobj,_swigarg0) (_swigobj->SetIndent(_swigarg0)) -static PyObject *_wrap_wxTreeCtrl_SetIndent(PyObject *self, PyObject *args) { +#define wxTreeCtrl_GetNextVisible(_swigobj,_swigarg0) (_swigobj->GetNextVisible(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_GetNextVisible(PyObject *self, PyObject *args) { PyObject * _resultobj; + wxTreeItemId * _result; wxTreeCtrl * _arg0; - int _arg1; + wxTreeItemId * _arg1; char * _argc0 = 0; + char * _argc1 = 0; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"si:wxTreeCtrl_SetIndent",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_GetNextVisible",&_argc0,&_argc1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetIndent. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetNextVisible. Expected _wxTreeCtrl_p."); return NULL; } } - wxTreeCtrl_SetIndent(_arg0,_arg1); - Py_INCREF(Py_None); - _resultobj = Py_None; + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetNextVisible. Expected _wxTreeItemId_p."); + return NULL; + } + } + _result = new wxTreeItemId (wxTreeCtrl_GetNextVisible(_arg0,*_arg1)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxTreeItemId_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxTreeCtrl_SetImageList(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetImageList(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxTreeCtrl_SetImageList(PyObject *self, PyObject *args) { +#define wxTreeCtrl_GetPrevVisible(_swigobj,_swigarg0) (_swigobj->GetPrevVisible(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_GetPrevVisible(PyObject *self, PyObject *args) { PyObject * _resultobj; + wxTreeItemId * _result; wxTreeCtrl * _arg0; - wxImageList * _arg1; - int _arg2 = wxIMAGE_LIST_NORMAL; + wxTreeItemId * _arg1; char * _argc0 = 0; char * _argc1 = 0; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"ss|i:wxTreeCtrl_SetImageList",&_argc0,&_argc1,&_arg2)) + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_GetPrevVisible",&_argc0,&_argc1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetImageList. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetPrevVisible. Expected _wxTreeCtrl_p."); return NULL; } } if (_argc1) { - if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxImageList_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetImageList. Expected _wxImageList_p."); + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_GetPrevVisible. Expected _wxTreeItemId_p."); return NULL; } } - wxTreeCtrl_SetImageList(_arg0,_arg1,_arg2); - Py_INCREF(Py_None); - _resultobj = Py_None; + _result = new wxTreeItemId (wxTreeCtrl_GetPrevVisible(_arg0,*_arg1)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxTreeItemId_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxTreeCtrl_SetItem(_swigobj,_swigarg0) (_swigobj->SetItem(_swigarg0)) -static PyObject *_wrap_wxTreeCtrl_SetItem(PyObject *self, PyObject *args) { +#define wxTreeCtrl_AddRoot(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->AddRoot(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_wxTreeCtrl_AddRoot(PyObject *self, PyObject *args) { PyObject * _resultobj; - bool _result; + wxTreeItemId * _result; wxTreeCtrl * _arg0; - wxTreeItem * _arg1; + wxString * _arg1; + int _arg2 = -1; + int _arg3 = -1; + wxTreeItemData * _arg4 = NULL; char * _argc0 = 0; - char * _argc1 = 0; + PyObject * _obj1 = 0; + char * _argc4 = 0; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_SetItem",&_argc0,&_argc1)) + if(!PyArg_ParseTuple(args,"sO|iis:wxTreeCtrl_AddRoot",&_argc0,&_obj1,&_arg2,&_arg3,&_argc4)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItem. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_AddRoot. Expected _wxTreeCtrl_p."); return NULL; } } - if (_argc1) { - if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItem_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItem. Expected _wxTreeItem_p."); +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1)); +} + if (_argc4) { + if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxTreeItemData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxTreeCtrl_AddRoot. Expected _wxTreeItemData_p."); return NULL; } } - _result = (bool )wxTreeCtrl_SetItem(_arg0,*_arg1); - _resultobj = Py_BuildValue("i",_result); + _result = new wxTreeItemId (wxTreeCtrl_AddRoot(_arg0,*_arg1,_arg2,_arg3,_arg4)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxTreeItemId_p"); + _resultobj = Py_BuildValue("s",_ptemp); +{ + if (_obj1) + delete _arg1; +} return _resultobj; } -#define wxTreeCtrl_SetItemImage(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->SetItemImage(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxTreeCtrl_SetItemImage(PyObject *self, PyObject *args) { +#define wxTreeCtrl_PrependItem(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->PrependItem(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) +static PyObject *_wrap_wxTreeCtrl_PrependItem(PyObject *self, PyObject *args) { PyObject * _resultobj; - bool _result; + wxTreeItemId * _result; wxTreeCtrl * _arg0; - long _arg1; - int _arg2; - int _arg3; + wxTreeItemId * _arg1; + wxString * _arg2; + int _arg3 = -1; + int _arg4 = -1; + wxTreeItemData * _arg5 = NULL; char * _argc0 = 0; + char * _argc1 = 0; + PyObject * _obj2 = 0; + char * _argc5 = 0; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"slii:wxTreeCtrl_SetItemImage",&_argc0,&_arg1,&_arg2,&_arg3)) + if(!PyArg_ParseTuple(args,"ssO|iis:wxTreeCtrl_PrependItem",&_argc0,&_argc1,&_obj2,&_arg3,&_arg4,&_argc5)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemImage. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_PrependItem. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (bool )wxTreeCtrl_SetItemImage(_arg0,_arg1,_arg2,_arg3); - _resultobj = Py_BuildValue("i",_result); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_PrependItem. Expected _wxTreeItemId_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj2)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg2 = new wxString(PyString_AsString(_obj2)); +} + if (_argc5) { + if (SWIG_GetPtr(_argc5,(void **) &_arg5,"_wxTreeItemData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of wxTreeCtrl_PrependItem. Expected _wxTreeItemData_p."); + return NULL; + } + } + _result = new wxTreeItemId (wxTreeCtrl_PrependItem(_arg0,*_arg1,*_arg2,_arg3,_arg4,_arg5)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxTreeItemId_p"); + _resultobj = Py_BuildValue("s",_ptemp); +{ + if (_obj2) + delete _arg2; +} return _resultobj; } -#define wxTreeCtrl_SetItemState(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->SetItemState(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxTreeCtrl_SetItemState(PyObject *self, PyObject *args) { +#define wxTreeCtrl_InsertItem(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->InsertItem(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_wxTreeCtrl_InsertItem(PyObject *self, PyObject *args) { PyObject * _resultobj; - bool _result; + wxTreeItemId * _result; wxTreeCtrl * _arg0; - long _arg1; - long _arg2; - long _arg3; + wxTreeItemId * _arg1; + wxTreeItemId * _arg2; + wxString * _arg3; + int _arg4 = -1; + int _arg5 = -1; + wxTreeItemData * _arg6 = NULL; char * _argc0 = 0; + char * _argc1 = 0; + char * _argc2 = 0; + PyObject * _obj3 = 0; + char * _argc6 = 0; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"slll:wxTreeCtrl_SetItemState",&_argc0,&_arg1,&_arg2,&_arg3)) + if(!PyArg_ParseTuple(args,"sssO|iis:wxTreeCtrl_InsertItem",&_argc0,&_argc1,&_argc2,&_obj3,&_arg4,&_arg5,&_argc6)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemState. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_InsertItem. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (bool )wxTreeCtrl_SetItemState(_arg0,_arg1,_arg2,_arg3); - _resultobj = Py_BuildValue("i",_result); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_InsertItem. Expected _wxTreeItemId_p."); + return NULL; + } + } + if (_argc2) { + if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxTreeCtrl_InsertItem. Expected _wxTreeItemId_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj3)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg3 = new wxString(PyString_AsString(_obj3)); +} + if (_argc6) { + if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxTreeItemData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxTreeCtrl_InsertItem. Expected _wxTreeItemData_p."); + return NULL; + } + } + _result = new wxTreeItemId (wxTreeCtrl_InsertItem(_arg0,*_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxTreeItemId_p"); + _resultobj = Py_BuildValue("s",_ptemp); +{ + if (_obj3) + delete _arg3; +} return _resultobj; } -#define wxTreeCtrl_SetItemText(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetItemText(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxTreeCtrl_SetItemText(PyObject *self, PyObject *args) { +#define wxTreeCtrl_AppendItem(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->AppendItem(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) +static PyObject *_wrap_wxTreeCtrl_AppendItem(PyObject *self, PyObject *args) { PyObject * _resultobj; + wxTreeItemId * _result; wxTreeCtrl * _arg0; - long _arg1; + wxTreeItemId * _arg1; wxString * _arg2; + int _arg3 = -1; + int _arg4 = -1; + wxTreeItemData * _arg5 = NULL; char * _argc0 = 0; + char * _argc1 = 0; PyObject * _obj2 = 0; + char * _argc5 = 0; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"slO:wxTreeCtrl_SetItemText",&_argc0,&_arg1,&_obj2)) + if(!PyArg_ParseTuple(args,"ssO|iis:wxTreeCtrl_AppendItem",&_argc0,&_argc1,&_obj2,&_arg3,&_arg4,&_argc5)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemText. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_AppendItem. Expected _wxTreeCtrl_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_AppendItem. Expected _wxTreeItemId_p."); return NULL; } } @@ -3167,9 +3350,15 @@ static PyObject *_wrap_wxTreeCtrl_SetItemText(PyObject *self, PyObject *args) { } _arg2 = new wxString(PyString_AsString(_obj2)); } - wxTreeCtrl_SetItemText(_arg0,_arg1,*_arg2); - Py_INCREF(Py_None); - _resultobj = Py_None; + if (_argc5) { + if (SWIG_GetPtr(_argc5,(void **) &_arg5,"_wxTreeItemData_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of wxTreeCtrl_AppendItem. Expected _wxTreeItemData_p."); + return NULL; + } + } + _result = new wxTreeItemId (wxTreeCtrl_AppendItem(_arg0,*_arg1,*_arg2,_arg3,_arg4,_arg5)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxTreeItemId_p"); + _resultobj = Py_BuildValue("s",_ptemp); { if (_obj2) delete _arg2; @@ -3177,39 +3366,376 @@ static PyObject *_wrap_wxTreeCtrl_SetItemText(PyObject *self, PyObject *args) { return _resultobj; } -#define wxTreeCtrl_SetItemData(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetItemData(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxTreeCtrl_SetItemData(PyObject *self, PyObject *args) { +#define wxTreeCtrl_Delete(_swigobj,_swigarg0) (_swigobj->Delete(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_Delete(PyObject *self, PyObject *args) { PyObject * _resultobj; - bool _result; wxTreeCtrl * _arg0; - long _arg1; - long _arg2; + wxTreeItemId * _arg1; char * _argc0 = 0; + char * _argc1 = 0; self = self; - if(!PyArg_ParseTuple(args,"sll:wxTreeCtrl_SetItemData",&_argc0,&_arg1,&_arg2)) + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_Delete",&_argc0,&_argc1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemData. Expected _wxTreeCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_Delete. Expected _wxTreeCtrl_p."); return NULL; } } - _result = (bool )wxTreeCtrl_SetItemData(_arg0,_arg1,_arg2); - _resultobj = Py_BuildValue("i",_result); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_Delete. Expected _wxTreeItemId_p."); + return NULL; + } + } + wxTreeCtrl_Delete(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxTreeCtrl_DeleteAllItems(_swigobj) (_swigobj->DeleteAllItems()) +static PyObject *_wrap_wxTreeCtrl_DeleteAllItems(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxTreeCtrl * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_DeleteAllItems",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_DeleteAllItems. Expected _wxTreeCtrl_p."); + return NULL; + } + } + wxTreeCtrl_DeleteAllItems(_arg0); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxTreeCtrl_Expand(_swigobj,_swigarg0) (_swigobj->Expand(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_Expand(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxTreeCtrl * _arg0; + wxTreeItemId * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_Expand",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_Expand. Expected _wxTreeCtrl_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_Expand. Expected _wxTreeItemId_p."); + return NULL; + } + } + wxTreeCtrl_Expand(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxTreeCtrl_Collapse(_swigobj,_swigarg0) (_swigobj->Collapse(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_Collapse(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxTreeCtrl * _arg0; + wxTreeItemId * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_Collapse",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_Collapse. Expected _wxTreeCtrl_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_Collapse. Expected _wxTreeItemId_p."); + return NULL; + } + } + wxTreeCtrl_Collapse(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxTreeCtrl_CollapseAndReset(_swigobj,_swigarg0) (_swigobj->CollapseAndReset(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_CollapseAndReset(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxTreeCtrl * _arg0; + wxTreeItemId * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_CollapseAndReset",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_CollapseAndReset. Expected _wxTreeCtrl_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_CollapseAndReset. Expected _wxTreeItemId_p."); + return NULL; + } + } + wxTreeCtrl_CollapseAndReset(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxTreeCtrl_Toggle(_swigobj,_swigarg0) (_swigobj->Toggle(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_Toggle(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxTreeCtrl * _arg0; + wxTreeItemId * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_Toggle",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_Toggle. Expected _wxTreeCtrl_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_Toggle. Expected _wxTreeItemId_p."); + return NULL; + } + } + wxTreeCtrl_Toggle(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxTreeCtrl_Unselect(_swigobj) (_swigobj->Unselect()) +static PyObject *_wrap_wxTreeCtrl_Unselect(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxTreeCtrl * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_Unselect",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_Unselect. Expected _wxTreeCtrl_p."); + return NULL; + } + } + wxTreeCtrl_Unselect(_arg0); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxTreeCtrl_SelectItem(_swigobj,_swigarg0) (_swigobj->SelectItem(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_SelectItem(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxTreeCtrl * _arg0; + wxTreeItemId * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_SelectItem",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SelectItem. Expected _wxTreeCtrl_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SelectItem. Expected _wxTreeItemId_p."); + return NULL; + } + } + wxTreeCtrl_SelectItem(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxTreeCtrl_EnsureVisible(_swigobj,_swigarg0) (_swigobj->EnsureVisible(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_EnsureVisible(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxTreeCtrl * _arg0; + wxTreeItemId * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_EnsureVisible",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_EnsureVisible. Expected _wxTreeCtrl_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_EnsureVisible. Expected _wxTreeItemId_p."); + return NULL; + } + } + wxTreeCtrl_EnsureVisible(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxTreeCtrl_ScrollTo(_swigobj,_swigarg0) (_swigobj->ScrollTo(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_ScrollTo(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxTreeCtrl * _arg0; + wxTreeItemId * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_ScrollTo",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_ScrollTo. Expected _wxTreeCtrl_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_ScrollTo. Expected _wxTreeItemId_p."); + return NULL; + } + } + wxTreeCtrl_ScrollTo(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxTreeCtrl_EditLabel(_swigobj,_swigarg0) (_swigobj->EditLabel(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_EditLabel(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxTextCtrl * _result; + wxTreeCtrl * _arg0; + wxTreeItemId * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_EditLabel",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_EditLabel. Expected _wxTreeCtrl_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_EditLabel. Expected _wxTreeItemId_p."); + return NULL; + } + } + _result = (wxTextCtrl *)wxTreeCtrl_EditLabel(_arg0,*_arg1); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxTreeCtrl_GetEditControl(_swigobj) (_swigobj->GetEditControl()) +static PyObject *_wrap_wxTreeCtrl_GetEditControl(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxTextCtrl * _result; + wxTreeCtrl * _arg0; + char * _argc0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetEditControl",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_GetEditControl. Expected _wxTreeCtrl_p."); + return NULL; + } + } + _result = (wxTextCtrl *)wxTreeCtrl_GetEditControl(_arg0); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxTreeCtrl_EndEditLabel(_swigobj,_swigarg0,_swigarg1) (_swigobj->EndEditLabel(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxTreeCtrl_EndEditLabel(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxTreeCtrl * _arg0; + wxTreeItemId * _arg1; + bool _arg2 = (0); + char * _argc0 = 0; + char * _argc1 = 0; + int tempbool2; + + self = self; + if(!PyArg_ParseTuple(args,"ss|i:wxTreeCtrl_EndEditLabel",&_argc0,&_argc1,&tempbool2)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_EndEditLabel. Expected _wxTreeCtrl_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_EndEditLabel. Expected _wxTreeItemId_p."); + return NULL; + } + } + _arg2 = (bool ) tempbool2; + wxTreeCtrl_EndEditLabel(_arg0,*_arg1,_arg2); + Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } #define wxTreeCtrl_SortChildren(_swigobj,_swigarg0) (_swigobj->SortChildren(_swigarg0)) static PyObject *_wrap_wxTreeCtrl_SortChildren(PyObject *self, PyObject *args) { PyObject * _resultobj; - bool _result; wxTreeCtrl * _arg0; - long _arg1; + wxTreeItemId * _arg1; char * _argc0 = 0; + char * _argc1 = 0; self = self; - if(!PyArg_ParseTuple(args,"sl:wxTreeCtrl_SortChildren",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_SortChildren",&_argc0,&_argc1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { @@ -3217,63 +3743,79 @@ static PyObject *_wrap_wxTreeCtrl_SortChildren(PyObject *self, PyObject *args) { return NULL; } } - _result = (bool )wxTreeCtrl_SortChildren(_arg0,_arg1); - _resultobj = Py_BuildValue("i",_result); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SortChildren. Expected _wxTreeItemId_p."); + return NULL; + } + } + wxTreeCtrl_SortChildren(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } static PyMethodDef controls2cMethods[] = { { "wxTreeCtrl_SortChildren", _wrap_wxTreeCtrl_SortChildren, 1 }, - { "wxTreeCtrl_SetItemData", _wrap_wxTreeCtrl_SetItemData, 1 }, - { "wxTreeCtrl_SetItemText", _wrap_wxTreeCtrl_SetItemText, 1 }, - { "wxTreeCtrl_SetItemState", _wrap_wxTreeCtrl_SetItemState, 1 }, - { "wxTreeCtrl_SetItemImage", _wrap_wxTreeCtrl_SetItemImage, 1 }, - { "wxTreeCtrl_SetItem", _wrap_wxTreeCtrl_SetItem, 1 }, - { "wxTreeCtrl_SetImageList", _wrap_wxTreeCtrl_SetImageList, 1 }, - { "wxTreeCtrl_SetIndent", _wrap_wxTreeCtrl_SetIndent, 1 }, - { "wxTreeCtrl_SelectItem", _wrap_wxTreeCtrl_SelectItem, 1 }, + { "wxTreeCtrl_EndEditLabel", _wrap_wxTreeCtrl_EndEditLabel, 1 }, + { "wxTreeCtrl_GetEditControl", _wrap_wxTreeCtrl_GetEditControl, 1 }, + { "wxTreeCtrl_EditLabel", _wrap_wxTreeCtrl_EditLabel, 1 }, { "wxTreeCtrl_ScrollTo", _wrap_wxTreeCtrl_ScrollTo, 1 }, - { "wxTreeCtrl_ItemHasChildren", _wrap_wxTreeCtrl_ItemHasChildren, 1 }, - { "wxTreeCtrl_InsertItemString", _wrap_wxTreeCtrl_InsertItemString, 1 }, + { "wxTreeCtrl_EnsureVisible", _wrap_wxTreeCtrl_EnsureVisible, 1 }, + { "wxTreeCtrl_SelectItem", _wrap_wxTreeCtrl_SelectItem, 1 }, + { "wxTreeCtrl_Unselect", _wrap_wxTreeCtrl_Unselect, 1 }, + { "wxTreeCtrl_Toggle", _wrap_wxTreeCtrl_Toggle, 1 }, + { "wxTreeCtrl_CollapseAndReset", _wrap_wxTreeCtrl_CollapseAndReset, 1 }, + { "wxTreeCtrl_Collapse", _wrap_wxTreeCtrl_Collapse, 1 }, + { "wxTreeCtrl_Expand", _wrap_wxTreeCtrl_Expand, 1 }, + { "wxTreeCtrl_DeleteAllItems", _wrap_wxTreeCtrl_DeleteAllItems, 1 }, + { "wxTreeCtrl_Delete", _wrap_wxTreeCtrl_Delete, 1 }, + { "wxTreeCtrl_AppendItem", _wrap_wxTreeCtrl_AppendItem, 1 }, { "wxTreeCtrl_InsertItem", _wrap_wxTreeCtrl_InsertItem, 1 }, - { "wxTreeCtrl_HitTest", _wrap_wxTreeCtrl_HitTest, 1 }, + { "wxTreeCtrl_PrependItem", _wrap_wxTreeCtrl_PrependItem, 1 }, + { "wxTreeCtrl_AddRoot", _wrap_wxTreeCtrl_AddRoot, 1 }, + { "wxTreeCtrl_GetPrevVisible", _wrap_wxTreeCtrl_GetPrevVisible, 1 }, + { "wxTreeCtrl_GetNextVisible", _wrap_wxTreeCtrl_GetNextVisible, 1 }, + { "wxTreeCtrl_GetFirstVisibleItem", _wrap_wxTreeCtrl_GetFirstVisibleItem, 1 }, + { "wxTreeCtrl_GetPrevSibling", _wrap_wxTreeCtrl_GetPrevSibling, 1 }, + { "wxTreeCtrl_GetNextSibling", _wrap_wxTreeCtrl_GetNextSibling, 1 }, + { "wxTreeCtrl_GetNextChild", _wrap_wxTreeCtrl_GetNextChild, 1 }, + { "wxTreeCtrl_GetFirstChild", _wrap_wxTreeCtrl_GetFirstChild, 1 }, + { "wxTreeCtrl_GetParent", _wrap_wxTreeCtrl_GetParent, 1 }, { "wxTreeCtrl_GetSelection", _wrap_wxTreeCtrl_GetSelection, 1 }, { "wxTreeCtrl_GetRootItem", _wrap_wxTreeCtrl_GetRootItem, 1 }, - { "wxTreeCtrl_GetParent", _wrap_wxTreeCtrl_GetParent, 1 }, - { "wxTreeCtrl_GetNextVisibleItem", _wrap_wxTreeCtrl_GetNextVisibleItem, 1 }, - { "wxTreeCtrl_GetNextItem", _wrap_wxTreeCtrl_GetNextItem, 1 }, - { "wxTreeCtrl_GetItemText", _wrap_wxTreeCtrl_GetItemText, 1 }, - { "wxTreeCtrl_GetItemState", _wrap_wxTreeCtrl_GetItemState, 1 }, - { "wxTreeCtrl_GetItemRect", _wrap_wxTreeCtrl_GetItemRect, 1 }, - { "wxTreeCtrl_GetItem", _wrap_wxTreeCtrl_GetItem, 1 }, + { "wxTreeCtrl_IsSelected", _wrap_wxTreeCtrl_IsSelected, 1 }, + { "wxTreeCtrl_IsExpanded", _wrap_wxTreeCtrl_IsExpanded, 1 }, + { "wxTreeCtrl_ItemHasChildren", _wrap_wxTreeCtrl_ItemHasChildren, 1 }, + { "wxTreeCtrl_IsVisible", _wrap_wxTreeCtrl_IsVisible, 1 }, + { "wxTreeCtrl_SetItemData", _wrap_wxTreeCtrl_SetItemData, 1 }, + { "wxTreeCtrl_SetItemSelectedImage", _wrap_wxTreeCtrl_SetItemSelectedImage, 1 }, + { "wxTreeCtrl_SetItemImage", _wrap_wxTreeCtrl_SetItemImage, 1 }, + { "wxTreeCtrl_SetItemText", _wrap_wxTreeCtrl_SetItemText, 1 }, { "wxTreeCtrl_GetItemData", _wrap_wxTreeCtrl_GetItemData, 1 }, - { "wxTreeCtrl_GetIndent", _wrap_wxTreeCtrl_GetIndent, 1 }, + { "wxTreeCtrl_GetItemSelectedImage", _wrap_wxTreeCtrl_GetItemSelectedImage, 1 }, + { "wxTreeCtrl_GetItemImage", _wrap_wxTreeCtrl_GetItemImage, 1 }, + { "wxTreeCtrl_GetItemText", _wrap_wxTreeCtrl_GetItemText, 1 }, + { "wxTreeCtrl_SetStateImageList", _wrap_wxTreeCtrl_SetStateImageList, 1 }, + { "wxTreeCtrl_SetImageList", _wrap_wxTreeCtrl_SetImageList, 1 }, + { "wxTreeCtrl_GetStateImageList", _wrap_wxTreeCtrl_GetStateImageList, 1 }, { "wxTreeCtrl_GetImageList", _wrap_wxTreeCtrl_GetImageList, 1 }, - { "wxTreeCtrl_GetFirstVisibleItem", _wrap_wxTreeCtrl_GetFirstVisibleItem, 1 }, - { "wxTreeCtrl_GetEditControl", _wrap_wxTreeCtrl_GetEditControl, 1 }, + { "wxTreeCtrl_SetIndent", _wrap_wxTreeCtrl_SetIndent, 1 }, + { "wxTreeCtrl_GetIndent", _wrap_wxTreeCtrl_GetIndent, 1 }, { "wxTreeCtrl_GetCount", _wrap_wxTreeCtrl_GetCount, 1 }, - { "wxTreeCtrl_GetChild", _wrap_wxTreeCtrl_GetChild, 1 }, - { "wxTreeCtrl_ExpandItem", _wrap_wxTreeCtrl_ExpandItem, 1 }, - { "wxTreeCtrl_EnsureVisible", _wrap_wxTreeCtrl_EnsureVisible, 1 }, - { "wxTreeCtrl_EditLabel", _wrap_wxTreeCtrl_EditLabel, 1 }, - { "wxTreeCtrl_DeleteItem", _wrap_wxTreeCtrl_DeleteItem, 1 }, - { "wxTreeCtrl_DeleteAllItems", _wrap_wxTreeCtrl_DeleteAllItems, 1 }, { "new_wxTreeCtrl", _wrap_new_wxTreeCtrl, 1 }, - { "wxTreeEvent_m_pointDrag_get", _wrap_wxTreeEvent_m_pointDrag_get, 1 }, - { "wxTreeEvent_m_oldItem_get", _wrap_wxTreeEvent_m_oldItem_get, 1 }, - { "wxTreeEvent_m_item_get", _wrap_wxTreeEvent_m_item_get, 1 }, - { "wxTreeEvent_m_code_get", _wrap_wxTreeEvent_m_code_get, 1 }, - { "delete_wxTreeItem", _wrap_delete_wxTreeItem, 1 }, - { "new_wxTreeItem", _wrap_new_wxTreeItem, 1 }, - { "wxTreeItem_m_data_get", _wrap_wxTreeItem_m_data_get, 1 }, - { "wxTreeItem_m_children_get", _wrap_wxTreeItem_m_children_get, 1 }, - { "wxTreeItem_m_selectedImage_get", _wrap_wxTreeItem_m_selectedImage_get, 1 }, - { "wxTreeItem_m_image_get", _wrap_wxTreeItem_m_image_get, 1 }, - { "wxTreeItem_m_text_get", _wrap_wxTreeItem_m_text_get, 1 }, - { "wxTreeItem_m_stateMask_get", _wrap_wxTreeItem_m_stateMask_get, 1 }, - { "wxTreeItem_m_state_get", _wrap_wxTreeItem_m_state_get, 1 }, - { "wxTreeItem_m_itemId_get", _wrap_wxTreeItem_m_itemId_get, 1 }, - { "wxTreeItem_m_mask_get", _wrap_wxTreeItem_m_mask_get, 1 }, + { "wxTreeEvent_Veto", _wrap_wxTreeEvent_Veto, 1 }, + { "wxTreeEvent_GetCode", _wrap_wxTreeEvent_GetCode, 1 }, + { "wxTreeEvent_GetPoint", _wrap_wxTreeEvent_GetPoint, 1 }, + { "wxTreeEvent_GetOldItem", _wrap_wxTreeEvent_GetOldItem, 1 }, + { "wxTreeEvent_GetItem", _wrap_wxTreeEvent_GetItem, 1 }, + { "wxTreeItemData_GetItemId", _wrap_wxTreeItemData_GetItemId, 1 }, + { "delete_wxTreeItemData", _wrap_delete_wxTreeItemData, 1 }, + { "new_wxTreeItemData", _wrap_new_wxTreeItemData, 1 }, + { "wxTreeItemId_GetId", _wrap_wxTreeItemId_GetId, 1 }, + { "wxTreeItemId_IsOk", _wrap_wxTreeItemId_IsOk, 1 }, + { "delete_wxTreeItemId", _wrap_delete_wxTreeItemId, 1 }, + { "new_wxTreeItemId", _wrap_new_wxTreeItemId, 1 }, { "wxListCtrl_SetWindowStyleFlag", _wrap_wxListCtrl_SetWindowStyleFlag, 1 }, { "wxListCtrl_SetTextColour", _wrap_wxListCtrl_SetTextColour, 1 }, { "wxListCtrl_SetSingleStyle", _wrap_wxListCtrl_SetSingleStyle, 1 }, @@ -3356,49 +3898,6 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_globals = SWIG_newvarlink(); m = Py_InitModule("controls2c", controls2cMethods); d = PyModule_GetDict(m); - PyDict_SetItemString(d,"wxTREE_MASK_HANDLE", PyInt_FromLong((long) wxTREE_MASK_HANDLE)); - PyDict_SetItemString(d,"wxTREE_MASK_STATE", PyInt_FromLong((long) wxTREE_MASK_STATE)); - PyDict_SetItemString(d,"wxTREE_MASK_TEXT", PyInt_FromLong((long) wxTREE_MASK_TEXT)); - PyDict_SetItemString(d,"wxTREE_MASK_IMAGE", PyInt_FromLong((long) wxTREE_MASK_IMAGE)); - PyDict_SetItemString(d,"wxTREE_MASK_SELECTED_IMAGE", PyInt_FromLong((long) wxTREE_MASK_SELECTED_IMAGE)); - PyDict_SetItemString(d,"wxTREE_MASK_CHILDREN", PyInt_FromLong((long) wxTREE_MASK_CHILDREN)); - PyDict_SetItemString(d,"wxTREE_MASK_DATA", PyInt_FromLong((long) wxTREE_MASK_DATA)); - PyDict_SetItemString(d,"wxTREE_STATE_BOLD", PyInt_FromLong((long) wxTREE_STATE_BOLD)); - PyDict_SetItemString(d,"wxTREE_STATE_DROPHILITED", PyInt_FromLong((long) wxTREE_STATE_DROPHILITED)); - PyDict_SetItemString(d,"wxTREE_STATE_EXPANDED", PyInt_FromLong((long) wxTREE_STATE_EXPANDED)); - PyDict_SetItemString(d,"wxTREE_STATE_EXPANDEDONCE", PyInt_FromLong((long) wxTREE_STATE_EXPANDEDONCE)); - PyDict_SetItemString(d,"wxTREE_STATE_FOCUSED", PyInt_FromLong((long) wxTREE_STATE_FOCUSED)); - PyDict_SetItemString(d,"wxTREE_STATE_SELECTED", PyInt_FromLong((long) wxTREE_STATE_SELECTED)); - PyDict_SetItemString(d,"wxTREE_STATE_CUT", PyInt_FromLong((long) wxTREE_STATE_CUT)); - PyDict_SetItemString(d,"wxTREE_HITTEST_ABOVE", PyInt_FromLong((long) wxTREE_HITTEST_ABOVE)); - PyDict_SetItemString(d,"wxTREE_HITTEST_BELOW", PyInt_FromLong((long) wxTREE_HITTEST_BELOW)); - PyDict_SetItemString(d,"wxTREE_HITTEST_NOWHERE", PyInt_FromLong((long) wxTREE_HITTEST_NOWHERE)); - PyDict_SetItemString(d,"wxTREE_HITTEST_ONITEMBUTTON", PyInt_FromLong((long) wxTREE_HITTEST_ONITEMBUTTON)); - PyDict_SetItemString(d,"wxTREE_HITTEST_ONITEMICON", PyInt_FromLong((long) wxTREE_HITTEST_ONITEMICON)); - PyDict_SetItemString(d,"wxTREE_HITTEST_ONITEMINDENT", PyInt_FromLong((long) wxTREE_HITTEST_ONITEMINDENT)); - PyDict_SetItemString(d,"wxTREE_HITTEST_ONITEMLABEL", PyInt_FromLong((long) wxTREE_HITTEST_ONITEMLABEL)); - PyDict_SetItemString(d,"wxTREE_HITTEST_ONITEMRIGHT", PyInt_FromLong((long) wxTREE_HITTEST_ONITEMRIGHT)); - PyDict_SetItemString(d,"wxTREE_HITTEST_ONITEMSTATEICON", PyInt_FromLong((long) wxTREE_HITTEST_ONITEMSTATEICON)); - PyDict_SetItemString(d,"wxTREE_HITTEST_TOLEFT", PyInt_FromLong((long) wxTREE_HITTEST_TOLEFT)); - PyDict_SetItemString(d,"wxTREE_HITTEST_TORIGHT", PyInt_FromLong((long) wxTREE_HITTEST_TORIGHT)); - PyDict_SetItemString(d,"wxTREE_HITTEST_ONITEM", PyInt_FromLong((long) wxTREE_HITTEST_ONITEM)); - PyDict_SetItemString(d,"wxTREE_NEXT_CARET", PyInt_FromLong((long) wxTREE_NEXT_CARET)); - PyDict_SetItemString(d,"wxTREE_NEXT_CHILD", PyInt_FromLong((long) wxTREE_NEXT_CHILD)); - PyDict_SetItemString(d,"wxTREE_NEXT_DROPHILITE", PyInt_FromLong((long) wxTREE_NEXT_DROPHILITE)); - PyDict_SetItemString(d,"wxTREE_NEXT_FIRSTVISIBLE", PyInt_FromLong((long) wxTREE_NEXT_FIRSTVISIBLE)); - PyDict_SetItemString(d,"wxTREE_NEXT_NEXT", PyInt_FromLong((long) wxTREE_NEXT_NEXT)); - PyDict_SetItemString(d,"wxTREE_NEXT_NEXTVISIBLE", PyInt_FromLong((long) wxTREE_NEXT_NEXTVISIBLE)); - PyDict_SetItemString(d,"wxTREE_NEXT_PARENT", PyInt_FromLong((long) wxTREE_NEXT_PARENT)); - PyDict_SetItemString(d,"wxTREE_NEXT_PREVIOUS", PyInt_FromLong((long) wxTREE_NEXT_PREVIOUS)); - PyDict_SetItemString(d,"wxTREE_NEXT_PREVIOUSVISIBLE", PyInt_FromLong((long) wxTREE_NEXT_PREVIOUSVISIBLE)); - PyDict_SetItemString(d,"wxTREE_NEXT_ROOT", PyInt_FromLong((long) wxTREE_NEXT_ROOT)); - PyDict_SetItemString(d,"wxTREE_EXPAND_EXPAND", PyInt_FromLong((long) wxTREE_EXPAND_EXPAND)); - PyDict_SetItemString(d,"wxTREE_EXPAND_COLLAPSE", PyInt_FromLong((long) wxTREE_EXPAND_COLLAPSE)); - PyDict_SetItemString(d,"wxTREE_EXPAND_COLLAPSE_RESET", PyInt_FromLong((long) wxTREE_EXPAND_COLLAPSE_RESET)); - PyDict_SetItemString(d,"wxTREE_EXPAND_TOGGLE", PyInt_FromLong((long) wxTREE_EXPAND_TOGGLE)); - PyDict_SetItemString(d,"wxTREE_INSERT_LAST", PyInt_FromLong((long) wxTREE_INSERT_LAST)); - PyDict_SetItemString(d,"wxTREE_INSERT_FIRST", PyInt_FromLong((long) wxTREE_INSERT_FIRST)); - PyDict_SetItemString(d,"wxTREE_INSERT_SORT", PyInt_FromLong((long) wxTREE_INSERT_SORT)); /* * These are the pointer type-equivalency mappings. * (Used by the SWIG pointer type-checker). @@ -3444,7 +3943,6 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0); - SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0); SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0); SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0); SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0); @@ -3476,6 +3974,7 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0); SWIG_RegisterMapping("_class_wxButton","_wxButton",0); SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0); + SWIG_RegisterMapping("_wxTreeItemData","_class_wxTreeItemData",0); SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0); SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0); SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0); @@ -3530,7 +4029,6 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0); SWIG_RegisterMapping("_class_wxFont","_wxFont",0); SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0); - SWIG_RegisterMapping("_wxTreeItem","_class_wxTreeItem",0); SWIG_RegisterMapping("_class_wxMenuEvent","_wxMenuEvent",0); SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0); SWIG_RegisterMapping("_wxMouseEvent","_class_wxMouseEvent",0); @@ -3546,8 +4044,8 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0); SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0); - SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0); SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0); + SWIG_RegisterMapping("_wxTreeItemId","_class_wxTreeItemId",0); SWIG_RegisterMapping("_unsigned_char","_byte",0); SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0); SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0); @@ -3594,6 +4092,7 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0); SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0); SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0); + SWIG_RegisterMapping("_class_wxTreeItemId","_wxTreeItemId",0); SWIG_RegisterMapping("_wxTreeCtrl","_class_wxTreeCtrl",0); SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0); SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0); @@ -3613,7 +4112,6 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0); SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0); SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0); - SWIG_RegisterMapping("_class_wxTreeItem","_wxTreeItem",0); SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxTreeEvent",SwigwxTreeEventTowxCommandEvent); SWIG_RegisterMapping("_class_wxCommandEvent","_wxTreeEvent",SwigwxTreeEventTowxCommandEvent); SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxListEvent",SwigwxListEventTowxCommandEvent); @@ -3622,6 +4120,7 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0); SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0); SWIG_RegisterMapping("_class_wxListCtrl","_wxListCtrl",0); + SWIG_RegisterMapping("_class_wxTreeItemData","_wxTreeItemData",0); SWIG_RegisterMapping("_class_wxSize","_wxSize",0); SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0); SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0); diff --git a/utils/wxPython/src/msw/controls2.py b/utils/wxPython/src/msw/controls2.py index 0a611f55af..effb646046 100644 --- a/utils/wxPython/src/msw/controls2.py +++ b/utils/wxPython/src/msw/controls2.py @@ -318,67 +318,45 @@ class wxListCtrl(wxListCtrlPtr): -class wxTreeItemPtr : +class wxTreeItemIdPtr : def __init__(self,this): self.this = this self.thisown = 0 def __del__(self): if self.thisown == 1 : - controls2c.delete_wxTreeItem(self.this) - def __setattr__(self,name,value): - if name == "m_mask" : - controls2c.wxTreeItem_m_mask_set(self.this,value) - return - if name == "m_itemId" : - controls2c.wxTreeItem_m_itemId_set(self.this,value) - return - if name == "m_state" : - controls2c.wxTreeItem_m_state_set(self.this,value) - return - if name == "m_stateMask" : - controls2c.wxTreeItem_m_stateMask_set(self.this,value) - return - if name == "m_text" : - controls2c.wxTreeItem_m_text_set(self.this,value) - return - if name == "m_image" : - controls2c.wxTreeItem_m_image_set(self.this,value) - return - if name == "m_selectedImage" : - controls2c.wxTreeItem_m_selectedImage_set(self.this,value) - return - if name == "m_children" : - controls2c.wxTreeItem_m_children_set(self.this,value) - return - if name == "m_data" : - controls2c.wxTreeItem_m_data_set(self.this,value) - return - self.__dict__[name] = value - def __getattr__(self,name): - if name == "m_mask" : - return controls2c.wxTreeItem_m_mask_get(self.this) - if name == "m_itemId" : - return controls2c.wxTreeItem_m_itemId_get(self.this) - if name == "m_state" : - return controls2c.wxTreeItem_m_state_get(self.this) - if name == "m_stateMask" : - return controls2c.wxTreeItem_m_stateMask_get(self.this) - if name == "m_text" : - return controls2c.wxTreeItem_m_text_get(self.this) - if name == "m_image" : - return controls2c.wxTreeItem_m_image_get(self.this) - if name == "m_selectedImage" : - return controls2c.wxTreeItem_m_selectedImage_get(self.this) - if name == "m_children" : - return controls2c.wxTreeItem_m_children_get(self.this) - if name == "m_data" : - return controls2c.wxTreeItem_m_data_get(self.this) - raise AttributeError,name + controls2c.delete_wxTreeItemId(self.this) + def IsOk(self): + val = controls2c.wxTreeItemId_IsOk(self.this) + return val + def GetId(self): + val = controls2c.wxTreeItemId_GetId(self.this) + return val + def __repr__(self): + return "" +class wxTreeItemId(wxTreeItemIdPtr): + def __init__(self) : + self.this = controls2c.new_wxTreeItemId() + self.thisown = 1 + + + + +class wxTreeItemDataPtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self): + if self.thisown == 1 : + controls2c.delete_wxTreeItemData(self.this) + def GetItemId(self): + val = controls2c.wxTreeItemData_GetItemId(self.this) + val = wxTreeItemIdPtr(val) + return val def __repr__(self): - return "" -class wxTreeItem(wxTreeItemPtr): + return "" +class wxTreeItemData(wxTreeItemDataPtr): def __init__(self) : - self.this = controls2c.new_wxTreeItem() + self.this = controls2c.new_wxTreeItemData() self.thisown = 1 @@ -388,30 +366,27 @@ class wxTreeEventPtr(wxCommandEventPtr): def __init__(self,this): self.this = this self.thisown = 0 - def __setattr__(self,name,value): - if name == "m_code" : - controls2c.wxTreeEvent_m_code_set(self.this,value) - return - if name == "m_item" : - controls2c.wxTreeEvent_m_item_set(self.this,value.this) - return - if name == "m_oldItem" : - controls2c.wxTreeEvent_m_oldItem_set(self.this,value) - return - if name == "m_pointDrag" : - controls2c.wxTreeEvent_m_pointDrag_set(self.this,value.this) - return - self.__dict__[name] = value - def __getattr__(self,name): - if name == "m_code" : - return controls2c.wxTreeEvent_m_code_get(self.this) - if name == "m_item" : - return wxTreeItemPtr(controls2c.wxTreeEvent_m_item_get(self.this)) - if name == "m_oldItem" : - return controls2c.wxTreeEvent_m_oldItem_get(self.this) - if name == "m_pointDrag" : - return wxPointPtr(controls2c.wxTreeEvent_m_pointDrag_get(self.this)) - raise AttributeError,name + def GetItem(self): + val = controls2c.wxTreeEvent_GetItem(self.this) + val = wxTreeItemIdPtr(val) + val.thisown = 1 + return val + def GetOldItem(self): + val = controls2c.wxTreeEvent_GetOldItem(self.this) + val = wxTreeItemIdPtr(val) + val.thisown = 1 + return val + def GetPoint(self): + val = controls2c.wxTreeEvent_GetPoint(self.this) + val = wxPointPtr(val) + val.thisown = 1 + return val + def GetCode(self): + val = controls2c.wxTreeEvent_GetCode(self.this) + return val + def Veto(self): + val = controls2c.wxTreeEvent_Veto(self.this) + return val def __repr__(self): return "" class wxTreeEvent(wxTreeEventPtr): @@ -425,116 +400,189 @@ class wxTreeCtrlPtr(wxControlPtr): def __init__(self,this): self.this = this self.thisown = 0 - def DeleteAllItems(self): - val = controls2c.wxTreeCtrl_DeleteAllItems(self.this) + def GetCount(self): + val = controls2c.wxTreeCtrl_GetCount(self.this) return val - def DeleteItem(self,arg0): - val = controls2c.wxTreeCtrl_DeleteItem(self.this,arg0) + def GetIndent(self): + val = controls2c.wxTreeCtrl_GetIndent(self.this) return val - def EditLabel(self,arg0): - val = controls2c.wxTreeCtrl_EditLabel(self.this,arg0) - val = wxTextCtrlPtr(val) + def SetIndent(self,arg0): + val = controls2c.wxTreeCtrl_SetIndent(self.this,arg0) return val - def EnsureVisible(self,arg0): - val = controls2c.wxTreeCtrl_EnsureVisible(self.this,arg0) + def GetImageList(self): + val = controls2c.wxTreeCtrl_GetImageList(self.this) return val - def ExpandItem(self,arg0,arg1): - val = controls2c.wxTreeCtrl_ExpandItem(self.this,arg0,arg1) + def GetStateImageList(self): + val = controls2c.wxTreeCtrl_GetStateImageList(self.this) return val - def GetChild(self,arg0): - val = controls2c.wxTreeCtrl_GetChild(self.this,arg0) + def SetImageList(self,arg0): + val = controls2c.wxTreeCtrl_SetImageList(self.this,arg0) return val - def GetCount(self): - val = controls2c.wxTreeCtrl_GetCount(self.this) + def SetStateImageList(self,arg0): + val = controls2c.wxTreeCtrl_SetStateImageList(self.this,arg0) return val - def GetEditControl(self): - val = controls2c.wxTreeCtrl_GetEditControl(self.this) - val = wxTextCtrlPtr(val) - return val - def GetFirstVisibleItem(self): - val = controls2c.wxTreeCtrl_GetFirstVisibleItem(self.this) + def GetItemText(self,arg0): + val = controls2c.wxTreeCtrl_GetItemText(self.this,arg0.this) return val - def GetImageList(self,*args): - val = apply(controls2c.wxTreeCtrl_GetImageList,(self.this,)+args) + def GetItemImage(self,arg0): + val = controls2c.wxTreeCtrl_GetItemImage(self.this,arg0.this) return val - def GetIndent(self): - val = controls2c.wxTreeCtrl_GetIndent(self.this) + def GetItemSelectedImage(self,arg0): + val = controls2c.wxTreeCtrl_GetItemSelectedImage(self.this,arg0.this) return val def GetItemData(self,arg0): - val = controls2c.wxTreeCtrl_GetItemData(self.this,arg0) + val = controls2c.wxTreeCtrl_GetItemData(self.this,arg0.this) + val = wxTreeItemDataPtr(val) return val - def GetItem(self): - val = controls2c.wxTreeCtrl_GetItem(self.this) - val = wxTreeItemPtr(val) - val.thisown = 1 + def SetItemText(self,arg0,arg1): + val = controls2c.wxTreeCtrl_SetItemText(self.this,arg0.this,arg1) return val - def GetItemRect(self,arg0,*args): - val = apply(controls2c.wxTreeCtrl_GetItemRect,(self.this,arg0,)+args) - val = wxRectPtr(val) - val.thisown = 1 + def SetItemImage(self,arg0,arg1): + val = controls2c.wxTreeCtrl_SetItemImage(self.this,arg0.this,arg1) return val - def GetItemState(self,arg0,arg1): - val = controls2c.wxTreeCtrl_GetItemState(self.this,arg0,arg1) + def SetItemSelectedImage(self,arg0,arg1): + val = controls2c.wxTreeCtrl_SetItemSelectedImage(self.this,arg0.this,arg1) return val - def GetItemText(self,arg0): - val = controls2c.wxTreeCtrl_GetItemText(self.this,arg0) + def SetItemData(self,arg0,arg1): + val = controls2c.wxTreeCtrl_SetItemData(self.this,arg0.this,arg1.this) + return val + def IsVisible(self,arg0): + val = controls2c.wxTreeCtrl_IsVisible(self.this,arg0.this) return val - def GetNextItem(self,arg0,arg1): - val = controls2c.wxTreeCtrl_GetNextItem(self.this,arg0,arg1) + def ItemHasChildren(self,arg0): + val = controls2c.wxTreeCtrl_ItemHasChildren(self.this,arg0.this) return val - def GetNextVisibleItem(self,arg0): - val = controls2c.wxTreeCtrl_GetNextVisibleItem(self.this,arg0) + def IsExpanded(self,arg0): + val = controls2c.wxTreeCtrl_IsExpanded(self.this,arg0.this) return val - def GetParent(self,arg0): - val = controls2c.wxTreeCtrl_GetParent(self.this,arg0) + def IsSelected(self,arg0): + val = controls2c.wxTreeCtrl_IsSelected(self.this,arg0.this) return val def GetRootItem(self): val = controls2c.wxTreeCtrl_GetRootItem(self.this) + val = wxTreeItemIdPtr(val) + val.thisown = 1 return val def GetSelection(self): val = controls2c.wxTreeCtrl_GetSelection(self.this) + val = wxTreeItemIdPtr(val) + val.thisown = 1 return val - def HitTest(self,arg0): - val = controls2c.wxTreeCtrl_HitTest(self.this,arg0.this) + def GetParent(self,arg0): + val = controls2c.wxTreeCtrl_GetParent(self.this,arg0.this) + val = wxTreeItemIdPtr(val) + val.thisown = 1 return val - def InsertItem(self,arg0,arg1,*args): - val = apply(controls2c.wxTreeCtrl_InsertItem,(self.this,arg0,arg1.this,)+args) + def GetFirstChild(self,arg0,arg1): + val = controls2c.wxTreeCtrl_GetFirstChild(self.this,arg0.this,arg1) return val - def InsertItemString(self,arg0,arg1,*args): - val = apply(controls2c.wxTreeCtrl_InsertItemString,(self.this,arg0,arg1,)+args) + def GetNextChild(self,arg0,arg1): + val = controls2c.wxTreeCtrl_GetNextChild(self.this,arg0.this,arg1) return val - def ItemHasChildren(self,arg0): - val = controls2c.wxTreeCtrl_ItemHasChildren(self.this,arg0) + def GetNextSibling(self,arg0): + val = controls2c.wxTreeCtrl_GetNextSibling(self.this,arg0.this) + val = wxTreeItemIdPtr(val) + val.thisown = 1 return val - def ScrollTo(self,arg0): - val = controls2c.wxTreeCtrl_ScrollTo(self.this,arg0) + def GetPrevSibling(self,arg0): + val = controls2c.wxTreeCtrl_GetPrevSibling(self.this,arg0.this) + val = wxTreeItemIdPtr(val) + val.thisown = 1 return val - def SelectItem(self,arg0): - val = controls2c.wxTreeCtrl_SelectItem(self.this,arg0) + def GetFirstVisibleItem(self): + val = controls2c.wxTreeCtrl_GetFirstVisibleItem(self.this) + val = wxTreeItemIdPtr(val) + val.thisown = 1 return val - def SetIndent(self,arg0): - val = controls2c.wxTreeCtrl_SetIndent(self.this,arg0) + def GetNextVisible(self,arg0): + val = controls2c.wxTreeCtrl_GetNextVisible(self.this,arg0.this) + val = wxTreeItemIdPtr(val) + val.thisown = 1 return val - def SetImageList(self,arg0,*args): - val = apply(controls2c.wxTreeCtrl_SetImageList,(self.this,arg0,)+args) + def GetPrevVisible(self,arg0): + val = controls2c.wxTreeCtrl_GetPrevVisible(self.this,arg0.this) + val = wxTreeItemIdPtr(val) + val.thisown = 1 return val - def SetItem(self,arg0): - val = controls2c.wxTreeCtrl_SetItem(self.this,arg0.this) + def AddRoot(self,arg0,*args): + argl = map(None,args) + try: argl[2] = argl[2].this + except: pass + args = tuple(argl) + val = apply(controls2c.wxTreeCtrl_AddRoot,(self.this,arg0,)+args) + val = wxTreeItemIdPtr(val) + val.thisown = 1 return val - def SetItemImage(self,arg0,arg1,arg2): - val = controls2c.wxTreeCtrl_SetItemImage(self.this,arg0,arg1,arg2) + def PrependItem(self,arg0,arg1,*args): + argl = map(None,args) + try: argl[2] = argl[2].this + except: pass + args = tuple(argl) + val = apply(controls2c.wxTreeCtrl_PrependItem,(self.this,arg0.this,arg1,)+args) + val = wxTreeItemIdPtr(val) + val.thisown = 1 return val - def SetItemState(self,arg0,arg1,arg2): - val = controls2c.wxTreeCtrl_SetItemState(self.this,arg0,arg1,arg2) + def InsertItem(self,arg0,arg1,arg2,*args): + argl = map(None,args) + try: argl[2] = argl[2].this + except: pass + args = tuple(argl) + val = apply(controls2c.wxTreeCtrl_InsertItem,(self.this,arg0.this,arg1.this,arg2,)+args) + val = wxTreeItemIdPtr(val) + val.thisown = 1 return val - def SetItemText(self,arg0,arg1): - val = controls2c.wxTreeCtrl_SetItemText(self.this,arg0,arg1) + def AppendItem(self,arg0,arg1,*args): + argl = map(None,args) + try: argl[2] = argl[2].this + except: pass + args = tuple(argl) + val = apply(controls2c.wxTreeCtrl_AppendItem,(self.this,arg0.this,arg1,)+args) + val = wxTreeItemIdPtr(val) + val.thisown = 1 return val - def SetItemData(self,arg0,arg1): - val = controls2c.wxTreeCtrl_SetItemData(self.this,arg0,arg1) + def Delete(self,arg0): + val = controls2c.wxTreeCtrl_Delete(self.this,arg0.this) + return val + def DeleteAllItems(self): + val = controls2c.wxTreeCtrl_DeleteAllItems(self.this) + return val + def Expand(self,arg0): + val = controls2c.wxTreeCtrl_Expand(self.this,arg0.this) + return val + def Collapse(self,arg0): + val = controls2c.wxTreeCtrl_Collapse(self.this,arg0.this) + return val + def CollapseAndReset(self,arg0): + val = controls2c.wxTreeCtrl_CollapseAndReset(self.this,arg0.this) + return val + def Toggle(self,arg0): + val = controls2c.wxTreeCtrl_Toggle(self.this,arg0.this) + return val + def Unselect(self): + val = controls2c.wxTreeCtrl_Unselect(self.this) + return val + def SelectItem(self,arg0): + val = controls2c.wxTreeCtrl_SelectItem(self.this,arg0.this) + return val + def EnsureVisible(self,arg0): + val = controls2c.wxTreeCtrl_EnsureVisible(self.this,arg0.this) + return val + def ScrollTo(self,arg0): + val = controls2c.wxTreeCtrl_ScrollTo(self.this,arg0.this) + return val + def EditLabel(self,arg0): + val = controls2c.wxTreeCtrl_EditLabel(self.this,arg0.this) + val = wxTextCtrlPtr(val) + return val + def GetEditControl(self): + val = controls2c.wxTreeCtrl_GetEditControl(self.this) + val = wxTextCtrlPtr(val) + return val + def EndEditLabel(self,arg0,*args): + val = apply(controls2c.wxTreeCtrl_EndEditLabel,(self.this,arg0.this,)+args) return val def SortChildren(self,arg0): - val = controls2c.wxTreeCtrl_SortChildren(self.this,arg0) + val = controls2c.wxTreeCtrl_SortChildren(self.this,arg0.this) return val def __repr__(self): return "" @@ -561,46 +609,3 @@ class wxTreeCtrl(wxTreeCtrlPtr): #-------------- VARIABLE WRAPPERS ------------------ -wxTREE_MASK_HANDLE = controls2c.wxTREE_MASK_HANDLE -wxTREE_MASK_STATE = controls2c.wxTREE_MASK_STATE -wxTREE_MASK_TEXT = controls2c.wxTREE_MASK_TEXT -wxTREE_MASK_IMAGE = controls2c.wxTREE_MASK_IMAGE -wxTREE_MASK_SELECTED_IMAGE = controls2c.wxTREE_MASK_SELECTED_IMAGE -wxTREE_MASK_CHILDREN = controls2c.wxTREE_MASK_CHILDREN -wxTREE_MASK_DATA = controls2c.wxTREE_MASK_DATA -wxTREE_STATE_BOLD = controls2c.wxTREE_STATE_BOLD -wxTREE_STATE_DROPHILITED = controls2c.wxTREE_STATE_DROPHILITED -wxTREE_STATE_EXPANDED = controls2c.wxTREE_STATE_EXPANDED -wxTREE_STATE_EXPANDEDONCE = controls2c.wxTREE_STATE_EXPANDEDONCE -wxTREE_STATE_FOCUSED = controls2c.wxTREE_STATE_FOCUSED -wxTREE_STATE_SELECTED = controls2c.wxTREE_STATE_SELECTED -wxTREE_STATE_CUT = controls2c.wxTREE_STATE_CUT -wxTREE_HITTEST_ABOVE = controls2c.wxTREE_HITTEST_ABOVE -wxTREE_HITTEST_BELOW = controls2c.wxTREE_HITTEST_BELOW -wxTREE_HITTEST_NOWHERE = controls2c.wxTREE_HITTEST_NOWHERE -wxTREE_HITTEST_ONITEMBUTTON = controls2c.wxTREE_HITTEST_ONITEMBUTTON -wxTREE_HITTEST_ONITEMICON = controls2c.wxTREE_HITTEST_ONITEMICON -wxTREE_HITTEST_ONITEMINDENT = controls2c.wxTREE_HITTEST_ONITEMINDENT -wxTREE_HITTEST_ONITEMLABEL = controls2c.wxTREE_HITTEST_ONITEMLABEL -wxTREE_HITTEST_ONITEMRIGHT = controls2c.wxTREE_HITTEST_ONITEMRIGHT -wxTREE_HITTEST_ONITEMSTATEICON = controls2c.wxTREE_HITTEST_ONITEMSTATEICON -wxTREE_HITTEST_TOLEFT = controls2c.wxTREE_HITTEST_TOLEFT -wxTREE_HITTEST_TORIGHT = controls2c.wxTREE_HITTEST_TORIGHT -wxTREE_HITTEST_ONITEM = controls2c.wxTREE_HITTEST_ONITEM -wxTREE_NEXT_CARET = controls2c.wxTREE_NEXT_CARET -wxTREE_NEXT_CHILD = controls2c.wxTREE_NEXT_CHILD -wxTREE_NEXT_DROPHILITE = controls2c.wxTREE_NEXT_DROPHILITE -wxTREE_NEXT_FIRSTVISIBLE = controls2c.wxTREE_NEXT_FIRSTVISIBLE -wxTREE_NEXT_NEXT = controls2c.wxTREE_NEXT_NEXT -wxTREE_NEXT_NEXTVISIBLE = controls2c.wxTREE_NEXT_NEXTVISIBLE -wxTREE_NEXT_PARENT = controls2c.wxTREE_NEXT_PARENT -wxTREE_NEXT_PREVIOUS = controls2c.wxTREE_NEXT_PREVIOUS -wxTREE_NEXT_PREVIOUSVISIBLE = controls2c.wxTREE_NEXT_PREVIOUSVISIBLE -wxTREE_NEXT_ROOT = controls2c.wxTREE_NEXT_ROOT -wxTREE_EXPAND_EXPAND = controls2c.wxTREE_EXPAND_EXPAND -wxTREE_EXPAND_COLLAPSE = controls2c.wxTREE_EXPAND_COLLAPSE -wxTREE_EXPAND_COLLAPSE_RESET = controls2c.wxTREE_EXPAND_COLLAPSE_RESET -wxTREE_EXPAND_TOGGLE = controls2c.wxTREE_EXPAND_TOGGLE -wxTREE_INSERT_LAST = controls2c.wxTREE_INSERT_LAST -wxTREE_INSERT_FIRST = controls2c.wxTREE_INSERT_FIRST -wxTREE_INSERT_SORT = controls2c.wxTREE_INSERT_SORT diff --git a/utils/wxPython/src/msw/events.cpp b/utils/wxPython/src/msw/events.cpp index f2c165aeb1..4754b20c52 100644 --- a/utils/wxPython/src/msw/events.cpp +++ b/utils/wxPython/src/msw/events.cpp @@ -379,27 +379,6 @@ static void *SwigwxCloseEventTowxEvent(void *ptr) { return (void *) dest; } -#define wxCloseEvent_GetSessionEnding(_swigobj) (_swigobj->GetSessionEnding()) -static PyObject *_wrap_wxCloseEvent_GetSessionEnding(PyObject *self, PyObject *args) { - PyObject * _resultobj; - bool _result; - wxCloseEvent * _arg0; - char * _argc0 = 0; - - self = self; - if(!PyArg_ParseTuple(args,"s:wxCloseEvent_GetSessionEnding",&_argc0)) - return NULL; - if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCloseEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_GetSessionEnding. Expected _wxCloseEvent_p."); - return NULL; - } - } - _result = (bool )wxCloseEvent_GetSessionEnding(_arg0); - _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - #define wxCloseEvent_GetLoggingOff(_swigobj) (_swigobj->GetLoggingOff()) static PyObject *_wrap_wxCloseEvent_GetLoggingOff(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -2629,7 +2608,6 @@ static PyMethodDef eventscMethods[] = { { "wxCloseEvent_GetVeto", _wrap_wxCloseEvent_GetVeto, 1 }, { "wxCloseEvent_Veto", _wrap_wxCloseEvent_Veto, 1 }, { "wxCloseEvent_GetLoggingOff", _wrap_wxCloseEvent_GetLoggingOff, 1 }, - { "wxCloseEvent_GetSessionEnding", _wrap_wxCloseEvent_GetSessionEnding, 1 }, { "wxSizeEvent_GetSize", _wrap_wxSizeEvent_GetSize, 1 }, { "wxEvent_Skip", _wrap_wxEvent_Skip, 1 }, { "wxEvent_SetTimestamp", _wrap_wxEvent_SetTimestamp, 1 }, diff --git a/utils/wxPython/src/msw/events.py b/utils/wxPython/src/msw/events.py index 53594aa316..130c95edbb 100644 --- a/utils/wxPython/src/msw/events.py +++ b/utils/wxPython/src/msw/events.py @@ -67,9 +67,6 @@ class wxCloseEventPtr(wxEventPtr): def __init__(self,this): self.this = this self.thisown = 0 - def GetSessionEnding(self): - val = eventsc.wxCloseEvent_GetSessionEnding(self.this) - return val def GetLoggingOff(self): val = eventsc.wxCloseEvent_GetLoggingOff(self.this) return val diff --git a/utils/wxPython/src/msw/frames.cpp b/utils/wxPython/src/msw/frames.cpp index d5fcee7877..17253d7d6b 100644 --- a/utils/wxPython/src/msw/frames.cpp +++ b/utils/wxPython/src/msw/frames.cpp @@ -831,7 +831,6 @@ SWIGEXPORT(void,initframesc)() { SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0); SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); - SWIG_RegisterMapping("_class_wxToolBarBase","_wxToolBarBase",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0); SWIG_RegisterMapping("_wxPen","_class_wxPen",0); @@ -854,7 +853,6 @@ SWIGEXPORT(void,initframesc)() { SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0); SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0); - SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0); SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0); SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0); SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0); @@ -888,7 +886,6 @@ SWIGEXPORT(void,initframesc)() { SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0); SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0); - SWIG_RegisterMapping("_wxToolBarSimple","_class_wxToolBarSimple",0); SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0); SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0); SWIG_RegisterMapping("_EBool","_signed_int",0); @@ -921,7 +918,6 @@ SWIGEXPORT(void,initframesc)() { SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0); SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0); SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0); - SWIG_RegisterMapping("_class_wxToolBarSimple","_wxToolBarSimple",0); SWIG_RegisterMapping("_WXTYPE","_short",0); SWIG_RegisterMapping("_WXTYPE","_signed_short",0); SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0); @@ -952,7 +948,6 @@ SWIGEXPORT(void,initframesc)() { SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0); SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0); - SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0); SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0); SWIG_RegisterMapping("_unsigned_char","_byte",0); SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0); @@ -997,7 +992,6 @@ SWIGEXPORT(void,initframesc)() { SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0); SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0); SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0); - SWIG_RegisterMapping("_wxToolBarBase","_class_wxToolBarBase",0); SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0); SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0); SWIG_RegisterMapping("_class_wxControl","_wxControl",0); diff --git a/utils/wxPython/src/msw/gdi.cpp b/utils/wxPython/src/msw/gdi.cpp index 3dac23f5fc..05f7e25cf3 100644 --- a/utils/wxPython/src/msw/gdi.cpp +++ b/utils/wxPython/src/msw/gdi.cpp @@ -4781,53 +4781,6 @@ static PyObject *_wrap_new_wxPaintDC(PyObject *self, PyObject *args) { return _resultobj; } -static void *SwigwxPostScriptDCTowxDC(void *ptr) { - wxPostScriptDC *src; - wxDC *dest; - src = (wxPostScriptDC *) ptr; - dest = (wxDC *) src; - return (void *) dest; -} - -#define new_wxPostScriptDC(_swigarg0,_swigarg1,_swigarg2) (new wxPostScriptDC(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_new_wxPostScriptDC(PyObject *self, PyObject *args) { - PyObject * _resultobj; - wxPostScriptDC * _result; - wxString * _arg0; - bool _arg1 = (1); - wxWindow * _arg2 = NULL; - PyObject * _obj0 = 0; - int tempbool1; - char * _argc2 = 0; - char _ptemp[128]; - - self = self; - if(!PyArg_ParseTuple(args,"O|is:new_wxPostScriptDC",&_obj0,&tempbool1,&_argc2)) - return NULL; -{ - if (!PyString_Check(_obj0)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); - return NULL; - } - _arg0 = new wxString(PyString_AsString(_obj0)); -} - _arg1 = (bool ) tempbool1; - if (_argc2) { - if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxPostScriptDC. Expected _wxWindow_p."); - return NULL; - } - } - _result = (wxPostScriptDC *)new_wxPostScriptDC(*_arg0,_arg1,_arg2); - SWIG_MakePtr(_ptemp, (char *) _result,"_wxPostScriptDC_p"); - _resultobj = Py_BuildValue("s",_ptemp); -{ - if (_obj0) - delete _arg0; -} - return _resultobj; -} - static void *SwigwxPrinterDCTowxDC(void *ptr) { wxPrinterDC *src; wxDC *dest; @@ -4958,7 +4911,6 @@ static PyMethodDef gdicMethods[] = { { "wxMetaFileDC_Close", _wrap_wxMetaFileDC_Close, 1 }, { "new_wxMetaFileDC", _wrap_new_wxMetaFileDC, 1 }, { "new_wxPrinterDC", _wrap_new_wxPrinterDC, 1 }, - { "new_wxPostScriptDC", _wrap_new_wxPostScriptDC, 1 }, { "new_wxPaintDC", _wrap_new_wxPaintDC, 1 }, { "new_wxClientDC", _wrap_new_wxClientDC, 1 }, { "wxScreenDC_EndDrawingOnTop", _wrap_wxScreenDC_EndDrawingOnTop, 1 }, @@ -5189,8 +5141,6 @@ SWIGEXPORT(void,initgdic)() { SWIG_RegisterMapping("_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC); SWIG_RegisterMapping("_wxDC","_class_wxPrinterDC",SwigwxPrinterDCTowxDC); SWIG_RegisterMapping("_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC); - SWIG_RegisterMapping("_wxDC","_class_wxPostScriptDC",SwigwxPostScriptDCTowxDC); - SWIG_RegisterMapping("_wxDC","_wxPostScriptDC",SwigwxPostScriptDCTowxDC); SWIG_RegisterMapping("_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC); SWIG_RegisterMapping("_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC); SWIG_RegisterMapping("_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC); @@ -5202,7 +5152,6 @@ SWIGEXPORT(void,initgdic)() { SWIG_RegisterMapping("_wxDC","_class_wxDC",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0); - SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0); SWIG_RegisterMapping("_class_wxMask","_wxMask",0); SWIG_RegisterMapping("_wxColour","_class_wxColour",0); SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0); @@ -5229,8 +5178,6 @@ SWIGEXPORT(void,initgdic)() { SWIG_RegisterMapping("_class_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC); SWIG_RegisterMapping("_class_wxDC","_class_wxPrinterDC",SwigwxPrinterDCTowxDC); SWIG_RegisterMapping("_class_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC); - SWIG_RegisterMapping("_class_wxDC","_class_wxPostScriptDC",SwigwxPostScriptDCTowxDC); - SWIG_RegisterMapping("_class_wxDC","_wxPostScriptDC",SwigwxPostScriptDCTowxDC); SWIG_RegisterMapping("_class_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC); SWIG_RegisterMapping("_class_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC); SWIG_RegisterMapping("_class_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC); @@ -5264,7 +5211,6 @@ SWIGEXPORT(void,initgdic)() { SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0); SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0); - SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0); SWIG_RegisterMapping("_unsigned_char","_byte",0); SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); diff --git a/utils/wxPython/src/msw/gdi.py b/utils/wxPython/src/msw/gdi.py index 7b6d5f792e..cd16564062 100644 --- a/utils/wxPython/src/msw/gdi.py +++ b/utils/wxPython/src/msw/gdi.py @@ -629,24 +629,6 @@ class wxPaintDC(wxPaintDCPtr): -class wxPostScriptDCPtr(wxDCPtr): - def __init__(self,this): - self.this = this - self.thisown = 0 - def __repr__(self): - return "" -class wxPostScriptDC(wxPostScriptDCPtr): - def __init__(self,arg0,*args) : - argl = map(None,args) - try: argl[1] = argl[1].this - except: pass - args = tuple(argl) - self.this = apply(gdic.new_wxPostScriptDC,(arg0,)+args) - self.thisown = 1 - - - - class wxPrinterDCPtr(wxDCPtr): def __init__(self,this): self.this = this diff --git a/utils/wxPython/src/msw/mdi.cpp b/utils/wxPython/src/msw/mdi.cpp index 4d461d1b5c..d4d5186acb 100644 --- a/utils/wxPython/src/msw/mdi.cpp +++ b/utils/wxPython/src/msw/mdi.cpp @@ -763,7 +763,6 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0); SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); - SWIG_RegisterMapping("_class_wxToolBarBase","_wxToolBarBase",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0); SWIG_RegisterMapping("_wxPen","_class_wxPen",0); @@ -786,7 +785,6 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0); SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0); - SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0); SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0); SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0); SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0); @@ -820,7 +818,6 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0); SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0); - SWIG_RegisterMapping("_wxToolBarSimple","_class_wxToolBarSimple",0); SWIG_RegisterMapping("_wxMDIChildFrame","_class_wxMDIChildFrame",0); SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0); SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0); @@ -855,7 +852,6 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0); SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0); SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0); - SWIG_RegisterMapping("_class_wxToolBarSimple","_wxToolBarSimple",0); SWIG_RegisterMapping("_class_wxMDIChildFrame","_wxMDIChildFrame",0); SWIG_RegisterMapping("_WXTYPE","_short",0); SWIG_RegisterMapping("_WXTYPE","_signed_short",0); @@ -890,7 +886,6 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0); SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0); - SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0); SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0); SWIG_RegisterMapping("_unsigned_char","_byte",0); SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0); @@ -938,7 +933,6 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0); SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0); SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0); - SWIG_RegisterMapping("_wxToolBarBase","_class_wxToolBarBase",0); SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0); SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0); SWIG_RegisterMapping("_class_wxControl","_wxControl",0); diff --git a/utils/wxPython/src/msw/misc.cpp b/utils/wxPython/src/msw/misc.cpp index a92c59c572..59d110ae10 100644 --- a/utils/wxPython/src/msw/misc.cpp +++ b/utils/wxPython/src/msw/misc.cpp @@ -890,8 +890,8 @@ static PyObject *_wrap_wxResourceCreateBitmap(PyObject *self, PyObject *args) { self = self; if(!PyArg_ParseTuple(args,"s:wxResourceCreateBitmap",&_arg0)) return NULL; - _result = (wxBitmap *)wxResourceCreateBitmap(_arg0); - SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p"); + _result = new wxBitmap (wxResourceCreateBitmap(_arg0)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxBitmap_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } @@ -905,8 +905,8 @@ static PyObject *_wrap_wxResourceCreateIcon(PyObject *self, PyObject *args) { self = self; if(!PyArg_ParseTuple(args,"s:wxResourceCreateIcon",&_arg0)) return NULL; - _result = (wxIcon *)wxResourceCreateIcon(_arg0); - SWIG_MakePtr(_ptemp, (char *) _result,"_wxIcon_p"); + _result = new wxIcon (wxResourceCreateIcon(_arg0)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxIcon_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } diff --git a/utils/wxPython/src/msw/misc.py b/utils/wxPython/src/msw/misc.py index b410c28bf0..2dd91a04b7 100644 --- a/utils/wxPython/src/msw/misc.py +++ b/utils/wxPython/src/msw/misc.py @@ -487,11 +487,13 @@ wxResourceClear = miscc.wxResourceClear def wxResourceCreateBitmap(arg0): val = miscc.wxResourceCreateBitmap(arg0) val = wxBitmapPtr(val) + val.thisown = 1 return val def wxResourceCreateIcon(arg0): val = miscc.wxResourceCreateIcon(arg0) val = wxIconPtr(val) + val.thisown = 1 return val def wxResourceCreateMenuBar(arg0): diff --git a/utils/wxPython/src/msw/stattool.cpp b/utils/wxPython/src/msw/stattool.cpp index 57447f67f1..a80d77a376 100644 --- a/utils/wxPython/src/msw/stattool.cpp +++ b/utils/wxPython/src/msw/stattool.cpp @@ -872,60 +872,102 @@ static PyObject *_wrap_wxToolBarTool_m_longHelpString_get(PyObject *self, PyObje return _resultobj; } -static void *SwigwxToolBarBaseTowxControl(void *ptr) { - wxToolBarBase *src; +static void *SwigwxToolBarTowxControl(void *ptr) { + wxToolBar *src; wxControl *dest; - src = (wxToolBarBase *) ptr; + src = (wxToolBar *) ptr; dest = (wxControl *) src; return (void *) dest; } -static void *SwigwxToolBarBaseTowxWindow(void *ptr) { - wxToolBarBase *src; +static void *SwigwxToolBarTowxWindow(void *ptr) { + wxToolBar *src; wxWindow *dest; - src = (wxToolBarBase *) ptr; + src = (wxToolBar *) ptr; dest = (wxWindow *) src; return (void *) dest; } -static void *SwigwxToolBarBaseTowxEvtHandler(void *ptr) { - wxToolBarBase *src; +static void *SwigwxToolBarTowxEvtHandler(void *ptr) { + wxToolBar *src; wxEvtHandler *dest; - src = (wxToolBarBase *) ptr; + src = (wxToolBar *) ptr; dest = (wxEvtHandler *) src; return (void *) dest; } -#define wxToolBarBase_AddSeparator(_swigobj) (_swigobj->AddSeparator()) -static PyObject *_wrap_wxToolBarBase_AddSeparator(PyObject *self, PyObject *args) { +#define new_wxToolBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxToolBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxToolBar * _result; + wxWindow * _arg0; + wxWindowID _arg1; + wxPoint * _arg2 = &wxPyDefaultPosition; + wxSize * _arg3 = &wxPyDefaultSize; + long _arg4 = (wxTB_HORIZONTAL)|(wxNO_BORDER); + char * _arg5 = "toolBar"; + char * _argc0 = 0; + char * _argc2 = 0; + char * _argc3 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"si|ssls:new_wxToolBar",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxToolBar. Expected _wxWindow_p."); + return NULL; + } + } + if (_argc2) { + if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxToolBar. Expected _wxPoint_p."); + return NULL; + } + } + if (_argc3) { + if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxToolBar. Expected _wxSize_p."); + return NULL; + } + } + _result = (wxToolBar *)new_wxToolBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxToolBar_AddSeparator(_swigobj) (_swigobj->AddSeparator()) +static PyObject *_wrap_wxToolBar_AddSeparator(PyObject *self, PyObject *args) { PyObject * _resultobj; - wxToolBarBase * _arg0; + wxToolBar * _arg0; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxToolBarBase_AddSeparator",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxToolBar_AddSeparator",&_argc0)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_AddSeparator. Expected _wxToolBarBase_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_AddSeparator. Expected _wxToolBar_p."); return NULL; } } - wxToolBarBase_AddSeparator(_arg0); + wxToolBar_AddSeparator(_arg0); Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; } -static wxToolBarTool * wxToolBarBase_AddTool(wxToolBarBase *self,int toolIndex,const wxBitmap & bitmap1,const wxBitmap & bitmap2,int isToggle,long xPos,long yPos,const wxString & shortHelpString,const wxString & longHelpString) { +static wxToolBarTool * wxToolBar_AddTool(wxToolBar *self,int toolIndex,const wxBitmap & bitmap1,const wxBitmap & bitmap2,int isToggle,long xPos,long yPos,const wxString & shortHelpString,const wxString & longHelpString) { return self->AddTool(toolIndex, bitmap1, bitmap2, isToggle, xPos, yPos, NULL, shortHelpString, longHelpString); } -static PyObject *_wrap_wxToolBarBase_AddTool(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxToolBar_AddTool(PyObject *self, PyObject *args) { PyObject * _resultobj; wxToolBarTool * _result; - wxToolBarBase * _arg0; + wxToolBar * _arg0; int _arg1; wxBitmap * _arg2; wxBitmap * _arg3 = &wxNullBitmap; @@ -942,23 +984,23 @@ static PyObject *_wrap_wxToolBarBase_AddTool(PyObject *self, PyObject *args) { char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"sis|sillOO:wxToolBarBase_AddTool",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5,&_arg6,&_obj7,&_obj8)) + if(!PyArg_ParseTuple(args,"sis|sillOO:wxToolBar_AddTool",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5,&_arg6,&_obj7,&_obj8)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_AddTool. Expected _wxToolBarBase_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_AddTool. Expected _wxToolBar_p."); return NULL; } } if (_argc2) { if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxBitmap_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxToolBarBase_AddTool. Expected _wxBitmap_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxToolBar_AddTool. Expected _wxBitmap_p."); return NULL; } } if (_argc3) { if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxBitmap_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxToolBarBase_AddTool. Expected _wxBitmap_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxToolBar_AddTool. Expected _wxBitmap_p."); return NULL; } } @@ -978,7 +1020,7 @@ static PyObject *_wrap_wxToolBarBase_AddTool(PyObject *self, PyObject *args) { } _arg8 = new wxString(PyString_AsString(_obj8)); } - _result = (wxToolBarTool *)wxToolBarBase_AddTool(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7,*_arg8); + _result = (wxToolBarTool *)wxToolBar_AddTool(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7,*_arg8); SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p"); _resultobj = Py_BuildValue("s",_ptemp); { @@ -992,165 +1034,165 @@ static PyObject *_wrap_wxToolBarBase_AddTool(PyObject *self, PyObject *args) { return _resultobj; } -#define wxToolBarBase_EnableTool(_swigobj,_swigarg0,_swigarg1) (_swigobj->EnableTool(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxToolBarBase_EnableTool(PyObject *self, PyObject *args) { +#define wxToolBar_EnableTool(_swigobj,_swigarg0,_swigarg1) (_swigobj->EnableTool(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxToolBar_EnableTool(PyObject *self, PyObject *args) { PyObject * _resultobj; - wxToolBarBase * _arg0; + wxToolBar * _arg0; int _arg1; bool _arg2; char * _argc0 = 0; int tempbool2; self = self; - if(!PyArg_ParseTuple(args,"sii:wxToolBarBase_EnableTool",&_argc0,&_arg1,&tempbool2)) + if(!PyArg_ParseTuple(args,"sii:wxToolBar_EnableTool",&_argc0,&_arg1,&tempbool2)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_EnableTool. Expected _wxToolBarBase_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_EnableTool. Expected _wxToolBar_p."); return NULL; } } _arg2 = (bool ) tempbool2; - wxToolBarBase_EnableTool(_arg0,_arg1,_arg2); + wxToolBar_EnableTool(_arg0,_arg1,_arg2); Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; } -#define wxToolBarBase_FindToolForPosition(_swigobj,_swigarg0,_swigarg1) (_swigobj->FindToolForPosition(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxToolBarBase_FindToolForPosition(PyObject *self, PyObject *args) { +#define wxToolBar_FindToolForPosition(_swigobj,_swigarg0,_swigarg1) (_swigobj->FindToolForPosition(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxToolBar_FindToolForPosition(PyObject *self, PyObject *args) { PyObject * _resultobj; wxToolBarTool * _result; - wxToolBarBase * _arg0; + wxToolBar * _arg0; float _arg1; float _arg2; char * _argc0 = 0; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"sff:wxToolBarBase_FindToolForPosition",&_argc0,&_arg1,&_arg2)) + if(!PyArg_ParseTuple(args,"sff:wxToolBar_FindToolForPosition",&_argc0,&_arg1,&_arg2)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_FindToolForPosition. Expected _wxToolBarBase_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_FindToolForPosition. Expected _wxToolBar_p."); return NULL; } } - _result = (wxToolBarTool *)wxToolBarBase_FindToolForPosition(_arg0,_arg1,_arg2); + _result = (wxToolBarTool *)wxToolBar_FindToolForPosition(_arg0,_arg1,_arg2); SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxToolBarBase_GetToolSize(_swigobj) (_swigobj->GetToolSize()) -static PyObject *_wrap_wxToolBarBase_GetToolSize(PyObject *self, PyObject *args) { +#define wxToolBar_GetToolSize(_swigobj) (_swigobj->GetToolSize()) +static PyObject *_wrap_wxToolBar_GetToolSize(PyObject *self, PyObject *args) { PyObject * _resultobj; wxSize * _result; - wxToolBarBase * _arg0; + wxToolBar * _arg0; char * _argc0 = 0; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"s:wxToolBarBase_GetToolSize",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxToolBar_GetToolSize",&_argc0)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolSize. Expected _wxToolBarBase_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolSize. Expected _wxToolBar_p."); return NULL; } } - _result = new wxSize (wxToolBarBase_GetToolSize(_arg0)); + _result = new wxSize (wxToolBar_GetToolSize(_arg0)); SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxToolBarBase_GetToolBitmapSize(_swigobj) (_swigobj->GetToolBitmapSize()) -static PyObject *_wrap_wxToolBarBase_GetToolBitmapSize(PyObject *self, PyObject *args) { +#define wxToolBar_GetToolBitmapSize(_swigobj) (_swigobj->GetToolBitmapSize()) +static PyObject *_wrap_wxToolBar_GetToolBitmapSize(PyObject *self, PyObject *args) { PyObject * _resultobj; wxSize * _result; - wxToolBarBase * _arg0; + wxToolBar * _arg0; char * _argc0 = 0; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"s:wxToolBarBase_GetToolBitmapSize",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxToolBar_GetToolBitmapSize",&_argc0)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolBitmapSize. Expected _wxToolBarBase_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolBitmapSize. Expected _wxToolBar_p."); return NULL; } } - _result = new wxSize (wxToolBarBase_GetToolBitmapSize(_arg0)); + _result = new wxSize (wxToolBar_GetToolBitmapSize(_arg0)); SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxToolBarBase_GetMaxSize(_swigobj) (_swigobj->GetMaxSize()) -static PyObject *_wrap_wxToolBarBase_GetMaxSize(PyObject *self, PyObject *args) { +#define wxToolBar_GetMaxSize(_swigobj) (_swigobj->GetMaxSize()) +static PyObject *_wrap_wxToolBar_GetMaxSize(PyObject *self, PyObject *args) { PyObject * _resultobj; wxSize * _result; - wxToolBarBase * _arg0; + wxToolBar * _arg0; char * _argc0 = 0; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"s:wxToolBarBase_GetMaxSize",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxToolBar_GetMaxSize",&_argc0)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetMaxSize. Expected _wxToolBarBase_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetMaxSize. Expected _wxToolBar_p."); return NULL; } } - _result = new wxSize (wxToolBarBase_GetMaxSize(_arg0)); + _result = new wxSize (wxToolBar_GetMaxSize(_arg0)); SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxToolBarBase_GetToolEnabled(_swigobj,_swigarg0) (_swigobj->GetToolEnabled(_swigarg0)) -static PyObject *_wrap_wxToolBarBase_GetToolEnabled(PyObject *self, PyObject *args) { +#define wxToolBar_GetToolEnabled(_swigobj,_swigarg0) (_swigobj->GetToolEnabled(_swigarg0)) +static PyObject *_wrap_wxToolBar_GetToolEnabled(PyObject *self, PyObject *args) { PyObject * _resultobj; bool _result; - wxToolBarBase * _arg0; + wxToolBar * _arg0; int _arg1; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"si:wxToolBarBase_GetToolEnabled",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"si:wxToolBar_GetToolEnabled",&_argc0,&_arg1)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolEnabled. Expected _wxToolBarBase_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolEnabled. Expected _wxToolBar_p."); return NULL; } } - _result = (bool )wxToolBarBase_GetToolEnabled(_arg0,_arg1); + _result = (bool )wxToolBar_GetToolEnabled(_arg0,_arg1); _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBarBase_GetToolLongHelp(_swigobj,_swigarg0) (_swigobj->GetToolLongHelp(_swigarg0)) -static PyObject *_wrap_wxToolBarBase_GetToolLongHelp(PyObject *self, PyObject *args) { +#define wxToolBar_GetToolLongHelp(_swigobj,_swigarg0) (_swigobj->GetToolLongHelp(_swigarg0)) +static PyObject *_wrap_wxToolBar_GetToolLongHelp(PyObject *self, PyObject *args) { PyObject * _resultobj; wxString * _result; - wxToolBarBase * _arg0; + wxToolBar * _arg0; int _arg1; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"si:wxToolBarBase_GetToolLongHelp",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"si:wxToolBar_GetToolLongHelp",&_argc0,&_arg1)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolLongHelp. Expected _wxToolBarBase_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolLongHelp. Expected _wxToolBar_p."); return NULL; } } - _result = new wxString (wxToolBarBase_GetToolLongHelp(_arg0,_arg1)); + _result = new wxString (wxToolBar_GetToolLongHelp(_arg0,_arg1)); { _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); } @@ -1160,66 +1202,66 @@ static PyObject *_wrap_wxToolBarBase_GetToolLongHelp(PyObject *self, PyObject *a return _resultobj; } -#define wxToolBarBase_GetToolPacking(_swigobj) (_swigobj->GetToolPacking()) -static PyObject *_wrap_wxToolBarBase_GetToolPacking(PyObject *self, PyObject *args) { +#define wxToolBar_GetToolPacking(_swigobj) (_swigobj->GetToolPacking()) +static PyObject *_wrap_wxToolBar_GetToolPacking(PyObject *self, PyObject *args) { PyObject * _resultobj; int _result; - wxToolBarBase * _arg0; + wxToolBar * _arg0; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxToolBarBase_GetToolPacking",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxToolBar_GetToolPacking",&_argc0)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolPacking. Expected _wxToolBarBase_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolPacking. Expected _wxToolBar_p."); return NULL; } } - _result = (int )wxToolBarBase_GetToolPacking(_arg0); + _result = (int )wxToolBar_GetToolPacking(_arg0); _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBarBase_GetToolSeparation(_swigobj) (_swigobj->GetToolSeparation()) -static PyObject *_wrap_wxToolBarBase_GetToolSeparation(PyObject *self, PyObject *args) { +#define wxToolBar_GetToolSeparation(_swigobj) (_swigobj->GetToolSeparation()) +static PyObject *_wrap_wxToolBar_GetToolSeparation(PyObject *self, PyObject *args) { PyObject * _resultobj; int _result; - wxToolBarBase * _arg0; + wxToolBar * _arg0; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxToolBarBase_GetToolSeparation",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxToolBar_GetToolSeparation",&_argc0)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolSeparation. Expected _wxToolBarBase_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolSeparation. Expected _wxToolBar_p."); return NULL; } } - _result = (int )wxToolBarBase_GetToolSeparation(_arg0); + _result = (int )wxToolBar_GetToolSeparation(_arg0); _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBarBase_GetToolShortHelp(_swigobj,_swigarg0) (_swigobj->GetToolShortHelp(_swigarg0)) -static PyObject *_wrap_wxToolBarBase_GetToolShortHelp(PyObject *self, PyObject *args) { +#define wxToolBar_GetToolShortHelp(_swigobj,_swigarg0) (_swigobj->GetToolShortHelp(_swigarg0)) +static PyObject *_wrap_wxToolBar_GetToolShortHelp(PyObject *self, PyObject *args) { PyObject * _resultobj; wxString * _result; - wxToolBarBase * _arg0; + wxToolBar * _arg0; int _arg1; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"si:wxToolBarBase_GetToolShortHelp",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"si:wxToolBar_GetToolShortHelp",&_argc0,&_arg1)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolShortHelp. Expected _wxToolBarBase_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolShortHelp. Expected _wxToolBar_p."); return NULL; } } - _result = new wxString (wxToolBarBase_GetToolShortHelp(_arg0,_arg1)); + _result = new wxString (wxToolBar_GetToolShortHelp(_arg0,_arg1)); { _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); } @@ -1229,122 +1271,93 @@ static PyObject *_wrap_wxToolBarBase_GetToolShortHelp(PyObject *self, PyObject * return _resultobj; } -#define wxToolBarBase_GetToolState(_swigobj,_swigarg0) (_swigobj->GetToolState(_swigarg0)) -static PyObject *_wrap_wxToolBarBase_GetToolState(PyObject *self, PyObject *args) { +#define wxToolBar_GetToolState(_swigobj,_swigarg0) (_swigobj->GetToolState(_swigarg0)) +static PyObject *_wrap_wxToolBar_GetToolState(PyObject *self, PyObject *args) { PyObject * _resultobj; bool _result; - wxToolBarBase * _arg0; + wxToolBar * _arg0; int _arg1; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"si:wxToolBarBase_GetToolState",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"si:wxToolBar_GetToolState",&_argc0,&_arg1)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolState. Expected _wxToolBarBase_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolState. Expected _wxToolBar_p."); return NULL; } } - _result = (bool )wxToolBarBase_GetToolState(_arg0,_arg1); + _result = (bool )wxToolBar_GetToolState(_arg0,_arg1); _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBarBase_Realize(_swigobj) (_swigobj->Realize()) -static PyObject *_wrap_wxToolBarBase_Realize(PyObject *self, PyObject *args) { +#define wxToolBar_Realize(_swigobj) (_swigobj->Realize()) +static PyObject *_wrap_wxToolBar_Realize(PyObject *self, PyObject *args) { PyObject * _resultobj; bool _result; - wxToolBarBase * _arg0; + wxToolBar * _arg0; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxToolBarBase_Realize",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxToolBar_Realize",&_argc0)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_Realize. Expected _wxToolBarBase_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_Realize. Expected _wxToolBar_p."); return NULL; } } - _result = (bool )wxToolBarBase_Realize(_arg0); + _result = (bool )wxToolBar_Realize(_arg0); _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBarBase_SetToolBitmapSize(_swigobj,_swigarg0) (_swigobj->SetToolBitmapSize(_swigarg0)) -static PyObject *_wrap_wxToolBarBase_SetToolBitmapSize(PyObject *self, PyObject *args) { +#define wxToolBar_SetToolBitmapSize(_swigobj,_swigarg0) (_swigobj->SetToolBitmapSize(_swigarg0)) +static PyObject *_wrap_wxToolBar_SetToolBitmapSize(PyObject *self, PyObject *args) { PyObject * _resultobj; - wxToolBarBase * _arg0; + wxToolBar * _arg0; wxSize * _arg1; char * _argc0 = 0; char * _argc1 = 0; self = self; - if(!PyArg_ParseTuple(args,"ss:wxToolBarBase_SetToolBitmapSize",&_argc0,&_argc1)) + if(!PyArg_ParseTuple(args,"ss:wxToolBar_SetToolBitmapSize",&_argc0,&_argc1)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetToolBitmapSize. Expected _wxToolBarBase_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolBitmapSize. Expected _wxToolBar_p."); return NULL; } } if (_argc1) { if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarBase_SetToolBitmapSize. Expected _wxSize_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBar_SetToolBitmapSize. Expected _wxSize_p."); return NULL; } } - wxToolBarBase_SetToolBitmapSize(_arg0,*_arg1); + wxToolBar_SetToolBitmapSize(_arg0,*_arg1); Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; } -#define wxToolBarBase_SetMargins(_swigobj,_swigarg0) (_swigobj->SetMargins(_swigarg0)) -static PyObject *_wrap_wxToolBarBase_SetMargins(PyObject *self, PyObject *args) { +#define wxToolBar_SetToolLongHelp(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetToolLongHelp(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxToolBar_SetToolLongHelp(PyObject *self, PyObject *args) { PyObject * _resultobj; - wxToolBarBase * _arg0; - wxSize * _arg1; - char * _argc0 = 0; - char * _argc1 = 0; - - self = self; - if(!PyArg_ParseTuple(args,"ss:wxToolBarBase_SetMargins",&_argc0,&_argc1)) - return NULL; - if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetMargins. Expected _wxToolBarBase_p."); - return NULL; - } - } - if (_argc1) { - if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarBase_SetMargins. Expected _wxSize_p."); - return NULL; - } - } - wxToolBarBase_SetMargins(_arg0,*_arg1); - Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxToolBarBase_SetToolLongHelp(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetToolLongHelp(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxToolBarBase_SetToolLongHelp(PyObject *self, PyObject *args) { - PyObject * _resultobj; - wxToolBarBase * _arg0; + wxToolBar * _arg0; int _arg1; wxString * _arg2; char * _argc0 = 0; PyObject * _obj2 = 0; self = self; - if(!PyArg_ParseTuple(args,"siO:wxToolBarBase_SetToolLongHelp",&_argc0,&_arg1,&_obj2)) + if(!PyArg_ParseTuple(args,"siO:wxToolBar_SetToolLongHelp",&_argc0,&_arg1,&_obj2)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetToolLongHelp. Expected _wxToolBarBase_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolLongHelp. Expected _wxToolBar_p."); return NULL; } } @@ -1355,7 +1368,7 @@ static PyObject *_wrap_wxToolBarBase_SetToolLongHelp(PyObject *self, PyObject *a } _arg2 = new wxString(PyString_AsString(_obj2)); } - wxToolBarBase_SetToolLongHelp(_arg0,_arg1,*_arg2); + wxToolBar_SetToolLongHelp(_arg0,_arg1,*_arg2); Py_INCREF(Py_None); _resultobj = Py_None; { @@ -1365,43 +1378,21 @@ static PyObject *_wrap_wxToolBarBase_SetToolLongHelp(PyObject *self, PyObject *a return _resultobj; } -#define wxToolBarBase_SetToolPacking(_swigobj,_swigarg0) (_swigobj->SetToolPacking(_swigarg0)) -static PyObject *_wrap_wxToolBarBase_SetToolPacking(PyObject *self, PyObject *args) { +#define wxToolBar_SetToolShortHelp(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetToolShortHelp(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxToolBar_SetToolShortHelp(PyObject *self, PyObject *args) { PyObject * _resultobj; - wxToolBarBase * _arg0; - int _arg1; - char * _argc0 = 0; - - self = self; - if(!PyArg_ParseTuple(args,"si:wxToolBarBase_SetToolPacking",&_argc0,&_arg1)) - return NULL; - if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetToolPacking. Expected _wxToolBarBase_p."); - return NULL; - } - } - wxToolBarBase_SetToolPacking(_arg0,_arg1); - Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxToolBarBase_SetToolShortHelp(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetToolShortHelp(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxToolBarBase_SetToolShortHelp(PyObject *self, PyObject *args) { - PyObject * _resultobj; - wxToolBarBase * _arg0; + wxToolBar * _arg0; int _arg1; wxString * _arg2; char * _argc0 = 0; PyObject * _obj2 = 0; self = self; - if(!PyArg_ParseTuple(args,"siO:wxToolBarBase_SetToolShortHelp",&_argc0,&_arg1,&_obj2)) + if(!PyArg_ParseTuple(args,"siO:wxToolBar_SetToolShortHelp",&_argc0,&_arg1,&_obj2)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetToolShortHelp. Expected _wxToolBarBase_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolShortHelp. Expected _wxToolBar_p."); return NULL; } } @@ -1412,7 +1403,7 @@ static PyObject *_wrap_wxToolBarBase_SetToolShortHelp(PyObject *self, PyObject * } _arg2 = new wxString(PyString_AsString(_obj2)); } - wxToolBarBase_SetToolShortHelp(_arg0,_arg1,*_arg2); + wxToolBar_SetToolShortHelp(_arg0,_arg1,*_arg2); Py_INCREF(Py_None); _resultobj = Py_None; { @@ -1422,225 +1413,127 @@ static PyObject *_wrap_wxToolBarBase_SetToolShortHelp(PyObject *self, PyObject * return _resultobj; } -#define wxToolBarBase_SetToolSeparation(_swigobj,_swigarg0) (_swigobj->SetToolSeparation(_swigarg0)) -static PyObject *_wrap_wxToolBarBase_SetToolSeparation(PyObject *self, PyObject *args) { +#define wxToolBar_SetMargins(_swigobj,_swigarg0) (_swigobj->SetMargins(_swigarg0)) +static PyObject *_wrap_wxToolBar_SetMargins(PyObject *self, PyObject *args) { PyObject * _resultobj; - wxToolBarBase * _arg0; - int _arg1; + wxToolBar * _arg0; + wxSize * _arg1; char * _argc0 = 0; + char * _argc1 = 0; self = self; - if(!PyArg_ParseTuple(args,"si:wxToolBarBase_SetToolSeparation",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"ss:wxToolBar_SetMargins",&_argc0,&_argc1)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetToolSeparation. Expected _wxToolBarBase_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetMargins. Expected _wxToolBar_p."); return NULL; } } - wxToolBarBase_SetToolSeparation(_arg0,_arg1); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBar_SetMargins. Expected _wxSize_p."); + return NULL; + } + } + wxToolBar_SetMargins(_arg0,*_arg1); Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; } -#define wxToolBarBase_ToggleTool(_swigobj,_swigarg0,_swigarg1) (_swigobj->ToggleTool(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxToolBarBase_ToggleTool(PyObject *self, PyObject *args) { +#define wxToolBar_SetToolPacking(_swigobj,_swigarg0) (_swigobj->SetToolPacking(_swigarg0)) +static PyObject *_wrap_wxToolBar_SetToolPacking(PyObject *self, PyObject *args) { PyObject * _resultobj; - wxToolBarBase * _arg0; + wxToolBar * _arg0; int _arg1; - bool _arg2; char * _argc0 = 0; - int tempbool2; self = self; - if(!PyArg_ParseTuple(args,"sii:wxToolBarBase_ToggleTool",&_argc0,&_arg1,&tempbool2)) + if(!PyArg_ParseTuple(args,"si:wxToolBar_SetToolPacking",&_argc0,&_arg1)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_ToggleTool. Expected _wxToolBarBase_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolPacking. Expected _wxToolBar_p."); return NULL; } } - _arg2 = (bool ) tempbool2; - wxToolBarBase_ToggleTool(_arg0,_arg1,_arg2); + wxToolBar_SetToolPacking(_arg0,_arg1); Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; } -static void *SwigwxToolBarTowxToolBarBase(void *ptr) { - wxToolBar *src; - wxToolBarBase *dest; - src = (wxToolBar *) ptr; - dest = (wxToolBarBase *) src; - return (void *) dest; -} - -static void *SwigwxToolBarTowxControl(void *ptr) { - wxToolBar *src; - wxControl *dest; - src = (wxToolBar *) ptr; - dest = (wxControl *) src; - return (void *) dest; -} - -static void *SwigwxToolBarTowxWindow(void *ptr) { - wxToolBar *src; - wxWindow *dest; - src = (wxToolBar *) ptr; - dest = (wxWindow *) src; - return (void *) dest; -} - -static void *SwigwxToolBarTowxEvtHandler(void *ptr) { - wxToolBar *src; - wxEvtHandler *dest; - src = (wxToolBar *) ptr; - dest = (wxEvtHandler *) src; - return (void *) dest; -} - -#define new_wxToolBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxToolBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) -static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args) { +#define wxToolBar_SetToolSeparation(_swigobj,_swigarg0) (_swigobj->SetToolSeparation(_swigarg0)) +static PyObject *_wrap_wxToolBar_SetToolSeparation(PyObject *self, PyObject *args) { PyObject * _resultobj; - wxToolBar * _result; - wxWindow * _arg0; - wxWindowID _arg1; - wxPoint * _arg2 = &wxPyDefaultPosition; - wxSize * _arg3 = &wxPyDefaultSize; - long _arg4 = (wxTB_HORIZONTAL)|(wxNO_BORDER); - char * _arg5 = "toolBar"; + wxToolBar * _arg0; + int _arg1; char * _argc0 = 0; - char * _argc2 = 0; - char * _argc3 = 0; - char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"si|ssls:new_wxToolBar",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) + if(!PyArg_ParseTuple(args,"si:wxToolBar_SetToolSeparation",&_argc0,&_arg1)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxToolBar. Expected _wxWindow_p."); - return NULL; - } - } - if (_argc2) { - if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxToolBar. Expected _wxPoint_p."); - return NULL; - } - } - if (_argc3) { - if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxToolBar. Expected _wxSize_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolSeparation. Expected _wxToolBar_p."); return NULL; } } - _result = (wxToolBar *)new_wxToolBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); - SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p"); - _resultobj = Py_BuildValue("s",_ptemp); + wxToolBar_SetToolSeparation(_arg0,_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -static void *SwigwxToolBarSimpleTowxToolBarBase(void *ptr) { - wxToolBarSimple *src; - wxToolBarBase *dest; - src = (wxToolBarSimple *) ptr; - dest = (wxToolBarBase *) src; - return (void *) dest; -} - -static void *SwigwxToolBarSimpleTowxControl(void *ptr) { - wxToolBarSimple *src; - wxControl *dest; - src = (wxToolBarSimple *) ptr; - dest = (wxControl *) src; - return (void *) dest; -} - -static void *SwigwxToolBarSimpleTowxWindow(void *ptr) { - wxToolBarSimple *src; - wxWindow *dest; - src = (wxToolBarSimple *) ptr; - dest = (wxWindow *) src; - return (void *) dest; -} - -static void *SwigwxToolBarSimpleTowxEvtHandler(void *ptr) { - wxToolBarSimple *src; - wxEvtHandler *dest; - src = (wxToolBarSimple *) ptr; - dest = (wxEvtHandler *) src; - return (void *) dest; -} - -#define new_wxToolBarSimple(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxToolBarSimple(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) -static PyObject *_wrap_new_wxToolBarSimple(PyObject *self, PyObject *args) { +#define wxToolBar_ToggleTool(_swigobj,_swigarg0,_swigarg1) (_swigobj->ToggleTool(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxToolBar_ToggleTool(PyObject *self, PyObject *args) { PyObject * _resultobj; - wxToolBarSimple * _result; - wxWindow * _arg0; - wxWindowID _arg1; - wxPoint * _arg2 = &wxPyDefaultPosition; - wxSize * _arg3 = &wxPyDefaultSize; - long _arg4 = (wxTB_HORIZONTAL)|(wxNO_BORDER); - char * _arg5 = "toolBar"; + wxToolBar * _arg0; + int _arg1; + bool _arg2; char * _argc0 = 0; - char * _argc2 = 0; - char * _argc3 = 0; - char _ptemp[128]; + int tempbool2; self = self; - if(!PyArg_ParseTuple(args,"si|ssls:new_wxToolBarSimple",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) + if(!PyArg_ParseTuple(args,"sii:wxToolBar_ToggleTool",&_argc0,&_arg1,&tempbool2)) return NULL; if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxToolBarSimple. Expected _wxWindow_p."); + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_ToggleTool. Expected _wxToolBar_p."); return NULL; } } - if (_argc2) { - if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxToolBarSimple. Expected _wxPoint_p."); - return NULL; - } - } - if (_argc3) { - if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxToolBarSimple. Expected _wxSize_p."); - return NULL; - } - } - _result = (wxToolBarSimple *)new_wxToolBarSimple(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); - SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarSimple_p"); - _resultobj = Py_BuildValue("s",_ptemp); + _arg2 = (bool ) tempbool2; + wxToolBar_ToggleTool(_arg0,_arg1,_arg2); + Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } static PyMethodDef stattoolcMethods[] = { - { "new_wxToolBarSimple", _wrap_new_wxToolBarSimple, 1 }, + { "wxToolBar_ToggleTool", _wrap_wxToolBar_ToggleTool, 1 }, + { "wxToolBar_SetToolSeparation", _wrap_wxToolBar_SetToolSeparation, 1 }, + { "wxToolBar_SetToolPacking", _wrap_wxToolBar_SetToolPacking, 1 }, + { "wxToolBar_SetMargins", _wrap_wxToolBar_SetMargins, 1 }, + { "wxToolBar_SetToolShortHelp", _wrap_wxToolBar_SetToolShortHelp, 1 }, + { "wxToolBar_SetToolLongHelp", _wrap_wxToolBar_SetToolLongHelp, 1 }, + { "wxToolBar_SetToolBitmapSize", _wrap_wxToolBar_SetToolBitmapSize, 1 }, + { "wxToolBar_Realize", _wrap_wxToolBar_Realize, 1 }, + { "wxToolBar_GetToolState", _wrap_wxToolBar_GetToolState, 1 }, + { "wxToolBar_GetToolShortHelp", _wrap_wxToolBar_GetToolShortHelp, 1 }, + { "wxToolBar_GetToolSeparation", _wrap_wxToolBar_GetToolSeparation, 1 }, + { "wxToolBar_GetToolPacking", _wrap_wxToolBar_GetToolPacking, 1 }, + { "wxToolBar_GetToolLongHelp", _wrap_wxToolBar_GetToolLongHelp, 1 }, + { "wxToolBar_GetToolEnabled", _wrap_wxToolBar_GetToolEnabled, 1 }, + { "wxToolBar_GetMaxSize", _wrap_wxToolBar_GetMaxSize, 1 }, + { "wxToolBar_GetToolBitmapSize", _wrap_wxToolBar_GetToolBitmapSize, 1 }, + { "wxToolBar_GetToolSize", _wrap_wxToolBar_GetToolSize, 1 }, + { "wxToolBar_FindToolForPosition", _wrap_wxToolBar_FindToolForPosition, 1 }, + { "wxToolBar_EnableTool", _wrap_wxToolBar_EnableTool, 1 }, + { "wxToolBar_AddTool", _wrap_wxToolBar_AddTool, 1 }, + { "wxToolBar_AddSeparator", _wrap_wxToolBar_AddSeparator, 1 }, { "new_wxToolBar", _wrap_new_wxToolBar, 1 }, - { "wxToolBarBase_ToggleTool", _wrap_wxToolBarBase_ToggleTool, 1 }, - { "wxToolBarBase_SetToolSeparation", _wrap_wxToolBarBase_SetToolSeparation, 1 }, - { "wxToolBarBase_SetToolShortHelp", _wrap_wxToolBarBase_SetToolShortHelp, 1 }, - { "wxToolBarBase_SetToolPacking", _wrap_wxToolBarBase_SetToolPacking, 1 }, - { "wxToolBarBase_SetToolLongHelp", _wrap_wxToolBarBase_SetToolLongHelp, 1 }, - { "wxToolBarBase_SetMargins", _wrap_wxToolBarBase_SetMargins, 1 }, - { "wxToolBarBase_SetToolBitmapSize", _wrap_wxToolBarBase_SetToolBitmapSize, 1 }, - { "wxToolBarBase_Realize", _wrap_wxToolBarBase_Realize, 1 }, - { "wxToolBarBase_GetToolState", _wrap_wxToolBarBase_GetToolState, 1 }, - { "wxToolBarBase_GetToolShortHelp", _wrap_wxToolBarBase_GetToolShortHelp, 1 }, - { "wxToolBarBase_GetToolSeparation", _wrap_wxToolBarBase_GetToolSeparation, 1 }, - { "wxToolBarBase_GetToolPacking", _wrap_wxToolBarBase_GetToolPacking, 1 }, - { "wxToolBarBase_GetToolLongHelp", _wrap_wxToolBarBase_GetToolLongHelp, 1 }, - { "wxToolBarBase_GetToolEnabled", _wrap_wxToolBarBase_GetToolEnabled, 1 }, - { "wxToolBarBase_GetMaxSize", _wrap_wxToolBarBase_GetMaxSize, 1 }, - { "wxToolBarBase_GetToolBitmapSize", _wrap_wxToolBarBase_GetToolBitmapSize, 1 }, - { "wxToolBarBase_GetToolSize", _wrap_wxToolBarBase_GetToolSize, 1 }, - { "wxToolBarBase_FindToolForPosition", _wrap_wxToolBarBase_FindToolForPosition, 1 }, - { "wxToolBarBase_EnableTool", _wrap_wxToolBarBase_EnableTool, 1 }, - { "wxToolBarBase_AddTool", _wrap_wxToolBarBase_AddTool, 1 }, - { "wxToolBarBase_AddSeparator", _wrap_wxToolBarBase_AddSeparator, 1 }, { "wxToolBarTool_m_longHelpString_get", _wrap_wxToolBarTool_m_longHelpString_get, 1 }, { "wxToolBarTool_m_shortHelpString_get", _wrap_wxToolBarTool_m_shortHelpString_get, 1 }, { "wxToolBarTool_m_isMenuCommand_get", _wrap_wxToolBarTool_m_isMenuCommand_get, 1 }, @@ -1693,23 +1586,14 @@ SWIGEXPORT(void,initstattoolc)() { SWIG_RegisterMapping("_signed_long","_long",0); SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0); SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0); - SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxEvtHandler); - SWIG_RegisterMapping("_class_wxEvtHandler","_wxToolBarSimple",SwigwxToolBarSimpleTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxToolBar",SwigwxToolBarTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_wxToolBar",SwigwxToolBarTowxEvtHandler); - SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxToolBarBase",SwigwxToolBarBaseTowxEvtHandler); - SWIG_RegisterMapping("_class_wxEvtHandler","_wxToolBarBase",SwigwxToolBarBaseTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxStatusBar",SwigwxStatusBarTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_wxStatusBar",SwigwxStatusBarTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0); SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0); SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); - SWIG_RegisterMapping("_class_wxToolBarBase","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxToolBarBase); - SWIG_RegisterMapping("_class_wxToolBarBase","_wxToolBarSimple",SwigwxToolBarSimpleTowxToolBarBase); - SWIG_RegisterMapping("_class_wxToolBarBase","_class_wxToolBar",SwigwxToolBarTowxToolBarBase); - SWIG_RegisterMapping("_class_wxToolBarBase","_wxToolBar",SwigwxToolBarTowxToolBarBase); - SWIG_RegisterMapping("_class_wxToolBarBase","_wxToolBarBase",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0); SWIG_RegisterMapping("_wxPen","_class_wxPen",0); @@ -1732,7 +1616,6 @@ SWIGEXPORT(void,initstattoolc)() { SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0); SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0); - SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0); SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0); SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0); SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0); @@ -1765,7 +1648,6 @@ SWIGEXPORT(void,initstattoolc)() { SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0); SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0); - SWIG_RegisterMapping("_wxToolBarSimple","_class_wxToolBarSimple",0); SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0); SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0); SWIG_RegisterMapping("_EBool","_signed_int",0); @@ -1798,19 +1680,14 @@ SWIGEXPORT(void,initstattoolc)() { SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0); SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0); SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0); - SWIG_RegisterMapping("_class_wxToolBarSimple","_wxToolBarSimple",0); SWIG_RegisterMapping("_WXTYPE","_short",0); SWIG_RegisterMapping("_WXTYPE","_signed_short",0); SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0); SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0); SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0); SWIG_RegisterMapping("_unsigned_short","_short",0); - SWIG_RegisterMapping("_class_wxWindow","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxWindow); - SWIG_RegisterMapping("_class_wxWindow","_wxToolBarSimple",SwigwxToolBarSimpleTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_class_wxToolBar",SwigwxToolBarTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_wxToolBar",SwigwxToolBarTowxWindow); - SWIG_RegisterMapping("_class_wxWindow","_class_wxToolBarBase",SwigwxToolBarBaseTowxWindow); - SWIG_RegisterMapping("_class_wxWindow","_wxToolBarBase",SwigwxToolBarBaseTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_class_wxStatusBar",SwigwxStatusBarTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_wxStatusBar",SwigwxStatusBarTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0); @@ -1833,17 +1710,12 @@ SWIGEXPORT(void,initstattoolc)() { SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0); SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0); - SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0); SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0); SWIG_RegisterMapping("_unsigned_char","_byte",0); SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0); SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0); - SWIG_RegisterMapping("_wxControl","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxControl); - SWIG_RegisterMapping("_wxControl","_wxToolBarSimple",SwigwxToolBarSimpleTowxControl); SWIG_RegisterMapping("_wxControl","_class_wxToolBar",SwigwxToolBarTowxControl); SWIG_RegisterMapping("_wxControl","_wxToolBar",SwigwxToolBarTowxControl); - SWIG_RegisterMapping("_wxControl","_class_wxToolBarBase",SwigwxToolBarBaseTowxControl); - SWIG_RegisterMapping("_wxControl","_wxToolBarBase",SwigwxToolBarBaseTowxControl); SWIG_RegisterMapping("_wxControl","_class_wxControl",0); SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); @@ -1881,19 +1753,10 @@ SWIGEXPORT(void,initstattoolc)() { SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0); SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0); SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0); - SWIG_RegisterMapping("_wxToolBarBase","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxToolBarBase); - SWIG_RegisterMapping("_wxToolBarBase","_wxToolBarSimple",SwigwxToolBarSimpleTowxToolBarBase); - SWIG_RegisterMapping("_wxToolBarBase","_class_wxToolBar",SwigwxToolBarTowxToolBarBase); - SWIG_RegisterMapping("_wxToolBarBase","_wxToolBar",SwigwxToolBarTowxToolBarBase); - SWIG_RegisterMapping("_wxToolBarBase","_class_wxToolBarBase",0); SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0); SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0); - SWIG_RegisterMapping("_class_wxControl","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxControl); - SWIG_RegisterMapping("_class_wxControl","_wxToolBarSimple",SwigwxToolBarSimpleTowxControl); SWIG_RegisterMapping("_class_wxControl","_class_wxToolBar",SwigwxToolBarTowxControl); SWIG_RegisterMapping("_class_wxControl","_wxToolBar",SwigwxToolBarTowxControl); - SWIG_RegisterMapping("_class_wxControl","_class_wxToolBarBase",SwigwxToolBarBaseTowxControl); - SWIG_RegisterMapping("_class_wxControl","_wxToolBarBase",SwigwxToolBarBaseTowxControl); SWIG_RegisterMapping("_class_wxControl","_wxControl",0); SWIG_RegisterMapping("_wxStaticBitmap","_class_wxStaticBitmap",0); SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0); @@ -1913,12 +1776,8 @@ SWIGEXPORT(void,initstattoolc)() { SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0); SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0); SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0); - SWIG_RegisterMapping("_wxEvtHandler","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxEvtHandler); - SWIG_RegisterMapping("_wxEvtHandler","_wxToolBarSimple",SwigwxToolBarSimpleTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxToolBar",SwigwxToolBarTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_wxToolBar",SwigwxToolBarTowxEvtHandler); - SWIG_RegisterMapping("_wxEvtHandler","_class_wxToolBarBase",SwigwxToolBarBaseTowxEvtHandler); - SWIG_RegisterMapping("_wxEvtHandler","_wxToolBarBase",SwigwxToolBarBaseTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxStatusBar",SwigwxStatusBarTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_wxStatusBar",SwigwxStatusBarTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0); @@ -1930,12 +1789,8 @@ SWIGEXPORT(void,initstattoolc)() { SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0); SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0); SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0); - SWIG_RegisterMapping("_wxWindow","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxWindow); - SWIG_RegisterMapping("_wxWindow","_wxToolBarSimple",SwigwxToolBarSimpleTowxWindow); SWIG_RegisterMapping("_wxWindow","_class_wxToolBar",SwigwxToolBarTowxWindow); SWIG_RegisterMapping("_wxWindow","_wxToolBar",SwigwxToolBarTowxWindow); - SWIG_RegisterMapping("_wxWindow","_class_wxToolBarBase",SwigwxToolBarBaseTowxWindow); - SWIG_RegisterMapping("_wxWindow","_wxToolBarBase",SwigwxToolBarBaseTowxWindow); SWIG_RegisterMapping("_wxWindow","_class_wxStatusBar",SwigwxStatusBarTowxWindow); SWIG_RegisterMapping("_wxWindow","_wxStatusBar",SwigwxStatusBarTowxWindow); SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0); diff --git a/utils/wxPython/src/msw/stattool.py b/utils/wxPython/src/msw/stattool.py index 41aa0ae188..f16438105e 100644 --- a/utils/wxPython/src/msw/stattool.py +++ b/utils/wxPython/src/msw/stattool.py @@ -170,98 +170,85 @@ class wxToolBarTool(wxToolBarToolPtr): -class wxToolBarBasePtr(wxControlPtr): +class wxToolBarPtr(wxControlPtr): def __init__(self,this): self.this = this self.thisown = 0 def AddSeparator(self): - val = stattoolc.wxToolBarBase_AddSeparator(self.this) + val = stattoolc.wxToolBar_AddSeparator(self.this) return val def AddTool(self,arg0,arg1,*args): argl = map(None,args) try: argl[0] = argl[0].this except: pass args = tuple(argl) - val = apply(stattoolc.wxToolBarBase_AddTool,(self.this,arg0,arg1.this,)+args) + val = apply(stattoolc.wxToolBar_AddTool,(self.this,arg0,arg1.this,)+args) val = wxToolBarToolPtr(val) return val def EnableTool(self,arg0,arg1): - val = stattoolc.wxToolBarBase_EnableTool(self.this,arg0,arg1) + val = stattoolc.wxToolBar_EnableTool(self.this,arg0,arg1) return val def FindToolForPosition(self,arg0,arg1): - val = stattoolc.wxToolBarBase_FindToolForPosition(self.this,arg0,arg1) + val = stattoolc.wxToolBar_FindToolForPosition(self.this,arg0,arg1) val = wxToolBarToolPtr(val) return val def GetToolSize(self): - val = stattoolc.wxToolBarBase_GetToolSize(self.this) + val = stattoolc.wxToolBar_GetToolSize(self.this) val = wxSizePtr(val) val.thisown = 1 return val def GetToolBitmapSize(self): - val = stattoolc.wxToolBarBase_GetToolBitmapSize(self.this) + val = stattoolc.wxToolBar_GetToolBitmapSize(self.this) val = wxSizePtr(val) val.thisown = 1 return val def GetMaxSize(self): - val = stattoolc.wxToolBarBase_GetMaxSize(self.this) + val = stattoolc.wxToolBar_GetMaxSize(self.this) val = wxSizePtr(val) val.thisown = 1 return val def GetToolEnabled(self,arg0): - val = stattoolc.wxToolBarBase_GetToolEnabled(self.this,arg0) + val = stattoolc.wxToolBar_GetToolEnabled(self.this,arg0) return val def GetToolLongHelp(self,arg0): - val = stattoolc.wxToolBarBase_GetToolLongHelp(self.this,arg0) + val = stattoolc.wxToolBar_GetToolLongHelp(self.this,arg0) return val def GetToolPacking(self): - val = stattoolc.wxToolBarBase_GetToolPacking(self.this) + val = stattoolc.wxToolBar_GetToolPacking(self.this) return val def GetToolSeparation(self): - val = stattoolc.wxToolBarBase_GetToolSeparation(self.this) + val = stattoolc.wxToolBar_GetToolSeparation(self.this) return val def GetToolShortHelp(self,arg0): - val = stattoolc.wxToolBarBase_GetToolShortHelp(self.this,arg0) + val = stattoolc.wxToolBar_GetToolShortHelp(self.this,arg0) return val def GetToolState(self,arg0): - val = stattoolc.wxToolBarBase_GetToolState(self.this,arg0) + val = stattoolc.wxToolBar_GetToolState(self.this,arg0) return val def Realize(self): - val = stattoolc.wxToolBarBase_Realize(self.this) + val = stattoolc.wxToolBar_Realize(self.this) return val def SetToolBitmapSize(self,arg0): - val = stattoolc.wxToolBarBase_SetToolBitmapSize(self.this,arg0.this) - return val - def SetMargins(self,arg0): - val = stattoolc.wxToolBarBase_SetMargins(self.this,arg0.this) + val = stattoolc.wxToolBar_SetToolBitmapSize(self.this,arg0.this) return val def SetToolLongHelp(self,arg0,arg1): - val = stattoolc.wxToolBarBase_SetToolLongHelp(self.this,arg0,arg1) - return val - def SetToolPacking(self,arg0): - val = stattoolc.wxToolBarBase_SetToolPacking(self.this,arg0) + val = stattoolc.wxToolBar_SetToolLongHelp(self.this,arg0,arg1) return val def SetToolShortHelp(self,arg0,arg1): - val = stattoolc.wxToolBarBase_SetToolShortHelp(self.this,arg0,arg1) + val = stattoolc.wxToolBar_SetToolShortHelp(self.this,arg0,arg1) + return val + def SetMargins(self,arg0): + val = stattoolc.wxToolBar_SetMargins(self.this,arg0.this) + return val + def SetToolPacking(self,arg0): + val = stattoolc.wxToolBar_SetToolPacking(self.this,arg0) return val def SetToolSeparation(self,arg0): - val = stattoolc.wxToolBarBase_SetToolSeparation(self.this,arg0) + val = stattoolc.wxToolBar_SetToolSeparation(self.this,arg0) return val def ToggleTool(self,arg0,arg1): - val = stattoolc.wxToolBarBase_ToggleTool(self.this,arg0,arg1) + val = stattoolc.wxToolBar_ToggleTool(self.this,arg0,arg1) return val - def __repr__(self): - return "" -class wxToolBarBase(wxToolBarBasePtr): - def __init__(self,this): - self.this = this - - - - -class wxToolBarPtr(wxToolBarBasePtr): - def __init__(self,this): - self.this = this - self.thisown = 0 def __repr__(self): return "" class wxToolBar(wxToolBarPtr): @@ -279,27 +266,6 @@ class wxToolBar(wxToolBarPtr): -class wxToolBarSimplePtr(wxToolBarBasePtr): - def __init__(self,this): - self.this = this - self.thisown = 0 - def __repr__(self): - return "" -class wxToolBarSimple(wxToolBarSimplePtr): - def __init__(self,arg0,arg1,*args) : - argl = map(None,args) - try: argl[0] = argl[0].this - except: pass - try: argl[1] = argl[1].this - except: pass - args = tuple(argl) - self.this = apply(stattoolc.new_wxToolBarSimple,(arg0.this,arg1,)+args) - self.thisown = 1 - wxp._StdWindowCallbacks(self) - - - - #-------------- FUNCTION WRAPPERS ------------------ diff --git a/utils/wxPython/src/msw/windows.cpp b/utils/wxPython/src/msw/windows.cpp index f915c01711..0d09c466ff 100644 --- a/utils/wxPython/src/msw/windows.cpp +++ b/utils/wxPython/src/msw/windows.cpp @@ -4441,7 +4441,6 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); - SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0); SWIG_RegisterMapping("_wxPanel","_class_wxDialog",SwigwxDialogTowxPanel); SWIG_RegisterMapping("_wxPanel","_wxDialog",SwigwxDialogTowxPanel); SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0); @@ -4502,7 +4501,6 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0); SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0); - SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0); SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0); SWIG_RegisterMapping("_unsigned_char","_byte",0); SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0); diff --git a/utils/wxPython/src/msw/windows2.cpp b/utils/wxPython/src/msw/windows2.cpp index 0701546d65..40f0928a00 100644 --- a/utils/wxPython/src/msw/windows2.cpp +++ b/utils/wxPython/src/msw/windows2.cpp @@ -3200,7 +3200,6 @@ SWIGEXPORT(void,initwindows2c)() { SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0); - SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0); SWIG_RegisterMapping("_wxPanel","_class_wxGrid",SwigwxGridTowxPanel); SWIG_RegisterMapping("_wxPanel","_wxGrid",SwigwxGridTowxPanel); SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0); @@ -3305,7 +3304,6 @@ SWIGEXPORT(void,initwindows2c)() { SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0); SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0); - SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0); SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0); SWIG_RegisterMapping("_unsigned_char","_byte",0); SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0); diff --git a/utils/wxPython/src/msw/wxp.cpp b/utils/wxPython/src/msw/wxp.cpp index 13bdf85466..33c4a7e599 100644 --- a/utils/wxPython/src/msw/wxp.cpp +++ b/utils/wxPython/src/msw/wxp.cpp @@ -33,8 +33,10 @@ * and things like that. * * $Log$ - * Revision 1.2 1998/10/02 06:42:02 RD - * Version 0.4 of wxPython for MSW. + * Revision 1.3 1998/10/20 06:45:09 RD + * New wxTreeCtrl wrappers (untested) + * some changes in helpers + * etc. * ************************************************************************/ @@ -1303,6 +1305,7 @@ SWIGEXPORT(void,initwxpc)() { PyDict_SetItemString(d,"wxBU_NOAUTODRAW", PyInt_FromLong((long) wxBU_NOAUTODRAW)); PyDict_SetItemString(d,"wxTR_HAS_BUTTONS", PyInt_FromLong((long) wxTR_HAS_BUTTONS)); PyDict_SetItemString(d,"wxTR_EDIT_LABELS", PyInt_FromLong((long) wxTR_EDIT_LABELS)); + PyDict_SetItemString(d,"wxTR_LINES_AT_ROOT", PyInt_FromLong((long) wxTR_LINES_AT_ROOT)); PyDict_SetItemString(d,"wxLC_ICON", PyInt_FromLong((long) wxLC_ICON)); PyDict_SetItemString(d,"wxLC_SMALL_ICON", PyInt_FromLong((long) wxLC_SMALL_ICON)); PyDict_SetItemString(d,"wxLC_LIST", PyInt_FromLong((long) wxLC_LIST)); @@ -1719,7 +1722,7 @@ SWIGEXPORT(void,initwxpc)() { PyDict_SetItemString(d,"wxEVT_COMMAND_TAB_SEL_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_TAB_SEL_CHANGING)); PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)); PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)); - PyDict_SetItemString(d,"__version__", PyString_FromString("0.3.1")); + PyDict_SetItemString(d,"__version__", PyString_FromString("0.4.1")); PyDict_SetItemString(d,"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set); SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set); @@ -1761,7 +1764,6 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0); SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); - SWIG_RegisterMapping("_class_wxToolBarBase","_wxToolBarBase",0); SWIG_RegisterMapping("_class_wxTreeCtrl","_wxTreeCtrl",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0); @@ -1791,7 +1793,6 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0); SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0); - SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0); SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0); SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0); SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0); @@ -1821,6 +1822,7 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0); SWIG_RegisterMapping("_class_wxButton","_wxButton",0); SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0); + SWIG_RegisterMapping("_wxTreeItemData","_class_wxTreeItemData",0); SWIG_RegisterMapping("_class_wxFontData","_wxFontData",0); SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0); SWIG_RegisterMapping("_wxPrintDialog","_class_wxPrintDialog",0); @@ -1835,7 +1837,6 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_wxTextEntryDialog","_class_wxTextEntryDialog",0); SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0); SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0); - SWIG_RegisterMapping("_wxToolBarSimple","_class_wxToolBarSimple",0); SWIG_RegisterMapping("_wxMDIChildFrame","_class_wxMDIChildFrame",0); SWIG_RegisterMapping("_wxListItem","_class_wxListItem",0); SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0); @@ -1876,7 +1877,6 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0); SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0); SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0); - SWIG_RegisterMapping("_class_wxToolBarSimple","_wxToolBarSimple",0); SWIG_RegisterMapping("_class_wxMDIChildFrame","_wxMDIChildFrame",0); SWIG_RegisterMapping("_WXTYPE","_short",0); SWIG_RegisterMapping("_WXTYPE","_signed_short",0); @@ -1891,7 +1891,6 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0); SWIG_RegisterMapping("_class_wxFont","_wxFont",0); SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0); - SWIG_RegisterMapping("_wxTreeItem","_class_wxTreeItem",0); SWIG_RegisterMapping("_class_wxMenuEvent","_wxMenuEvent",0); SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0); SWIG_RegisterMapping("_wxMouseEvent","_class_wxMouseEvent",0); @@ -1912,8 +1911,8 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0); SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0); - SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0); SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0); + SWIG_RegisterMapping("_wxTreeItemId","_class_wxTreeItemId",0); SWIG_RegisterMapping("_unsigned_char","_byte",0); SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0); SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0); @@ -1961,7 +1960,7 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0); SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0); SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0); - SWIG_RegisterMapping("_wxToolBarBase","_class_wxToolBarBase",0); + SWIG_RegisterMapping("_class_wxTreeItemId","_wxTreeItemId",0); SWIG_RegisterMapping("_wxTreeCtrl","_class_wxTreeCtrl",0); SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0); SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0); @@ -1981,11 +1980,11 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0); SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0); SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0); - SWIG_RegisterMapping("_class_wxTreeItem","_wxTreeItem",0); SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0); SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0); SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0); SWIG_RegisterMapping("_class_wxListCtrl","_wxListCtrl",0); + SWIG_RegisterMapping("_class_wxTreeItemData","_wxTreeItemData",0); SWIG_RegisterMapping("_class_wxGridCell","_wxGridCell",0); SWIG_RegisterMapping("_class_wxSize","_wxSize",0); SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0); diff --git a/utils/wxPython/src/msw/wxp.py b/utils/wxPython/src/msw/wxp.py index f0efa68755..9df8e04e5d 100644 --- a/utils/wxPython/src/msw/wxp.py +++ b/utils/wxPython/src/msw/wxp.py @@ -199,6 +199,7 @@ wxBU_AUTODRAW = wxpc.wxBU_AUTODRAW wxBU_NOAUTODRAW = wxpc.wxBU_NOAUTODRAW wxTR_HAS_BUTTONS = wxpc.wxTR_HAS_BUTTONS wxTR_EDIT_LABELS = wxpc.wxTR_EDIT_LABELS +wxTR_LINES_AT_ROOT = wxpc.wxTR_LINES_AT_ROOT wxLC_ICON = wxpc.wxLC_ICON wxLC_SMALL_ICON = wxpc.wxLC_SMALL_ICON wxLC_LIST = wxpc.wxLC_LIST @@ -964,7 +965,7 @@ def EVT_COMMAND_ENTER(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_ENTER, func) - +# wxNotebook events def EVT_NOTEBOOK_PAGE_CHANGED(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, func) @@ -972,6 +973,50 @@ def EVT_NOTEBOOK_PAGE_CHANGING(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, func) +#wxTreeCtrl events +def EVT_TREE_BEGIN_DRAG(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_BEGIN_DRAG, func) + +def EVT_TREE_BEGIN_RDRAG(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_BEGIN_RDRAG, func) + +def EVT_TREE_BEGIN_LABEL_EDIT(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, func) + +def EVT_TREE_END_LABEL_EDIT(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_END_LABEL_EDIT, func) + +def EVT_TREE_GET_INFO(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_GET_INFO, func) + +def EVT_TREE_SET_INFO(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_SET_INFO, func) + +def EVT_TREE_ITEM_EXPANDED(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_ITEM_EXPANDED, func) + +def EVT_TREE_ITEM_EXPANDING(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_ITEM_EXPANDING, func) + +def EVT_TREE_ITEM_COLLAPSED(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_ITEM_COLLAPSED, func) + +def EVT_TREE_ITEM_COLLAPSING(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_ITEM_COLLAPSING, func) + +def EVT_TREE_SEL_CHANGED(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_SEL_CHANGED, func) + +def EVT_TREE_SEL_CHANGING(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_SEL_CHANGING, func) + +def EVT_TREE_KEY_DOWN(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_KEY_DOWN, func) + +def EVT_TREE_DELETE_ITEM(win, id, func): + win.Connect(id, -1. wxEVT_COMMAND_TREE_DELETE_ITEM, func) + + #---------------------------------------------------------------------- @@ -1068,7 +1113,13 @@ class wxApp(wxPyApp): #---------------------------------------------------------------------------- # # $Log$ -# Revision 1.2 1998/10/02 06:42:04 RD +# Revision 1.3 1998/10/20 06:45:11 RD +# New wxTreeCtrl wrappers (untested) +# some changes in helpers +# etc. +# +# Revision 1.3 1998/10/02 06:40:33 RD +# # Version 0.4 of wxPython for MSW. # # Revision 1.2 1998/08/18 19:48:12 RD diff --git a/utils/wxPython/tests/test4.py b/utils/wxPython/tests/test4.py index e9e4b3745e..9e4afaaff4 100644 --- a/utils/wxPython/tests/test4.py +++ b/utils/wxPython/tests/test4.py @@ -36,12 +36,12 @@ class TestSimpleControlsDlg(wxDialog): EVT_TEXT(self, 10, self.EvtText) y_pos = y_pos + delta - wxCheckBox(self, 20, "wxCheckBox", wxPoint(80, y_pos), wxSize(150, 20)) + wxCheckBox(self, 20, "wxCheckBox", wxPoint(80, y_pos), wxSize(150, 20), wxNO_BORDER) EVT_CHECKBOX(self, 20, self.EvtCheckBox) y_pos = y_pos + delta rb = wxRadioBox(self, 30, "wxRadioBox", wxPoint(80, y_pos), wxPyDefaultSize, - sampleList, 3, wxRA_HORIZONTAL) + sampleList, 3, wxRA_HORIZONTAL| wxNO_BORDER) EVT_RADIOBOX(self, 30, self.EvtRadioBox) width, height = rb.GetSize() y_pos = y_pos + height + 5 @@ -717,7 +717,13 @@ if __name__ == '__main__': #---------------------------------------------------------------------------- # # $Log$ +# Revision 1.6 1998/10/20 06:45:33 RD +# New wxTreeCtrl wrappers (untested) +# some changes in helpers +# etc. +# # Revision 1.5 1998/10/02 06:42:28 RD +# # Version 0.4 of wxPython for MSW. # # Revision 1.4 1998/08/27 21:59:51 RD -- 2.47.2