Changed the import semantics from "from wxPython import *" to "from

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

diff --git a/utils/wxPython/src/controls.i b/utils/wxPython/src/controls.i
index 1d6c728b27304582e12f78520b4605e157aac623..7279b5dc3c6d6d51d928e564761cff8e6915ad41 100644 (file)
--- a/utils/wxPython/src/controls.i
+++ b/utils/wxPython/src/controls.i
@@ -16,6 +16,12 @@
 #include "helpers.h"
 #include <wx/slider.h>
 #include <wx/spinbutt.h>
+
+#ifdef __WXMSW__
+#if wxUSE_OWNER_DRAWN
+#include <wx/checklst.h>
+#endif
+#endif
 %}
 
 //----------------------------------------------------------------------
@@ -30,6 +36,8 @@
 %import gdi.i
 %import events.i
 
+%pragma(python) code = "import wx"
+
 //----------------------------------------------------------------------
 
 %{
@@ -41,7 +49,7 @@ wxValidator wxPyDefaultValidator;       // Non-const default because of SWIG
 class wxControl : public wxWindow {
 public:
     void Command(wxCommandEvent& event);
-    wxString& GetLabel();
+    wxString GetLabel();
     void SetLabel(const wxString& label);
 };
 
@@ -55,6 +63,9 @@ public:
              long style = 0,
              const wxValidator& validator = wxPyDefaultValidator,
              char* name = "button");
+
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+
     void SetDefault();
 };
 
@@ -69,14 +80,18 @@ public:
                    const wxValidator& validator = wxPyDefaultValidator,
                    char* name = "button");
 
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+
+    wxBitmap& GetBitmapLabel();
+#ifdef __WXMSW__
     wxBitmap& GetBitmapDisabled();
     wxBitmap& GetBitmapFocus();
-    wxBitmap& GetBitmapLabel();
     wxBitmap& GetBitmapSelected();
     void SetBitmapDisabled(const wxBitmap& bitmap);
     void SetBitmapFocus(const wxBitmap& bitmap);
-    void SetBitmapLabel(const wxBitmap& bitmap);
     void SetBitmapSelected(const wxBitmap& bitmap);
+#endif
+    void SetBitmapLabel(const wxBitmap& bitmap);
 
 };
 
@@ -91,6 +106,8 @@ public:
                const wxValidator& val = wxPyDefaultValidator,
                char* name = "checkBox");
 
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+
     bool GetValue();
     void SetValue(const bool state);
 };
@@ -107,6 +124,8 @@ public:
              const wxValidator& validator = wxPyDefaultValidator,
              char* name = "choice");
 
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+
     void Append(const wxString& item);
     void Clear();
     int FindString(const wxString& string);
@@ -132,6 +151,8 @@ public:
                const wxValidator& validator = wxPyDefaultValidator,
                char* name = "comboBox");
 
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+
     void Append(const wxString& item);
     // TODO: void Append(const wxString& item, char* clientData);
     void Clear();
@@ -170,6 +191,8 @@ public:
             const wxValidator& validator = wxPyDefaultValidator,
             char* name = "gauge");
 
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+
     int GetBezelFace();
     int GetRange();
     int GetShadowWidth();
@@ -202,6 +225,8 @@ public:
                  long style = 0,
                  char* name = "staticText");
 
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+
     wxString GetLabel();
     void SetLabel(const wxString& label);
 };
@@ -218,6 +243,8 @@ public:
               const wxValidator& validator = wxPyDefaultValidator,
               char* name = "listBox");
 
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+
     void Append(const wxString& item);
     // TODO:    void Append(const wxString& item, char* clientData);
     void Clear();
@@ -241,6 +268,29 @@ public:
 };
 
 
+//----------------------------------------------------------------------
+
+#ifdef __WXMSW__
+class wxCheckListBox : public wxListBox {
+public:
+    wxCheckListBox(wxWindow *parent, wxWindowID id,
+                   const wxPoint& pos = wxPyDefaultPosition,
+                   const wxSize& size = wxPyDefaultSize,
+                   int LCOUNT = 0,
+                   wxString* LIST = NULL,
+                   long style = 0,
+                   const wxValidator& validator = wxPyDefaultValidator,
+                   char* name = "listBox");
+
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+
+    bool  IsChecked(int uiIndex);
+    void  Check(int uiIndex, bool bCheck = TRUE);
+
+    int GetItemHeight();
+};
+#endif
+
 //----------------------------------------------------------------------
 
 class wxTextCtrl : public wxControl {
@@ -252,6 +302,8 @@ public:
                const wxValidator& validator = wxPyDefaultValidator,
                char* name = "text");
 
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+
     void Clear();
     void Copy();
     void Cut();
@@ -290,11 +342,13 @@ public:
                 const wxValidator& validator = wxPyDefaultValidator,
                 char* name = "scrollBar");
 
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+
     int GetRange();
     int GetPageSize();
-    int GetPosition();
+    int GetThumbPosition();
     int GetThumbSize();
-    void SetPosition(int viewStart);
+    void SetThumbPosition(int viewStart);
     void SetScrollbar(int position, int thumbSize,
                       int range,    int pageSize,
                       bool refresh = TRUE);
@@ -328,6 +382,8 @@ public:
                    long style = 0,
                    char* name = "staticBitmap");
 
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+
     wxBitmap& GetBitmap();
     void SetBitmap(const wxBitmap& bitmap);
 };
@@ -346,10 +402,14 @@ public:
                const wxValidator& validator = wxPyDefaultValidator,
                char* name = "radioBox");
 
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+
     %name(EnableBox)void Enable(bool enable);
     void Enable(int n, bool enable);
     int FindString(const wxString& string);
+#ifdef __WXMSW__
     %name(GetBoxLabel)wxString GetLabel();
+#endif
     wxString GetLabel(int n);
     int GetSelection();
     wxString GetString(int n);
@@ -375,6 +435,8 @@ public:
                   const wxValidator& validator = wxPyDefaultValidator,
                   char* name = "radioButton");
 
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+
     bool GetValue();
     void SetValue(bool value);
 };
@@ -391,6 +453,8 @@ public:
              const wxValidator& validator = wxPyDefaultValidator,
              char* name = "slider");
 
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+
     void ClearSel();
     void ClearTicks();
     int GetLineSize();
@@ -419,6 +483,43 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.8  1998/12/15 20:41:15  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.7  1998/11/16 00:00:53  RD
+// Generic treectrl for wxPython/GTK compiles...
+//
+// Revision 1.6  1998/11/15 23:03:43  RD
+// Removing some ifdef's for wxGTK
+//
+// Revision 1.5  1998/10/07 07:34:32  RD
+// Version 0.4.1 for wxGTK
+//
+// Revision 1.4  1998/10/02 06:40:35  RD
+//
+// Version 0.4 of wxPython for MSW.
+//
+// Revision 1.3  1998/08/18 19:48:14  RD
+// more wxGTK compatibility things.
+//
+// It builds now but there are serious runtime problems...
+//
 // Revision 1.2  1998/08/15 07:36:28  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