X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e702ff0f08a54622a6b0f1e2ec39537b082c3a8e..6cf7c00f3beb3aa6c84b47d43d904e0e40f91a97:/src/gtk/textctrl.cpp?ds=sidebyside

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 5fd1f455a1..d300952a7f 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -37,9 +37,9 @@ extern bool   g_blockEventsOnDrag;
 static void
 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {
-    win->SetModified();
+    if (!win->m_hasVMT) return;
 
-    win->CalculateScrollbar();
+    win->SetModified();
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId );
     event.SetString( win->GetValue() );
@@ -48,12 +48,14 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 }
 
 //-----------------------------------------------------------------------------
-// "size_allocate"
+// "changed" from vertical scrollbar
 //-----------------------------------------------------------------------------
 
 static void
-gtk_text_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* WXUNUSED(alloc), wxTextCtrl *win )
+gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {
+    if (!win->m_hasVMT) return;
+    
     win->CalculateScrollbar();
 }
 
@@ -124,19 +126,19 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
 
     SetValidator( validator );
 
-    m_vScrollbarVisible = TRUE;
+    m_vScrollbarVisible = FALSE;
 
     bool multi_line = (style & wxTE_MULTILINE) != 0;
     if ( multi_line )
     {
-        // a multi-line edit control: create a vertical scrollbar by default and
-        // horizontal if requested
+        /* a multi-line edit control: create a vertical scrollbar by default and
+           horizontal if requested */
         bool bHasHScrollbar = (style & wxHSCROLL) != 0;
 
-        // create our control...
+        /* create our control ... */
         m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
 
-        // ... and put into the upper left hand corner of the table
+        /* ... and put into the upper left hand corner of the table */
         m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
         GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 	
@@ -145,7 +147,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
                       (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
                        0, 0);
 
-        // put the horizontal scrollbar in the lower left hand corner
+        /* put the horizontal scrollbar in the lower left hand corner */
         if (bHasHScrollbar)
         {
             GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj);
@@ -158,22 +160,13 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
             gtk_widget_show(hscrollbar);
         }
 
-        // finally, put the vertical scrollbar in the upper right corner
-        m_vScrollbar = gtk_vscrollbar_new( GTK_TEXT(m_text)->vadj );
-        GTK_WIDGET_UNSET_FLAGS( m_vScrollbar, GTK_CAN_FOCUS );
-	
-        gtk_table_attach(GTK_TABLE(m_widget), m_vScrollbar, 1, 2, 0, 1,
-                     GTK_FILL,
-                     (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
-                     0, 0);
-        gtk_widget_show( m_vScrollbar );
+        /* we create the vertical scrollbar on demand */
+	m_vScrollbar = (GtkWidget*) NULL;
 
-        gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
-          GTK_SIGNAL_FUNC(gtk_text_size_callback), (gpointer)this );
     }
     else
     {
-        // a single-line text control: no need for scrollbars
+        /* a single-line text control: no need for scrollbars */
         m_widget =
           m_text = gtk_entry_new();
     }
@@ -195,14 +188,19 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
         gtk_widget_show(m_text);
     }
 
-    // we want to be notified about text changes
+    /* we want to be notified about text changes */
     gtk_signal_connect( GTK_OBJECT(m_text), "changed",
       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
 
     if (!value.IsEmpty())
     {
         gint tmp = 0;
+#if wxUSE_UNICODE
+	wxWX2MBbuf val = value.mbc_str();
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), val, strlen(val), &tmp );
+#else
         gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
+#endif
 	
         if (multi_line)
         {
@@ -228,11 +226,17 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
         if (multi_line)
             gtk_text_set_editable( GTK_TEXT(m_text), 1 );
     }
+    
+    SetBackgroundColour( parent->GetBackgroundColour() );
+    SetForegroundColour( parent->GetForegroundColour() );
 
     Show( TRUE );
 
-    SetBackgroundColour( parent->GetBackgroundColour() );
-    SetForegroundColour( parent->GetForegroundColour() );
+    if (multi_line)
+    {
+        gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed",
+          (GtkSignalFunc) gtk_scrollbar_changed_callback, (gpointer) this );
+    }
 
     return TRUE;
 }
