X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/445365141a2b028acbd779aa352bf664d930cfb5..2361ce822f82cd4964066319b2253562bf4de84b:/wxPython/src/controls2.i diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i index c870ad4320..2ca2e9a39e 100644 --- a/wxPython/src/controls2.i +++ b/wxPython/src/controls2.i @@ -40,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 { @@ -332,12 +344,14 @@ 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(); long GetIndex(); @@ -365,7 +379,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 +387,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 +414,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 +422,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)" @@ -655,21 +669,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... @@ -712,6 +716,23 @@ public: self.SetStringItem(pos, i, str(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); + } + } }; @@ -747,7 +768,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 +777,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)" @@ -1031,7 +1052,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 +1060,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); } @@ -1078,7 +1099,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, @@ -1086,7 +1107,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); void _setCallbackInfo(PyObject* self, PyObject* _class); %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxTreeCtrl)" @@ -1220,7 +1241,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, @@ -1313,6 +1334,10 @@ enum { wxDIRCTRL_SELECT_FIRST, wxDIRCTRL_SHOW_FILTERS, wxDIRCTRL_3D_INTERNAL, + wxDIRCTRL_EDIT_LABELS, + + wxID_TREECTRL, + wxID_FILTERLISTCTRL, }; @@ -1333,26 +1358,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.