X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e702ff0f08a54622a6b0f1e2ec39537b082c3a8e..4438caf41af49f00f3c8137ac801871f59cce386:/include/wx/gtk1/textctrl.h diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h index 31946009a3..a930d772d4 100644 --- a/include/wx/gtk1/textctrl.h +++ b/include/wx/gtk1/textctrl.h @@ -29,10 +29,6 @@ #include #endif -#else - -#define NO_TEXT_WINDOW_STREAM - #endif //----------------------------------------------------------------------------- @@ -51,7 +47,7 @@ extern const char *wxTextCtrlNameStr; // wxTextCtrl //----------------------------------------------------------------------------- -#ifndef NO_TEXT_WINDOW_STREAM +#if wxUSE_STD_IOSTREAM class wxTextCtrl: public wxControl, public streambuf #else class wxTextCtrl: public wxControl @@ -130,10 +126,11 @@ class wxTextCtrl: public wxControl void OnUpdateUndo(wxUpdateUIEvent& event); void OnUpdateRedo(wxUpdateUIEvent& event); -#ifndef NO_TEXT_WINDOW_STREAM +#if wxUSE_STD_IOSTREAM int overflow(int i); int sync(); int underflow(); +#endif wxTextCtrl& operator<<(const wxString& s); wxTextCtrl& operator<<(int i); @@ -141,11 +138,10 @@ class wxTextCtrl: public wxControl wxTextCtrl& operator<<(float f); wxTextCtrl& operator<<(double d); wxTextCtrl& operator<<(const char c); -#endif - void SetFont( const wxFont &font ); - void SetForegroundColour(const wxColour &colour); - void SetBackgroundColour(const wxColour &colour); + bool SetFont( const wxFont &font ); + bool SetForegroundColour(const wxColour &colour); + bool SetBackgroundColour(const wxColour &colour); // implementation