X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2830bf19dc5094794e8f1fee05aceb591ffe215b..47b61a784c21a15b75d5a571f47d12a1ef591080:/src/gtk1/textctrl.cpp diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index bb72ccea1b..4d206d3c6d 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -20,35 +20,58 @@ #include #include +#include "gdk/gdk.h" +#include "gtk/gtk.h" +#include "gdk/gdkkeysyms.h" + +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + +//----------------------------------------------------------------------------- +// data +//----------------------------------------------------------------------------- + +extern bool g_blockEventsOnDrag; + //----------------------------------------------------------------------------- // "changed" //----------------------------------------------------------------------------- -static void +static void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) { + if (!win->m_hasVMT) return; + + if (g_isIdle) + wxapp_install_idle_handler(); + win->SetModified(); - - win->CalculateScrollbar(); - wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId ); - wxString val( win->GetValue() ); - if (!val.IsNull()) event.m_commandString = WXSTRINGCAST val; + 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 ) +static void +gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) { + if (!win->m_hasVMT) return; + + if (g_isIdle) + wxapp_install_idle_handler(); + win->CalculateScrollbar(); } - //----------------------------------------------------------------------------- // wxTextCtrl //----------------------------------------------------------------------------- @@ -57,15 +80,35 @@ IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl) BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_CHAR(wxTextCtrl::OnChar) + + EVT_MENU(wxID_CUT, wxTextCtrl::OnCut) + EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy) + EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste) + EVT_MENU(wxID_UNDO, wxTextCtrl::OnUndo) + EVT_MENU(wxID_REDO, wxTextCtrl::OnRedo) + + EVT_UPDATE_UI(wxID_CUT, wxTextCtrl::OnUpdateCut) + EVT_UPDATE_UI(wxID_COPY, wxTextCtrl::OnUpdateCopy) + EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste) + EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo) + 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() @@ -75,61 +118,80 @@ wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value, 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 ) +{ + 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, int style, const wxValidator& validator, const wxString &name ) { m_needParent = TRUE; + m_acceptsFocus = TRUE; PreCreation( parent, id, pos, size, style, name ); +#if wxUSE_VALIDATORS SetValidator( validator ); - - m_vScrollbarVisible = TRUE; +#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 + /* 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 ); 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 ); + + /* 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); - } - // finally, put the vertical scrollbar in the upper right corner +#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); - 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(); } @@ -139,28 +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); + /* 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.IsNull()) + 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 ); - SetInsertionPointEnd(); +#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) ); + } } if (style & wxTE_PASSWORD) @@ -179,12 +259,12 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, if (multi_line) 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; } @@ -193,95 +273,151 @@ void wxTextCtrl::CalculateScrollbar() if ((m_windowStyle & wxTE_MULTILINE) == 0) return; GtkAdjustment *adj = GTK_TEXT(m_text)->vadj; - + if (adj->upper - adj->page_size < 0.8) { 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,*wxConv_current); g_free( text ); } else { - tmp = gtk_entry_get_text( GTK_ENTRY(m_text) ); + tmp = wxString(gtk_entry_get_text( GTK_ENTRY(m_text) ),*wxConv_current); } 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 (m_windowStyle & wxTE_MULTILINE) { + /* 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) ); + } + else + { + /* 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(); + + /* bring entry's cursor uptodate. bug in GTK. */ + gtk_entry_set_position( GTK_ENTRY(m_text), GTK_EDITABLE(m_text)->current_pos ); + } +} + +void wxTextCtrl::AppendText( const wxString &text ) +{ + 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; Clear(); - FILE *fp = NULL; + 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; } @@ -295,15 +431,16 @@ bool wxTextCtrl::LoadFile( const wxString &file ) return FALSE; } if (fread (text, sizeof (char), len, fp) != (size_t) len) - { - } + { + } fclose (fp); text[len] = 0; if (m_windowStyle & wxTE_MULTILINE) { - gtk_editable_insert_text( GTK_EDITABLE(m_text), text, 0, &len ); + gint pos = 0; + gtk_editable_insert_text( GTK_EDITABLE(m_text), text, len, &pos ); } else { @@ -319,19 +456,19 @@ 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; } else { - char *text = NULL; + char *text = (char*) NULL; gint len = 0; if (m_windowStyle & wxTE_MULTILINE) @@ -345,13 +482,13 @@ bool wxTextCtrl::SaveFile( const wxString &file ) } if (fwrite (text, sizeof (char), len, fp) != (size_t) len) - { - // Did not write whole file - } + { + // Did not write whole file + } // Make sure newline terminates the file if (text[len - 1] != '\n') - fputc ('\n', fp); + fputc ('\n', fp); fclose (fp); @@ -373,7 +510,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++ ) @@ -399,45 +536,61 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) ) { - wxFAIL_MSG( "wxTextCtrl::OnDropFiles not implemented" ); + /* If you implement this, don't forget to update the documentation! + * (file docs/latex/wx/text.tex) */ + wxFAIL_MSG( _T("wxTextCtrl::OnDropFiles not implemented") ); } long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const { - if (!(m_windowStyle & wxTE_MULTILINE)) - return 0; - gint len = gtk_text_get_length( GTK_TEXT(m_text) ); - char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len ); - if(!text) - return 0; - if( pos >= len) - return pos=len-1; - - *x=1; // Col 1 - *y=1; // Line 1 - for (int i = 0; i < pos; i++ ) - { - if (text[i] == '\n') - { - (*y)++; - *x=1; - } - else - (*x)++; + if ( m_windowStyle & wxTE_MULTILINE ) + { + wxString text = GetValue(); + + // cast to prevent warning. But pos really should've been unsigned. + if( (unsigned long)pos > text.Len() ) + return FALSE; + + *x=0; // First Col + *y=0; // First Line + + const wxChar* stop = text.c_str() + pos; + for ( const wxChar *p = text.c_str(); p < stop; p++ ) + { + if (*p == _T('\n')) + { + (*y)++; + *x=0; + } + else + (*x)++; + } + } + else // single line control + { + if ( pos <= GTK_ENTRY(m_text)->text_length ) + { + *y = 0; + *x = pos; + } + else + { + // index out of bounds + return FALSE; + } } - g_free( text ); - return 1; + + return TRUE; } long wxTextCtrl::XYToPosition(long x, long y ) const { if (!(m_windowStyle & wxTE_MULTILINE)) return 0; - + long pos=0; + for( int i=0; icurrent_pos = gtk_text_get_point( GTK_TEXT(m_text) ); + } else - gtk_entry_set_position( GTK_ENTRY(m_text), tmp ); + { + 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; + } } void wxTextCtrl::SetInsertionPointEnd() { - wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); + wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") ); - int pos = 0; if (m_windowStyle & wxTE_MULTILINE) - pos = gtk_text_get_length( GTK_TEXT(m_text) ); + SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text))); else - pos = GTK_ENTRY(m_text)->text_length; - - SetInsertionPoint((pos-1)>0 ? (pos-1):0); + gtk_entry_set_position( GTK_ENTRY(m_text), -1 ); } 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 ); @@ -512,58 +690,63 @@ 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) ) +void wxTextCtrl::ShowPosition( long 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) pos = gtk_text_get_length( GTK_TEXT(m_text) ); else pos = GTK_ENTRY(m_text)->text_length; - - return (long)pos-1; + + return (long)pos; } 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)to; + 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 == 1) +#if (GTK_MINOR_VERSION > 0) gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) ); #else gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 ); @@ -572,9 +755,9 @@ 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 == 1) +#if (GTK_MINOR_VERSION > 0) gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) ); #else gtk_editable_copy_clipboard( GTK_EDITABLE(m_text), 0 ); @@ -583,42 +766,107 @@ 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 == 1) +#if (GTK_MINOR_VERSION > 0) gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) ); #else gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 ); #endif } +bool wxTextCtrl::CanCopy() const +{ + // Can copy if there's a selection + long from, to; + GetSelection(& from, & to); + return (from != to) ; +} + +bool wxTextCtrl::CanCut() const +{ + // Can cut if there's a selection + long from, to; + GetSelection(& from, & to); + return (from != to) ; +} + +bool wxTextCtrl::CanPaste() const +{ + return IsEditable() ; +} + +// Undo/redo +void wxTextCtrl::Undo() +{ + // TODO + wxFAIL_MSG( _T("wxTextCtrl::Undo not implemented") ); +} + +void wxTextCtrl::Redo() +{ + // TODO + wxFAIL_MSG( _T("wxTextCtrl::Redo not implemented") ); +} + +bool wxTextCtrl::CanUndo() const +{ + // TODO + wxFAIL_MSG( _T("wxTextCtrl::CanUndo not implemented") ); + return FALSE; +} + +bool wxTextCtrl::CanRedo() const +{ + // TODO + wxFAIL_MSG( _T("wxTextCtrl::CanRedo not implemented") ); + return FALSE; +} + +// If the return values from and to are the same, there is no +// selection. +void wxTextCtrl::GetSelection(long* from, long* to) const +{ + 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 +{ + wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") ); + + return GTK_EDITABLE(m_text)->editable; +} + 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)) { wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); event.SetEventObject(this); if (GetEventHandler()->ProcessEvent(event)) return; } - else if (key_event.KeyCode() == WXK_TAB) - { - wxNavigationKeyEvent event; - event.SetDirection( key_event.m_shiftDown ); - event.SetWindowChange(FALSE); - event.SetEventObject(this); - if (GetEventHandler()->ProcessEvent(event)) return; - } key_event.Skip(); } +#ifndef NO_TEXT_WINDOW_STREAM int wxTextCtrl::overflow( int WXUNUSED(c) ) { int len = pptr() - pbase(); @@ -650,7 +898,7 @@ int wxTextCtrl::underflow() wxTextCtrl& wxTextCtrl::operator<<(const wxString& s) { - WriteText(s); + AppendText(s); return *this; } @@ -658,7 +906,7 @@ wxTextCtrl& wxTextCtrl::operator<<(float f) { static char buf[100]; sprintf(buf, "%.2f", f); - WriteText(buf); + AppendText(buf); return *this; } @@ -666,7 +914,7 @@ wxTextCtrl& wxTextCtrl::operator<<(double d) { static char buf[100]; sprintf(buf, "%.2f", d); - WriteText(buf); + AppendText(buf); return *this; } @@ -674,7 +922,7 @@ wxTextCtrl& wxTextCtrl::operator<<(int i) { static char buf[100]; sprintf(buf, "%i", i); - WriteText(buf); + AppendText(buf); return *this; } @@ -682,7 +930,7 @@ wxTextCtrl& wxTextCtrl::operator<<(long i) { static char buf[100]; sprintf(buf, "%ld", i); - WriteText(buf); + AppendText(buf); return *this; } @@ -692,9 +940,10 @@ wxTextCtrl& wxTextCtrl::operator<<(const char c) buf[0] = c; buf[1] = 0; - WriteText(buf); + AppendText(buf); return *this; } +#endif GtkWidget* wxTextCtrl::GetConnectWidget() { @@ -709,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, "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, "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() && + if (sysbg.Red() == colour.Red() && + sysbg.Green() == colour.Green() && sysbg.Blue() == colour.Blue()) { - return; - } - - if (!m_backgroundColour.Ok()) return; + return FALSE; // FIXME or TRUE? + } + + 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() @@ -753,7 +1012,7 @@ void wxTextCtrl::ApplyWidgetStyle() if (m_windowStyle & wxTE_MULTILINE) { // how ? - } + } else { SetWidgetStyle(); @@ -761,3 +1020,52 @@ void wxTextCtrl::ApplyWidgetStyle() } } +void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event)) +{ + Cut(); +} + +void wxTextCtrl::OnCopy(wxCommandEvent& WXUNUSED(event)) +{ + Copy(); +} + +void wxTextCtrl::OnPaste(wxCommandEvent& WXUNUSED(event)) +{ + Paste(); +} + +void wxTextCtrl::OnUndo(wxCommandEvent& WXUNUSED(event)) +{ + Undo(); +} + +void wxTextCtrl::OnRedo(wxCommandEvent& WXUNUSED(event)) +{ + Redo(); +} + +void wxTextCtrl::OnUpdateCut(wxUpdateUIEvent& event) +{ + event.Enable( CanCut() ); +} + +void wxTextCtrl::OnUpdateCopy(wxUpdateUIEvent& event) +{ + event.Enable( CanCopy() ); +} + +void wxTextCtrl::OnUpdatePaste(wxUpdateUIEvent& event) +{ + event.Enable( CanPaste() ); +} + +void wxTextCtrl::OnUpdateUndo(wxUpdateUIEvent& event) +{ + event.Enable( CanUndo() ); +} + +void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event) +{ + event.Enable( CanRedo() ); +}