A few tweaks

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

diff --git a/utils/wxPython/src/controls2.i b/utils/wxPython/src/controls2.i
index 979130677a31d11fda498b22b0c9db90f7079521..65ea561ecfd92ffadc223e9470be68f0a44f57d8 100644 (file)
--- a/utils/wxPython/src/controls2.i
+++ b/utils/wxPython/src/controls2.i
@@ -1,5 +1,3 @@
-%module controls2
-%{
 /////////////////////////////////////////////////////////////////////////////
 // Name:        controls2.i
 // Purpose:     More control (widget) classes for wxPython
@@ -12,7 +10,9 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
+%module controls2
 
+%{
 #include "helpers.h"
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
@@ -76,21 +76,31 @@ 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");
+#else
+    wxListCtrl(wxWindow* parent, wxWindowID id,
+               const wxPoint& pos = wxPyDefaultPosition,
+               const wxSize& size = wxPyDefaultSize,
+               long style = wxLC_ICON,
+               char* name = "listctrl");
+#endif
 
     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);
     wxTextCtrl* EditLabel(long item);
     bool EndEditLabel(bool cancel);
+#endif
     bool EnsureVisible(long item);
     long FindItem(long start, const wxString& str, bool partial = FALSE);
     %name(FindItemData)long FindItem(long start, long data);
@@ -99,7 +109,9 @@ public:
     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);
 
@@ -129,7 +141,9 @@ public:
                      int geometry = wxLIST_NEXT_ALL,
                      int state = wxLIST_STATE_DONTCARE);
     int GetSelectedItemCount();
+#ifdef __WXMSW__
     wxColour GetTextColour();
+#endif
     long GetTopItem();
     long HitTest(const wxPoint& point, int& OUTPUT);
     %name(InsertColumnWithInfo)long InsertColumn(long col, wxListItem& info);
@@ -157,7 +171,9 @@ public:
     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);
 };
@@ -262,22 +278,38 @@ public:
 
 class wxTreeCtrl : public wxControl {
 public:
+#ifdef __WXMSW__
     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");
+#else
+    wxTreeCtrl(wxWindow *parent, wxWindowID id = -1,
+            const wxPoint& pos = wxPyDefaultPosition,
+            const wxSize& size = wxPyDefaultSize,
+            long style = wxTR_HAS_BUTTONS,
+            char* name = "wxTreeCtrl");
+#endif
 
     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);
@@ -288,17 +320,23 @@ public:
             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();
@@ -310,20 +348,31 @@ public:
                         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
 };
 
 //----------------------------------------------------------------------
 
+#ifdef __WXMSW__
 class wxTabEvent : public wxCommandEvent {
 public:
 };
@@ -369,12 +418,26 @@ public:
 
 };
 
+#endif
+
 //----------------------------------------------------------------------
 
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// 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
 //