X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc7a2a602b4bd9308be21bc07e40a680f483438e..3684ade82ec6f5fb7ff72341e26060b6ea0793c8:/include/wx/msw/textctrl.h diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h index bc47dbd9f8..dfc07966c5 100644 --- a/include/wx/msw/textctrl.h +++ b/include/wx/msw/textctrl.h @@ -12,7 +12,7 @@ #ifndef _WX_TEXTCTRL_H_ #define _WX_TEXTCTRL_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "textctrl.h" #endif @@ -74,6 +74,7 @@ public: virtual bool LoadFile(const wxString& file); // clears the dirty flag + virtual void MarkDirty(); virtual void DiscardEdits(); virtual void SetMaxLength(unsigned long len); @@ -207,12 +208,13 @@ protected: // false if we hit the limit set by SetMaxLength() and so didn't change it bool AdjustSpaceLimit(); -#if wxUSE_RICHEDIT +#if wxUSE_RICHEDIT && (!wxUSE_UNICODE || wxUSE_UNICODE_MSLU) // replace the selection or the entire control contents with the given text // in the specified encoding - bool StreamIn(const wxString& value, - wxFontEncoding encoding, - bool selOnly); + bool StreamIn(const wxString& value, wxFontEncoding encoding, bool selOnly); + + // get the contents of the control out as text in the given encoding + wxString StreamOut(wxFontEncoding encoding, bool selOnly = false) const; #endif // wxUSE_RICHEDIT // replace the contents of the selection or of the entire control with the