And a 'standard colours' bitmap to help fix wxToolBar colour mapping problem

[wxWidgets.git] / include / wx / textctrl.h

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 7db565fd5c7f333bb9805bc779d95eccc1967424..02434c33775ddc9569a2c45d941d055cd45df055 100644 (file)
--- 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
@@ -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
 };
 
 // ----------------------------------------------------------------------------