@@ -247,32 +251,44 @@ void wxTextCtrl::CalculateScrollbar()
     {
         if (m_vScrollbarVisible)
         {
-        gtk_widget_hide( m_vScrollbar );
+            gtk_widget_hide( m_vScrollbar );
 
-        m_vScrollbarVisible = FALSE;
+            m_vScrollbarVisible = FALSE;
         }
     }
     else
     {
         if (!m_vScrollbarVisible)
         {
-        gtk_widget_show( m_vScrollbar );
+	    if (!m_vScrollbar)
+	    {
+                /* finally, put the vertical scrollbar in the upper right corner */
+                m_vScrollbar = gtk_vscrollbar_new( GTK_TEXT(m_text)->vadj );
+                GTK_WIDGET_UNSET_FLAGS( m_vScrollbar, GTK_CAN_FOCUS );
+	
+                gtk_table_attach(GTK_TABLE(m_widget), m_vScrollbar, 1, 2, 0, 1,
+                     GTK_FILL,
+                     (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
+                     0, 0);
+	    }
+	    
+            gtk_widget_show( m_vScrollbar );
 
-        m_vScrollbarVisible = TRUE;
+            m_vScrollbarVisible = TRUE;
         }
     }
 }
 
 wxString wxTextCtrl::GetValue() const
 {
-    wxCHECK_MSG( m_text != NULL, "", "invalid text ctrl" );
+    wxCHECK_MSG( m_text != NULL, _T(""), _T("invalid text ctrl") );
 
     wxString tmp;
     if (m_windowStyle & wxTE_MULTILINE)
     {
         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
         char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
-        tmp = text;
+        tmp = wxString(text,*wxConv_current);
         g_free( text );
     }
     else
@@ -284,26 +300,31 @@ wxString wxTextCtrl::GetValue() const
 
 void wxTextCtrl::SetValue( const wxString &value )
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
-    wxString tmp = "";
+    wxString tmp = _T("");
     if (!value.IsNull()) tmp = value;
     if (m_windowStyle & wxTE_MULTILINE)
     {
         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
         gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len );
         len = 0;
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), tmp, tmp.Length(), &len );
+#if wxUSE_UNICODE
+	wxWX2MBbuf tmpbuf = tmp.mbc_str();
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), tmpbuf, strlen(tmpbuf), &len );
+#else
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), tmp.mbc_str(), tmp.Length(), &len );
+#endif
     }
     else
     {
-        gtk_entry_set_text( GTK_ENTRY(m_text), tmp );
+        gtk_entry_set_text( GTK_ENTRY(m_text), tmp.mbc_str() );
     }
 }
 
 void wxTextCtrl::WriteText( const wxString &text )
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
     if (text.IsNull()) return;
 
@@ -312,7 +333,12 @@ void wxTextCtrl::WriteText( const wxString &text )
         /* this moves the cursor pos to behind the inserted text */
 	gint len = GTK_EDITABLE(m_text)->current_pos;
 	
+#if wxUSE_UNICODE
+	wxWX2MBbuf buf = text.mbc_str();
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len );
+#else
         gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
+#endif
 	
 	/* bring editable's cursor uptodate. bug in GTK. */
 	GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
@@ -321,7 +347,12 @@ void wxTextCtrl::WriteText( const wxString &text )
     {
         /* this moves the cursor pos to behind the inserted text */
 	gint len = GTK_EDITABLE(m_text)->current_pos;
+#if wxUSE_UNICODE
+	wxWX2MBbuf buf = text.mbc_str();
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len );
+#else
         gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
+#endif
 	
 	/* bring editable's cursor uptodate. bug in GTK. */
 	GTK_EDITABLE(m_text)->current_pos += text.Len();
@@ -333,26 +364,31 @@ void wxTextCtrl::WriteText( const wxString &text )
 
 void wxTextCtrl::AppendText( const wxString &text )
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, _T("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) );
+#if wxUSE_UNICODE
+	wxWX2MBbuf buf = text.mbc_str();
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len );
+#else
         gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
