X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a324a7bccf4bda8f4f2bf09daee8104cae953cee..8cb9f0d0f82650b707adc39823a73531d080ffec:/include/wx/textctrl.h diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index 0de57cdcf6..02434c3377 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 @@ -29,7 +32,7 @@ #ifndef NO_TEXT_WINDOW_STREAM #if wxUSE_STD_IOSTREAM - #include "ioswrap.h" // for iostream classes if we need them + #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 @@ -61,6 +64,7 @@ public: // -------- wxTextCtrlBase(); + ~wxTextCtrlBase(); // accessors // --------- @@ -152,10 +156,17 @@ public: 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; + +private: +#ifndef NO_TEXT_WINDOW_STREAM +#if !wxUSE_IOSTREAMH + char *m_streambuf; +#endif +#endif }; // ---------------------------------------------------------------------------- @@ -172,6 +183,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