X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e702ff0f08a54622a6b0f1e2ec39537b082c3a8e..510649e4d5e8eaf8967ddd082f3eb5945471eb5e:/src/gtk1/textctrl.cpp?ds=inline diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index 5fd1f455a1..9739c45681 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -24,6 +24,13 @@ #include "gtk/gtk.h" #include "gdk/gdkkeysyms.h" +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -37,23 +44,31 @@ extern bool g_blockEventsOnDrag; static void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) { - win->SetModified(); + if (!win->m_hasVMT) return; - win->CalculateScrollbar(); + 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 ); } //----------------------------------------------------------------------------- -// "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; + + if (g_isIdle) + wxapp_install_idle_handler(); + win->CalculateScrollbar(); } @@ -79,31 +94,11 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo) END_EVENT_TABLE() -#ifndef NO_TEXT_WINDOW_STREAM -wxTextCtrl::wxTextCtrl() : streambuf() -{ - if (allocate()) setp(base(),ebuf()); - - m_modified = FALSE; -} -#else wxTextCtrl::wxTextCtrl() { m_modified = FALSE; } -#endif -#ifndef NO_TEXT_WINDOW_STREAM -wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value, - const wxPoint &pos, const wxSize &size, - int style, const wxValidator& validator, const wxString &name ) : streambuf() -{ - if (allocate()) setp(base(),ebuf()); - - m_modified = FALSE; - Create( parent, id, value, pos, size, style, validator, name ); -} -#else wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value, const wxPoint &pos, const wxSize &size, int style, const wxValidator& validator, const wxString &name ) @@ -111,7 +106,6 @@ wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value, m_modified = FALSE; Create( parent, id, value, pos, size, style, validator, name ); } -#endif bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, const wxPoint &pos, const wxSize &size, @@ -122,58 +116,65 @@ 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 = TRUE; + 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 +#if (GTK_MINOR_VERSION > 2) + /* a multi-line edit control: create a vertical scrollbar by default and + horizontal if requested */ bool bHasHScrollbar = (style & wxHSCROLL) != 0; +#else + bool bHasHScrollbar = FALSE; +#endif - // 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 ); - 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); - // put the horizontal scrollbar in the lower left hand corner + /* always wrap words */ + gtk_text_set_word_wrap( GTK_TEXT(m_text), TRUE ); + +#if (GTK_MINOR_VERSION > 2) + /* 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); + + /* 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 + /* 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 ); - - 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(); } @@ -183,33 +184,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 + /* 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(); + gtk_editable_insert_text( GTK_EDITABLE(m_text), val, strlen(val), &tmp ); +#else // !Unicode gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp ); - +#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) @@ -229,11 +243,11 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, gtk_text_set_editable( GTK_TEXT(m_text), 1 ); } - Show( TRUE ); - - SetBackgroundColour( parent->GetBackgroundColour() ); + SetBackgroundColour( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ); SetForegroundColour( parent->GetForegroundColour() ); + Show( TRUE ); + return TRUE; } @@ -247,203 +261,160 @@ void wxTextCtrl::CalculateScrollbar() { if (m_vScrollbarVisible) { - gtk_widget_hide( m_vScrollbar ); - - m_vScrollbarVisible = FALSE; + gtk_widget_hide( m_vScrollbar ); + m_vScrollbarVisible = FALSE; } } else { if (!m_vScrollbarVisible) { - gtk_widget_show( m_vScrollbar ); - - m_vScrollbarVisible = TRUE; + gtk_widget_show( m_vScrollbar ); + 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,*wxConvCurrent); g_free( text ); } else { - tmp = gtk_entry_get_text( GTK_ENTRY(m_text) ); + tmp = wxString(gtk_entry_get_text( GTK_ENTRY(m_text) ),*wxConvCurrent); } return tmp; } 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 = ""; + 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) { 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() ); } + + gtk_signal_connect( GTK_OBJECT(m_text), "changed", + GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); } 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; + if (text.IsEmpty()) return; + + gtk_signal_disconnect_by_func( GTK_OBJECT(m_text), + GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); 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(); + 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 ); - - /* bring editable's cursor uptodate. bug in GTK. */ - GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); +#endif + + /* 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(); + 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 ); - - /* 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 ); - } -} +#endif -void wxTextCtrl::AppendText( const wxString &text ) -{ - wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); + /* bring editable's cursor uptodate. bug in GTK. */ + GTK_EDITABLE(m_text)->current_pos += text.Len(); - 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 ); - - /* 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 ); + /* bring entry's cursor uptodate. bug in GTK. */ + gtk_entry_set_position( GTK_ENTRY(m_text), GTK_EDITABLE(m_text)->current_pos ); } + + gtk_signal_connect( GTK_OBJECT(m_text), "changed", + GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); } -bool wxTextCtrl::LoadFile( const wxString &file ) +void wxTextCtrl::AppendText( const wxString &text ) { - wxCHECK_MSG( m_text != NULL, FALSE, "invalid text ctrl" ); - - if (!wxFileExists(file)) return FALSE; - - Clear(); + wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") ); - FILE *fp = (FILE*) NULL; - struct stat statb; + if (text.IsEmpty()) return; - if ((stat ((char*) (const char*) file, &statb) == -1) || (statb.st_mode & S_IFMT) != S_IFREG || - !(fp = fopen ((char*) (const char*) file, "r"))) - { - return FALSE; - } - else - { - gint len = statb.st_size; - char *text; - if (!(text = (char*)malloc ((unsigned) (len + 1)))) - { - fclose (fp); - return FALSE; - } - if (fread (text, sizeof (char), len, fp) != (size_t) len) - { - } - fclose (fp); - - text[len] = 0; + gtk_signal_disconnect_by_func( GTK_OBJECT(m_text), + GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); if (m_windowStyle & wxTE_MULTILINE) { - gint pos = 0; - gtk_editable_insert_text( GTK_EDITABLE(m_text), text, len, &pos ); - } - else - { - gtk_entry_set_text( GTK_ENTRY(m_text), text ); - } - - free (text); - m_modified = FALSE; - return TRUE; - } - return FALSE; -} - -bool wxTextCtrl::SaveFile( const wxString &file ) -{ - wxCHECK_MSG( m_text != NULL, FALSE, "invalid text ctrl" ); - - if (file == "") return FALSE; + bool hasSpecialAttributes = m_font.Ok() || + m_foregroundColour.Ok() || + m_backgroundColour.Ok(); + if ( hasSpecialAttributes ) + { + gtk_text_insert( GTK_TEXT(m_text), + m_font.GetInternalFont(), + m_foregroundColour.GetColor(), + m_backgroundColour.GetColor(), + text.mbc_str(), text.length()); - FILE *fp; + } + else + { + /* 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 + } - if (!(fp = fopen ((char*) (const char*) file, "w"))) - { - return FALSE; + /* bring editable's cursor uptodate. bug in GTK. */ + GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); } - else + else { - char *text = (char*) NULL; - gint len = 0; - - if (m_windowStyle & wxTE_MULTILINE) - { - len = gtk_text_get_length( GTK_TEXT(m_text) ); - text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len ); - } - else - { - text = gtk_entry_get_text( GTK_ENTRY(m_text) ); - } - - if (fwrite (text, sizeof (char), len, fp) != (size_t) len) - { - // Did not write whole file - } - - // Make sure newline terminates the file - if (text[len - 1] != '\n') - fputc ('\n', fp); - - fclose (fp); - - if (m_windowStyle & wxTE_MULTILINE) g_free( text ); - - m_modified = FALSE; - return TRUE; + gtk_entry_append_text( GTK_ENTRY(m_text), text.mbc_str() ); } - return TRUE; + gtk_signal_connect( GTK_OBJECT(m_text), "changed", + GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); } wxString wxTextCtrl::GetLineText( long lineNo ) const @@ -455,7 +426,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,10 +454,10 @@ 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 +bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const { if ( m_windowStyle & wxTE_MULTILINE ) { @@ -499,10 +470,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; @@ -535,7 +506,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; } } 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 +596,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 ); @@ -633,28 +604,33 @@ void wxTextCtrl::SetEditable( bool editable ) gtk_entry_set_editable( GTK_ENTRY(m_text), editable ); } +void wxTextCtrl::DiscardEdits() +{ + m_modified = FALSE; +} + 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" ); +// SetInsertionPoint( pos ); } 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,35 +643,61 @@ 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_signal_disconnect_by_func( GTK_OBJECT(m_text), + GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to ); + + gtk_signal_connect( GTK_OBJECT(m_text), "changed", + GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); } 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_signal_disconnect_by_func( GTK_OBJECT(m_text), + GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to ); - if (value.IsNull()) return; - gint pos = (gint)from; - gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos ); + + if (!value.IsEmpty()) + { + 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 + } + + gtk_signal_connect( GTK_OBJECT(m_text), "changed", + GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); } void wxTextCtrl::Cut() { - wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); + 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); #if (GTK_MINOR_VERSION > 0) gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) ); #else gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 ); #endif + + gtk_signal_connect( GTK_OBJECT(m_text), "changed", + GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); } 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,13 +708,19 @@ void wxTextCtrl::Copy() void wxTextCtrl::Paste() { - wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); + 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); #if (GTK_MINOR_VERSION > 0) gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) ); #else gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 ); #endif + + gtk_signal_connect( GTK_OBJECT(m_text), "changed", + GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); } bool wxTextCtrl::CanCopy() const @@ -740,26 +748,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; } @@ -767,27 +775,39 @@ bool wxTextCtrl::CanRedo() const // selection. void wxTextCtrl::GetSelection(long* from, long* to) const { - // TODO - *from = 0; - *to = 0; - wxFAIL_MSG( "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( "wxTextCtrl::IsEditable not implemented" ); - return FALSE; + wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") ); + + return GTK_EDITABLE(m_text)->editable; +} + +bool wxTextCtrl::IsModified() const +{ + return m_modified; } 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)) { @@ -799,85 +819,6 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event ) key_event.Skip(); } -#ifndef NO_TEXT_WINDOW_STREAM -int wxTextCtrl::overflow( int WXUNUSED(c) ) -{ - int len = pptr() - pbase(); - char *txt = new char[len+1]; - strncpy(txt, pbase(), len); - txt[len] = '\0'; - (*this) << txt; - setp(pbase(), epptr()); - delete[] txt; - return EOF; -} - -int wxTextCtrl::sync() -{ - int len = pptr() - pbase(); - char *txt = new char[len+1]; - strncpy(txt, pbase(), len); - txt[len] = '\0'; - (*this) << txt; - setp(pbase(), epptr()); - delete[] txt; - return 0; -} - -int wxTextCtrl::underflow() -{ - return EOF; -} - -wxTextCtrl& wxTextCtrl::operator<<(const wxString& s) -{ - AppendText(s); - return *this; -} - -wxTextCtrl& wxTextCtrl::operator<<(float f) -{ - static char buf[100]; - sprintf(buf, "%.2f", f); - AppendText(buf); - return *this; -} - -wxTextCtrl& wxTextCtrl::operator<<(double d) -{ - static char buf[100]; - sprintf(buf, "%.2f", d); - AppendText(buf); - return *this; -} - -wxTextCtrl& wxTextCtrl::operator<<(int i) -{ - static char buf[100]; - sprintf(buf, "%i", i); - AppendText(buf); - return *this; -} - -wxTextCtrl& wxTextCtrl::operator<<(long i) -{ - static char buf[100]; - sprintf(buf, "%ld", i); - AppendText(buf); - return *this; -} - -wxTextCtrl& wxTextCtrl::operator<<(const char c) -{ - char buf[2]; - - buf[0] = c; - buf[1] = 0; - AppendText(buf); - return *this; -} -#endif - GtkWidget* wxTextCtrl::GetConnectWidget() { return GTK_WIDGET(m_text); @@ -891,43 +832,72 @@ bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window ) return (window == GTK_ENTRY(m_text)->text_area); } -void wxTextCtrl::SetFont( const wxFont &WXUNUSED(font) ) +// the font will change for subsequent text insertiongs +bool wxTextCtrl::SetFont( const wxFont &font ) { - wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); + wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") ); - // doesn't work + if ( !wxWindowBase::SetFont(font) ) + { + // font didn't change, nothing to do + return FALSE; + } + + if ( m_windowStyle & wxTE_MULTILINE ) + { + // for compatibility with other ports: the font is a global controls + // characteristic, so change the font globally + wxString value = GetValue(); + if ( !value.IsEmpty() ) + { + Clear(); + + AppendText(value); + } + } + + return TRUE; } -void wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) ) +bool wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) ) { - wxCHECK_RET( m_text != NULL, "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, "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()