+#endif
 	
 	/* bring editable's cursor uptodate. bug in GTK. */
 	GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
     }
     else
     {
-        gtk_entry_append_text( GTK_ENTRY(m_text), text );
+        gtk_entry_append_text( GTK_ENTRY(m_text), text.mbc_str() );
     }
 }
 
 bool wxTextCtrl::LoadFile( const wxString &file )
 {
-  wxCHECK_MSG( m_text != NULL, FALSE, "invalid text ctrl" );
+  wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") );
 
   if (!wxFileExists(file)) return FALSE;
 
@@ -361,8 +397,8 @@ bool wxTextCtrl::LoadFile( const wxString &file )
   FILE *fp = (FILE*) NULL;
   struct stat statb;
 
-  if ((stat ((char*) (const char*) file, &statb) == -1) || (statb.st_mode & S_IFMT) != S_IFREG ||
-      !(fp = fopen ((char*) (const char*) file, "r")))
+  if ((stat (FNSTRINGCAST file.fn_str(), &statb) == -1) || (statb.st_mode & S_IFMT) != S_IFREG ||
+      !(fp = fopen (FNSTRINGCAST file.fn_str(), "r")))
   {
       return FALSE;
   }
@@ -401,13 +437,13 @@ bool wxTextCtrl::LoadFile( const wxString &file )
 
 bool wxTextCtrl::SaveFile( const wxString &file )
 {
-  wxCHECK_MSG( m_text != NULL, FALSE, "invalid text ctrl" );
+  wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") );
 
-  if (file == "") return FALSE;
+  if (file == _T("")) return FALSE;
 
   FILE *fp;
 
-  if (!(fp = fopen ((char*) (const char*) file, "w")))
+  if (!(fp = fopen (FNSTRINGCAST file.fn_str(), "w")))
     {
       return FALSE;
     }
@@ -455,7 +491,7 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
 
     if (text)
     {
-        wxString buf("");
+        wxString buf(_T(""));
         long i;
         int currentLine = 0;
         for (i = 0; currentLine != lineNo && text[i]; i++ )
@@ -483,7 +519,7 @@ void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
 {
   /* If you implement this, don't forget to update the documentation!
    * (file docs/latex/wx/text.tex) */
-    wxFAIL_MSG( "wxTextCtrl::OnDropFiles not implemented" );
+    wxFAIL_MSG( _T("wxTextCtrl::OnDropFiles not implemented") );
 }
 
 long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
@@ -499,10 +535,10 @@ long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
         *x=0;   // First Col
         *y=0;   // First Line
 
-        const char* stop = text.c_str() + pos;
-        for ( const char *p = text.c_str(); p < stop; p++ )
+        const wxChar* stop = text.c_str() + pos;
+        for ( const wxChar *p = text.c_str(); p < stop; p++ )
         {
-            if (*p == '\n')
+            if (*p == _T('\n'))
             {
                 (*y)++;
                 *x=0;
@@ -578,7 +614,7 @@ int wxTextCtrl::GetNumberOfLines() const
 
 void wxTextCtrl::SetInsertionPoint( long pos )
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
     
     if (m_windowStyle & wxTE_MULTILINE) 
     {
@@ -615,7 +651,7 @@ void wxTextCtrl::SetInsertionPoint( long pos )
 
 void wxTextCtrl::SetInsertionPointEnd()
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
     if (m_windowStyle & wxTE_MULTILINE)
         SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text)));
@@ -625,7 +661,7 @@ void wxTextCtrl::SetInsertionPointEnd()
 
 void wxTextCtrl::SetEditable( bool editable )
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
     if (m_windowStyle & wxTE_MULTILINE)
         gtk_text_set_editable( GTK_TEXT(m_text), editable );
@@ -635,26 +671,26 @@ void wxTextCtrl::SetEditable( bool editable )
 
 void wxTextCtrl::SetSelection( long from, long to )
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
     gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 }
 
 void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )
 {
-    wxFAIL_MSG( "wxTextCtrl::ShowPosition not implemented" );
+    wxFAIL_MSG( _T("wxTextCtrl::ShowPosition not implemented") );
 }
 
 long wxTextCtrl::GetInsertionPoint() const
 {
-    wxCHECK_MSG( m_text != NULL, 0, "invalid text ctrl" );
+    wxCHECK_MSG( m_text != NULL, 0, _T("invalid text ctrl") );
 
     return (long) GTK_EDITABLE(m_text)->current_pos;
 }
 
 long wxTextCtrl::GetLastPosition() const
 {
-    wxCHECK_MSG( m_text != NULL, 0, "invalid text ctrl" );
+    wxCHECK_MSG( m_text != NULL, 0, _T("invalid text ctrl") );
 
     int pos = 0;
     if (m_windowStyle & wxTE_MULTILINE)
@@ -667,24 +703,29 @@ long wxTextCtrl::GetLastPosition() const
 
 void wxTextCtrl::Remove( long from, long to )
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
     gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 }
 
 void wxTextCtrl::Replace( long from, long to, const wxString &value )
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
     gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
     if (value.IsNull()) return;
     gint pos = (gint)from;
+#if wxUSE_UNICODE
+    wxWX2MBbuf buf = value.mbc_str();
+    gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &pos );
+#else
     gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos );
