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,
};
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)
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)
"
wxLC_MASK_ALIGN,
wxLC_MASK_SORT,
+ wxLC_USER_TEXT,
};
bool HasBackgroundColour();
bool HasFont();
- const wxColour& GetTextColour();
- const wxColour& GetBackgroundColour();
- const wxFont& GetFont();
+ wxColour GetTextColour();
+ wxColour GetBackgroundColour();
+ wxFont GetFont();
};
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();
long GetData();
long GetMask();
const wxListItem& GetItem();
+
+ long GetCacheFrom();
+ long GetCacheTo();
};
-%{
+%{ // C++ Version of a Python aware class
class wxPyListCtrl : public wxListCtrl {
DECLARE_ABSTRACT_CLASS(wxPyListCtrl);
public:
+ wxPyListCtrl() : wxListCtrl() {}
wxPyListCtrl(wxWindow* parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
char* name) :
wxListCtrl(parent, id, pos, size, style, validator, name) {}
+ bool Create(wxWindow* parent, wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxValidator& validator,
+ char* name) {
+ return wxListCtrl::Create(parent, id, pos, size, style, validator, name);
+ }
+
DEC_PYCALLBACK_STRING_LONGLONG(OnGetItemText);
DEC_PYCALLBACK_INT_LONG(OnGetItemImage);
DEC_PYCALLBACK_LISTATTR_LONG(OnGetItemAttr);
%}
+
%name(wxListCtrl)class wxPyListCtrl : public wxControl {
public:
wxPyListCtrl(wxWindow* parent, wxWindowID id = -1,
long style = wxLC_ICON,
const wxValidator& validator = wxDefaultValidator,
char* name = "listCtrl");
+ %name(wxPreListCtrl)wxPyListCtrl();
+
+ bool Create(wxWindow* parent, wxWindowID id = -1,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = wxLC_ICON,
+ const wxValidator& validator = wxDefaultValidator,
+ char* name = "listCtrl");
- void _setSelf(PyObject* self, PyObject* _class);
- %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
- %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);
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
void RefreshItem(long item);
void RefreshItems(long itemFrom, long itemTo);
-
-
-
// Arranges the items
bool Arrange(int flag = wxLIST_ALIGN_DEFAULT);
}
}
+ %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)
+ "
};
-%{
+%{ // 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();
+ wxPyTState* state = wxPyBeginBlockThreads();
PyObject* args = Py_BuildValue("(ii)", item1, item2);
PyObject* result = PyEval_CallObject(func, args);
Py_DECREF(result);
}
- wxPySaveThread(doSave);
+ wxPyEndBlockThreads(state);
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 = "listctrl" );
+ %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 = "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);
+
+ // 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
bool HasBackgroundColour();
bool HasFont();
- const wxColour& GetTextColour();
- const wxColour& GetBackgroundColour();
- const wxFont& GetFont();
+ wxColour GetTextColour();
+ wxColour GetBackgroundColour();
+ wxFont GetFont();
};
wxTreeItemId();
~wxTreeItemId();
bool IsOk();
+ %pragma(python) addtoclass = "Ok = IsOk"
%addmethods {
int __cmp__(wxTreeItemId* other) {
}
~wxPyTreeItemData() {
- bool doSave = wxPyRestoreThread();
+ wxPyTState* state = wxPyBeginBlockThreads();
Py_DECREF(m_obj);
- wxPySaveThread(doSave);
+ wxPyEndBlockThreads(state);
}
PyObject* GetData() {
}
void SetData(PyObject* obj) {
- bool doSave = wxPyRestoreThread();
+ wxPyTState* state = wxPyBeginBlockThreads();
Py_DECREF(m_obj);
- wxPySaveThread(doSave);
+ wxPyEndBlockThreads(state);
m_obj = obj;
Py_INCREF(obj);
}
wxTreeItemId GetItem();
wxTreeItemId GetOldItem();
wxPoint GetPoint();
+ const wxKeyEvent& GetKeyEvent();
int GetCode();
const wxString& GetLabel();
};
-%{
+%{ // C++ version of Python aware wxTreeCtrl
class wxPyTreeCtrl : public wxTreeCtrl {
DECLARE_ABSTRACT_CLASS(wxPyTreeCtrl);
public:
+ wxPyTreeCtrl() : wxTreeCtrl() {}
wxPyTreeCtrl(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
char* name) :
wxTreeCtrl(parent, id, pos, size, style, validator, name) {}
+ bool Create(wxWindow *parent, wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxValidator& validator,
+ char* name) {
+ return wxTreeCtrl::Create(parent, id, pos, size, style, validator, name);
+ }
+
+
int OnCompareItems(const wxTreeItemId& item1,
const wxTreeItemId& item2) {
int rval = 0;
- bool doSave = wxPyRestoreThread();
- if (m_myInst.findCallback("OnCompareItems"))
+ 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")));
- else
+ wxPyEndBlockThreads(state);
+ if (! found)
rval = wxTreeCtrl::OnCompareItems(item1, item2);
- wxPySaveThread(doSave);
return rval;
}
PYPRIVATE;
long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
const wxValidator& validator = wxDefaultValidator,
char* name = "wxTreeCtrl");
+ %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");
- void _setSelf(PyObject* self, PyObject* _class);
- %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
- %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();
//size_t GetSelections(wxArrayTreeItemIds& selection);
%addmethods {
PyObject* GetSelections() {
- bool doSave = wxPyRestoreThread();
+ wxPyTState* state = wxPyBeginBlockThreads();
PyObject* rval = PyList_New(0);
wxArrayTreeItemIds array;
size_t num, x;
PyObject* item = wxPyConstructObject((void*)tii, "wxTreeItemId", TRUE);
PyList_Append(rval, item);
}
- wxPySaveThread(doSave);
+ wxPyEndBlockThreads(state);
return rval;
}
}
#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();
+ wxPyTState* state = wxPyBeginBlockThreads();
wxRect* r = new wxRect(rect);
PyObject* val = wxPyConstructObject((void*)r, "wxRect");
- wxPySaveThread(doSave);
+ wxPyEndBlockThreads(state);
return val;
}
else {
}
}
}
-#endif
+
%pragma(python) addtoclass = "
# Redefine some methods that SWIG gets a bit confused on...
val1.thisown = 1
return (val1,val2)
"
-};
-
-//----------------------------------------------------------------------
-
-#ifdef SKIPTHIS
-#ifdef __WXMSW__
-
-
-enum {
- /* tab control event types */
- wxEVT_COMMAND_TAB_SEL_CHANGED,
- wxEVT_COMMAND_TAB_SEL_CHANGING,
};
-class wxTabEvent : public wxCommandEvent {
-public:
-};
-
-
-
-class wxTabCtrl : public wxControl {
-public:
- wxTabCtrl(wxWindow* parent, wxWindowID id,
- const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize,
- long style = 0,
- char* name = "tabCtrl");
-
- %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
-
- bool DeleteAllItems();
- bool DeleteItem(int item);
- wxImageList* GetImageList();
- int GetItemCount();
- // TODO: void* GetItemData();
- int GetItemImage(int item);
-
- %addmethods {
- %new wxRect* GetItemRect(int item) {
- wxRect* rect = new wxRect;
- self->GetItemRect(item, *rect);
- return rect;
- }
- }
-
- wxString GetItemText(int item);
- bool GetRowCount();
- int GetSelection();
- int HitTest(const wxPoint& pt, long& OUTPUT);
- void InsertItem(int item, const wxString& text,
- int imageId = -1, void* clientData = NULL);
- // TODO: bool SetItemData(int item, void* data);
- bool SetItemImage(int item, int image);
- void SetImageList(wxImageList* imageList);
- void SetItemSize(const wxSize& size);
- bool SetItemText(int item, const wxString& text);
- void SetPadding(const wxSize& padding);
- int SetSelection(int item);
-
-};
-
-#endif
-#endif
-
//----------------------------------------------------------------------
%init %{
+ // Map renamed classes back to their common name for OOR
wxPyPtrTypeMap_Add("wxTreeItemData", "wxPyTreeItemData");
wxPyPtrTypeMap_Add("wxTreeCtrl", "wxPyTreeCtrl");
+ wxPyPtrTypeMap_Add("wxListCtrl", "wxPyListCtrl");
%}
//----------------------------------------------------------------------
projects / wxWidgets.git / blobdiff