merged in the commit from the 2.2 branch

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

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 1718f736641a6f265bb16a015eda03a625441191..02434c33775ddc9569a2c45d941d055cd45df055 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -15,6 +15,9 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

+#ifdef __GNUG__
+    #pragma interface "textctrlbase.h"
+#endif   

 
 #include "wx/defs.h"
 #include "wx/control.h"         // the base class
 
 #include "wx/defs.h"
 #include "wx/control.h"         // the base class


@@ -29,7 +32,7 @@
 
 #ifndef NO_TEXT_WINDOW_STREAM
     #if wxUSE_STD_IOSTREAM
 
 #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
     #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();

+    ~wxTextCtrlBase();

 
     // accessors
     // ---------
 
     // accessors
     // ---------


@@ -145,17 +149,24 @@ public:
     wxTextCtrl& operator<<(long i);
     wxTextCtrl& operator<<(float f);
     wxTextCtrl& operator<<(double d);
     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
 
 
     // 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;
     // 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"
     #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
 #elif defined(__WXSTUBS__)
     #include "wx/stubs/textctrl.h"
 #endif