avoid a bug in Carbon headers

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

diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h
index e0732db03fc5f4fa485c4cd0154b68a3aa839acf..85b1717f61076619fa3940c10138623accdc8fd5 100644 (file)
--- a/include/wx/univ/textctrl.h
+++ b/include/wx/univ/textctrl.h
@@ -12,7 +12,7 @@
 #ifndef _WX_UNIV_TEXTCTRL_H_
 #define _WX_UNIV_TEXTCTRL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "univtextctrl.h"
 #endif
 
@@ -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); }
@@ -456,7 +455,6 @@ protected:
 
     // event handlers
     // --------------
-    void OnIdle(wxIdleEvent& event);
     void OnChar(wxKeyEvent& event);
     void OnSize(wxSizeEvent& event);
 
@@ -477,6 +475,8 @@ protected:
     bool DoCut();
     bool DoPaste();
 
+    // idle processing
+    virtual void OnInternalIdle();
 private:
     // all these methods are for multiline text controls only
 
@@ -562,14 +562,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