Version 0.4.1 for wxGTK

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

diff --git a/utils/wxPython/src/controls2.i b/utils/wxPython/src/controls2.i
index 65ea561ecfd92ffadc223e9470be68f0a44f57d8..1a4d475fa3e4fd5726d418790a308495a8139529 100644 (file)
--- a/utils/wxPython/src/controls2.i
+++ b/utils/wxPython/src/controls2.i
@@ -16,7 +16,9 @@
 #include "helpers.h"
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
+#if 0
 #include <wx/tabctrl.h>
+#endif
 %}
 
 //----------------------------------------------------------------------
@@ -32,6 +34,8 @@
 %import events.i
 %import controls.i
 
+%pragma(python) code = "import wxp"
+
 //----------------------------------------------------------------------
 
 %{
@@ -91,6 +95,8 @@ public:
                char* name = "listctrl");
 #endif
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     bool Arrange(int flag = wxLIST_ALIGN_DEFAULT);
     bool DeleteItem(long item);
     bool DeleteAllItems();
@@ -109,7 +115,7 @@ public:
     bool GetColumn(int col, wxListItem& item);
     int GetColumnWidth(int col);
     int GetCountPerPage();
-#ifdef __WXMSW
+#ifdef __WXMSW__
     wxTextCtrl* GetEditControl();
 #endif
     wxImageList* GetImageList(int which);
@@ -278,20 +284,14 @@ 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
+
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
 
     bool DeleteAllItems();
 #ifdef __WXMSW__
@@ -372,6 +372,7 @@ public:
 
 //----------------------------------------------------------------------
 
+#ifdef SKIPTHIS
 #ifdef __WXMSW__
 class wxTabEvent : public wxCommandEvent {
 public:
@@ -387,6 +388,8 @@ public:
               long style = 0,
               char* name = "tabCtrl");
 
+    %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+
     bool DeleteAllItems();
     bool DeleteItem(int item);
     wxImageList* GetImageList();
@@ -418,6 +421,7 @@ public:
 
 };
 
+#endif
 #endif
 
 //----------------------------------------------------------------------
@@ -426,6 +430,13 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $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.
 //