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 2996269eabc84598da8a672ad9189f28f58d12ee..db89aaf1ced4809e4989cc12e13df1fab4793434 100644 (file)
--- a/utils/wxPython/src/controls2.i
+++ b/utils/wxPython/src/controls2.i
@@ -41,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


@@ -90,11 +136,12 @@ public:
     bool DeleteItem(long item);
     bool DeleteAllItems();
     bool DeleteColumn(int col);
     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);


@@ -104,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;
         }


@@ -138,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);


@@ -157,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);
 };


@@ -184,9 +229,6 @@ public:
     ~wxTreeItemId();
     bool IsOk() const { return m_itemId != 0; }
 
     ~wxTreeItemId();
     bool IsOk() const { return m_itemId != 0; }
 

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

 };
 
 
 };
 
 


@@ -222,7 +264,6 @@ public:
 
 class wxTreeCtrl : public wxControl {
 public:
 
 class wxTreeCtrl : public wxControl {
 public:

-#ifdef __WXMSW__

     wxTreeCtrl(wxWindow *parent, wxWindowID id = -1,
                const wxPoint& pos = wxPyDefaultPosition,
                const wxSize& size = wxPyDefaultSize,
     wxTreeCtrl(wxWindow *parent, wxWindowID id = -1,
                const wxPoint& pos = wxPyDefaultPosition,
                const wxSize& size = wxPyDefaultSize,


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

-#else
-    wxTreeCtrl(wxWindow *parent, wxWindowID id = -1,
-               const wxPoint& pos = wxPyDefaultPosition,
-               const wxSize& size = wxPyDefaultSize,
-               long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
-               //const wxValidator& validator = wxPyDefaultValidator,
-               char* name = "wxTreeCtrl");
-#endif

     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
     size_t GetCount();
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
     size_t GetCount();


@@ -257,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);


@@ -294,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);


@@ -382,6 +417,36 @@ 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
 // 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