fix for group names containing ']'

[wxWidgets.git] / src / common / textcmn.cpp

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index 33796a5371efc7ea745a8113f01e5f13021a99bc..0ce243a14111ba80826975086fc1bbf54a766d50 100644 (file)
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -12,7 +12,10 @@
 // ============================================================================
 // declarations
 // ============================================================================
 // ============================================================================
 // declarations
 // ============================================================================

-
+#ifdef __GNUG__
+    #pragma implementation "textctrlbase.h"
+#endif
+        

 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -21,6 +24,8 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/intl.h"
+    #include "wx/log.h"

     #include "wx/textctrl.h"
 #endif // WX_PRECOMP
 
     #include "wx/textctrl.h"
 #endif // WX_PRECOMP
 


@@ -44,6 +49,24 @@
 
 wxTextCtrlBase::wxTextCtrlBase()
 {
 
 wxTextCtrlBase::wxTextCtrlBase()
 {

+#ifndef NO_TEXT_WINDOW_STREAM
+  #if wxUSE_IOSTREAMH
+  if (allocate())
+    setp(base(),ebuf());
+  #else
+  m_streambuf=new char[64];
+  setp(m_streambuf,m_streambuf+64);
+  #endif //wxUSE_IOSTREAMH
+#endif // NO_TEXT_WINDOW_STREAM
+}
+
+wxTextCtrlBase::~wxTextCtrlBase()
+{
+#ifndef NO_TEXT_WINDOW_STREAM
+#if !wxUSE_IOSTREAMH
+  delete m_streambuf;
+#endif
+#endif

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -79,7 +102,7 @@ bool wxTextCtrlBase::SaveFile(const wxString& filename)
     if ( !filenameToUse )
     {
         // what kind of message to give? is it an error or a program bug?
     if ( !filenameToUse )
     {
         // what kind of message to give? is it an error or a program bug?

-        wxLogDebug(_T("Can't save textctrl to file without filename."));
+        wxLogDebug(wxT("Can't save textctrl to file without filename."));

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -113,7 +136,7 @@ wxTextCtrl& wxTextCtrlBase::operator<<(const wxString& s)
 wxTextCtrl& wxTextCtrlBase::operator<<(float f)
 {
     wxString str;
 wxTextCtrl& wxTextCtrlBase::operator<<(float f)
 {
     wxString str;

-    str.Printf(_T("%.2f"), f);
+    str.Printf(wxT("%.2f"), f);

     AppendText(str);
     return *TEXTCTRL(this);
 }
     AppendText(str);
     return *TEXTCTRL(this);
 }


@@ -121,7 +144,7 @@ wxTextCtrl& wxTextCtrlBase::operator<<(float f)
 wxTextCtrl& wxTextCtrlBase::operator<<(double d)
 {
     wxString str;
 wxTextCtrl& wxTextCtrlBase::operator<<(double d)
 {
     wxString str;

-    str.Printf(_T("%.2f"), d);
+    str.Printf(wxT("%.2f"), d);

     AppendText(str);
     return *TEXTCTRL(this);
 }
     AppendText(str);
     return *TEXTCTRL(this);
 }


@@ -129,7 +152,7 @@ wxTextCtrl& wxTextCtrlBase::operator<<(double d)
 wxTextCtrl& wxTextCtrlBase::operator<<(int i)
 {
     wxString str;
 wxTextCtrl& wxTextCtrlBase::operator<<(int i)
 {
     wxString str;

-    str.Printf(_T("%d"), i);
+    str.Printf(wxT("%d"), i);

     AppendText(str);
     return *TEXTCTRL(this);
 }
     AppendText(str);
     return *TEXTCTRL(this);
 }


@@ -137,12 +160,12 @@ wxTextCtrl& wxTextCtrlBase::operator<<(int i)
 wxTextCtrl& wxTextCtrlBase::operator<<(long i)
 {
     wxString str;
 wxTextCtrl& wxTextCtrlBase::operator<<(long i)
 {
     wxString str;

-    str.Printf(_T("%ld"), i);
+    str.Printf(wxT("%ld"), i);

     AppendText(str);
     return *TEXTCTRL(this);
 }
 
     AppendText(str);
     return *TEXTCTRL(this);
 }
 

-wxTextCtrl& wxTextCtrlBase::operator<<(const char c)
+wxTextCtrl& wxTextCtrlBase::operator<<(const wxChar c)

 {
     return operator<<(wxString(c));
 }
 {
     return operator<<(wxString(c));
 }