Added (and documented) GetTraceMasks so userspace can probe the currently

[wxWidgets.git] / include / wx / univ / textctrl.h

diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h
index 54f62629d7ac0cafc19db03e29a15b3c25ea2d7f..947a789c81ad4d0e24e03122f336f32d2449ea24 100644 (file)
--- a/include/wx/univ/textctrl.h
+++ b/include/wx/univ/textctrl.h
@@ -13,7 +13,7 @@
 #define _WX_UNIV_TEXTCTRL_H_
 
 #ifdef __GNUG__
-    #pragma interface "textctrl.h"
+    #pragma interface "univtextctrl.h"
 #endif
 
 class WXDLLEXPORT wxCaret;
@@ -265,7 +265,6 @@ public:
     virtual bool Enable(bool enable = TRUE);
 
     // more readable flag testing methods
-    bool IsSingleLine() const { return !(GetWindowStyle() & wxTE_MULTILINE); }
     bool IsPassword() const { return (GetWindowStyle() & wxTE_PASSWORD) != 0; }
     bool WrapLines() const
         { return !IsSingleLine() && !(GetWindowStyle() & wxHSCROLL); }
@@ -562,14 +561,14 @@ class WXDLLEXPORT wxStdTextCtrlInputHandler : public wxStdInputHandler
 public:
     wxStdTextCtrlInputHandler(wxInputHandler *inphand);
 
-    virtual bool HandleKey(wxControl *control,
+    virtual bool HandleKey(wxInputConsumer *consumer,
                            const wxKeyEvent& event,
                            bool pressed);
-    virtual bool HandleMouse(wxControl *control,
+    virtual bool HandleMouse(wxInputConsumer *consumer,
                              const wxMouseEvent& event);
-    virtual bool HandleMouseMove(wxControl *control,
+    virtual bool HandleMouseMove(wxInputConsumer *consumer,
                                  const wxMouseEvent& event);
-    virtual bool HandleFocus(wxControl *control, const wxFocusEvent& event);
+    virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event);
 
 protected:
     // get the position of the mouse click