X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78e8819c2e3e35d6a7383af683e8d14b295462a2..fd657b8a5907c8584db84c85535ce281bdd65193:/wxPython/src/controls2.i diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i index 12990e015c..67f87c0475 100644 --- a/wxPython/src/controls2.i +++ b/wxPython/src/controls2.i @@ -20,6 +20,9 @@ #include #include #include +#include + +#include "pytree.h" %} //---------------------------------------------------------------------- @@ -39,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 { @@ -331,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(); @@ -364,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, @@ -372,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); } @@ -399,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, @@ -407,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)" @@ -420,7 +443,23 @@ public: 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; + 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. + %pragma(python) addtoclass = " + def GetColumn(self, *_args, **_kwargs): + val = 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) ; @@ -456,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) ; @@ -523,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; @@ -587,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 @@ -639,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... @@ -673,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 @@ -685,7 +727,49 @@ public: 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): + if wx.wxUSE_UNICODE: + cvtfunc = unicode + else: + cvtfunc = str + pos = self.GetItemCount() + self.InsertStringItem(pos, cvtfunc(entry[0])) + for i in range(1, len(entry)): + 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 + } + } }; @@ -694,7 +778,7 @@ public: int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) { int retval = 0; PyObject* func = (PyObject*)funcPtr; - wxPyTState* state = wxPyBeginBlockThreads(); + wxPyBeginBlockThreads(); PyObject* args = Py_BuildValue("(ii)", item1, item2); PyObject* result = PyEval_CallObject(func, args); @@ -704,7 +788,7 @@ public: Py_DECREF(result); } - wxPyEndBlockThreads(state); + wxPyEndBlockThreads(); return retval; } @@ -721,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, @@ -730,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)" @@ -765,10 +849,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, @@ -919,7 +1005,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) { @@ -931,40 +1021,6 @@ public: -%{ -class wxPyTreeItemData : public wxTreeItemData { -public: - wxPyTreeItemData(PyObject* obj = NULL) { - if (obj == NULL) - obj = Py_None; - Py_INCREF(obj); - m_obj = obj; - } - - ~wxPyTreeItemData() { - wxPyTState* state = wxPyBeginBlockThreads(); - Py_DECREF(m_obj); - wxPyEndBlockThreads(state); - } - - PyObject* GetData() { - Py_INCREF(m_obj); - return m_obj; - } - - void SetData(PyObject* obj) { - wxPyTState* state = wxPyBeginBlockThreads(); - Py_DECREF(m_obj); - wxPyEndBlockThreads(state); - m_obj = obj; - Py_INCREF(obj); - } - - PyObject* m_obj; -}; -%} - - %name(wxTreeItemData) class wxPyTreeItemData : public wxObject { public: @@ -987,8 +1043,16 @@ public: wxTreeItemId GetOldItem(); wxPoint GetPoint(); const wxKeyEvent& GetKeyEvent(); - int GetCode(); + int GetKeyCode(); + %pragma(python) addtoclass = "GetCode = GetKeyCode" const wxString& GetLabel(); + bool IsEditCancelled() const; + void SetItem(const wxTreeItemId& item); + void SetOldItem(const wxTreeItemId& item); + void SetPoint(const wxPoint& pt); + void SetKeyEvent(const wxKeyEvent& evt); + void SetLabel(const wxString& label); + void SetEditCanceled(bool editCancelled); }; @@ -1003,7 +1067,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, @@ -1011,7 +1075,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); } @@ -1020,13 +1084,15 @@ public: const wxTreeItemId& item2) { int rval = 0; bool found; - wxPyTState* state = wxPyBeginBlockThreads(); - if ((found = m_myInst.findCallback("OnCompareItems"))) - rval = m_myInst.callCallback(Py_BuildValue( - "(OO)", - wxPyConstructObject((void*)&item1, "wxTreeItemId"), - wxPyConstructObject((void*)&item2, "wxTreeItemId"))); - wxPyEndBlockThreads(state); + wxPyBeginBlockThreads(); + 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); return rval; @@ -1046,19 +1112,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)" @@ -1134,6 +1200,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); @@ -1141,21 +1217,21 @@ 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() { - wxPyTState* state = wxPyBeginBlockThreads(); + wxPyBeginBlockThreads(); PyObject* rval = PyList_New(0); wxArrayTreeItemIds array; size_t num, x; 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(state); + wxPyEndBlockThreads(); return rval; } } @@ -1164,7 +1240,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); @@ -1192,7 +1268,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, @@ -1212,12 +1288,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); @@ -1234,16 +1309,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)) { - wxPyTState* state = wxPyBeginBlockThreads(); + wxPyBeginBlockThreads(); wxRect* r = new wxRect(rect); - PyObject* val = wxPyConstructObject((void*)r, "wxRect"); - wxPyEndBlockThreads(state); + PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"), 1); + wxPyEndBlockThreads(); return val; } else { @@ -1252,29 +1328,152 @@ public: } } } -#endif + %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) " + +}; + + +//---------------------------------------------------------------------- + + +enum { + wxDIRCTRL_DIR_ONLY, + wxDIRCTRL_SELECT_FIRST, + wxDIRCTRL_SHOW_FILTERS, + wxDIRCTRL_3D_INTERNAL, + wxDIRCTRL_EDIT_LABELS, + + wxID_TREECTRL, + wxID_FILTERLISTCTRL, }; +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; + + // 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 +// 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 %{