X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bb69661b050ad2c774985e225cce0e497a875143..461697c2ae572caeaa26539aa5a504368e8b350e:/src/gtk/textctrl.cpp diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index 3d426e1668..c525be6c9c 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -14,7 +14,9 @@ #include "wx/textctrl.h" #include "wx/utils.h" #include "wx/intl.h" +#include "wx/log.h" #include "wx/settings.h" +#include "wx/panel.h" #include #include @@ -35,7 +37,8 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnDrag; +extern wxCursor g_globalCursor; //----------------------------------------------------------------------------- // "changed" @@ -50,6 +53,7 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) wxapp_install_idle_handler(); win->SetModified(); + win->UpdateFontIfNeeded(); wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); event.SetString( win->GetValue() ); @@ -72,6 +76,116 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) win->CalculateScrollbar(); } +//----------------------------------------------------------------------------- +// "focus_in_event" +//----------------------------------------------------------------------------- + +wxWindow *FindFocusedChild(wxWindow *win); +extern wxWindow *g_focusWindow; +extern bool g_blockEventsOnDrag; +// extern bool g_isIdle; + +static gint gtk_text_focus_in_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win ) +{ + // Necessary? +#if 0 + if (g_isIdle) + wxapp_install_idle_handler(); +#endif + if (!win->m_hasVMT) return FALSE; + if (g_blockEventsOnDrag) return FALSE; + + g_focusWindow = win; + + wxPanel *panel = wxDynamicCast(win->GetParent(), wxPanel); + if (panel) + { + panel->SetLastFocus(win); + } + +#ifdef HAVE_XIM + if (win->m_ic) + gdk_im_begin(win->m_ic, win->m_wxwindow->window); +#endif + +#if 0 +#ifdef wxUSE_CARET + // caret needs to be informed about focus change + wxCaret *caret = win->GetCaret(); + if ( caret ) + { + caret->OnSetFocus(); + } +#endif // wxUSE_CARET +#endif + + wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() ); + event.SetEventObject( win ); + + if (win->GetEventHandler()->ProcessEvent( event )) + { + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus_in_event" ); + return TRUE; + } + + return FALSE; +} + +//----------------------------------------------------------------------------- +// "focus_out_event" +//----------------------------------------------------------------------------- + +static gint gtk_text_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win ) +{ +#if 0 + if (g_isIdle) + wxapp_install_idle_handler(); +#endif + + if (!win->m_hasVMT) return FALSE; + if (g_blockEventsOnDrag) return FALSE; + +#if 0 + // if the focus goes out of our app alltogether, OnIdle() will send + // wxActivateEvent, otherwise gtk_window_focus_in_callback() will reset + // g_sendActivateEvent to -1 + g_sendActivateEvent = 0; +#endif + + wxWindow *winFocus = FindFocusedChild(win); + if ( winFocus ) + win = winFocus; + + g_focusWindow = (wxWindow *)NULL; + +#ifdef HAVE_XIM + if (win->m_ic) + gdk_im_end(); +#endif + +#if 0 +#ifdef wxUSE_CARET + // caret needs to be informed about focus change + wxCaret *caret = win->GetCaret(); + if ( caret ) + { + caret->OnKillFocus(); + } +#endif // wxUSE_CARET +#endif + + wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() ); + event.SetEventObject( win ); + + if (win->GetEventHandler()->ProcessEvent( event )) + { + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus_out_event" ); + return TRUE; + } + + return FALSE; +} + //----------------------------------------------------------------------------- // wxTextCtrl //----------------------------------------------------------------------------- @@ -94,61 +208,60 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo) END_EVENT_TABLE() -#if wxUSE_STD_IOSTREAM -wxTextCtrl::wxTextCtrl() : streambuf() -{ - if (allocate()) setp(base(),ebuf()); - - m_modified = FALSE; -} -#else -wxTextCtrl::wxTextCtrl() +void wxTextCtrl::Init() { m_modified = FALSE; + m_updateFont = FALSE; + m_text = + m_vScrollbar = (GtkWidget *)NULL; } -#endif -#if wxUSE_STD_IOSTREAM -wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value, - const wxPoint &pos, const wxSize &size, - int style, const wxValidator& validator, const wxString &name ) : streambuf() +wxTextCtrl::wxTextCtrl( wxWindow *parent, + wxWindowID id, + const wxString &value, + const wxPoint &pos, + const wxSize &size, + long style, + const wxValidator& validator, + const wxString &name ) { - if (allocate()) setp(base(),ebuf()); + Init(); - 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 ) +bool wxTextCtrl::Create( wxWindow *parent, + wxWindowID id, + const wxString &value, + const wxPoint &pos, + const wxSize &size, + long style, + const wxValidator& validator, + const wxString &name ) { m_needParent = TRUE; m_acceptsFocus = TRUE; - PreCreation( parent, id, pos, size, style, name ); + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, validator, name )) + { + wxFAIL_MSG( wxT("wxTextCtrl creation failed") ); + return FALSE; + } -#if wxUSE_VALIDATORS - SetValidator( validator ); -#endif // wxUSE_VALIDATORS m_vScrollbarVisible = FALSE; bool multi_line = (style & wxTE_MULTILINE) != 0; if (multi_line) { +#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 ... */ m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); @@ -164,6 +277,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, /* 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) { @@ -175,11 +289,10 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, 0, 0); gtk_widget_show(hscrollbar); -#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 } +#endif /* finally, put the vertical scrollbar in the upper right corner */ m_vScrollbar = gtk_vscrollbar_new( GTK_TEXT(m_text)->vadj ); @@ -196,26 +309,42 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, m_text = gtk_entry_new(); } - wxSize newSize = size; - if (newSize.x == -1) newSize.x = 80; - if (newSize.y == -1) newSize.y = 26; - SetSize( newSize.x, newSize.y ); - m_parent->DoAddChild( this ); PostCreation(); + SetFont( parent->GetFont() ); + + wxSize size_best( DoGetBestSize() ); + wxSize new_size( size ); + if (new_size.x == -1) + new_size.x = size_best.x; + if (new_size.y == -1) + new_size.y = size_best.y; + if ((new_size.x != size.x) || (new_size.y != size.y)) + SetSize( new_size.x, new_size.y ); + if (multi_line) 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 ); + + gtk_signal_connect( GTK_OBJECT(GTK_TEXT(m_text)), "focus_in_event", + GTK_SIGNAL_FUNC(gtk_text_focus_in_callback), (gpointer)this ); + + gtk_signal_connect( GTK_OBJECT(GTK_TEXT(m_text)), "focus_out_event", + GTK_SIGNAL_FUNC(gtk_text_focus_out_callback), (gpointer)this ); + } + else + { + gtk_signal_connect( GTK_OBJECT(m_text), "focus_in_event", + GTK_SIGNAL_FUNC(gtk_text_focus_in_callback), (gpointer)this ); + + gtk_signal_connect( GTK_OBJECT(m_text), "focus_out_event", + GTK_SIGNAL_FUNC(gtk_text_focus_out_callback), (gpointer)this ); } if (!value.IsEmpty()) @@ -260,9 +389,15 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, gtk_text_set_editable( GTK_TEXT(m_text), 1 ); } + /* 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); + SetBackgroundColour( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ); SetForegroundColour( parent->GetForegroundColour() ); + m_cursor = wxCursor( wxCURSOR_IBEAM ); + Show( TRUE ); return TRUE; @@ -294,7 +429,7 @@ void wxTextCtrl::CalculateScrollbar() wxString wxTextCtrl::GetValue() const { - wxCHECK_MSG( m_text != NULL, _T(""), _T("invalid text ctrl") ); + wxCHECK_MSG( m_text != NULL, wxT(""), wxT("invalid text ctrl") ); wxString tmp; if (m_windowStyle & wxTE_MULTILINE) @@ -313,43 +448,39 @@ wxString wxTextCtrl::GetValue() const 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); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - 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; #if wxUSE_UNICODE - wxWX2MBbuf tmpbuf = tmp.mbc_str(); + wxWX2MBbuf tmpbuf = value.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 ); + gtk_editable_insert_text( GTK_EDITABLE(m_text), value.mbc_str(), value.Length(), &len ); #endif } else { - gtk_entry_set_text( GTK_ENTRY(m_text), tmp.mbc_str() ); + gtk_entry_set_text( GTK_ENTRY(m_text), value.mbc_str() ); } - gtk_signal_connect( GTK_OBJECT(m_text), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); + // GRG, Jun/2000: Changed this after a lot of discussion in + // the lists. wxWindows 2.2 will have a set of flags to + // customize this behaviour. + SetInsertionPoint(0); + + m_modified = FALSE; } void wxTextCtrl::WriteText( const wxString &text ) { - wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") ); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); 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 */ @@ -382,20 +513,14 @@ void wxTextCtrl::WriteText( const wxString &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); } void wxTextCtrl::AppendText( const wxString &text ) { - wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") ); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); 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) { bool hasSpecialAttributes = m_font.Ok() || @@ -407,7 +532,7 @@ void wxTextCtrl::AppendText( const wxString &text ) m_font.GetInternalFont(), m_foregroundColour.GetColor(), m_backgroundColour.GetColor(), - text, text.length()); + text.mbc_str(), text.length()); } else @@ -429,111 +554,6 @@ void wxTextCtrl::AppendText( const wxString &text ) { gtk_entry_append_text( GTK_ENTRY(m_text), text.mbc_str() ); } - - gtk_signal_connect( GTK_OBJECT(m_text), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); -} - -bool wxTextCtrl::LoadFile( const wxString &file ) -{ - wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") ); - - if (!wxFileExists(file)) return FALSE; - - Clear(); - - FILE *fp = (FILE*) NULL; - struct stat statb; - - if ((stat (FNSTRINGCAST file.fn_str(), &statb) == -1) || (statb.st_mode & S_IFMT) != S_IFREG || - !(fp = fopen (FNSTRINGCAST file.fn_str(), "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 ); - } - - gtk_signal_connect( GTK_OBJECT(m_text), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); - - free (text); - m_modified = FALSE; - return TRUE; - } - return FALSE; -} - -bool wxTextCtrl::SaveFile( const wxString &file ) -{ - wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") ); - - if (file == _T("")) return FALSE; - - FILE *fp; - - if (!(fp = fopen (FNSTRINGCAST file.fn_str(), "w"))) - { - return FALSE; - } - 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; - } - - return TRUE; } wxString wxTextCtrl::GetLineText( long lineNo ) const @@ -545,7 +565,7 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const if (text) { - wxString buf(_T("")); + wxString buf(wxT("")); long i; int currentLine = 0; for (i = 0; currentLine != lineNo && text[i]; i++ ) @@ -573,10 +593,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( _T("wxTextCtrl::OnDropFiles not implemented") ); + wxFAIL_MSG( wxT("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 ) { @@ -592,7 +612,7 @@ long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const const wxChar* stop = text.c_str() + pos; for ( const wxChar *p = text.c_str(); p < stop; p++ ) { - if (*p == _T('\n')) + if (*p == wxT('\n')) { (*y)++; *x=0; @@ -668,7 +688,7 @@ int wxTextCtrl::GetNumberOfLines() const void wxTextCtrl::SetInsertionPoint( long pos ) { - wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") ); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); if (m_windowStyle & wxTE_MULTILINE) { @@ -699,13 +719,13 @@ void wxTextCtrl::SetInsertionPoint( long pos ) /* bring editable's cursor uptodate. bug in GTK. */ - GTK_EDITABLE(m_text)->current_pos = pos; + GTK_EDITABLE(m_text)->current_pos = (guint32)pos; } } void wxTextCtrl::SetInsertionPointEnd() { - wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") ); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); if (m_windowStyle & wxTE_MULTILINE) SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text))); @@ -715,7 +735,7 @@ void wxTextCtrl::SetInsertionPointEnd() void wxTextCtrl::SetEditable( bool editable ) { - wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") ); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); if (m_windowStyle & wxTE_MULTILINE) gtk_text_set_editable( GTK_TEXT(m_text), editable ); @@ -723,9 +743,42 @@ void wxTextCtrl::SetEditable( bool editable ) gtk_entry_set_editable( GTK_ENTRY(m_text), editable ); } +bool wxTextCtrl::Enable( bool enable ) +{ + if (!wxWindowBase::Enable(enable)) + { + // nothing to do + return FALSE; + } + + if (m_windowStyle & wxTE_MULTILINE) + { + gtk_text_set_editable( GTK_TEXT(m_text), enable ); + } + else + { + gtk_widget_set_sensitive( m_text, enable ); + } + + return TRUE; +} + +void wxTextCtrl::DiscardEdits() +{ + m_modified = FALSE; +} + void wxTextCtrl::SetSelection( long from, long to ) { - wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") ); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); + + if ( (m_windowStyle & wxTE_MULTILINE) && + !GTK_TEXT(m_text)->line_start_cache ) + { + // tell the programmer that it didn't work + wxLogDebug(_T("Can't call SetSelection() before realizing the control")); + return; + } gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to ); } @@ -737,14 +790,14 @@ void wxTextCtrl::ShowPosition( long WXUNUSED(pos) ) long wxTextCtrl::GetInsertionPoint() const { - wxCHECK_MSG( m_text != NULL, 0, _T("invalid text ctrl") ); + wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") ); return (long) GTK_EDITABLE(m_text)->current_pos; } long wxTextCtrl::GetLastPosition() const { - wxCHECK_MSG( m_text != NULL, 0, _T("invalid text ctrl") ); + wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") ); int pos = 0; if (m_windowStyle & wxTE_MULTILINE) @@ -757,23 +810,14 @@ long wxTextCtrl::GetLastPosition() const void wxTextCtrl::Remove( long from, long to ) { - 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); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); 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, _T("invalid text ctrl") ); - - gtk_signal_disconnect_by_func( GTK_OBJECT(m_text), - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to ); @@ -787,31 +831,22 @@ void wxTextCtrl::Replace( long from, long to, const wxString &value ) 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, _T("invalid text ctrl") ); - - gtk_signal_disconnect_by_func( GTK_OBJECT(m_text), - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); #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, _T("invalid text ctrl") ); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); #if (GTK_MINOR_VERSION > 0) gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) ); @@ -822,19 +857,13 @@ void wxTextCtrl::Copy() void wxTextCtrl::Paste() { - 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); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); #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 @@ -850,7 +879,7 @@ bool wxTextCtrl::CanCut() const // Can cut if there's a selection long from, to; GetSelection(& from, & to); - return (from != to) ; + return (from != to) && (IsEditable()); } bool wxTextCtrl::CanPaste() const @@ -862,26 +891,26 @@ bool wxTextCtrl::CanPaste() const void wxTextCtrl::Undo() { // TODO - wxFAIL_MSG( _T("wxTextCtrl::Undo not implemented") ); + wxFAIL_MSG( wxT("wxTextCtrl::Undo not implemented") ); } void wxTextCtrl::Redo() { // TODO - wxFAIL_MSG( _T("wxTextCtrl::Redo not implemented") ); + wxFAIL_MSG( wxT("wxTextCtrl::Redo not implemented") ); } bool wxTextCtrl::CanUndo() const { // TODO - wxFAIL_MSG( _T("wxTextCtrl::CanUndo not implemented") ); + wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") ); return FALSE; } bool wxTextCtrl::CanRedo() const { // TODO - wxFAIL_MSG( _T("wxTextCtrl::CanRedo not implemented") ); + wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") ); return FALSE; } @@ -889,12 +918,13 @@ bool wxTextCtrl::CanRedo() const // selection. void wxTextCtrl::GetSelection(long* from, long* to) const { - wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") ); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); if (!(GTK_EDITABLE(m_text)->has_selection)) { - if (from) *from = 0; - if (to) *to = 0; + long i = GetInsertionPoint(); + if (from) *from = i; + if (to) *to = i; return; } @@ -904,107 +934,48 @@ void wxTextCtrl::GetSelection(long* from, long* to) const bool wxTextCtrl::IsEditable() const { - wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") ); + wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") ); return GTK_EDITABLE(m_text)->editable; } +bool wxTextCtrl::IsModified() const +{ + return m_modified; +} + void wxTextCtrl::Clear() { - SetValue( _T("") ); + SetValue( wxT("") ); } void wxTextCtrl::OnChar( wxKeyEvent &key_event ) { - wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") ); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER)) { wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); event.SetEventObject(this); + event.SetString(GetValue()); if (GetEventHandler()->ProcessEvent(event)) return; } - key_event.Skip(); -} - -#if wxUSE_STD_IOSTREAM -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; -} -#endif - -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; -} + if ((key_event.KeyCode() == WXK_RETURN) && !(m_windowStyle & wxTE_MULTILINE)) + { + wxWindow *top_frame = m_parent; + while (top_frame->GetParent() && !(top_frame->IsTopLevel())) + top_frame = top_frame->GetParent(); + GtkWindow *window = GTK_WINDOW(top_frame->m_widget); -wxTextCtrl& wxTextCtrl::operator<<(const char c) -{ - char buf[2]; + if (window->default_widget) + { + gtk_widget_activate (window->default_widget); + return; + } + } - buf[0] = c; - buf[1] = 0; - AppendText(buf); - return *this; + key_event.Skip(); } GtkWidget* wxTextCtrl::GetConnectWidget() @@ -1023,7 +994,7 @@ bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window ) // the font will change for subsequent text insertiongs bool wxTextCtrl::SetFont( const wxFont &font ) { - wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") ); + wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") ); if ( !wxWindowBase::SetFont(font) ) { @@ -1033,23 +1004,40 @@ bool wxTextCtrl::SetFont( const wxFont &font ) 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(); + m_updateFont = TRUE; - AppendText(value); - } + ChangeFontGlobally(); } return TRUE; } +void wxTextCtrl::ChangeFontGlobally() +{ + // this method is very inefficient and hence should be called as rarely as + // possible! + wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont, + _T("shouldn't be called for single line controls") ); + + wxString value = GetValue(); + if ( !value.IsEmpty() ) + { + Clear(); + AppendText(value); + + m_updateFont = FALSE; + } +} + +void wxTextCtrl::UpdateFontIfNeeded() +{ + if ( m_updateFont ) + ChangeFontGlobally(); +} + bool wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) ) { - wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") ); + wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") ); // doesn't work return FALSE; @@ -1057,7 +1045,7 @@ bool wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) ) bool wxTextCtrl::SetBackgroundColour( const wxColour &colour ) { - wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") ); + wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") ); wxControl::SetBackgroundColour( colour ); @@ -1150,3 +1138,37 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event) { event.Enable( CanRedo() ); } + +void wxTextCtrl::OnInternalIdle() +{ + wxCursor cursor = m_cursor; + if (g_globalCursor.Ok()) cursor = g_globalCursor; + + if (cursor.Ok()) + { + GdkWindow *window = (GdkWindow*) NULL; + if (HasFlag(wxTE_MULTILINE)) + window = GTK_TEXT(m_text)->text_area; + else + window = GTK_ENTRY(m_text)->text_area; + + if (window) + gdk_window_set_cursor( window, cursor.GetCursor() ); + + if (!g_globalCursor.Ok()) + cursor = *wxSTANDARD_CURSOR; + + window = m_widget->window; + if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget))) + gdk_window_set_cursor( window, cursor.GetCursor() ); + } + + UpdateWindowUI(); +} + +wxSize wxTextCtrl::DoGetBestSize() const +{ + // FIXME should be different for multi-line controls... + wxSize ret( wxControl::DoGetBestSize() ); + return wxSize(80, ret.y); +}