X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19da43267e410c8acdd57a31d89b6c5ecce8c36f..0180dad680ecbe4cb5cf8e6e45ce569f7a1029f7:/src/gtk1/textctrl.cpp diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index 4969acb19f..51169aaa60 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -44,13 +44,14 @@ extern bool g_blockEventsOnDrag; static void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) { - if (g_isIdle) wxapp_install_idle_handler(); - if (!win->m_hasVMT) return; + if (g_isIdle) + wxapp_install_idle_handler(); + win->SetModified(); - wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId ); + wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); event.SetString( win->GetValue() ); event.SetEventObject( win ); win->GetEventHandler()->ProcessEvent( event ); @@ -63,10 +64,11 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) static void gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) { - if (g_isIdle) wxapp_install_idle_handler(); - if (!win->m_hasVMT) return; + if (g_isIdle) + wxapp_install_idle_handler(); + win->CalculateScrollbar(); } @@ -135,12 +137,14 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, PreCreation( parent, id, pos, size, style, name ); +#if wxUSE_VALIDATORS SetValidator( validator ); +#endif // wxUSE_VALIDATORS m_vScrollbarVisible = FALSE; bool multi_line = (style & wxTE_MULTILINE) != 0; - if ( multi_line ) + if (multi_line) { /* a multi-line edit control: create a vertical scrollbar by default and horizontal if requested */ @@ -152,28 +156,38 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, /* ... 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 ); - gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK), (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK), 0, 0); - + + /* always wrap words */ + gtk_text_set_word_wrap( GTK_TEXT(m_text), TRUE ); + /* put the horizontal scrollbar in the lower left hand corner */ if (bHasHScrollbar) { GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj); GTK_WIDGET_UNSET_FLAGS( hscrollbar, GTK_CAN_FOCUS ); - gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2, - (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), + (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK), GTK_FILL, 0, 0); gtk_widget_show(hscrollbar); - } - - /* we create the vertical scrollbar on demand */ - m_vScrollbar = (GtkWidget*) NULL; +#if (GTK_MINOR_VERSION > 0) + /* don't wrap lines, otherwise we wouldn't need the scrollbar */ + gtk_text_set_line_wrap( GTK_TEXT(m_text), FALSE ); +#endif + } + + /* 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); } else { @@ -187,38 +201,46 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, if (newSize.y == -1) newSize.y = 26; SetSize( newSize.x, newSize.y ); - m_parent->AddChild( this ); - - (m_parent->m_insertCallback)( m_parent, this ); + m_parent->DoAddChild( this ); PostCreation(); if (multi_line) - { -// gtk_widget_realize(m_text); gtk_widget_show(m_text); - } /* 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 (multi_line) + { + gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed", + (GtkSignalFunc) gtk_scrollbar_changed_callback, (gpointer) this ); + } + if (!value.IsEmpty()) { gint tmp = 0; + +#if GTK_MINOR_VERSION == 0 + // if we don't realize it, GTK 1.0.6 dies with a SIGSEGV in + // gtk_editable_insert_text() + gtk_widget_realize(m_text); +#endif // GTK 1.0 + #if wxUSE_UNICODE - wxWX2MBbuf val = value.mbc_str(); + wxWX2MBbuf val = value.mbc_str(); gtk_editable_insert_text( GTK_EDITABLE(m_text), val, strlen(val), &tmp ); -#else +#else // !Unicode gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp ); -#endif - +#endif // Unicode/!Unicode + if (multi_line) { - /* bring editable's cursor uptodate. bug in GTK. */ - - GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); - } + /* bring editable's cursor uptodate. bug in GTK. */ + + GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); + } } if (style & wxTE_PASSWORD) @@ -237,18 +259,12 @@ 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() ); + + SetBackgroundColour( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ); SetForegroundColour( parent->GetForegroundColour() ); Show( TRUE ); - if (multi_line) - { - gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed", - (GtkSignalFunc) gtk_scrollbar_changed_callback, (gpointer) this ); - } - return TRUE; } @@ -263,7 +279,6 @@ void wxTextCtrl::CalculateScrollbar() if (m_vScrollbarVisible) { gtk_widget_hide( m_vScrollbar ); - m_vScrollbarVisible = FALSE; } } @@ -271,20 +286,7 @@ void wxTextCtrl::CalculateScrollbar() { if (!m_vScrollbarVisible) { - 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; } } @@ -313,6 +315,9 @@ void wxTextCtrl::SetValue( const wxString &value ) { wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") ); + gtk_signal_disconnect_by_func( GTK_OBJECT(m_text), + GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); + wxString tmp = _T(""); if (!value.IsNull()) tmp = value; if (m_windowStyle & wxTE_MULTILINE) @@ -321,7 +326,7 @@ void wxTextCtrl::SetValue( const wxString &value ) gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len ); len = 0; #if wxUSE_UNICODE - wxWX2MBbuf tmpbuf = tmp.mbc_str(); + 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 ); @@ -331,6 +336,9 @@ void wxTextCtrl::SetValue( const wxString &value ) { gtk_entry_set_text( GTK_ENTRY(m_text), tmp.mbc_str() ); } + + gtk_signal_connect( GTK_OBJECT(m_text), "changed", + GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); } void wxTextCtrl::WriteText( const wxString &text ) @@ -342,34 +350,34 @@ void wxTextCtrl::WriteText( const wxString &text ) if (m_windowStyle & wxTE_MULTILINE) { /* this moves the cursor pos to behind the inserted text */ - gint len = GTK_EDITABLE(m_text)->current_pos; - + gint len = GTK_EDITABLE(m_text)->current_pos; + #if wxUSE_UNICODE - wxWX2MBbuf buf = text.mbc_str(); + 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) ); + + /* bring editable's cursor uptodate. bug in GTK. */ + GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); } else { /* this moves the cursor pos to behind the inserted text */ - gint len = GTK_EDITABLE(m_text)->current_pos; + gint len = GTK_EDITABLE(m_text)->current_pos; #if wxUSE_UNICODE - wxWX2MBbuf buf = text.mbc_str(); + 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(); - - /* bring entry's cursor uptodate. bug in GTK. */ - gtk_entry_set_position( GTK_ENTRY(m_text), GTK_EDITABLE(m_text)->current_pos ); + + /* bring editable's cursor uptodate. bug in GTK. */ + GTK_EDITABLE(m_text)->current_pos += text.Len(); + + /* bring entry's cursor uptodate. bug in GTK. */ + gtk_entry_set_position( GTK_ENTRY(m_text), GTK_EDITABLE(m_text)->current_pos ); } } @@ -382,14 +390,14 @@ void wxTextCtrl::AppendText( const wxString &text ) /* 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(); + 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) ); + + /* bring editable's cursor uptodate. bug in GTK. */ + GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); } else { @@ -582,7 +590,7 @@ long wxTextCtrl::XYToPosition(long x, long y ) const long pos=0; for( int i=0; icurrent_pos = gtk_text_get_point( GTK_TEXT(m_text) ); + + /* bring editable's cursor uptodate. another bug in GTK. */ + + GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); } else { gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos ); - - /* bring editable's cursor uptodate. bug in GTK. */ - - GTK_EDITABLE(m_text)->current_pos = pos; + + /* bring editable's cursor uptodate. bug in GTK. */ + + GTK_EDITABLE(m_text)->current_pos = pos; } } @@ -689,7 +697,7 @@ void wxTextCtrl::SetSelection( long from, long to ) void wxTextCtrl::ShowPosition( long WXUNUSED(pos) ) { - wxFAIL_MSG( _T("wxTextCtrl::ShowPosition not implemented") ); +// SetInsertionPoint( pos ); } long wxTextCtrl::GetInsertionPoint() const @@ -819,17 +827,24 @@ bool wxTextCtrl::CanRedo() const // selection. void wxTextCtrl::GetSelection(long* from, long* to) const { - // TODO - *from = 0; - *to = 0; - wxFAIL_MSG( _T("wxTextCtrl::GetSelection not implemented") ); + wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") ); + + if (!(GTK_EDITABLE(m_text)->has_selection)) + { + if (from) *from = 0; + if (to) *to = 0; + return; + } + + if (from) *from = (long) GTK_EDITABLE(m_text)->selection_start_pos; + if (to) *to = (long) GTK_EDITABLE(m_text)->selection_end_pos; } bool wxTextCtrl::IsEditable() const { - // TODO - wxFAIL_MSG( _T("wxTextCtrl::IsEditable not implemented") ); - return FALSE; + wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") ); + + return GTK_EDITABLE(m_text)->editable; } void wxTextCtrl::Clear() @@ -943,43 +958,53 @@ bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window ) return (window == GTK_ENTRY(m_text)->text_area); } -void wxTextCtrl::SetFont( const wxFont &WXUNUSED(font) ) +bool wxTextCtrl::SetFont( const wxFont &WXUNUSED(font) ) { - wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") ); + wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") ); // doesn't work + return FALSE; } -void wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) ) +bool wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) ) { - wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") ); + wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") ); // doesn't work + return FALSE; } -void wxTextCtrl::SetBackgroundColour( const wxColour &colour ) +bool wxTextCtrl::SetBackgroundColour( const wxColour &colour ) { - wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") ); + wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") ); wxControl::SetBackgroundColour( colour ); + if (!m_widget->window) + return FALSE; + wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ); if (sysbg.Red() == colour.Red() && sysbg.Green() == colour.Green() && sysbg.Blue() == colour.Blue()) { - return; + return FALSE; // FIXME or TRUE? } - if (!m_backgroundColour.Ok()) return; + if (!m_backgroundColour.Ok()) + return FALSE; if (m_windowStyle & wxTE_MULTILINE) { GdkWindow *window = GTK_TEXT(m_text)->text_area; + if (!window) + return FALSE; m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) ); gdk_window_set_background( window, m_backgroundColour.GetColor() ); gdk_window_clear( window ); } + + return TRUE; } void wxTextCtrl::ApplyWidgetStyle()