minimal now works in Unicode mode

[wxWidgets.git] / utils / wxPython / src / controls2.i

diff --git a/utils/wxPython/src/controls2.i b/utils/wxPython/src/controls2.i
index fa7489ddacd504b2026382bc35ad6e09f7dd96d3..db89aaf1ced4809e4989cc12e13df1fab4793434 100644 (file)
--- a/utils/wxPython/src/controls2.i
+++ b/utils/wxPython/src/controls2.i
@@ -16,9 +16,6 @@
 #include "helpers.h"
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
 #include "helpers.h"
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>

-#if 0
-#include <wx/tabctrl.h>
-#endif

 %}
 
 //----------------------------------------------------------------------
 %}
 
 //----------------------------------------------------------------------


@@ -34,7 +31,7 @@
 %import events.i
 %import controls.i
 
 %import events.i
 %import controls.i
 

-%pragma(python) code = "import wxp"
+%pragma(python) code = "import wx"

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 


@@ -44,6 +41,52 @@ extern wxValidator wxPyDefaultValidator;
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

+enum {
+    wxLIST_MASK_TEXT,
+    wxLIST_MASK_IMAGE,
+    wxLIST_MASK_DATA,
+    wxLIST_MASK_WIDTH,
+    wxLIST_MASK_FORMAT,
+    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 wxListItem {
 public:
     long            m_mask;     // Indicates what fields are valid


@@ -80,32 +123,25 @@ public:
 
 class wxListCtrl : public wxControl {
 public:
 
 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");
     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);
 
     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);
     bool DeleteAllColumns(void);
     void ClearAll(void);

+#ifdef __WXMSW__

     wxTextCtrl* EditLabel(long item);
     bool EndEditLabel(bool cancel);
     wxTextCtrl* EditLabel(long item);
     bool EndEditLabel(bool cancel);

+    wxTextCtrl* GetEditControl();

 #endif
     bool EnsureVisible(long item);
     long FindItem(long start, const wxString& str, bool partial = FALSE);
 #endif
     bool EnsureVisible(long item);
     long FindItem(long start, const wxString& str, bool partial = FALSE);


@@ -115,15 +151,13 @@ public:
     bool GetColumn(int col, wxListItem& item);
     int GetColumnWidth(int col);
     int GetCountPerPage();
     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 {
     wxImageList* GetImageList(int which);
     long GetItemData(long item);
 
     %addmethods {

-        %new wxListItem* GetItem() {
+        %new wxListItem* GetItem(long itemId) {

             wxListItem* info = new wxListItem;
             wxListItem* info = new wxListItem;

+            info->m_itemId = itemId;

             self->GetItem(*info);
             return info;
         }
             self->GetItem(*info);
             return info;
         }


@@ -149,10 +183,11 @@ public:
     int GetSelectedItemCount();
 #ifdef __WXMSW__
     wxColour GetTextColour();
     int GetSelectedItemCount();
 #ifdef __WXMSW__
     wxColour GetTextColour();

+    void SetTextColour(const wxColour& col);

 #endif
     long GetTopItem();
     long HitTest(const wxPoint& point, int& OUTPUT);
 #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);
     long InsertColumn(long col, const wxString& heading,
                       int format = wxLIST_FORMAT_LEFT,
                       int width = -1);


@@ -168,18 +203,17 @@ public:
     bool SetColumn(int col, wxListItem& item);
     bool SetColumnWidth(int col, int width);
     void SetImageList(wxImageList* imageList, int which);
     bool SetColumn(int col, wxListItem& item);
     bool SetColumnWidth(int col, int width);
     void SetImageList(wxImageList* imageList, int which);

+

     bool SetItem(wxListItem& info);
     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);
                                      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);
     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);
 };
     void SetWindowStyleFlag(long style);
     // TODO:  bool SortItems(wxListCtrlCompare fn, long data);
 };


@@ -189,202 +223,12 @@ public:
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 
 

-#ifdef SKIPTHIS
-
-
-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,
-};
-
-
-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 wxTreeItem {
-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();
-};
-
-
-
-class  wxTreeEvent : public wxCommandEvent {
-public:
-    int           m_code;
-    wxTreeItem    m_item;
-    long          m_oldItem;
-    wxPoint       m_pointDrag;
-};
-
-
-
-
-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");
-
-    %pragma(python) addtomethod = "__init__:wxp._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);
-
-    %addmethods {
-        %new wxTreeItem* GetItem() {
-            wxTreeItem* info = new wxTreeItem;
-            self->GetItem(*info);
-            return info;
-        }
-#ifdef __WXMSW__
-        %new wxRect* GetItemRect(long item, int textOnly = FALSE) {
-            wxRect* rect = new wxRect;
-            self->GetItemRect(item, *rect, textOnly);
-            return rect;
-        }
-#endif
-    }
-
-#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);
-#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);
-#endif
-};
-
-#endif
-
-
-//----------------------------------------------------------------------
-
-#ifdef __WXMSW__

 class wxTreeItemId {
 public:
     wxTreeItemId();
     ~wxTreeItemId();
     bool IsOk() const { return m_itemId != 0; }
 
 class wxTreeItemId {
 public:
     wxTreeItemId();
     ~wxTreeItemId();
     bool IsOk() const { return m_itemId != 0; }
 

-    %addmethods {
-        long GetId() { return (long)(*self); }
-    }

 };
 
 
 };
 
 


