added wxTextCtrl::AppendText, used by TextCtrl operator <<

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/textctrl.h b/include/wx/mac/textctrl.h
index 253491eaa0a5d5e13ae4666c60dd7c415a82f160..675e21bb3fcabe3f523f9cbfe46cfdd5580b0de2 100644 (file)
--- a/include/wx/mac/textctrl.h
+++ b/include/wx/mac/textctrl.h
@@ -111,6 +111,7 @@ public:
   virtual bool LoadFile(const wxString& file);
   virtual bool SaveFile(const wxString& file);
   virtual void WriteText(const wxString& text);
   virtual bool LoadFile(const wxString& file);
   virtual bool SaveFile(const wxString& file);
   virtual void WriteText(const wxString& text);

+  virtual void AppendText(const wxString& text);

   virtual void DiscardEdits();
   virtual bool IsModified() const;
   
   virtual void DiscardEdits();
   virtual bool IsModified() const;
   

diff --git a/include/wx/qt/textctrl.h b/include/wx/qt/textctrl.h
index 26fe6548a3d435fe90da65efcd27ee7f8c531802..6b323a9fbe23c4bdab48597c192d33977f9e7a58 100644 (file)
--- a/include/wx/qt/textctrl.h
+++ b/include/wx/qt/textctrl.h
@@ -111,6 +111,7 @@ public:
   virtual bool LoadFile(const wxString& file);
   virtual bool SaveFile(const wxString& file);
   virtual void WriteText(const wxString& text);
   virtual bool LoadFile(const wxString& file);
   virtual bool SaveFile(const wxString& file);
   virtual void WriteText(const wxString& text);

+  virtual void AppendText(const wxString& text);

   virtual void DiscardEdits();
   virtual bool IsModified() const;
   
   virtual void DiscardEdits();
   virtual bool IsModified() const;
   

diff --git a/include/wx/stubs/textctrl.h b/include/wx/stubs/textctrl.h
index 253491eaa0a5d5e13ae4666c60dd7c415a82f160..675e21bb3fcabe3f523f9cbfe46cfdd5580b0de2 100644 (file)
--- a/include/wx/stubs/textctrl.h
+++ b/include/wx/stubs/textctrl.h
@@ -111,6 +111,7 @@ public:
   virtual bool LoadFile(const wxString& file);
   virtual bool SaveFile(const wxString& file);
   virtual void WriteText(const wxString& text);
   virtual bool LoadFile(const wxString& file);
   virtual bool SaveFile(const wxString& file);
   virtual void WriteText(const wxString& text);

+  virtual void AppendText(const wxString& text);

   virtual void DiscardEdits();
   virtual bool IsModified() const;
   
   virtual void DiscardEdits();
   virtual bool IsModified() const;
   

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 4171b868b644f2cc2e326c897dd8ad3f0f8335d2..a2b5e7d38effbe43e23612fb33c0be7463d4917e 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -220,6 +220,11 @@ void wxTextCtrl::WriteText(const wxString& text)
     // TODO write text to control
 }
 
     // TODO write text to control
 }
 

+void wxTextCtrl::AppendText(const wxString& text)
+{
+    // TODO append text to control
+}
+

 void wxTextCtrl::Clear()
 {
     // TODO
 void wxTextCtrl::Clear()
 {
     // TODO


@@ -345,7 +350,7 @@ int wxTextCtrl::overflow(int c)
   txt[plen] = (char)c;     // append c
   txt[plen+xtra] = '\0';   // append '\0' or overwrite c
     // If the put area already contained \0, output will be truncated there
   txt[plen] = (char)c;     // append c
   txt[plen+xtra] = '\0';   // append '\0' or overwrite c
     // If the put area already contained \0, output will be truncated there

-  WriteText(txt);
+  AppendText(txt);

     delete[] txt;
   }
 
     delete[] txt;
   }
 


@@ -399,7 +404,7 @@ int wxTextCtrl::underflow()
 
 wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
 {
 
 wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
 {

-    WriteText(s);
+    AppendText(s);

     return *this;
 }
 
     return *this;
 }
 


