added functions to read/write several elements at once (patch 754986)

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

diff --git a/wxPython/src/controls.i b/wxPython/src/controls.i
index efc72fcafa893aad77450fd6bd9861032074b06f..f6146b9e270fbdaa2d0a9a8f5cc2dd55b10193f0 100644 (file)
--- a/wxPython/src/controls.i
+++ b/wxPython/src/controls.i
@@ -323,7 +323,7 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,

-               const wxValidator& val = wxDefaultValidator,
+               const wxValidator& validator = wxDefaultValidator,

                const wxString& name = wxPyCheckBoxNameStr);
     %name(wxPreCheckBox)wxCheckBox();
 
                const wxString& name = wxPyCheckBoxNameStr);
     %name(wxPreCheckBox)wxCheckBox();
 


@@ -331,13 +331,14 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,

-               const wxValidator& val = wxDefaultValidator,
+               const wxValidator& validator = wxDefaultValidator,

                const wxString& name = wxPyCheckBoxNameStr);
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %pragma(python) addtomethod = "wxPreCheckBox:val._setOORInfo(val)"
 
     bool GetValue();
                const wxString& name = wxPyCheckBoxNameStr);
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %pragma(python) addtomethod = "wxPreCheckBox:val._setOORInfo(val)"
 
     bool GetValue();

+    bool IsChecked();

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


@@ -380,11 +381,11 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-// wxGTK's wxComboBox doesn't derive from wxChoice like wxMSW, or
-// even wxControlWithItems, so we have to duplicate the methods
-// here... <blech!>
+// wxGTK's wxComboBox doesn't derive from wxChoice like wxMSW, or even
+// wxControlWithItems, so we have to duplicate the methods here... <blech!>
+// wxMac's inheritace is weird too so we'll fake it with this one too.

 
 

-#ifdef __WXGTK__
+#ifndef __WXMSW__

 class wxComboBox : public wxControl
 {
 public:
 class wxComboBox : public wxControl
 {
 public:


@@ -476,8 +477,8 @@ public:
 
 
 
 
 
 

-#else  // For all but wxGTK
-
+#else
+// MSW's version derives from wxChoice

 
 class wxComboBox : public wxChoice {
 public:
 
 class wxComboBox : public wxChoice {
 public:


@@ -709,6 +710,11 @@ public:
 #ifndef __WXMAC__
     int GetItemHeight();
 #endif
 #ifndef __WXMAC__
     int GetItemHeight();
 #endif

+
+    // return the index of the item at this position or wxNOT_FOUND
+    int HitTest(const wxPoint& pt) const;
+    %name(HitTestXY)int HitTest(wxCoord x, wxCoord y) const;
+

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


@@ -857,6 +863,10 @@ public:
     void SelectAll();
     void SetEditable(bool editable);
 
     void SelectAll();
     void SetEditable(bool editable);
 

+    bool IsSingleLine();
+    bool IsMultiLine();
+
+

     %addmethods {
         void write(const wxString& text) {
             self->AppendText(text);
     %addmethods {
         void write(const wxString& text) {
             self->AppendText(text);


@@ -866,7 +876,7 @@ public:
     // TODO: replace this when the method is really added to wxTextCtrl
     %addmethods {
         wxString GetString(long from, long to) {
     // TODO: replace this when the method is really added to wxTextCtrl
     %addmethods {
         wxString GetString(long from, long to) {

-            return self->GetValue().Mid(from, to-from);
+            return self->GetValue().Mid(from, to - from);

         }
     }
 };
         }
     }
 };


@@ -994,18 +1004,15 @@ public:
     int FindString(const wxString& string);
 
     wxString GetString(int n);
     int FindString(const wxString& string);
 
     wxString GetString(int n);

-
-#ifdef __WXGTK__
-    %name(GetItemLabel)wxString GetLabel( int item );
-    %name(SetItemLabel)void SetLabel( int item, const wxString& label );
-#else

     void SetString(int n, const wxString& label);
     %pragma(python) addtoclass = "
     GetItemLabel = GetString
     SetItemLabel = SetString
     "
     void SetString(int n, const wxString& label);
     %pragma(python) addtoclass = "
     GetItemLabel = GetString
     SetItemLabel = SetString
     "

+#ifndef __WXGTK__

     int GetColumnCount();
     int GetRowCount();
     int GetColumnCount();
     int GetRowCount();

+    int GetNextItem(int item, wxDirection dir, long style);

 #endif
 
     int GetSelection();
 #endif
 
     int GetSelection();


@@ -1124,7 +1131,14 @@ public:
     int GetValue();
     void SetRange(int min, int max);
     void SetValue(int value);
     int GetValue();
     void SetRange(int min, int max);
     void SetValue(int value);

-
+#ifdef __WXGTK__
+    %addmethods {
+        void SetSelection(long from, long to) {
+        }
+    }
+#else
+    void SetSelection(long from, long to);
+#endif

 };
 
 
 };