Added wrappers for wxTreeListCtrl, only to wxPython so far but it
could probably go into contrib/gizmos with some more work. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -21,6 +21,8 @@
|
|||||||
#include <wx/treectrl.h>
|
#include <wx/treectrl.h>
|
||||||
#include <wx/imaglist.h>
|
#include <wx/imaglist.h>
|
||||||
#include <wx/dirctrl.h>
|
#include <wx/dirctrl.h>
|
||||||
|
|
||||||
|
#include "pytree.h"
|
||||||
%}
|
%}
|
||||||
|
|
||||||
//----------------------------------------------------------------------
|
//----------------------------------------------------------------------
|
||||||
@@ -1019,40 +1021,6 @@ public:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
%{
|
|
||||||
class wxPyTreeItemData : public wxTreeItemData {
|
|
||||||
public:
|
|
||||||
wxPyTreeItemData(PyObject* obj = NULL) {
|
|
||||||
if (obj == NULL)
|
|
||||||
obj = Py_None;
|
|
||||||
Py_INCREF(obj);
|
|
||||||
m_obj = obj;
|
|
||||||
}
|
|
||||||
|
|
||||||
~wxPyTreeItemData() {
|
|
||||||
wxPyBeginBlockThreads();
|
|
||||||
Py_DECREF(m_obj);
|
|
||||||
wxPyEndBlockThreads();
|
|
||||||
}
|
|
||||||
|
|
||||||
PyObject* GetData() {
|
|
||||||
Py_INCREF(m_obj);
|
|
||||||
return m_obj;
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetData(PyObject* obj) {
|
|
||||||
wxPyBeginBlockThreads();
|
|
||||||
Py_DECREF(m_obj);
|
|
||||||
wxPyEndBlockThreads();
|
|
||||||
m_obj = obj;
|
|
||||||
Py_INCREF(obj);
|
|
||||||
}
|
|
||||||
|
|
||||||
PyObject* m_obj;
|
|
||||||
};
|
|
||||||
%}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%name(wxTreeItemData) class wxPyTreeItemData : public wxObject {
|
%name(wxTreeItemData) class wxPyTreeItemData : public wxObject {
|
||||||
public:
|
public:
|
||||||
@@ -1079,6 +1047,12 @@ public:
|
|||||||
%pragma(python) addtoclass = "GetCode = GetKeyCode"
|
%pragma(python) addtoclass = "GetCode = GetKeyCode"
|
||||||
const wxString& GetLabel();
|
const wxString& GetLabel();
|
||||||
bool IsEditCancelled() const;
|
bool IsEditCancelled() const;
|
||||||
|
void SetItem(const wxTreeItemId& item);
|
||||||
|
void SetOldItem(const wxTreeItemId& item);
|
||||||
|
void SetPoint(const wxPoint& pt);
|
||||||
|
void SetKeyEvent(const wxKeyEvent& evt);
|
||||||
|
void SetLabel(const wxString& label);
|
||||||
|
void SetEditCanceled(bool editCancelled);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -1138,19 +1112,19 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyTreeCtrl, wxTreeCtrl);
|
|||||||
%name(wxTreeCtrl)class wxPyTreeCtrl : public wxControl {
|
%name(wxTreeCtrl)class wxPyTreeCtrl : public wxControl {
|
||||||
public:
|
public:
|
||||||
wxPyTreeCtrl(wxWindow *parent, wxWindowID id = -1,
|
wxPyTreeCtrl(wxWindow *parent, wxWindowID id = -1,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize,
|
const wxSize& size = wxDefaultSize,
|
||||||
long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
|
long style = wxTR_DEFAULT_STYLE,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxPy_TreeCtrlNameStr);
|
const wxString& name = wxPy_TreeCtrlNameStr);
|
||||||
%name(wxPreTreeCtrl)wxPyTreeCtrl();
|
%name(wxPreTreeCtrl)wxPyTreeCtrl();
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID id = -1,
|
bool Create(wxWindow *parent, wxWindowID id = -1,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize,
|
const wxSize& size = wxDefaultSize,
|
||||||
long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
|
long style = wxTR_DEFAULT_STYLE,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxPy_TreeCtrlNameStr);
|
const wxString& name = wxPy_TreeCtrlNameStr);
|
||||||
|
|
||||||
void _setCallbackInfo(PyObject* self, PyObject* _class);
|
void _setCallbackInfo(PyObject* self, PyObject* _class);
|
||||||
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxTreeCtrl)"
|
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxTreeCtrl)"
|
||||||
@@ -1344,7 +1318,7 @@ public:
|
|||||||
if (self->GetBoundingRect(item, rect, textOnly)) {
|
if (self->GetBoundingRect(item, rect, textOnly)) {
|
||||||
wxPyBeginBlockThreads();
|
wxPyBeginBlockThreads();
|
||||||
wxRect* r = new wxRect(rect);
|
wxRect* r = new wxRect(rect);
|
||||||
PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"));
|
PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"), 1);
|
||||||
wxPyEndBlockThreads();
|
wxPyEndBlockThreads();
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user