minimal now works in Unicode mode

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

diff --git a/utils/wxPython/src/controls.i b/utils/wxPython/src/controls.i
index c0b0bf8096340221c5fe0af34a401375b2fa7685..cc606fec8b7cc80dd910d67ebf0195cddffb0eb5 100644 (file)
--- a/utils/wxPython/src/controls.i
+++ b/utils/wxPython/src/controls.i
@@ -15,13 +15,17 @@
 %{
 #include "helpers.h"
 #include <wx/slider.h>
 %{
 #include "helpers.h"
 #include <wx/slider.h>

+#include <wx/spinbutt.h>

 
 #ifdef __WXMSW__
 
 #ifdef __WXMSW__

-#include <wx/spinbutt.h>

 #if wxUSE_OWNER_DRAWN
 #include <wx/checklst.h>
 #endif
 #endif
 #if wxUSE_OWNER_DRAWN
 #include <wx/checklst.h>
 #endif
 #endif

+
+#ifdef __WXGTK__
+#include <wx/checklst.h>
+#endif

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


@@ -36,7 +40,7 @@
 %import gdi.i
 %import events.i
 
 %import gdi.i
 %import events.i
 

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

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


@@ -64,7 +68,7 @@ public:
              const wxValidator& validator = wxPyDefaultValidator,
              char* name = "button");
 
              const wxValidator& validator = wxPyDefaultValidator,
              char* name = "button");
 

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

 
     void SetDefault();
 };
 
     void SetDefault();
 };


@@ -80,17 +84,15 @@ public:
                    const wxValidator& validator = wxPyDefaultValidator,
                    char* name = "button");
 
                    const wxValidator& validator = wxPyDefaultValidator,
                    char* name = "button");
 

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

 
     wxBitmap& GetBitmapLabel();
 
     wxBitmap& GetBitmapLabel();

-#ifdef __WXMSW__

     wxBitmap& GetBitmapDisabled();
     wxBitmap& GetBitmapFocus();
     wxBitmap& GetBitmapSelected();
     void SetBitmapDisabled(const wxBitmap& bitmap);
     void SetBitmapFocus(const wxBitmap& bitmap);
     void SetBitmapSelected(const wxBitmap& bitmap);
     wxBitmap& GetBitmapDisabled();
     wxBitmap& GetBitmapFocus();
     wxBitmap& GetBitmapSelected();
     void SetBitmapDisabled(const wxBitmap& bitmap);
     void SetBitmapFocus(const wxBitmap& bitmap);
     void SetBitmapSelected(const wxBitmap& bitmap);

-#endif

     void SetBitmapLabel(const wxBitmap& bitmap);
 
 };
     void SetBitmapLabel(const wxBitmap& bitmap);
 
 };


@@ -106,7 +108,7 @@ public:
                const wxValidator& val = wxPyDefaultValidator,
                char* name = "checkBox");
 
                const wxValidator& val = wxPyDefaultValidator,
                char* name = "checkBox");
 

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

 
     bool GetValue();
     void SetValue(const bool state);
 
     bool GetValue();
     void SetValue(const bool state);


@@ -124,7 +126,7 @@ public:
              const wxValidator& validator = wxPyDefaultValidator,
              char* name = "choice");
 
              const wxValidator& validator = wxPyDefaultValidator,
              char* name = "choice");
 

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

 
     void Append(const wxString& item);
     void Clear();
 
     void Append(const wxString& item);
     void Clear();


@@ -151,7 +153,7 @@ public:
                const wxValidator& validator = wxPyDefaultValidator,
                char* name = "comboBox");
 
                const wxValidator& validator = wxPyDefaultValidator,
                char* name = "comboBox");
 

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

 
     void Append(const wxString& item);
     // TODO: void Append(const wxString& item, char* clientData);
 
     void Append(const wxString& item);
     // TODO: void Append(const wxString& item, char* clientData);


@@ -191,7 +193,7 @@ public:
             const wxValidator& validator = wxPyDefaultValidator,
             char* name = "gauge");
 
             const wxValidator& validator = wxPyDefaultValidator,
             char* name = "gauge");
 

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

 
     int GetBezelFace();
     int GetRange();
 
     int GetBezelFace();
     int GetRange();


@@ -225,7 +227,7 @@ public:
                  long style = 0,
                  char* name = "staticText");
 
                  long style = 0,
                  char* name = "staticText");
 

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

 
     wxString GetLabel();
     void SetLabel(const wxString& label);
 
     wxString GetLabel();
     void SetLabel(const wxString& label);


@@ -243,7 +245,7 @@ public:
               const wxValidator& validator = wxPyDefaultValidator,
               char* name = "listBox");
 
               const wxValidator& validator = wxPyDefaultValidator,
               char* name = "listBox");
 

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

 
     void Append(const wxString& item);
     // TODO:    void Append(const wxString& item, char* clientData);
 
     void Append(const wxString& item);
     // TODO:    void Append(const wxString& item, char* clientData);


