X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23645bfa01b6450257f140a30c87565225b1ef4a..411bdf741573f72ff5560f6b5230036c0c0675a8:/include/wx/univ/textctrl.h diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h index 43e6d1a53b..85b1717f61 100644 --- 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