@@ -396,7 +240,8 @@ public:
     wxTreeItemData();
     ~wxTreeItemData();
 
     wxTreeItemData();
     ~wxTreeItemData();
 

-    const wxTreeItemId& GetItemId();
+    const wxTreeItemId& GetId();
+    void SetId(const wxTreeItemId& id);

 };
 
 
 };
 
 


@@ -426,7 +271,7 @@ public:
                const wxValidator& validator = wxPyDefaultValidator,
                char* name = "wxTreeCtrl");
 
                const wxValidator& validator = wxPyDefaultValidator,
                char* name = "wxTreeCtrl");
 

-    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"

 
     size_t GetCount();
     unsigned int GetIndent();
 
     size_t GetCount();
     unsigned int GetIndent();


@@ -445,6 +290,7 @@ public:
     void SetItemImage(const wxTreeItemId& item, int image);
     void SetItemSelectedImage(const wxTreeItemId& item, int image);
     void SetItemData(const wxTreeItemId& item, wxTreeItemData *data);
     void SetItemImage(const wxTreeItemId& item, int image);
     void SetItemSelectedImage(const wxTreeItemId& item, int image);
     void SetItemData(const wxTreeItemId& item, wxTreeItemData *data);

+    void SetItemHasChildren(const wxTreeItemId& item, bool hasChildren = TRUE);

 
     bool IsVisible(const wxTreeItemId& item);
     bool ItemHasChildren(const wxTreeItemId& item);
 
     bool IsVisible(const wxTreeItemId& item);
     bool ItemHasChildren(const wxTreeItemId& item);


@@ -482,6 +328,7 @@ public:
                             wxTreeItemData *data = NULL);
 
     void Delete(const wxTreeItemId& item);
                             wxTreeItemData *data = NULL);
 
     void Delete(const wxTreeItemId& item);

+    void DeleteChildren(const wxTreeItemId& item);

     void DeleteAllItems();
 
     void Expand(const wxTreeItemId& item);
     void DeleteAllItems();
 
     void Expand(const wxTreeItemId& item);


@@ -500,13 +347,15 @@ public:
     wxTextCtrl* GetEditControl();
     void EndEditLabel(const wxTreeItemId& item, bool discardChanges = FALSE);
 
     wxTextCtrl* GetEditControl();
     void EndEditLabel(const wxTreeItemId& item, bool discardChanges = FALSE);
 

-    void SortChildren(const wxTreeItemId& item);
+//    void SortChildren(const wxTreeItemId& item);

                       // **** And this too
                       // wxTreeItemCmpFunc *cmpFunction = NULL);
 
                       // **** 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);

 };
 
 };
 

-#endif

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 


@@ -526,7 +375,7 @@ public:
               long style = 0,
               char* name = "tabCtrl");
 
               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);
 
     bool DeleteAllItems();
     bool DeleteItem(int item);


@@ -568,6 +417,72 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.16  1999/02/25 07:08:32  RD
+// wxPython version 2.0b5
+//
+// Revision 1.15  1999/02/20 09:02:56  RD
+// Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
+// window handle.  If you can get the window handle into the python code,
+// it should just work...  More news on this later.
+//
+// Added wxImageList, wxToolTip.
+//
+// Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
+// wxRegConfig class.
+//
+// As usual, some bug fixes, tweaks, etc.
+//
+// Revision 1.14  1999/01/30 07:30:10  RD
+//
+// Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
+//
+// Various cleanup, tweaks, minor additions, etc. to maintain
+// compatibility with the current wxWindows.
+//
+// Revision 1.13  1998/12/17 14:07:34  RR
+//
+//   Removed minor differences between wxMSW and wxGTK
+//
+// Revision 1.12  1998/12/16 22:10:52  RD
+//
+// Tweaks needed to be able to build wxPython with wxGTK.
+//
+// Revision 1.11  1998/12/15 20:41:16  RD
+// Changed the import semantics from "from wxPython import *" to "from
+// wxPython.wx import *"  This is for people who are worried about
+// namespace pollution, they can use "from wxPython import wx" and then
+// prefix all the wxPython identifiers with "wx."
+//
+// Added wxTaskbarIcon for wxMSW.
+//
+// Made the events work for wxGrid.
+//
+// Added wxConfig.
+//
+// Added wxMiniFrame for wxGTK, (untested.)
+//
+// Changed many of the args and return values that were pointers to gdi
+// objects to references to reflect changes in the wxWindows API.
+//
+// Other assorted fixes and additions.
+//
+// Revision 1.10  1998/11/25 08:45:23  RD
+//
+// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
+// Added events for wxGrid
+// Other various fixes and additions
+//
+// Revision 1.9  1998/11/16 00:00:54  RD
+// Generic treectrl for wxPython/GTK compiles...
+//
+// Revision 1.8  1998/11/11 04:40:20  RD
+// wxTreeCtrl now works (sort of) for wxPython-GTK.  This is the new
+// TreeCtrl in src/gtk/treectrl.cpp not the old generic one.
+//
+// Revision 1.7  1998/11/11 03:12:25  RD
+//
+// Additions for wxTreeCtrl
+//

 // Revision 1.6  1998/10/20 06:43:55  RD
 // New wxTreeCtrl wrappers (untested)
 // some changes in helpers
 // Revision 1.6  1998/10/20 06:43:55  RD
 // New wxTreeCtrl wrappers (untested)
 // some changes in helpers