#include "helpers.h"
#include <wx/listctrl.h>
#include <wx/treectrl.h>
-#if 0
-#include <wx/tabctrl.h>
-#endif
%}
//----------------------------------------------------------------------
%import events.i
%import controls.i
-%pragma(python) code = "import wxp"
+%pragma(python) code = "import wx"
//----------------------------------------------------------------------
//----------------------------------------------------------------------
+enum {
+ wxLIST_MASK_TEXT,
+ wxLIST_MASK_IMAGE,
+ wxLIST_MASK_DATA,
+ wxLIST_MASK_WIDTH,
+ wxLIST_MASK_FORMAT,
+ wxLIST_MASK_STATE,
+ wxLIST_STATE_DONTCARE,
+ wxLIST_STATE_DROPHILITED,
+ wxLIST_STATE_FOCUSED,
+ wxLIST_STATE_SELECTED,
+ wxLIST_STATE_CUT,
+ wxLIST_HITTEST_ABOVE,
+ wxLIST_HITTEST_BELOW,
+ wxLIST_HITTEST_NOWHERE,
+ wxLIST_HITTEST_ONITEMICON,
+ wxLIST_HITTEST_ONITEMLABEL,
+ wxLIST_HITTEST_ONITEMRIGHT,
+ wxLIST_HITTEST_ONITEMSTATEICON,
+ wxLIST_HITTEST_TOLEFT,
+ wxLIST_HITTEST_TORIGHT,
+ wxLIST_HITTEST_ONITEM,
+ wxLIST_NEXT_ABOVE,
+ wxLIST_NEXT_ALL,
+ wxLIST_NEXT_BELOW,
+ wxLIST_NEXT_LEFT,
+ wxLIST_NEXT_RIGHT,
+ wxLIST_ALIGN_DEFAULT,
+ wxLIST_ALIGN_LEFT,
+ wxLIST_ALIGN_TOP,
+ wxLIST_ALIGN_SNAP_TO_GRID,
+ wxLIST_FORMAT_LEFT,
+ wxLIST_FORMAT_RIGHT,
+ wxLIST_FORMAT_CENTRE,
+ wxLIST_FORMAT_CENTER,
+ wxLIST_AUTOSIZE,
+ wxLIST_AUTOSIZE_USEHEADER,
+ wxLIST_RECT_BOUNDS,
+ wxLIST_RECT_ICON,
+ wxLIST_RECT_LABEL,
+ wxLIST_FIND_UP,
+ wxLIST_FIND_DOWN,
+ wxLIST_FIND_LEFT,
+ wxLIST_FIND_RIGHT,
+};
+
+
class wxListItem {
public:
long m_mask; // Indicates what fields are valid
class wxListCtrl : public wxControl {
public:
-#ifdef __WXMSW__
wxListCtrl(wxWindow* parent, wxWindowID id,
const wxPoint& pos = wxPyDefaultPosition,
const wxSize& size = wxPyDefaultSize,
long style = wxLC_ICON,
const wxValidator& validator = wxPyDefaultValidator,
char* name = "listCtrl");
-#else
- wxListCtrl(wxWindow* parent, wxWindowID id,
- const wxPoint& pos = wxPyDefaultPosition,
- const wxSize& size = wxPyDefaultSize,
- long style = wxLC_ICON,
- char* name = "listctrl");
-#endif
- %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+ %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
bool Arrange(int flag = wxLIST_ALIGN_DEFAULT);
bool DeleteItem(long item);
bool DeleteAllItems();
bool DeleteColumn(int col);
-#ifdef __WXMSW__
bool DeleteAllColumns(void);
void ClearAll(void);
+#ifdef __WXMSW__
wxTextCtrl* EditLabel(long item);
bool EndEditLabel(bool cancel);
+ wxTextCtrl* GetEditControl();
+#else
+ void EditLabel(long item);
#endif
bool EnsureVisible(long item);
long FindItem(long start, const wxString& str, bool partial = FALSE);
bool GetColumn(int col, wxListItem& item);
int GetColumnWidth(int col);
int GetCountPerPage();
-#ifdef __WXMSW__
- wxTextCtrl* GetEditControl();
-#endif
wxImageList* GetImageList(int which);
long GetItemData(long item);
%addmethods {
- %new wxListItem* GetItem() {
+ %new wxListItem* GetItem(long itemId) {
wxListItem* info = new wxListItem;
+ info->m_itemId = itemId;
self->GetItem(*info);
return info;
}
int GetSelectedItemCount();
#ifdef __WXMSW__
wxColour GetTextColour();
+ void SetTextColour(const wxColour& col);
#endif
long GetTopItem();
long HitTest(const wxPoint& point, int& OUTPUT);
- %name(InsertColumnWithInfo)long InsertColumn(long col, wxListItem& info);
+ %name(InsertColumnWith)long InsertColumn(long col, wxListItem& info);
long InsertColumn(long col, const wxString& heading,
int format = wxLIST_FORMAT_LEFT,
int width = -1);
bool SetColumn(int col, wxListItem& item);
bool SetColumnWidth(int col, int width);
void SetImageList(wxImageList* imageList, int which);
+
bool SetItem(wxListItem& info);
- %name(SetItemString)long SetItem(long index, int col, const wxString& label,
+ %name(SetStringItem)long SetItem(long index, int col, const wxString& label,
int imageId = -1);
+
bool SetItemData(long item, long data);
bool SetItemImage(long item, int image, int selImage);
bool SetItemPosition(long item, const wxPoint& pos);
bool SetItemState(long item, long state, long stateMask);
void SetItemText(long item, const wxString& text);
void SetSingleStyle(long style, bool add = TRUE);
-#ifdef __WXMSW__
- void SetTextColour(const wxColour& col);
-#endif
void SetWindowStyleFlag(long style);
// TODO: bool SortItems(wxListCtrlCompare fn, long data);
};
//----------------------------------------------------------------------
-enum {
- wxTREE_MASK_HANDLE,
- wxTREE_MASK_STATE,
- wxTREE_MASK_TEXT,
- wxTREE_MASK_IMAGE,
- wxTREE_MASK_SELECTED_IMAGE,
- wxTREE_MASK_CHILDREN,
- wxTREE_MASK_DATA,
-
- wxTREE_STATE_BOLD,
- wxTREE_STATE_DROPHILITED,
- wxTREE_STATE_EXPANDED,
- wxTREE_STATE_EXPANDEDONCE,
- wxTREE_STATE_FOCUSED,
- wxTREE_STATE_SELECTED,
- wxTREE_STATE_CUT,
-
- wxTREE_HITTEST_ABOVE,
- wxTREE_HITTEST_BELOW,
- wxTREE_HITTEST_NOWHERE,
- wxTREE_HITTEST_ONITEMBUTTON,
- wxTREE_HITTEST_ONITEMICON,
- wxTREE_HITTEST_ONITEMINDENT,
- wxTREE_HITTEST_ONITEMLABEL,
- wxTREE_HITTEST_ONITEMRIGHT,
- wxTREE_HITTEST_ONITEMSTATEICON,
- wxTREE_HITTEST_TOLEFT,
- wxTREE_HITTEST_TORIGHT,
- wxTREE_HITTEST_ONITEM,
-};
-
+class wxTreeItemId {
+public:
+ wxTreeItemId();
+ ~wxTreeItemId();
+ bool IsOk();
-enum {
- wxTREE_NEXT_CARET,
- wxTREE_NEXT_CHILD,
- wxTREE_NEXT_DROPHILITE,
- wxTREE_NEXT_FIRSTVISIBLE,
- wxTREE_NEXT_NEXT,
- wxTREE_NEXT_NEXTVISIBLE,
- wxTREE_NEXT_PARENT,
- wxTREE_NEXT_PREVIOUS,
- wxTREE_NEXT_PREVIOUSVISIBLE,
- wxTREE_NEXT_ROOT
};
-enum {
- wxTREE_EXPAND_EXPAND,
- wxTREE_EXPAND_COLLAPSE,
- wxTREE_EXPAND_COLLAPSE_RESET,
- wxTREE_EXPAND_TOGGLE
-};
-enum {
- wxTREE_INSERT_LAST,
- wxTREE_INSERT_FIRST,
- wxTREE_INSERT_SORT,
-};
+%{
+class wxPyTreeItemData : public wxTreeItemData {
+public:
+ wxPyTreeItemData(PyObject* obj = NULL) {
+ if (obj == NULL)
+ obj = Py_None;
+ Py_INCREF(obj);
+ m_obj = obj;
+ }
+
+ ~wxPyTreeItemData() {
+ bool doSave = wxPyRestoreThread();
+ Py_DECREF(m_obj);
+ wxPySaveThread(doSave);
+ }
+ PyObject* GetData() {
+ Py_INCREF(m_obj);
+ return m_obj;
+ }
+ void SetData(PyObject* obj) {
+ Py_DECREF(m_obj);
+ m_obj = obj;
+ Py_INCREF(obj);
+ }
+ PyObject* m_obj;
+};
+%}
-class wxTreeItem {
+%name(wxTreeItemData) class wxPyTreeItemData {
public:
- long m_mask;
- long m_itemId;
- long m_state;
- long m_stateMask;
- wxString m_text;
- int m_image;
- int m_selectedImage;
- int m_children;
- long m_data;
-
- wxTreeItem();
- ~wxTreeItem();
+ wxPyTreeItemData(PyObject* obj = NULL);
+
+ PyObject* GetData();
+ void SetData(PyObject* obj);
+
+ const wxTreeItemId& GetId();
+ void SetId(const wxTreeItemId& id);
};
-class wxTreeEvent : public wxCommandEvent {
+class wxTreeEvent : public wxNotifyEvent {
public:
- int m_code;
- wxTreeItem m_item;
- long m_oldItem;
- wxPoint m_pointDrag;
+ wxTreeItemId GetItem();
+ wxTreeItemId GetOldItem();
+ wxPoint GetPoint();
+ int GetCode();
+ const wxString& GetLabel();
};
+// These are for the GetFirstChild/GetNextChild methods below
+%typemap(python, in) long& INOUT = long* INOUT;
+%typemap(python, argout) long& INOUT = long* INOUT;
class wxTreeCtrl : public wxControl {
public:
wxTreeCtrl(wxWindow *parent, wxWindowID id = -1,
- const wxPoint& pos = wxPyDefaultPosition,
- const wxSize& size = wxPyDefaultSize,
- long style = wxTR_HAS_BUTTONS,
- const wxValidator& validator = wxPyDefaultValidator,
- char* name = "wxTreeCtrl");
+ const wxPoint& pos = wxPyDefaultPosition,
+ const wxSize& size = wxPyDefaultSize,
+ long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
+ const wxValidator& validator = wxPyDefaultValidator,
+ char* name = "wxTreeCtrl");
- %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+ %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
- bool DeleteAllItems();
-#ifdef __WXMSW__
- bool DeleteItem(long item);
-#else
- void DeleteItem(long item);
-#endif
-#ifdef __WXMSW__
- wxTextCtrl* EditLabel(long item);
- bool EnsureVisible(long item);
- bool ExpandItem(long item, int action);
- long GetChild(long item);
-#endif
- int GetCount();
-#ifdef __WXMSW__
- wxTextCtrl* GetEditControl();
- long GetFirstVisibleItem();
-#endif
- wxImageList* GetImageList(int which = wxIMAGE_LIST_NORMAL);
- int GetIndent();
- long GetItemData(long item);
+ size_t GetCount();
+ unsigned int GetIndent();
+ void SetIndent(unsigned int indent);
+ wxImageList *GetImageList();
+ wxImageList *GetStateImageList();
+ void SetImageList(wxImageList *imageList);
+ void SetStateImageList(wxImageList *imageList);
+
+ wxString GetItemText(const wxTreeItemId& item);
+ int GetItemImage(const wxTreeItemId& item);
+ int GetItemSelectedImage(const wxTreeItemId& item);
+
+ void SetItemText(const wxTreeItemId& item, const wxString& text);
+ void SetItemImage(const wxTreeItemId& item, int image);
+ void SetItemSelectedImage(const wxTreeItemId& item, int image);
+ void SetItemHasChildren(const wxTreeItemId& item, bool hasChildren = TRUE);
%addmethods {
- %new wxTreeItem* GetItem() {
- wxTreeItem* info = new wxTreeItem;
- self->GetItem(*info);
- return info;
+ // [Get|Set]ItemData substitutes. Automatically create wxPyTreeItemData
+ // if needed.
+ wxPyTreeItemData* GetItemData(const wxTreeItemId& item) {
+ wxPyTreeItemData* data = (wxPyTreeItemData*)self->GetItemData(item);
+ if (data == NULL) {
+ data = new wxPyTreeItemData();
+ self->SetItemData(item, data);
+ }
+ return data;
}
-#ifdef __WXMSW__
- %new wxRect* GetItemRect(long item, int textOnly = FALSE) {
- wxRect* rect = new wxRect;
- self->GetItemRect(item, *rect, textOnly);
- return rect;
- }
-#endif
+
+ void SetItemData(const wxTreeItemId& item, wxPyTreeItemData* data) {
+ self->SetItemData(item, data);
+ }
+
+ // [Get|Set]PyData are short-cuts. Also made somewhat crash-proof by
+ // automatically creating data classes.
+ PyObject* GetPyData(const wxTreeItemId& item) {
+ wxPyTreeItemData* data = (wxPyTreeItemData*)self->GetItemData(item);
+ if (data == NULL) {
+ data = new wxPyTreeItemData();
+ self->SetItemData(item, data);
+ }
+ return data->GetData();
+ }
+
+ void SetPyData(const wxTreeItemId& item, PyObject* obj) {
+ wxPyTreeItemData* data = (wxPyTreeItemData*)self->GetItemData(item);
+ if (data == NULL) {
+ data = new wxPyTreeItemData(obj);
+ self->SetItemData(item, data);
+ } else
+ data->SetData(obj);
+ }
}
+
+ bool IsVisible(const wxTreeItemId& item);
+ bool ItemHasChildren(const wxTreeItemId& item);
+ bool IsExpanded(const wxTreeItemId& item);
+ bool IsSelected(const wxTreeItemId& item);
+
+ wxTreeItemId GetRootItem();
+ wxTreeItemId GetSelection();
+ wxTreeItemId GetParent(const wxTreeItemId& item);
+
+ size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = TRUE);
+
+ wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& INOUT);
+ wxTreeItemId GetNextChild(const wxTreeItemId& item, long& INOUT);
+ wxTreeItemId GetNextSibling(const wxTreeItemId& item);
+ wxTreeItemId GetPrevSibling(const wxTreeItemId& item);
+ wxTreeItemId GetFirstVisibleItem();
+ wxTreeItemId GetNextVisible(const wxTreeItemId& item);
+ wxTreeItemId GetPrevVisible(const wxTreeItemId& item);
+
+
+ wxTreeItemId AddRoot(const wxString& text,
+ int image = -1, int selectedImage = -1,
+ wxPyTreeItemData *data = NULL);
+ wxTreeItemId PrependItem(const wxTreeItemId& parent,
+ const wxString& text,
+ int image = -1, int selectedImage = -1,
+ wxPyTreeItemData *data = NULL);
+ wxTreeItemId InsertItem(const wxTreeItemId& parent,
+ const wxTreeItemId& idPrevious,
+ const wxString& text,
+ int image = -1, int selectedImage = -1,
+ wxPyTreeItemData *data = NULL);
+ wxTreeItemId AppendItem(const wxTreeItemId& parent,
+ const wxString& text,
+ int image = -1, int selectedImage = -1,
+ wxPyTreeItemData *data = NULL);
+
+ void Delete(const wxTreeItemId& item);
+ void DeleteChildren(const wxTreeItemId& item);
+ void DeleteAllItems();
+
+ void Expand(const wxTreeItemId& item);
+ void Collapse(const wxTreeItemId& item);
+ void CollapseAndReset(const wxTreeItemId& item);
+ void Toggle(const wxTreeItemId& item);
+
+ void Unselect();
+ void UnselectAll();
+ void SelectItem(const wxTreeItemId& item);
+ void EnsureVisible(const wxTreeItemId& item);
+ void ScrollTo(const wxTreeItemId& item);
#ifdef __WXMSW__
- int GetItemState(long item, long stateMask);
-#endif
- wxString GetItemText(long item);
-#ifdef __WXMSW__
- long GetNextItem(long item, int code);
- long GetNextVisibleItem(long item);
-#endif
- long GetParent(long item);
- long GetRootItem();
- long GetSelection();
- long HitTest(const wxPoint& point, int& OUTPUT); // *** check this
- long InsertItem(long parent, wxTreeItem& info,
- long insertAfter = wxTREE_INSERT_LAST);
- %name(InsertItemString)
- long InsertItem(long parent, const wxString& label,
- int image = -1, int selImage = -1,
- long insertAfter = wxTREE_INSERT_LAST);
- bool ItemHasChildren(long item);
-#ifdef __WXMSW__
- bool ScrollTo(long item);
-#endif
- bool SelectItem(long item);
- void SetIndent(int indent);
- void SetImageList(wxImageList* imageList, int which = wxIMAGE_LIST_NORMAL);
- bool SetItem(wxTreeItem& info);
-#ifdef __WXMSW__
- bool SetItemImage(long item, int image, int selImage);
+ wxTextCtrl* EditLabel(const wxTreeItemId& item);
+ wxTextCtrl* GetEditControl();
+ void EndEditLabel(const wxTreeItemId& item, bool discardChanges = FALSE);
#else
- void SetItemImage(long item, int image, int selImage);
-#endif
-#ifdef __WXMSW__
- bool SetItemState(long item, long state, long stateMask);
-#endif
- void SetItemText(long item, const wxString& text);
- bool SetItemData(long item, long data);
-#ifdef __WXMSW__
- bool SortChildren(long item);
+ void EditLabel(const wxTreeItemId& item);
#endif
+
+// void SortChildren(const wxTreeItemId& item);
+ // **** And this too
+ // wxTreeItemCmpFunc *cmpFunction = NULL);
+
+ void SetItemBold(const wxTreeItemId& item, bool bold = TRUE);
+ bool IsBold(const wxTreeItemId& item) const;
+ wxTreeItemId HitTest(const wxPoint& point);
+
+%pragma(python) addtoclass = "
+ # Redefine a couple methods that SWIG gets a bit confused on...
+ def GetFirstChild(self,arg0,arg1):
+ val1, val2 = controls2c.wxTreeCtrl_GetFirstChild(self.this,arg0.this,arg1)
+ val1 = wxTreeItemIdPtr(val1)
+ val1.thisown = 1
+ return (val1,val2)
+ def GetNextChild(self,arg0,arg1):
+ val1, val2 = controls2c.wxTreeCtrl_GetNextChild(self.this,arg0.this,arg1)
+ val1 = wxTreeItemIdPtr(val1)
+ val1.thisown = 1
+ return (val1,val2)
+"
};
+
//----------------------------------------------------------------------
#ifdef SKIPTHIS
long style = 0,
char* name = "tabCtrl");
- %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+ %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
bool DeleteAllItems();
bool DeleteItem(int item);
//----------------------------------------------------------------------
-/////////////////////////////////////////////////////////////////////////////
-//
-// $Log$
-// Revision 1.5 1998/10/07 07:34:33 RD
-// Version 0.4.1 for wxGTK
-//
-// Revision 1.4 1998/10/02 06:40:36 RD
-//
-// Version 0.4 of wxPython for MSW.
-//
-// Revision 1.3 1998/08/18 19:48:15 RD
-// more wxGTK compatibility things.
-//
-// It builds now but there are serious runtime problems...
-//
-// Revision 1.2 1998/08/15 07:36:30 RD
-// - Moved the header in the .i files out of the code that gets put into
-// the .cpp files. It caused CVS conflicts because of the RCS ID being
-// different each time.
-//
-// - A few minor fixes.
-//
-// Revision 1.1 1998/08/09 08:25:49 RD
-// Initial version
-//
-//
projects / wxWidgets.git / blobdiff