support Show() in wxFlexGridSizer (patch 737850)

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

diff --git a/wxPython/src/controls.i b/wxPython/src/controls.i
index 64e69048f4daaa54186ea30d77950bc6215334b1..c3f57ddb658b7d2b8f84e86d759a2a1eb7871e62 100644 (file)
--- a/wxPython/src/controls.i
+++ b/wxPython/src/controls.i
@@ -92,12 +92,12 @@ public:
 
     //
     wxControl(wxWindow *parent,
 
     //
     wxControl(wxWindow *parent,

-                       wxWindowID id,
-                       const wxPoint& pos=wxDefaultPosition,
-                       const wxSize& size=wxDefaultSize,
-                       long style=0,
-                       const wxValidator& validator=wxDefaultValidator,
-                       const wxString& name=wxPyControlNameStr);
+              wxWindowID id,
+              const wxPoint& pos=wxDefaultPosition,
+              const wxSize& size=wxDefaultSize,
+              long style=0,
+              const wxValidator& validator=wxDefaultValidator,
+              const wxString& name=wxPyControlNameStr);

 
     //
     %name(wxPreControl)wxControl();
 
     //
     %name(wxPreControl)wxControl();


@@ -338,6 +338,7 @@ public:
     %pragma(python) addtomethod = "wxPreCheckBox:val._setOORInfo(val)"
 
     bool GetValue();
     %pragma(python) addtomethod = "wxPreCheckBox:val._setOORInfo(val)"
 
     bool GetValue();

+    bool IsChecked();

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


@@ -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();