fixes for reading bitmapswith BI_BITFIELDS (patch 597906)

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

diff --git a/wxPython/src/controls.i b/wxPython/src/controls.i
index 64e69048f4daaa54186ea30d77950bc6215334b1..96ca6cb7b401baba153b9ecafdf21eb5f90c8de5 100644 (file)
--- a/wxPython/src/controls.i
+++ b/wxPython/src/controls.i
@@ -92,12 +92,12 @@ public:
 
     //
     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();
@@ -709,6 +709,11 @@ public:
 #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 +862,10 @@ public:
     void SelectAll();
     void SetEditable(bool editable);
 
+    bool IsSingleLine();
+    bool IsMultiLine();
+
+
     %addmethods {
         void write(const wxString& text) {
             self->AppendText(text);
@@ -866,7 +875,7 @@ public:
     // 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);
         }
     }
 };