X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/445365141a2b028acbd779aa352bf664d930cfb5..877d6bae5ea06c6d45b74307e7ce61f65af514d9:/wxPython/src/controls2.i diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i index c870ad4320..f88d140f45 100644 --- a/wxPython/src/controls2.i +++ b/wxPython/src/controls2.i @@ -21,6 +21,8 @@ #include #include #include + +#include "pytree.h" %} //---------------------------------------------------------------------- @@ -40,6 +42,23 @@ //---------------------------------------------------------------------- +%{ + // Put some wx default wxChar* values into wxStrings. + const wxChar* wxListCtrlNameStr = _T("wxListCtrl"); + DECLARE_DEF_STRING(ListCtrlNameStr); + + const wxChar* wx_TreeCtrlNameStr = _T("wxTreeCtrl"); + DECLARE_DEF_STRING(_TreeCtrlNameStr); + DECLARE_DEF_STRING(DirDialogDefaultFolderStr); + + static const wxString wxPyEmptyString(wxT("")); +%} + + +%{ + static const long longzero = 0; +%} + //---------------------------------------------------------------------- enum { @@ -332,14 +351,17 @@ class wxListEvent: public wxNotifyEvent { public: wxListEvent(wxEventType commandType = wxEVT_NULL, int id = 0); +%readonly int m_code; long m_oldItemIndex; long m_itemIndex; int m_col; wxPoint m_pointDrag; wxListItem m_item; +%readwrite - int GetCode(); + int GetKeyCode(); + %pragma(python) addtoclass = "GetCode = GetKeyCode" long GetIndex(); int GetColumn(); wxPoint GetPoint(); @@ -365,7 +387,7 @@ public: const wxSize& size, long style, const wxValidator& validator, - char* name) : + const wxString& name) : wxListCtrl(parent, id, pos, size, style, validator, name) {} bool Create(wxWindow* parent, wxWindowID id, @@ -373,7 +395,7 @@ public: const wxSize& size, long style, const wxValidator& validator, - char* name) { + const wxString& name) { return wxListCtrl::Create(parent, id, pos, size, style, validator, name); } @@ -400,7 +422,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, - char* name = "listCtrl"); + const wxString& name = wxPyListCtrlNameStr); %name(wxPreListCtrl)wxPyListCtrl(); bool Create(wxWindow* parent, wxWindowID id = -1, @@ -408,7 +430,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, - char* name = "listCtrl"); + const wxString& name = wxPyListCtrlNameStr); void _setCallbackInfo(PyObject* self, PyObject* _class); %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxListCtrl)" @@ -425,15 +447,16 @@ public: %addmethods { %new wxListItem* GetColumn(int col) { wxListItem item; + item.SetMask(0xFFFF); if (self->GetColumn(col, item)) return new wxListItem(item); else return NULL; } - } // The OOR typemaps don't know what to do with the %new, so fix it up. + } // The OOR typemaps don't know what to do with the %new, so fix it up. %pragma(python) addtoclass = " - def GetItem(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetColumn,(self,) + _args, _kwargs) + def GetColumn(self, *_args, **_kwargs): + val = controls2c.wxListCtrl_GetColumn(self, *_args, **_kwargs) if val is not None: val.thisown = 1 return val " @@ -472,12 +495,11 @@ public: } // The OOR typemaps don't know what to do with the %new, so fix it up. %pragma(python) addtoclass = " def GetItem(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_GetItem,(self,) + _args, _kwargs) - val.thisown = 1 + val = controls2c.wxListCtrl_GetItem(self, *_args, **_kwargs) + if val is not None: val.thisown = 1 return val " - // Sets information about the item bool SetItem(wxListItem& info) ; @@ -539,6 +561,10 @@ public: // view, otherwise the large icon view. int GetItemSpacing(bool isSmall) const; +#ifndef __WXMSW__ + void SetItemSpacing( int spacing, bool isSmall = FALSE ); +#endif + // Gets the number of selected items in the list control int GetSelectedItemCount() const; @@ -603,6 +629,8 @@ public: // End label editing, optionally cancelling the edit bool EndEditLabel(bool cancel); +#else + void EditLabel(long item); #endif // Ensures this item is visible @@ -655,21 +683,11 @@ public: // to scroll. If in report view mode, y specifies the number of lines to scroll. bool ScrollList(int dx, int dy); - // bool SortItems(wxListCtrlCompare fn, long data); - %addmethods { - // Sort items. - // func is a function which takes 2 long arguments: item1, item2. - // item1 is the long data associated with a first item (NOT the index). - // item2 is the long data associated with a second item (NOT the index). - // The return value is a negative number if the first item should precede the second - // item, a positive number of the second item should precede the first, - // or zero if the two items are equivalent. - bool SortItems(PyObject* func) { - if (!PyCallable_Check(func)) - return FALSE; - return self->SortItems(wxPyListCtrl_SortItems, (long)func); - } - } + void SetItemTextColour( long item, const wxColour& col); + wxColour GetItemTextColour( long item ) const; + void SetItemBackgroundColour( long item, const wxColour &col); + wxColour GetItemBackgroundColour( long item ) const; + %pragma(python) addtoclass = " # Some helpers... @@ -689,6 +707,14 @@ public: '''get the currently focused item or -1 if none''' return self.GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED) + def GetFirstSelected(self, *args): + '''return first selected item, or -1 when none''' + return self.GetNextSelected(-1) + + def GetNextSelected(self, item): + '''return subsequent selected items, or -1 when no more''' + return self.GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) + def IsSelected(self, idx): '''return TRUE if the item is selected''' return self.GetItemState(idx, wxLIST_STATE_SELECTED) != 0 @@ -706,12 +732,44 @@ public: '''Append an item to the list control. The entry parameter should be a sequence with an item for each column''' if len(entry): + if wx.wxUSE_UNICODE: + cvtfunc = unicode + else: + cvtfunc = str pos = self.GetItemCount() - self.InsertStringItem(pos, str(entry[0])) + self.InsertStringItem(pos, cvtfunc(entry[0])) for i in range(1, len(entry)): - self.SetStringItem(pos, i, str(entry[i])) + self.SetStringItem(pos, i, cvtfunc(entry[i])) return pos " + + + // bool SortItems(wxListCtrlCompare fn, long data); + %addmethods { + // Sort items. + // func is a function which takes 2 long arguments: item1, item2. + // item1 is the long data associated with a first item (NOT the index). + // item2 is the long data associated with a second item (NOT the index). + // The return value is a negative number if the first item should precede the second + // item, a positive number of the second item should precede the first, + // or zero if the two items are equivalent. + bool SortItems(PyObject* func) { + if (!PyCallable_Check(func)) + return FALSE; + return self->SortItems(wxPyListCtrl_SortItems, (long)func); + } + } + + + %addmethods { + wxWindow* GetMainWindow() { + #ifdef __WXMSW__ + return self; + #else + return (wxWindow*)self->m_mainWin; + #endif + } + } }; @@ -747,7 +805,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxLC_REPORT, const wxValidator& validator = wxDefaultValidator, - const wxString &name = "listctrl" ); + const wxString& name = wxPyListCtrlNameStr); %name(wxPreListView)wxListView(); bool Create( wxWindow *parent, @@ -756,7 +814,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxLC_REPORT, const wxValidator& validator = wxDefaultValidator, - const wxString &name = "listctrl" ); + const wxString& name = wxPyListCtrlNameStr); %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" %pragma(python) addtomethod = "wxPreListView:val._setOORInfo(val)" @@ -782,31 +840,34 @@ public: }; -//---------------------------------------------------------------------- +//-------------------------------------------------------------------------------- +//-------------------------------------------------------------------------------- // wxTreeCtrl flags enum { wxTR_NO_BUTTONS, wxTR_HAS_BUTTONS, - wxTR_TWIST_BUTTONS, wxTR_NO_LINES, - wxTR_MAC_BUTTONS, - wxTR_AQUA_BUTTONS, + wxTR_LINES_AT_ROOT, wxTR_SINGLE, wxTR_MULTIPLE, wxTR_EXTENDED, - wxTR_FULL_ROW_HIGHLIGHT, + wxTR_HAS_VARIABLE_ROW_HEIGHT, wxTR_EDIT_LABELS, - wxTR_LINES_AT_ROOT, wxTR_HIDE_ROOT, wxTR_ROW_LINES, - wxTR_HAS_VARIABLE_ROW_HEIGHT, + wxTR_FULL_ROW_HIGHLIGHT, wxTR_DEFAULT_STYLE, + + wxTR_TWIST_BUTTONS, + wxTR_MAC_BUTTONS, + wxTR_AQUA_BUTTONS, }; + enum wxTreeItemIcon { wxTreeItemIcon_Normal, // not selected, not expanded @@ -856,6 +917,7 @@ enum { wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, wxEVT_COMMAND_TREE_END_DRAG, + wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, }; @@ -867,9 +929,6 @@ def EVT_TREE_BEGIN_DRAG(win, id, func): def EVT_TREE_BEGIN_RDRAG(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_RDRAG, func) -def EVT_TREE_END_DRAG(win, id, func): - win.Connect(id, -1, wxEVT_COMMAND_TREE_END_DRAG, func) - def EVT_TREE_BEGIN_LABEL_EDIT(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, func) @@ -914,9 +973,19 @@ def EVT_TREE_ITEM_RIGHT_CLICK(win, id, func): def EVT_TREE_ITEM_MIDDLE_CLICK(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, func) + +def EVT_TREE_END_DRAG(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_TREE_END_DRAG, func) + +def EVT_TREE_STATE_IMAGE_CLICK(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, func) + " +typedef void *wxTreeItemIdValue; + + class wxTreeItemAttr { public: @@ -947,7 +1016,11 @@ public: wxTreeItemId(); ~wxTreeItemId(); bool IsOk(); - %pragma(python) addtoclass = "Ok = IsOk" + %pragma(python) addtoclass = " + Ok = IsOk + def __nonzero__(self): + return self.IsOk() +" %addmethods { int __cmp__(wxTreeItemId* other) { @@ -959,42 +1032,8 @@ public: -%{ -class wxPyTreeItemData : public wxTreeItemData { -public: - wxPyTreeItemData(PyObject* obj = NULL) { - if (obj == NULL) - obj = Py_None; - Py_INCREF(obj); - m_obj = obj; - } - - ~wxPyTreeItemData() { - wxPyBeginBlockThreads(); - Py_DECREF(m_obj); - wxPyEndBlockThreads(); - } - - PyObject* GetData() { - Py_INCREF(m_obj); - return m_obj; - } - - void SetData(PyObject* obj) { - wxPyBeginBlockThreads(); - Py_DECREF(m_obj); - wxPyEndBlockThreads(); - m_obj = obj; - Py_INCREF(obj); - } - - PyObject* m_obj; -}; -%} - - -%name(wxTreeItemData) class wxPyTreeItemData : public wxObject { +%name(wxTreeItemData) class wxPyTreeItemData { public: wxPyTreeItemData(PyObject* obj = NULL); @@ -1011,12 +1050,34 @@ class wxTreeEvent : public wxNotifyEvent { public: wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0); - wxTreeItemId GetItem(); - wxTreeItemId GetOldItem(); - wxPoint GetPoint(); - const wxKeyEvent& GetKeyEvent(); - int GetCode(); - const wxString& GetLabel(); + // get the item on which the operation was performed or the newly + // selected item for wxEVT_COMMAND_TREE_SEL_CHANGED/ING events + wxTreeItemId GetItem() const; + void SetItem(const wxTreeItemId& item); + + // for wxEVT_COMMAND_TREE_SEL_CHANGED/ING events, get the previously + // selected item + wxTreeItemId GetOldItem() const; + void SetOldItem(const wxTreeItemId& item); + + // the point where the mouse was when the drag operation started (for + // wxEVT_COMMAND_TREE_BEGIN_(R)DRAG events only) or click position + wxPoint GetPoint() const; + void SetPoint(const wxPoint& pt); + + // keyboard data (for wxEVT_COMMAND_TREE_KEY_DOWN only) + const wxKeyEvent& GetKeyEvent() const; + int GetKeyCode() const; + void SetKeyEvent(const wxKeyEvent& evt); + + // label (for EVT_TREE_{BEGIN|END}_LABEL_EDIT only) + const wxString& GetLabel() const; + void SetLabel(const wxString& label); + + // edit cancel flag (for EVT_TREE_{BEGIN|END}_LABEL_EDIT only) + bool IsEditCancelled() const; + void SetEditCanceled(bool editCancelled); + }; @@ -1031,7 +1092,7 @@ public: const wxSize& size, long style, const wxValidator& validator, - char* name) : + const wxString& name) : wxTreeCtrl(parent, id, pos, size, style, validator, name) {} bool Create(wxWindow *parent, wxWindowID id, @@ -1039,7 +1100,7 @@ public: const wxSize& size, long style, const wxValidator& validator, - char* name) { + const wxString& name) { return wxTreeCtrl::Create(parent, id, pos, size, style, validator, name); } @@ -1049,11 +1110,13 @@ public: int rval = 0; bool found; wxPyBeginBlockThreads(); - if ((found = m_myInst.findCallback("OnCompareItems"))) - rval = m_myInst.callCallback(Py_BuildValue( - "(OO)", - wxPyConstructObject((void*)&item1, "wxTreeItemId"), - wxPyConstructObject((void*)&item2, "wxTreeItemId"))); + if ((found = m_myInst.findCallback("OnCompareItems"))) { + PyObject *o1 = wxPyConstructObject((void*)&item1, wxT("wxTreeItemId")); + PyObject *o2 = wxPyConstructObject((void*)&item2, wxT("wxTreeItemId")); + rval = m_myInst.callCallback(Py_BuildValue("(OO)",o1,o2)); + Py_DECREF(o1); + Py_DECREF(o2); + } wxPyEndBlockThreads(); if (! found) rval = wxTreeCtrl::OnCompareItems(item1, item2); @@ -1074,19 +1137,19 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyTreeCtrl, wxTreeCtrl); %name(wxTreeCtrl)class wxPyTreeCtrl : public wxControl { public: wxPyTreeCtrl(wxWindow *parent, wxWindowID id = -1, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT, - const wxValidator& validator = wxDefaultValidator, - char* name = "wxTreeCtrl"); + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTR_DEFAULT_STYLE, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxPy_TreeCtrlNameStr); %name(wxPreTreeCtrl)wxPyTreeCtrl(); bool Create(wxWindow *parent, wxWindowID id = -1, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT, - const wxValidator& validator = wxDefaultValidator, - char* name = "wxTreeCtrl"); + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTR_DEFAULT_STYLE, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxPy_TreeCtrlNameStr); void _setCallbackInfo(PyObject* self, PyObject* _class); %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxTreeCtrl)" @@ -1162,6 +1225,16 @@ public: } + // get the item's text colour + wxColour GetItemTextColour(const wxTreeItemId& item) const; + + // get the item's background colour + wxColour GetItemBackgroundColour(const wxTreeItemId& item) const; + + // get the item's font + wxFont GetItemFont(const wxTreeItemId& item) const; + + bool IsVisible(const wxTreeItemId& item); bool ItemHasChildren(const wxTreeItemId& item); bool IsExpanded(const wxTreeItemId& item); @@ -1169,7 +1242,7 @@ public: wxTreeItemId GetRootItem(); wxTreeItemId GetSelection(); - %name(GetItemParent) wxTreeItemId GetParent(const wxTreeItemId& item); + wxTreeItemId GetItemParent(const wxTreeItemId& item); //size_t GetSelections(wxArrayTreeItemIds& selection); %addmethods { PyObject* GetSelections() { @@ -1180,7 +1253,7 @@ public: num = self->GetSelections(array); for (x=0; x < num; x++) { wxTreeItemId *tii = new wxTreeItemId(array.Item(x)); - PyObject* item = wxPyConstructObject((void*)tii, "wxTreeItemId", TRUE); + PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), TRUE); PyList_Append(rval, item); } wxPyEndBlockThreads(); @@ -1192,7 +1265,7 @@ public: size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = TRUE); - wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& INOUT); + wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& INOUT = longzero); wxTreeItemId GetNextChild(const wxTreeItemId& item, long& INOUT); wxTreeItemId GetNextSibling(const wxTreeItemId& item); wxTreeItemId GetPrevSibling(const wxTreeItemId& item); @@ -1220,7 +1293,7 @@ public: size_t before, const wxString& text, int image = -1, int selectedImage = -1, - wxTreeItemData *data = NULL); + wxPyTreeItemData *data = NULL); wxTreeItemId AppendItem(const wxTreeItemId& parent, const wxString& text, int image = -1, int selectedImage = -1, @@ -1240,12 +1313,11 @@ public: void SelectItem(const wxTreeItemId& item); void EnsureVisible(const wxTreeItemId& item); void ScrollTo(const wxTreeItemId& item); -#ifdef __WXMSW__ - wxTextCtrl* EditLabel(const wxTreeItemId& item); + wxTextCtrl* GetEditControl(); - void EndEditLabel(const wxTreeItemId& item, int discardChanges = FALSE); -#else void EditLabel(const wxTreeItemId& item); +#ifdef __WXMSW__ + void EndEditLabel(const wxTreeItemId& item, int discardChanges = FALSE); #endif void SortChildren(const wxTreeItemId& item); @@ -1271,7 +1343,7 @@ public: if (self->GetBoundingRect(item, rect, textOnly)) { wxPyBeginBlockThreads(); wxRect* r = new wxRect(rect); - PyObject* val = wxPyConstructObject((void*)r, "wxRect"); + PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"), 1); wxPyEndBlockThreads(); return val; } @@ -1286,17 +1358,17 @@ public: %pragma(python) addtoclass = " # Redefine some methods that SWIG gets a bit confused on... def GetFirstChild(self, *_args, **_kwargs): - val1,val2 = apply(controls2c.wxTreeCtrl_GetFirstChild,(self,) + _args, _kwargs) + val1,val2 = controls2c.wxTreeCtrl_GetFirstChild(self, *_args, **_kwargs) val1 = wxTreeItemIdPtr(val1) val1.thisown = 1 return (val1,val2) def GetNextChild(self, *_args, **_kwargs): - val1,val2 = apply(controls2c.wxTreeCtrl_GetNextChild,(self,) + _args, _kwargs) + val1,val2 = controls2c.wxTreeCtrl_GetNextChild(self, *_args, **_kwargs) val1 = wxTreeItemIdPtr(val1) val1.thisown = 1 return (val1,val2) def HitTest(self, *_args, **_kwargs): - val1, val2 = apply(controls2c.wxTreeCtrl_HitTest,(self,) + _args, _kwargs) + val1, val2 = controls2c.wxTreeCtrl_HitTest(self, *_args, **_kwargs) val1 = wxTreeItemIdPtr(val1) val1.thisown = 1 return (val1,val2) @@ -1313,6 +1385,10 @@ enum { wxDIRCTRL_SELECT_FIRST, wxDIRCTRL_SHOW_FILTERS, wxDIRCTRL_3D_INTERNAL, + wxDIRCTRL_EDIT_LABELS, + + wxID_TREECTRL, + wxID_FILTERLISTCTRL, }; @@ -1333,26 +1409,26 @@ class wxGenericDirCtrl: public wxControl { public: wxGenericDirCtrl(wxWindow *parent, const wxWindowID id = -1, - const char* dir = wxDirDialogDefaultFolderStr, + const wxString& dir = wxPyDirDialogDefaultFolderStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, - const char* filter = wxEmptyString, + const wxString& filter = wxPyEmptyString, int defaultFilter = 0, - const char* name = "dirCtrl" ); + const wxString& name = wxPy_TreeCtrlNameStr); %name(wxPreGenericDirCtrl)wxGenericDirCtrl(); %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" %pragma(python) addtomethod = "wxPreGenericDirCtrl:val._setOORInfo(val)" bool Create(wxWindow *parent, const wxWindowID id = -1, - const char* dir = wxDirDialogDefaultFolderStr, + const wxString& dir = wxPyDirDialogDefaultFolderStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, - const char* filter = wxEmptyString, + const wxString& filter = wxPyEmptyString, int defaultFilter = 0, - const char* name = "dirCtrl" ); + const wxString& name = wxPy_TreeCtrlNameStr); // Try to expand as much of the given path as possible. @@ -1385,6 +1461,9 @@ public: wxTreeCtrl* GetTreeCtrl() const; wxDirFilterListCtrl* GetFilterListCtrl() const; + // Collapse & expand the tree, thus re-creating it from scratch: + void ReCreateTree(); + // //// Helpers // void SetupSections(); // // Parse the filter into an array of filters and an array of descriptions @@ -1419,6 +1498,30 @@ public: }; +class wxFileIconsTable +{ +public: + wxFileIconsTable(); + ~wxFileIconsTable(); + + enum iconId_Type + { + folder, + folder_open, + computer, + drive, + cdrom, + floppy, + removeable, + file, + executable + }; + + int GetIconID(const wxString& extension, const wxString& mime = wxEmptyString); + wxImageList *GetSmallImageList(); +}; + + //---------------------------------------------------------------------- //----------------------------------------------------------------------