added AppendText method, now used by operator <<

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

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index da978601d18a3828bd7de81f77df28fc40788fed..fcc1be71f3ed4f3cce96b098568ae3125967e398 100644 (file)
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -73,6 +73,7 @@ class wxTextCtrl: public wxControl
     wxString GetValue() const;
     void SetValue( const wxString &value );
     void WriteText( const wxString &text );
     wxString GetValue() const;
     void SetValue( const wxString &value );
     void WriteText( const wxString &text );

+    void AppendText( const wxString &text );

 
     bool LoadFile( const wxString &file );
     bool SaveFile( const wxString &file );
 
     bool LoadFile( const wxString &file );
     bool SaveFile( const wxString &file );

diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index da978601d18a3828bd7de81f77df28fc40788fed..fcc1be71f3ed4f3cce96b098568ae3125967e398 100644 (file)
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -73,6 +73,7 @@ class wxTextCtrl: public wxControl
     wxString GetValue() const;
     void SetValue( const wxString &value );
     void WriteText( const wxString &text );
     wxString GetValue() const;
     void SetValue( const wxString &value );
     void WriteText( const wxString &text );

+    void AppendText( const wxString &text );

 
     bool LoadFile( const wxString &file );
     bool SaveFile( const wxString &file );
 
     bool LoadFile( const wxString &file );
     bool SaveFile( const wxString &file );

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index cc172bce3c2494af44c03ca0b85d0bd041bf05e0..4f221beeffa6ffee4582f01ab0e5f48789008777 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -309,6 +309,23 @@ void wxTextCtrl::WriteText( const wxString &text )
     }
 }
 
     }
 }
 

+void wxTextCtrl::AppendText( const wxString &text )
+{
+    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+
+    if (m_windowStyle & wxTE_MULTILINE)
+    {
+        /* we'll insert at the last position */
+        gint len = gtk_text_get_length( GTK_TEXT(m_text) );
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
+       GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
+    }
+    else
+    {
+        gtk_entry_append_text( GTK_ENTRY(m_text), text );
+    }
+}
+

 bool wxTextCtrl::LoadFile( const wxString &file )
 {
   wxCHECK_MSG( m_text != NULL, FALSE, "invalid text ctrl" );
 bool wxTextCtrl::LoadFile( const wxString &file )
 {
   wxCHECK_MSG( m_text != NULL, FALSE, "invalid text ctrl" );


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

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

     return *this;
 }
 
     return *this;
 }
 


@@ -729,7 +746,7 @@ wxTextCtrl& wxTextCtrl::operator<<(float f)
 {
     static char buf[100];
     sprintf(buf, "%.2f", f);
 {
     static char buf[100];
     sprintf(buf, "%.2f", f);

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

     return *this;
 }
 
     return *this;
 }
 


@@ -737,7 +754,7 @@ wxTextCtrl& wxTextCtrl::operator<<(double d)
 {
     static char buf[100];
     sprintf(buf, "%.2f", d);
 {
     static char buf[100];
     sprintf(buf, "%.2f", d);

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

     return *this;
 }
 
     return *this;
 }
 


@@ -745,7 +762,7 @@ wxTextCtrl& wxTextCtrl::operator<<(int i)
 {
     static char buf[100];
     sprintf(buf, "%i", i);
 {
     static char buf[100];
     sprintf(buf, "%i", i);

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

     return *this;
 }
 
     return *this;
 }
 


@@ -753,7 +770,7 @@ wxTextCtrl& wxTextCtrl::operator<<(long i)
 {
     static char buf[100];
     sprintf(buf, "%ld", i);
 {
     static char buf[100];
     sprintf(buf, "%ld", i);

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

     return *this;
 }
 
     return *this;
 }
 


@@ -763,7 +780,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;
 }
 #endif
     return *this;
 }
 #endif

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index cc172bce3c2494af44c03ca0b85d0bd041bf05e0..4f221beeffa6ffee4582f01ab0e5f48789008777 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -309,6 +309,23 @@ void wxTextCtrl::WriteText( const wxString &text )
     }
 }
 
     }
 }
 

+void wxTextCtrl::AppendText( const wxString &text )
+{
+    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+
+    if (m_windowStyle & wxTE_MULTILINE)
+    {
+        /* we'll insert at the last position */
+        gint len = gtk_text_get_length( GTK_TEXT(m_text) );
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
+       GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
+    }
+    else
+    {
+        gtk_entry_append_text( GTK_ENTRY(m_text), text );
+    }
+}
+

 bool wxTextCtrl::LoadFile( const wxString &file )
 {
   wxCHECK_MSG( m_text != NULL, FALSE, "invalid text ctrl" );
 bool wxTextCtrl::LoadFile( const wxString &file )
 {
   wxCHECK_MSG( m_text != NULL, FALSE, "invalid text ctrl" );


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

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

     return *this;
 }
 
     return *this;
 }
 


@@ -729,7 +746,7 @@ wxTextCtrl& wxTextCtrl::operator<<(float f)
 {
     static char buf[100];
     sprintf(buf, "%.2f", f);
 {
     static char buf[100];
     sprintf(buf, "%.2f", f);

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

     return *this;
 }
 
     return *this;
 }
 


@@ -737,7 +754,7 @@ wxTextCtrl& wxTextCtrl::operator<<(double d)
 {
     static char buf[100];
     sprintf(buf, "%.2f", d);
 {
     static char buf[100];
     sprintf(buf, "%.2f", d);

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

     return *this;
 }
 
     return *this;
 }
 


@@ -745,7 +762,7 @@ wxTextCtrl& wxTextCtrl::operator<<(int i)
 {
     static char buf[100];
     sprintf(buf, "%i", i);
 {
     static char buf[100];
     sprintf(buf, "%i", i);

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

     return *this;
 }
 
     return *this;
 }
 


@@ -753,7 +770,7 @@ wxTextCtrl& wxTextCtrl::operator<<(long i)
 {
     static char buf[100];
     sprintf(buf, "%ld", i);
 {
     static char buf[100];
     sprintf(buf, "%ld", i);

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

     return *this;
 }
 
     return *this;
 }
 


@@ -763,7 +780,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;
 }
 #endif
     return *this;
 }
 #endif