X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/09f3d4e679f5742c54fb062ede846b77606a9c5b..546bfbea8180aeee5a16f4abb34e721445277305:/wxPython/src/controls2.i?ds=sidebyside diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i index 990e3f1e11..2ad60661cc 100644 --- a/wxPython/src/controls2.i +++ b/wxPython/src/controls2.i @@ -20,6 +20,7 @@ #include #include #include +#include %} //---------------------------------------------------------------------- @@ -39,6 +40,18 @@ //---------------------------------------------------------------------- +%{ + // 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("")); +%} + //---------------------------------------------------------------------- enum { @@ -60,6 +73,11 @@ enum { wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxEVT_COMMAND_LIST_CACHE_HINT, + wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, + wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, + wxEVT_COMMAND_LIST_COL_DRAGGING, + wxEVT_COMMAND_LIST_COL_END_DRAG, + wxEVT_COMMAND_LIST_ITEM_FOCUSED, }; @@ -103,6 +121,18 @@ def EVT_LIST_INSERT_ITEM(win, id, func): def EVT_LIST_COL_CLICK(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_LIST_COL_CLICK, func) +def EVT_LIST_COL_RIGHT_CLICK(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, func) + +def EVT_LIST_COL_BEGIN_DRAG(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, func) + +def EVT_LIST_COL_DRAGGING(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_COL_DRAGGING, func) + +def EVT_LIST_COL_END_DRAG(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_COL_END_DRAG, func) + def EVT_LIST_ITEM_RIGHT_CLICK(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, func) @@ -114,6 +144,9 @@ def EVT_LIST_ITEM_ACTIVATED(win, id, func): def EVT_LIST_CACHE_HINT(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_LIST_CACHE_HINT, func) + +def EVT_LIST_ITEM_FOCUSED(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_FOCUSED, func) " @@ -142,6 +175,7 @@ enum { wxLC_MASK_ALIGN, wxLC_MASK_SORT, + wxLC_USER_TEXT, }; @@ -238,9 +272,9 @@ public: bool HasBackgroundColour(); bool HasFont(); - const wxColour& GetTextColour(); - const wxColour& GetBackgroundColour(); - const wxFont& GetFont(); + wxColour GetTextColour(); + wxColour GetBackgroundColour(); + wxFont GetFont(); }; @@ -308,20 +342,18 @@ public: class wxListEvent: public wxNotifyEvent { public: + wxListEvent(wxEventType commandType = wxEVT_NULL, int id = 0); + int m_code; - long m_itemIndex; long m_oldItemIndex; + long m_itemIndex; int m_col; - bool m_cancelled; wxPoint m_pointDrag; wxListItem m_item; int GetCode(); long GetIndex(); - long GetOldIndex(); - long GetOldItem(); int GetColumn(); - bool Cancelled(); wxPoint GetPoint(); const wxString& GetLabel(); const wxString& GetText(); @@ -329,6 +361,9 @@ public: long GetData(); long GetMask(); const wxListItem& GetItem(); + + long GetCacheFrom(); + long GetCacheTo(); }; @@ -342,7 +377,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, @@ -350,7 +385,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); } @@ -369,6 +404,7 @@ IMP_PYCALLBACK_LISTATTR_LONG(wxPyListCtrl, wxListCtrl, OnGetItemAttr); %} + %name(wxListCtrl)class wxPyListCtrl : public wxControl { public: wxPyListCtrl(wxWindow* parent, wxWindowID id = -1, @@ -376,7 +412,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, @@ -384,18 +420,35 @@ public: const wxSize& size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, - char* name = "listCtrl"); + const wxString& name = wxPyListCtrlNameStr); - void _setSelf(PyObject* self, PyObject* _class); - %pragma(python) addtomethod = "__init__:self._setSelf(self, wxListCtrl)" + void _setCallbackInfo(PyObject* self, PyObject* _class); + %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxListCtrl)" + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + %pragma(python) addtomethod = "wxPreListCtrl:val._setOORInfo(val)" // Set the control colours bool SetForegroundColour(const wxColour& col); bool SetBackgroundColour(const wxColour& col); // Gets information about this column - bool GetColumn(int col, wxListItem& item) const; + // bool GetColumn(int col, wxListItem& item) const; + %addmethods { + %new wxListItem* GetColumn(int col) { + wxListItem item; + 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. + %pragma(python) addtoclass = " + def GetItem(self, *_args, **_kwargs): + val = apply(controls2c.wxListCtrl_GetColumn,(self,) + _args, _kwargs) + if val is not None: val.thisown = 1 + return val + " // Sets information about this column bool SetColumn(int col, wxListItem& item) ; @@ -491,7 +544,7 @@ public: int GetItemCount() const; // Gets the number of columns in the list control - int GetColumnCount() const { return m_colCount; } + int GetColumnCount() const; // Retrieves the spacing between icons in pixels. // If small is TRUE, gets the spacing for the small icon @@ -538,9 +591,6 @@ public: void RefreshItem(long item); void RefreshItems(long itemFrom, long itemTo); - - - // Arranges the items bool Arrange(int flag = wxLIST_ALIGN_DEFAULT); @@ -633,15 +683,56 @@ public: } } + %pragma(python) addtoclass = " + # Some helpers... + + def Select(self, idx, on=1): + '''[de]select an item''' + if on: state = wxLIST_STATE_SELECTED + else: state = 0 + self.SetItemState(idx, state, wxLIST_STATE_SELECTED) + + def Focus(self, idx): + '''Focus and show the given item''' + self.SetItemState(idx, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED) + self.EnsureVisible(idx) + + def GetFocusedItem(self): + '''get the currently focused item or -1 if none''' + return self.GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED) + + def IsSelected(self, idx): + '''return TRUE if the item is selected''' + return self.GetItemState(idx, wxLIST_STATE_SELECTED) != 0 + + def SetColumnImage(self, col, image): + item = wxListItem() + item.SetMask(wxLIST_MASK_IMAGE) + item.SetImage(image) + self.SetColumn(col, item) + + def ClearColumnImage(self, col): + self.SetColumnImage(col, -1) + + def Append(self, entry): + '''Append an item to the list control. The entry parameter should be a + sequence with an item for each column''' + if len(entry): + pos = self.GetItemCount() + self.InsertStringItem(pos, str(entry[0])) + for i in range(1, len(entry)): + self.SetStringItem(pos, i, str(entry[i])) + return pos + " }; -%{ +%{ // Python aware sorting function for wxPyListCtrl int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) { int retval = 0; PyObject* func = (PyObject*)funcPtr; - bool doSave = wxPyRestoreThread(); + wxPyBeginBlockThreads(); PyObject* args = Py_BuildValue("(ii)", item1, item2); PyObject* result = PyEval_CallObject(func, args); @@ -651,12 +742,58 @@ public: Py_DECREF(result); } - wxPySaveThread(doSave); + wxPyEndBlockThreads(); return retval; } %} +//---------------------------------------------------------------------- + +class wxListView : public wxPyListCtrl +{ +public: + wxListView( wxWindow *parent, + wxWindowID id = -1, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxLC_REPORT, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxPyListCtrlNameStr); + %name(wxPreListView)wxListView(); + + bool Create( wxWindow *parent, + wxWindowID id = -1, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxLC_REPORT, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxPyListCtrlNameStr); + + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + %pragma(python) addtomethod = "wxPreListView:val._setOORInfo(val)" + + // [de]select an item + void Select(long n, bool on = TRUE); + + // focus and show the given item + void Focus(long index); + + // get the currently focused item or -1 if none + long GetFocusedItem() const; + + // get first and subsequent selected items, return -1 when no more + long GetNextSelected(long item) const; + long GetFirstSelected() const; + + // return TRUE if the item is selected + bool IsSelected(long index); + + void SetColumnImage(int col, int image); + void ClearColumnImage(int col); +}; + + //---------------------------------------------------------------------- // wxTreeCtrl flags @@ -666,10 +803,12 @@ enum { wxTR_TWIST_BUTTONS, wxTR_NO_LINES, wxTR_MAC_BUTTONS, + wxTR_AQUA_BUTTONS, wxTR_SINGLE, wxTR_MULTIPLE, wxTR_EXTENDED, + wxTR_FULL_ROW_HIGHLIGHT, wxTR_EDIT_LABELS, wxTR_LINES_AT_ROOT, @@ -809,9 +948,9 @@ public: bool HasBackgroundColour(); bool HasFont(); - const wxColour& GetTextColour(); - const wxColour& GetBackgroundColour(); - const wxFont& GetFont(); + wxColour GetTextColour(); + wxColour GetBackgroundColour(); + wxFont GetFont(); }; @@ -820,6 +959,7 @@ public: wxTreeItemId(); ~wxTreeItemId(); bool IsOk(); + %pragma(python) addtoclass = "Ok = IsOk" %addmethods { int __cmp__(wxTreeItemId* other) { @@ -842,9 +982,9 @@ public: } ~wxPyTreeItemData() { - bool doSave = wxPyRestoreThread(); + wxPyBeginBlockThreads(); Py_DECREF(m_obj); - wxPySaveThread(doSave); + wxPyEndBlockThreads(); } PyObject* GetData() { @@ -853,9 +993,9 @@ public: } void SetData(PyObject* obj) { - bool doSave = wxPyRestoreThread(); + wxPyBeginBlockThreads(); Py_DECREF(m_obj); - wxPySaveThread(doSave); + wxPyEndBlockThreads(); m_obj = obj; Py_INCREF(obj); } @@ -886,6 +1026,7 @@ public: wxTreeItemId GetItem(); wxTreeItemId GetOldItem(); wxPoint GetPoint(); + const wxKeyEvent& GetKeyEvent(); int GetCode(); const wxString& GetLabel(); }; @@ -902,7 +1043,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, @@ -910,7 +1051,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); } @@ -918,15 +1059,16 @@ public: int OnCompareItems(const wxTreeItemId& item1, const wxTreeItemId& item2) { int rval = 0; - bool doSave = wxPyRestoreThread(); - if (m_myInst.findCallback("OnCompareItems")) + bool found; + wxPyBeginBlockThreads(); + if ((found = m_myInst.findCallback("OnCompareItems"))) rval = m_myInst.callCallback(Py_BuildValue( "(OO)", wxPyConstructObject((void*)&item1, "wxTreeItemId"), wxPyConstructObject((void*)&item2, "wxTreeItemId"))); - else + wxPyEndBlockThreads(); + if (! found) rval = wxTreeCtrl::OnCompareItems(item1, item2); - wxPySaveThread(doSave); return rval; } PYPRIVATE; @@ -948,7 +1090,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT, const wxValidator& validator = wxDefaultValidator, - char* name = "wxTreeCtrl"); + const wxString& name = wxPy_TreeCtrlNameStr); %name(wxPreTreeCtrl)wxPyTreeCtrl(); bool Create(wxWindow *parent, wxWindowID id = -1, @@ -956,10 +1098,13 @@ public: const wxSize& size = wxDefaultSize, long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT, const wxValidator& validator = wxDefaultValidator, - char* name = "wxTreeCtrl"); + const wxString& name = wxPy_TreeCtrlNameStr); + + void _setCallbackInfo(PyObject* self, PyObject* _class); + %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxTreeCtrl)" - void _setSelf(PyObject* self, PyObject* _class); - %pragma(python) addtomethod = "__init__:self._setSelf(self, wxTreeCtrl)" + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + %pragma(python) addtomethod = "wxPreTreeCtrl:val._setOORInfo(val)" size_t GetCount(); unsigned int GetIndent(); @@ -1040,7 +1185,7 @@ public: //size_t GetSelections(wxArrayTreeItemIds& selection); %addmethods { PyObject* GetSelections() { - bool doSave = wxPyRestoreThread(); + wxPyBeginBlockThreads(); PyObject* rval = PyList_New(0); wxArrayTreeItemIds array; size_t num, x; @@ -1050,7 +1195,7 @@ public: PyObject* item = wxPyConstructObject((void*)tii, "wxTreeItemId", TRUE); PyList_Append(rval, item); } - wxPySaveThread(doSave); + wxPyEndBlockThreads(); return rval; } } @@ -1087,7 +1232,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, @@ -1129,16 +1274,17 @@ public: #ifdef __WXMSW__ void SetItemDropHighlight(const wxTreeItemId& item, int highlight = TRUE); +#endif //bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, int textOnly = FALSE) %addmethods { PyObject* GetBoundingRect(const wxTreeItemId& item, int textOnly = FALSE) { wxRect rect; if (self->GetBoundingRect(item, rect, textOnly)) { - bool doSave = wxPyRestoreThread(); + wxPyBeginBlockThreads(); wxRect* r = new wxRect(rect); PyObject* val = wxPyConstructObject((void*)r, "wxRect"); - wxPySaveThread(doSave); + wxPyEndBlockThreads(); return val; } else { @@ -1147,7 +1293,7 @@ public: } } } -#endif + %pragma(python) addtoclass = " # Redefine some methods that SWIG gets a bit confused on... @@ -1167,14 +1313,132 @@ public: val1.thisown = 1 return (val1,val2) " + }; //---------------------------------------------------------------------- + +enum { + wxDIRCTRL_DIR_ONLY, + wxDIRCTRL_SELECT_FIRST, + wxDIRCTRL_SHOW_FILTERS, + wxDIRCTRL_3D_INTERNAL, +}; + + +class wxDirItemData : public wxObject // wxTreeItemData +{ +public: + wxDirItemData(const wxString& path, const wxString& name, bool isDir); +// ~wxDirItemDataEx(); + void SetNewDirName( wxString path ); + wxString m_path, m_name; + bool m_isHidden; + bool m_isExpanded; + bool m_isDir; +}; + + +class wxGenericDirCtrl: public wxControl +{ +public: + wxGenericDirCtrl(wxWindow *parent, const wxWindowID id = -1, + const wxString& dir = wxPyDirDialogDefaultFolderStr, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, + const wxString& filter = wxPyEmptyString, + int defaultFilter = 0, + 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 wxString& dir = wxPyDirDialogDefaultFolderStr, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, + const wxString& filter = wxPyEmptyString, + int defaultFilter = 0, + const wxString& name = wxPy_TreeCtrlNameStr); + + + // Try to expand as much of the given path as possible. + bool ExpandPath(const wxString& path); + + // Accessors + + inline wxString GetDefaultPath() const; + void SetDefaultPath(const wxString& path); + + // Get dir or filename + wxString GetPath() const ; + + // Get selected filename path only (else empty string). + // I.e. don't count a directory as a selection + wxString GetFilePath() const ; + void SetPath(const wxString& path) ; + + void ShowHidden( bool show ); + bool GetShowHidden(); + + wxString GetFilter() const; + void SetFilter(const wxString& filter); + + int GetFilterIndex() const; + void SetFilterIndex(int n) ; + + wxTreeItemId GetRootId(); + + wxTreeCtrl* GetTreeCtrl() const; + wxDirFilterListCtrl* GetFilterListCtrl() const; + +// //// Helpers +// void SetupSections(); +// // Parse the filter into an array of filters and an array of descriptions +// int ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions); +// // Find the child that matches the first part of 'path'. +// // E.g. if a child path is "/usr" and 'path' is "/usr/include" +// // then the child for /usr is returned. +// // If the path string has been used (we're at the leaf), done is set to TRUE +// wxTreeItemId FindChild(wxTreeItemId parentId, const wxString& path, bool& done); +}; + + +class wxDirFilterListCtrl: public wxChoice +{ +public: + wxDirFilterListCtrl(wxGenericDirCtrl* parent, const wxWindowID id = -1, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0); + %name(wxPreDirFilterListCtrl)wxDirFilterListCtrl(); + + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + %pragma(python) addtomethod = "wxPreDirFilterListCtrl:val._setOORInfo(val)" + + bool Create(wxGenericDirCtrl* parent, const wxWindowID id = -1, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0); + +//// Operations + void FillFilterList(const wxString& filter, int defaultFilter); +}; + + +//---------------------------------------------------------------------- +//---------------------------------------------------------------------- + %init %{ + // Map renamed classes back to their common name for OOR wxPyPtrTypeMap_Add("wxTreeItemData", "wxPyTreeItemData"); wxPyPtrTypeMap_Add("wxTreeCtrl", "wxPyTreeCtrl"); + wxPyPtrTypeMap_Add("wxListCtrl", "wxPyListCtrl"); %} //----------------------------------------------------------------------