#include "treelistctrl.h"
#include "wx/wxPython/pytree.h"
-
- static const wxString wxPyDynamicSashNameStr(wxT("dynamicSashWindow"));
- static const wxString wxPyEditableListBoxNameStr(wxT("editableListBox"));
- static const wxString wxPyTreeListCtrlNameStr(wxT("treelistctrl"));
- static const wxString wxPyEmptyString(wxT(""));
%}
//---------------------------------------------------------------------------
%import windows.i
%import controls.i
-%pythoncode { wx = core }
+%pythoncode { wx = _core }
+%pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
+
+
+MAKE_CONST_WXSTRING2(DynamicSashNameStr, wxT("dynamicSashWindow"));
+MAKE_CONST_WXSTRING2(EditableListBoxNameStr, wxT("editableListBox"));
+MAKE_CONST_WXSTRING2(TreeListCtrlNameStr, wxT("treelistctrl"));
+
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
+
%include _gizmos_rename.i
class wxDynamicSashWindow : public wxWindow {
public:
- %addtofunc wxDynamicSashWindow "self._setOORInfo(self)"
- %addtofunc wxDynamicSashWindow() ""
+ %pythonAppend wxDynamicSashWindow "self._setOORInfo(self)"
+ %pythonAppend wxDynamicSashWindow() ""
wxDynamicSashWindow(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
class wxEditableListBox : public wxPanel
{
public:
- %addtofunc wxEditableListBox "self._setOORInfo(self)"
- %addtofunc wxEditableListBox() ""
+ %pythonAppend wxEditableListBox "self._setOORInfo(self)"
+ %pythonAppend wxEditableListBox() ""
wxEditableListBox(wxWindow *parent, wxWindowID id,
const wxString& label,
class wxRemotelyScrolledTreeCtrl: public wxPyTreeCtrl
{
public:
- %addtofunc wxRemotelyScrolledTreeCtrl "self._setOORInfo(self)"
- %addtofunc wxRemotelyScrolledTreeCtrl() ""
+ %pythonAppend wxRemotelyScrolledTreeCtrl "self._setOORInfo(self)"
+ %pythonAppend wxRemotelyScrolledTreeCtrl() ""
wxRemotelyScrolledTreeCtrl(wxWindow* parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
virtual void DrawItem(wxDC& dc, wxTreeItemId id, const wxRect& rect) {
bool found;
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "DrawItem"))) {
PyObject* dcobj = wxPyMake_wxObject(&dc);
- PyObject* idobj = wxPyConstructObject((void*)&id, wxT("wxTreeItemId"), FALSE);
- PyObject* recobj= wxPyConstructObject((void*)&rect, wxT("wxRect"), FALSE);
+ PyObject* idobj = wxPyConstructObject((void*)&id, wxT("wxTreeItemId"), False);
+ PyObject* recobj= wxPyConstructObject((void*)&rect, wxT("wxRect"), False);
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", dcobj, idobj, recobj));
Py_DECREF(dcobj);
Py_DECREF(idobj);
Py_DECREF(recobj);
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
if (! found)
wxTreeCompanionWindow::DrawItem(dc, id, rect);
}
%name(TreeCompanionWindow) class wxPyTreeCompanionWindow: public wxWindow
{
public:
- %addtofunc wxPyTreeCompanionWindow "self._setOORInfo(self);self._setCallbackInfo(self, TreeCompanionWindow)"
- %addtofunc wxPyTreeCompanionWindow() ""
+ %pythonAppend wxPyTreeCompanionWindow "self._setOORInfo(self);self._setCallbackInfo(self, TreeCompanionWindow)"
+ %pythonAppend wxPyTreeCompanionWindow() ""
wxPyTreeCompanionWindow(wxWindow* parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
class wxThinSplitterWindow: public wxSplitterWindow
{
public:
- %addtofunc wxThinSplitterWindow "self._setOORInfo(self)"
- %addtofunc wxThinSplitterWindow() ""
+ %pythonAppend wxThinSplitterWindow "self._setOORInfo(self)"
+ %pythonAppend wxThinSplitterWindow() ""
wxThinSplitterWindow(wxWindow* parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
class wxSplitterScrolledWindow: public wxScrolledWindow
{
public:
- %addtofunc wxSplitterScrolledWindow "self._setOORInfo(self)"
- %addtofunc wxSplitterScrolledWindow() ""
+ %pythonAppend wxSplitterScrolledWindow "self._setOORInfo(self)"
+ %pythonAppend wxSplitterScrolledWindow() ""
wxSplitterScrolledWindow(wxWindow* parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
class wxLEDNumberCtrl : public wxControl
{
public:
- %addtofunc wxLEDNumberCtrl "self._setOORInfo(self)"
- %addtofunc wxLEDNumberCtrl() ""
+ %pythonAppend wxLEDNumberCtrl "self._setOORInfo(self)"
+ %pythonAppend wxLEDNumberCtrl() ""
wxLEDNumberCtrl(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
const wxTreeItemId& item2) {
int rval = 0;
bool found;
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "OnCompareItems"))) {
PyObject *o1 = wxPyConstructObject((void*)&item1, wxT("wxTreeItemId"), 0);
PyObject *o2 = wxPyConstructObject((void*)&item2, wxT("wxTreeItemId"), 0);
Py_DECREF(o1);
Py_DECREF(o2);
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
if (! found)
rval = wxTreeListCtrl::OnCompareItems(item1, item2);
return rval;
%name(TreeListCtrl) class wxPyTreeListCtrl : public wxControl
{
public:
- %addtofunc wxPyTreeListCtrl "self._setOORInfo(self);self._setCallbackInfo(self, TreeListCtrl)"
- %addtofunc wxPyTreeListCtrl() ""
+ %pythonAppend wxPyTreeListCtrl "self._setOORInfo(self);self._setCallbackInfo(self, TreeListCtrl)"
+ %pythonAppend wxPyTreeListCtrl() ""
wxPyTreeListCtrl(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
void SetStateImageList(wxImageList *imageList);
void SetButtonsImageList(wxImageList *imageList);
- %addtofunc AssignImageList "args[1].thisown = 0";
+ %apply SWIGTYPE *DISOWN { wxImageList *imageList };
void AssignImageList(wxImageList *imageList);
-
- %addtofunc AssignStateImageList "args[1].thisown = 0";
void AssignStateImageList(wxImageList *imageList);
-
- %addtofunc AssignButtonsImageList "args[1].thisown = 0";
void AssignButtonsImageList(wxImageList *imageList);
-
+ %clear wxImageList *imageList;
// adds a column
data->SetData(obj);
}
}
+ %pythoncode { GetPyData = GetItemPyData }
+ %pythoncode { SetPyData = SetItemPyData }
// force appearance of [+] button near the item. This is useful to
// allow the user to expand the items which don't have any children now
// - but instead add them only when needed, thus minimizing memory
// usage and loading time.
- void SetItemHasChildren(const wxTreeItemId& item, bool has = TRUE);
+ void SetItemHasChildren(const wxTreeItemId& item, bool has = True);
// the item will be shown in bold
- void SetItemBold(const wxTreeItemId& item, bool bold = TRUE);
+ void SetItemBold(const wxTreeItemId& item, bool bold = True);
// set the item's text colour
void SetItemTextColour(const wxTreeItemId& item, const wxColour& col);
// is item text in bold font?
bool IsBold(const wxTreeItemId& item) const;
- // if 'recursively' is FALSE, only immediate children count, otherwise
+ // if 'recursively' is False, only immediate children count, otherwise
// the returned number is the number of all items in this branch
- size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = TRUE);
+ size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = True);
- // wxTreeItemId.IsOk() will return FALSE if there is no such item
+ // wxTreeItemId.IsOk() will return False if there is no such item
// get the root tree item
wxTreeItemId GetRootItem() const;
//size_t GetSelections(wxArrayTreeItemIds&) const;
%extend {
PyObject* GetSelections() {
- wxPyBeginBlockThreads();
+ bool blocked = 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, wxT("wxTreeItemId"), TRUE);
+ PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), True);
PyList_Append(rval, item);
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return rval;
}
}
// order to continue the search.
PyObject* GetFirstChild(const wxTreeItemId& item) {
long cookie = 0;
- wxTreeItemId ritem = self->GetFirstChild(item, cookie);
- wxPyBeginBlockThreads();
+ wxTreeItemId* ritem = new wxTreeItemId(self->GetFirstChild(item, cookie));
+ bool blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2);
- PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), true));
+ PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true));
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(cookie));
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return tup;
}
// Returns a wxTreeItemId and an opaque "cookie" value that should be
// passed to GetNextChild in order to continue the search.
PyObject* GetNextChild(const wxTreeItemId& item, long cookie) {
- wxTreeItemId ritem = self->GetNextChild(item, cookie);
- wxPyBeginBlockThreads();
+ wxTreeItemId* ritem = new wxTreeItemId(self->GetNextChild(item, cookie));
+ bool blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2);
- PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), true));
+ PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true));
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(cookie));
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return tup;
}
}
void UnselectAll();
// select this item
- void SelectItem(const wxTreeItemId& item, bool unselect_others=TRUE,
- bool extended_select=FALSE);
+ void SelectItem(const wxTreeItemId& item, bool unselect_others=True,
+ bool extended_select=False);
// make sure this item is visible (expanding the parent item and/or
// scrolling to this item if necessary)
%extend {
// get the bounding rectangle of the item (or of its label only)
- PyObject* GetBoundingRect(const wxTreeItemId& item, bool textOnly = FALSE) {
+ PyObject* GetBoundingRect(const wxTreeItemId& item, bool textOnly = False) {
wxRect rect;
if (self->GetBoundingRect(item, rect, textOnly)) {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
wxRect* r = new wxRect(rect);
PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"), 1);
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return val;
}
else {
projects / wxWidgets.git / blobdiff