X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4309759886d3f79801610d3095b414e262a9f8cc..8dba8632c5bcd64724e2e9e2d40e295555a0cb86:/wxPython/src/controls2.i diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i index 01436fa680..2e6b36ab84 100644 --- a/wxPython/src/controls2.i +++ b/wxPython/src/controls2.i @@ -64,7 +64,7 @@ enum { wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, wxEVT_COMMAND_LIST_COL_DRAGGING, wxEVT_COMMAND_LIST_COL_END_DRAG, - + wxEVT_COMMAND_LIST_ITEM_FOCUSED, }; @@ -131,6 +131,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) " @@ -256,9 +259,9 @@ public: bool HasBackgroundColour(); bool HasFont(); - const wxColour& GetTextColour(); - const wxColour& GetBackgroundColour(); - const wxFont& GetFont(); + wxColour GetTextColour(); + wxColour GetBackgroundColour(); + wxFont GetFont(); }; @@ -329,19 +332,15 @@ 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(); @@ -392,6 +391,7 @@ IMP_PYCALLBACK_LISTATTR_LONG(wxPyListCtrl, wxListCtrl, OnGetItemAttr); %} + %name(wxListCtrl)class wxPyListCtrl : public wxControl { public: wxPyListCtrl(wxWindow* parent, wxWindowID id = -1, @@ -409,9 +409,11 @@ public: const wxValidator& validator = wxDefaultValidator, char* name = "listCtrl"); - 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); @@ -514,7 +516,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 @@ -561,9 +563,6 @@ public: void RefreshItem(long item); void RefreshItems(long itemFrom, long itemTo); - - - // Arranges the items bool Arrange(int flag = wxLIST_ALIGN_DEFAULT); @@ -695,7 +694,7 @@ public: 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); @@ -705,7 +704,7 @@ public: Py_DECREF(result); } - wxPySaveThread(doSave); + wxPyEndBlockThreads(); return retval; } @@ -733,6 +732,8 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString &name = "listctrl" ); + %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); @@ -907,9 +908,9 @@ public: bool HasBackgroundColour(); bool HasFont(); - const wxColour& GetTextColour(); - const wxColour& GetBackgroundColour(); - const wxFont& GetFont(); + wxColour GetTextColour(); + wxColour GetBackgroundColour(); + wxFont GetFont(); }; @@ -918,6 +919,7 @@ public: wxTreeItemId(); ~wxTreeItemId(); bool IsOk(); + %pragma(python) addtoclass = "Ok = IsOk" %addmethods { int __cmp__(wxTreeItemId* other) { @@ -940,9 +942,9 @@ public: } ~wxPyTreeItemData() { - bool doSave = wxPyRestoreThread(); + wxPyBeginBlockThreads(); Py_DECREF(m_obj); - wxPySaveThread(doSave); + wxPyEndBlockThreads(); } PyObject* GetData() { @@ -951,9 +953,9 @@ public: } void SetData(PyObject* obj) { - bool doSave = wxPyRestoreThread(); + wxPyBeginBlockThreads(); Py_DECREF(m_obj); - wxPySaveThread(doSave); + wxPyEndBlockThreads(); m_obj = obj; Py_INCREF(obj); } @@ -984,6 +986,7 @@ public: wxTreeItemId GetItem(); wxTreeItemId GetOldItem(); wxPoint GetPoint(); + const wxKeyEvent& GetKeyEvent(); int GetCode(); const wxString& GetLabel(); }; @@ -1016,15 +1019,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; @@ -1056,8 +1060,11 @@ public: const wxValidator& validator = wxDefaultValidator, char* name = "wxTreeCtrl"); - void _setSelf(PyObject* self, PyObject* _class); - %pragma(python) addtomethod = "__init__:self._setSelf(self, wxTreeCtrl)" + void _setCallbackInfo(PyObject* self, PyObject* _class); + %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxTreeCtrl)" + + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + %pragma(python) addtomethod = "wxPreTreeCtrl:val._setOORInfo(val)" size_t GetCount(); unsigned int GetIndent(); @@ -1138,7 +1145,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; @@ -1148,7 +1155,7 @@ public: PyObject* item = wxPyConstructObject((void*)tii, "wxTreeItemId", TRUE); PyList_Append(rval, item); } - wxPySaveThread(doSave); + wxPyEndBlockThreads(); return rval; } } @@ -1227,16 +1234,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 { @@ -1245,7 +1253,7 @@ public: } } } -#endif + %pragma(python) addtoclass = " # Redefine some methods that SWIG gets a bit confused on... @@ -1265,14 +1273,17 @@ public: val1.thisown = 1 return (val1,val2) " + }; //---------------------------------------------------------------------- %init %{ + // Map renamed classes back to their common name for OOR wxPyPtrTypeMap_Add("wxTreeItemData", "wxPyTreeItemData"); wxPyPtrTypeMap_Add("wxTreeCtrl", "wxPyTreeCtrl"); + wxPyPtrTypeMap_Add("wxListCtrl", "wxPyListCtrl"); %} //----------------------------------------------------------------------