@@ -407,7 +412,7 @@ wxTextCtrl& wxTextCtrl::operator<<(float f)
 {
     wxString str;
     str.Printf("%.2f", f);
 {
     wxString str;
     str.Printf("%.2f", f);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -415,7 +420,7 @@ wxTextCtrl& wxTextCtrl::operator<<(double d)
 {
     wxString str;
     str.Printf("%.2f", d);
 {
     wxString str;
     str.Printf("%.2f", d);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -423,7 +428,7 @@ wxTextCtrl& wxTextCtrl::operator<<(int i)
 {
     wxString str;
     str.Printf("%d", i);
 {
     wxString str;
     str.Printf("%d", i);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -431,7 +436,7 @@ wxTextCtrl& wxTextCtrl::operator<<(long i)
 {
     wxString str;
     str.Printf("%ld", i);
 {
     wxString str;
     str.Printf("%ld", i);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -441,7 +446,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const char c)
 
     buf[0] = c;
     buf[1] = 0;
 
     buf[0] = c;
     buf[1] = 0;

-    WriteText(buf);
+    AppendText(buf);

     return *this;
 }
 
     return *this;
 }
 

diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp
index 4171b868b644f2cc2e326c897dd8ad3f0f8335d2..a2b5e7d38effbe43e23612fb33c0be7463d4917e 100644 (file)
--- a/src/mac/textctrl.cpp
+++ b/src/mac/textctrl.cpp
@@ -220,6 +220,11 @@ void wxTextCtrl::WriteText(const wxString& text)
     // TODO write text to control
 }
 
     // TODO write text to control
 }
 

+void wxTextCtrl::AppendText(const wxString& text)
+{
+    // TODO append text to control
+}
+

 void wxTextCtrl::Clear()
 {
     // TODO
 void wxTextCtrl::Clear()
 {
     // TODO


@@ -345,7 +350,7 @@ int wxTextCtrl::overflow(int c)
   txt[plen] = (char)c;     // append c
   txt[plen+xtra] = '\0';   // append '\0' or overwrite c
     // If the put area already contained \0, output will be truncated there
   txt[plen] = (char)c;     // append c
   txt[plen+xtra] = '\0';   // append '\0' or overwrite c
     // If the put area already contained \0, output will be truncated there

-  WriteText(txt);
+  AppendText(txt);

     delete[] txt;
   }
 
     delete[] txt;
   }
 


@@ -399,7 +404,7 @@ int wxTextCtrl::underflow()
 
 wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
 {
 
 wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
 {

-    WriteText(s);
+    AppendText(s);

     return *this;
 }
 
     return *this;
 }
 


@@ -407,7 +412,7 @@ wxTextCtrl& wxTextCtrl::operator<<(float f)
 {
     wxString str;
     str.Printf("%.2f", f);
 {
     wxString str;
     str.Printf("%.2f", f);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -415,7 +420,7 @@ wxTextCtrl& wxTextCtrl::operator<<(double d)
 {
     wxString str;
     str.Printf("%.2f", d);
 {
     wxString str;
     str.Printf("%.2f", d);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -423,7 +428,7 @@ wxTextCtrl& wxTextCtrl::operator<<(int i)
 {
     wxString str;
     str.Printf("%d", i);
 {
     wxString str;
     str.Printf("%d", i);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -431,7 +436,7 @@ wxTextCtrl& wxTextCtrl::operator<<(long i)
 {
     wxString str;
     str.Printf("%ld", i);
 {
     wxString str;
     str.Printf("%ld", i);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -441,7 +446,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const char c)
 
     buf[0] = c;
     buf[1] = 0;
 
     buf[0] = c;
     buf[1] = 0;

-    WriteText(buf);
+    AppendText(buf);

     return *this;
 }
 
     return *this;
 }
 

diff --git a/src/qt/textctrl.cpp b/src/qt/textctrl.cpp
index fb522df053e0a2194d09960b39f1ab56b0692330..ce3459256d159556092e58831e5e3cec300f1916 100644 (file)
--- a/src/qt/textctrl.cpp
+++ b/src/qt/textctrl.cpp
@@ -212,6 +212,11 @@ void wxTextCtrl::WriteText(const wxString& text)
     // TODO write text to control
 }
 
     // TODO write text to control
 }
 

+void wxTextCtrl::AppendText(const wxString& text)
+{
+    // TODO append text to control
+}
+

 void wxTextCtrl::Clear()
 {
     // TODO
 void wxTextCtrl::Clear()
 {
     // TODO


@@ -337,7 +342,7 @@ int wxTextCtrl::overflow(int c)
   txt[plen] = (char)c;     // append c
   txt[plen+xtra] = '\0';   // append '\0' or overwrite c
     // If the put area already contained \0, output will be truncated there
   txt[plen] = (char)c;     // append c
   txt[plen+xtra] = '\0';   // append '\0' or overwrite c
     // If the put area already contained \0, output will be truncated there

-  WriteText(txt);
+  AppendText(txt);

     delete[] txt;
   }
 
     delete[] txt;
   }
 


@@ -391,7 +396,7 @@ int wxTextCtrl::underflow()
 
 wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
 {
 
 wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
 {

-    WriteText(s);
+    AppendText(s);

     return *this;
 }
 
     return *this;
 }
 


@@ -399,7 +404,7 @@ wxTextCtrl& wxTextCtrl::operator<<(float f)
 {
     wxString str;
     str.Printf("%.2f", f);
 {
     wxString str;
     str.Printf("%.2f", f);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -407,7 +412,7 @@ wxTextCtrl& wxTextCtrl::operator<<(double d)
 {
     wxString str;
     str.Printf("%.2f", d);
 {
     wxString str;
     str.Printf("%.2f", d);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -415,7 +420,7 @@ wxTextCtrl& wxTextCtrl::operator<<(int i)
 {
     wxString str;
     str.Printf("%d", i);
 {
     wxString str;
     str.Printf("%d", i);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -423,7 +428,7 @@ wxTextCtrl& wxTextCtrl::operator<<(long i)
 {
     wxString str;
     str.Printf("%ld", i);
 {
     wxString str;
     str.Printf("%ld", i);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -433,7 +438,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const char c)
 
     buf[0] = c;
     buf[1] = 0;
 
     buf[0] = c;
     buf[1] = 0;

-    WriteText(buf);
+    AppendText(buf);

     return *this;
 }
 
     return *this;
 }
 

diff --git a/src/stubs/textctrl.cpp b/src/stubs/textctrl.cpp
index 6083ace113eb3907d59ff34cb95513b1e75af78d..a9ede8a5a4ba9488ededcb4b569592d8a8d95b29 100644 (file)
--- a/src/stubs/textctrl.cpp
+++ b/src/stubs/textctrl.cpp
@@ -211,6 +211,11 @@ void wxTextCtrl::WriteText(const wxString& text)
     // TODO write text to control
 }
 
     // TODO write text to control
 }
 

+void wxTextCtrl::AppendText(const wxString& text)
+{
+    // TODO append text to control
+}
+

 void wxTextCtrl::Clear()
 {
     // TODO
 void wxTextCtrl::Clear()
 {
     // TODO


@@ -336,7 +341,7 @@ int wxTextCtrl::overflow(int c)
   txt[plen] = (char)c;     // append c
   txt[plen+xtra] = '\0';   // append '\0' or overwrite c
     // If the put area already contained \0, output will be truncated there
   txt[plen] = (char)c;     // append c
   txt[plen+xtra] = '\0';   // append '\0' or overwrite c
     // If the put area already contained \0, output will be truncated there

-  WriteText(txt);
+  AppendText(txt);

     delete[] txt;
   }
 
     delete[] txt;
   }
 


@@ -390,7 +395,7 @@ int wxTextCtrl::underflow()
 
 wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
 {
 
 wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
 {

-    WriteText(s);
+    AppendText(s);

     return *this;
 }
 
     return *this;
 }
 


@@ -398,7 +403,7 @@ wxTextCtrl& wxTextCtrl::operator<<(float f)
 {
     wxString str;
     str.Printf("%.2f", f);
 {
     wxString str;
     str.Printf("%.2f", f);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -406,7 +411,7 @@ wxTextCtrl& wxTextCtrl::operator<<(double d)
 {
     wxString str;
     str.Printf("%.2f", d);
 {
     wxString str;
     str.Printf("%.2f", d);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -414,7 +419,7 @@ wxTextCtrl& wxTextCtrl::operator<<(int i)
 {
     wxString str;
     str.Printf("%d", i);
 {
     wxString str;
     str.Printf("%d", i);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -422,7 +427,7 @@ wxTextCtrl& wxTextCtrl::operator<<(long i)
 {
     wxString str;
     str.Printf("%ld", i);
 {
     wxString str;
     str.Printf("%ld", i);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -432,7 +437,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const char c)
 
     buf[0] = c;
     buf[1] = 0;
 
     buf[0] = c;
     buf[1] = 0;

-    WriteText(buf);
+    AppendText(buf);

     return *this;
 }
 
     return *this;
 }