@@ -270,7 +272,6 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-#ifdef __WXMSW__

 class wxCheckListBox : public wxListBox {
 public:
     wxCheckListBox(wxWindow *parent, wxWindowID id,
 class wxCheckListBox : public wxListBox {
 public:
     wxCheckListBox(wxWindow *parent, wxWindowID id,


@@ -282,14 +283,13 @@ public:
                    const wxValidator& validator = wxPyDefaultValidator,
                    char* name = "listBox");
 
                    const wxValidator& validator = wxPyDefaultValidator,
                    char* name = "listBox");
 

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

 
     bool  IsChecked(int uiIndex);
     void  Check(int uiIndex, bool bCheck = TRUE);
 
     int GetItemHeight();
 };
 
     bool  IsChecked(int uiIndex);
     void  Check(int uiIndex, bool bCheck = TRUE);
 
     int GetItemHeight();
 };

-#endif

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


@@ -302,7 +302,7 @@ public:
                const wxValidator& validator = wxPyDefaultValidator,
                char* name = "text");
 
                const wxValidator& validator = wxPyDefaultValidator,
                char* name = "text");
 

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

 
     void Clear();
     void Copy();
 
     void Clear();
     void Copy();


@@ -342,13 +342,13 @@ public:
                 const wxValidator& validator = wxPyDefaultValidator,
                 char* name = "scrollBar");
 
                 const wxValidator& validator = wxPyDefaultValidator,
                 char* name = "scrollBar");
 

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

 
     int GetRange();
     int GetPageSize();
 
     int GetRange();
     int GetPageSize();

-    int GetPosition();
+    int GetThumbPosition();

     int GetThumbSize();
     int GetThumbSize();

-    void SetPosition(int viewStart);
+    void SetThumbPosition(int viewStart);

     void SetScrollbar(int position, int thumbSize,
                       int range,    int pageSize,
                       bool refresh = TRUE);
     void SetScrollbar(int position, int thumbSize,
                       int range,    int pageSize,
                       bool refresh = TRUE);


@@ -356,7 +356,6 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-#ifdef __WXMSW__

 class wxSpinButton : public wxControl {
 public:
     wxSpinButton(wxWindow* parent, wxWindowID id = -1,
 class wxSpinButton : public wxControl {
 public:
     wxSpinButton(wxWindow* parent, wxWindowID id = -1,


@@ -371,7 +370,6 @@ public:
     void SetRange(int min, int max);
     void SetValue(int value);
 };
     void SetRange(int min, int max);
     void SetValue(int value);
 };

-#endif

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


@@ -384,7 +382,7 @@ public:
                    long style = 0,
                    char* name = "staticBitmap");
 
                    long style = 0,
                    char* name = "staticBitmap");
 

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

 
     wxBitmap& GetBitmap();
     void SetBitmap(const wxBitmap& bitmap);
 
     wxBitmap& GetBitmap();
     void SetBitmap(const wxBitmap& bitmap);


@@ -404,21 +402,21 @@ public:
                const wxValidator& validator = wxPyDefaultValidator,
                char* name = "radioBox");
 
                const wxValidator& validator = wxPyDefaultValidator,
                char* name = "radioBox");
 

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

 
 

-    %name(EnableBox)void Enable(bool enable);
-    void Enable(int n, bool enable);
+    void Enable(bool enable);
+    %name(EnableItem)void Enable(int n, bool enable);

     int FindString(const wxString& string);
 #ifdef __WXMSW__
     int FindString(const wxString& string);
 #ifdef __WXMSW__

-    %name(GetBoxLabel)wxString GetLabel();
+    wxString GetLabel();

 #endif
 #endif

-    wxString GetLabel(int n);
+    %name(GetItemLabel)wxString GetLabel(int n);

     int GetSelection();
     wxString GetString(int n);
     wxString GetStringSelection();
     int Number();
     int GetSelection();
     wxString GetString(int n);
     wxString GetStringSelection();
     int Number();

-    %name(SetBoxLabel)void SetLabel(const wxString& label);
-    void SetLabel(int n, const wxString& label);
+    void SetLabel(const wxString& label);
+    %name(SetItemLabel)void SetLabel(int n, const wxString& label);

     void SetSelection(int n);
     void SetStringSelection(const wxString& string);
     void Show(bool show);
     void SetSelection(int n);
     void SetStringSelection(const wxString& string);
     void Show(bool show);


@@ -437,7 +435,7 @@ public:
                   const wxValidator& validator = wxPyDefaultValidator,
                   char* name = "radioButton");
 
                   const wxValidator& validator = wxPyDefaultValidator,
                   char* name = "radioButton");
 

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

 
     bool GetValue();
     void SetValue(bool value);
 
     bool GetValue();
     void SetValue(bool value);


@@ -455,7 +453,7 @@ public:
              const wxValidator& validator = wxPyDefaultValidator,
              char* name = "slider");
 
              const wxValidator& validator = wxPyDefaultValidator,
              char* name = "slider");
 

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

 
     void ClearSel();
     void ClearTicks();
 
     void ClearSel();
     void ClearTicks();


@@ -485,6 +483,41 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.11  1999/02/25 07:08:30  RD
+// wxPython version 2.0b5
+//
+// Revision 1.10  1998/12/17 17:52:19  RD
+//
+// wxPython 0.5.2
+// Minor fixes and SWIG code generation for RR's changes.  MSW and GTK
+// versions are much closer now!
+//
+// Revision 1.9  1998/12/17 14:07:29  RR
+//
+//   Removed minor differences between wxMSW and wxGTK
+//
+// 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.6  1998/11/15 23:03:43  RD
 // Removing some ifdef's for wxGTK
 //