X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78e8819c2e3e35d6a7383af683e8d14b295462a2..9a9e73f6fdc119b856b97962abeb9be38b55683d:/wxPython/src/controls2.i diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i index 12990e015c..5f0077a7bf 100644 --- a/wxPython/src/controls2.i +++ b/wxPython/src/controls2.i @@ -20,6 +20,7 @@ #include #include #include +#include %} //---------------------------------------------------------------------- @@ -420,7 +421,22 @@ 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; + 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) ; @@ -694,7 +710,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 +720,7 @@ public: Py_DECREF(result); } - wxPyEndBlockThreads(state); + wxPyEndBlockThreads(); return retval; } @@ -765,10 +781,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, @@ -942,9 +960,9 @@ public: } ~wxPyTreeItemData() { - wxPyTState* state = wxPyBeginBlockThreads(); + wxPyBeginBlockThreads(); Py_DECREF(m_obj); - wxPyEndBlockThreads(state); + wxPyEndBlockThreads(); } PyObject* GetData() { @@ -953,9 +971,9 @@ public: } void SetData(PyObject* obj) { - wxPyTState* state = wxPyBeginBlockThreads(); + wxPyBeginBlockThreads(); Py_DECREF(m_obj); - wxPyEndBlockThreads(state); + wxPyEndBlockThreads(); m_obj = obj; Py_INCREF(obj); } @@ -1020,13 +1038,13 @@ public: const wxTreeItemId& item2) { int rval = 0; bool found; - wxPyTState* state = wxPyBeginBlockThreads(); + wxPyBeginBlockThreads(); if ((found = m_myInst.findCallback("OnCompareItems"))) rval = m_myInst.callCallback(Py_BuildValue( "(OO)", wxPyConstructObject((void*)&item1, "wxTreeItemId"), wxPyConstructObject((void*)&item2, "wxTreeItemId"))); - wxPyEndBlockThreads(state); + wxPyEndBlockThreads(); if (! found) rval = wxTreeCtrl::OnCompareItems(item1, item2); return rval; @@ -1145,7 +1163,7 @@ public: //size_t GetSelections(wxArrayTreeItemIds& selection); %addmethods { PyObject* GetSelections() { - wxPyTState* state = wxPyBeginBlockThreads(); + wxPyBeginBlockThreads(); PyObject* rval = PyList_New(0); wxArrayTreeItemIds array; size_t num, x; @@ -1155,7 +1173,7 @@ public: PyObject* item = wxPyConstructObject((void*)tii, "wxTreeItemId", TRUE); PyList_Append(rval, item); } - wxPyEndBlockThreads(state); + wxPyEndBlockThreads(); return rval; } } @@ -1234,16 +1252,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); + wxPyEndBlockThreads(); return val; } else { @@ -1252,7 +1271,7 @@ public: } } } -#endif + %pragma(python) addtoclass = " # Redefine some methods that SWIG gets a bit confused on... @@ -1272,9 +1291,125 @@ 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 char* dir = wxDirDialogDefaultFolderStr, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, + const char* filter = wxEmptyString, + int defaultFilter = 0, + const char* name = "dirCtrl" ); + %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 wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, + const char* filter = wxEmptyString, + int defaultFilter = 0, + const char* name = "dirCtrl" ); + + + // 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 %{