Merged some STC fixes over to the main branch

[wxWidgets.git] / src / qt / textctrl.cpp

diff --git a/src/qt/textctrl.cpp b/src/qt/textctrl.cpp
index fb522df053e0a2194d09960b39f1ab56b0692330..f8267f300b5670070cd860ccf6d8c13e10cd409e 100644 (file)
--- a/src/qt/textctrl.cpp
+++ b/src/qt/textctrl.cpp
@@ -28,7 +28,6 @@
 #endif
 #endif
 
 #endif
 #endif
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)


@@ -36,7 +35,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
        EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
        EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground)
 END_EVENT_TABLE()
        EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
        EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground)
 END_EVENT_TABLE()

-#endif

 
 // Text item
 wxTextCtrl::wxTextCtrl()
 
 // Text item
 wxTextCtrl::wxTextCtrl()


@@ -212,6 +210,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 +340,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 +394,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 +402,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 +410,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 +418,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 +426,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 +436,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;
 }