*** empty log message ***

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

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

+#include <wx/spinbutt.h>
+#include <wx/dynarray.h>
+#include <wx/statline.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 +43,7 @@
 %import gdi.i
 %import events.i
 
 %import gdi.i
 %import events.i
 

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

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


@@ -48,7 +55,9 @@ wxValidator wxPyDefaultValidator;       // Non-const default because of SWIG
 
 class wxControl : public wxWindow {
 public:
 
 class wxControl : public wxWindow {
 public:

+#ifdef __WXMSW__

     void Command(wxCommandEvent& event);
     void Command(wxCommandEvent& event);

+#endif

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


@@ -64,7 +73,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 +89,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 +113,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 +131,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();


@@ -141,7 +148,7 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-class wxComboBox : public wxControl {
+class wxComboBox : public wxChoice {

 public:
     wxComboBox(wxWindow* parent, wxWindowID id, char* value = "",
                const wxPoint& pos = wxPyDefaultPosition,
 public:
     wxComboBox(wxWindow* parent, wxWindowID id, char* value = "",
                const wxPoint& pos = wxPyDefaultPosition,


@@ -151,7 +158,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);


@@ -175,7 +182,7 @@ public:
     // TODO:    void SetClientData(const int n, char* data);
     void SetInsertionPoint(long pos);
     void SetInsertionPointEnd();
     // TODO:    void SetClientData(const int n, char* data);
     void SetInsertionPoint(long pos);
     void SetInsertionPointEnd();

-    void SetSelection(int n, bool select = TRUE);
+    void SetSelection(int n);

     %name(SetMark)void SetSelection(long from, long to);
     void SetValue(const wxString& text);
 };
     %name(SetMark)void SetSelection(long from, long to);
     void SetValue(const wxString& text);
 };


@@ -191,7 +198,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();


@@ -215,6 +222,19 @@ public:
 };
 
 
 };
 
 

+//----------------------------------------------------------------------
+
+
+class wxStaticLine : public wxControl {
+public:
+    wxStaticLine( wxWindow *parent, wxWindowID id,
+                  const wxPoint &pos = wxPyDefaultPosition,
+                  const wxSize &size = wxPyDefaultSize,
+                  long style = wxLI_HORIZONTAL,
+                  const char* name = "staticLine" );
+};
+
+

 //----------------------------------------------------------------------
 
 class wxStaticText : public wxControl {
 //----------------------------------------------------------------------
 
 class wxStaticText : public wxControl {


@@ -225,7 +245,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 +263,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);


@@ -253,7 +273,20 @@ public:
     int FindString(const wxString& string);
     // TODO:    char* GetClientData(const int n);
     int GetSelection();
     int FindString(const wxString& string);
     // TODO:    char* GetClientData(const int n);
     int GetSelection();

-    // TODO: int GetSelections(int **selections);
+
+    // int GetSelections(int **selections);
+    %addmethods {
+      PyObject* GetSelections() {
+          wxArrayInt lst;
+          self->GetSelections(lst);
+          PyObject *tup = PyTuple_New(lst.GetCount());
+          for(int i=0; i<lst.GetCount(); i++) {
+              PyTuple_SetItem(tup, i, PyInt_FromLong(lst[i]));
+          }
+          return tup;
+      }
+    }
+

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


@@ -270,7 +303,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 +314,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 +333,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();


@@ -328,7 +359,16 @@ public:
     void SetValue(const wxString& value);
     void ShowPosition(long pos);
     void WriteText(const wxString& text);
     void SetValue(const wxString& value);
     void ShowPosition(long pos);
     void WriteText(const wxString& text);

+    void AppendText(const wxString& text);

     long XYToPosition(long x, long y);
     long XYToPosition(long x, long y);

+
+    bool CanCopy();
+    bool CanCut();
+    bool CanPaste();
+    bool CanRedo();
+    bool CanUndo();
+    void GetSelection(long* OUTPUT, long* OUTPUT);
+    bool IsEditable();

 };
 
 //----------------------------------------------------------------------
 };
 
 //----------------------------------------------------------------------


@@ -342,13 +382,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 +396,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 +410,6 @@ public:
     void SetRange(int min, int max);
     void SetValue(int value);
 };
     void SetRange(int min, int max);
     void SetValue(int value);
 };

-#endif

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


@@ -384,10 +422,11 @@ 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();
+    const wxBitmap& GetBitmap();

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

+    void SetIcon(const wxIcon& icon);

 };
 
 //----------------------------------------------------------------------
 };
 
 //----------------------------------------------------------------------


@@ -404,21 +443,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);
     int FindString(const wxString& string);

-#ifdef __WXMSW__
-    %name(GetBoxLabel)wxString GetLabel();
-#endif
-    wxString GetLabel(int n);
+
+//***    wxString GetLabel();
+//***    void SetLabel(const wxString& label);
+
+    %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);
+    %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 +476,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 +494,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();


@@ -481,34 +520,3 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-
-/////////////////////////////////////////////////////////////////////////////
-//
-// $Log$
-// 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
-// different each time.
-//
-// - A few minor fixes.
-//
-// Revision 1.1  1998/08/09 08:25:49  RD
-// Initial version
-//
-//
-