X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0efe5ba76e45711cad627222905a55c7e04adf9a..ab79958a7fdd0ad585436abefa5a49568a2d8122:/include/wx/textctrl.h diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index ec72f8f377..223403b1c8 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -15,6 +15,9 @@ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- +#ifdef __GNUG__ + #pragma interface "textctrlbase.h" +#endif #include "wx/defs.h" #include "wx/control.h" // the base class @@ -28,8 +31,8 @@ #endif #ifndef NO_TEXT_WINDOW_STREAM - #ifdef wxUSE_STD_IOSTREAM - #include "ioswrap.h" // for iostream classes if we need them + #if wxUSE_STD_IOSTREAM + #include "wx/ioswrap.h" // for iostream classes if we need them #else // !wxUSE_STD_IOSTREAM // can't compile this feature in if we don't use streams at all #define NO_TEXT_WINDOW_STREAM @@ -145,14 +148,14 @@ public: wxTextCtrl& operator<<(long i); wxTextCtrl& operator<<(float f); wxTextCtrl& operator<<(double d); - wxTextCtrl& operator<<(const char c); + wxTextCtrl& operator<<(const wxChar c); // obsolete functions #if WXWIN_COMPATIBILITY bool Modified() const { return IsModified(); } #endif -private: +protected: // the name of the last file loaded with LoadFile() which will be used by // SaveFile() by default wxString m_filename; @@ -172,6 +175,8 @@ private: #include "wx/qt/textctrl.h" #elif defined(__WXMAC__) #include "wx/mac/textctrl.h" +#elif defined(__WXPM__) + #include "wx/os2/textctrl.h" #elif defined(__WXSTUBS__) #include "wx/stubs/textctrl.h" #endif