+#endif
 }
 
 void wxTextCtrl::Cut()
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
 #if (GTK_MINOR_VERSION > 0)
     gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) );
@@ -695,7 +736,7 @@ void wxTextCtrl::Cut()
 
 void wxTextCtrl::Copy()
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
 #if (GTK_MINOR_VERSION > 0)
     gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) );
@@ -706,7 +747,7 @@ void wxTextCtrl::Copy()
 
 void wxTextCtrl::Paste()
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
 #if (GTK_MINOR_VERSION > 0)
     gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) );
@@ -740,26 +781,26 @@ bool wxTextCtrl::CanPaste() const
 void wxTextCtrl::Undo()
 {
     // TODO
-    wxFAIL_MSG( "wxTextCtrl::Undo not implemented" );
+    wxFAIL_MSG( _T("wxTextCtrl::Undo not implemented") );
 }
 
 void wxTextCtrl::Redo()
 {
     // TODO
-    wxFAIL_MSG( "wxTextCtrl::Redo not implemented" );
+    wxFAIL_MSG( _T("wxTextCtrl::Redo not implemented") );
 }
 
 bool wxTextCtrl::CanUndo() const
 {
     // TODO
-    wxFAIL_MSG( "wxTextCtrl::CanUndo not implemented" );
+    wxFAIL_MSG( _T("wxTextCtrl::CanUndo not implemented") );
     return FALSE;
 }
 
 bool wxTextCtrl::CanRedo() const
 {
     // TODO
-    wxFAIL_MSG( "wxTextCtrl::CanRedo not implemented" );
+    wxFAIL_MSG( _T("wxTextCtrl::CanRedo not implemented") );
     return FALSE;
 }
 
@@ -770,24 +811,24 @@ void wxTextCtrl::GetSelection(long* from, long* to) const
     // TODO
     *from = 0;
     *to = 0;
-    wxFAIL_MSG( "wxTextCtrl::GetSelection not implemented" );
+    wxFAIL_MSG( _T("wxTextCtrl::GetSelection not implemented") );
 }
 
 bool wxTextCtrl::IsEditable() const
 {
     // TODO
-    wxFAIL_MSG( "wxTextCtrl::IsEditable not implemented" );
+    wxFAIL_MSG( _T("wxTextCtrl::IsEditable not implemented") );
     return FALSE;
 }
 
 void wxTextCtrl::Clear()
 {
-    SetValue( "" );
+    SetValue( _T("") );
 }
 
 void wxTextCtrl::OnChar( wxKeyEvent &key_event )
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
     if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
     {
@@ -893,21 +934,21 @@ bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window )
 
 void wxTextCtrl::SetFont( const wxFont &WXUNUSED(font) )
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
     // doesn't work
 }
 
 void wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) )
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
     // doesn't work
 }
 
 void wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
     wxControl::SetBackgroundColour( colour );