X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae0bdb016fb973f49765101e3ba14f898aada4e7..87df17a11b0017d31c09f767bd921abb27193bee:/src/gtk/textctrl.cpp?ds=inline diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index 8891fd63fb..bde02f7faa 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -14,25 +14,176 @@ #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 #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; +extern wxCursor g_globalCursor; + //----------------------------------------------------------------------------- // "changed" //----------------------------------------------------------------------------- -static void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) +static void +gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) { - win->SetModified(); + if (!win->m_hasVMT) return; + + if (g_isIdle) + wxapp_install_idle_handler(); - wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId ); - wxString val( win->GetValue() ); - if (!val.IsNull()) event.m_commandString = WXSTRINGCAST val; - event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event ); + win->SetModified(); + win->UpdateFontIfNeeded(); + + wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); + event.SetString( win->GetValue() ); + event.SetEventObject( win ); + win->GetEventHandler()->ProcessEvent( event ); +} + +//----------------------------------------------------------------------------- +// "changed" from vertical scrollbar +//----------------------------------------------------------------------------- + +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(); +} + +//----------------------------------------------------------------------------- +// "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; } //----------------------------------------------------------------------------- @@ -42,281 +193,406 @@ static void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl * IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl) BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) - EVT_CHAR(wxTextCtrl::OnChar) + 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() -wxTextCtrl::wxTextCtrl() : streambuf() +void wxTextCtrl::Init() { - if (allocate()) setp(base(),ebuf()); - - m_modified = FALSE; + m_modified = FALSE; + m_updateFont = FALSE; + m_text = + m_vScrollbar = (GtkWidget *)NULL; } -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 ); + Create( parent, id, value, pos, size, style, validator, name ); } -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_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; + } - SetValidator( validator ); - bool multi_line = (style & wxTE_MULTILINE) != 0; - if ( multi_line ) - { - // a multi-line edit control: create a vertical scrollbar by default and - // horizontal if requested - bool bHasHScrollbar = (style & wxHSCROLL) != 0; + 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 ); + /* create our control ... */ + m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); - // ... and put into the upper left hand corner of the table - m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE); - gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1, + /* ... 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 - if (bHasHScrollbar) - { - GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj); - gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2, - (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), + /* 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 | GTK_SHRINK), GTK_FILL, 0, 0); - gtk_widget_show(hscrollbar); - } + 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 - GtkWidget *vscrollbar = gtk_vscrollbar_new(GTK_TEXT(m_text)->vadj); - gtk_table_attach(GTK_TABLE(m_widget), vscrollbar, 1, 2, 0, 1, + /* 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( vscrollbar ); - } - else - { - // a single-line text control: no need for scrollbars - m_widget = - m_text = gtk_entry_new(); - } + } + else + { + /* a single-line text control: no need for scrollbars */ + m_widget = + 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 ); - m_parent->AddChild( this ); + PostCreation(); - (m_parent->m_insertCallback)( m_parent, this ); + SetFont( parent->GetFont() ); - PostCreation(); + 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_realize(m_text); - gtk_widget_show(m_text); - } + 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 ); - if (!value.IsNull()) - { - gint tmp = 0; - gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp ); - SetInsertionPointEnd(); - } + gtk_signal_connect( GTK_OBJECT(GTK_TEXT(m_text)), "focus_in_event", + GTK_SIGNAL_FUNC(gtk_text_focus_in_callback), (gpointer)this ); - if (style & wxTE_PASSWORD) - { - if (!multi_line) - gtk_entry_set_visibility( GTK_ENTRY(m_text), FALSE ); - } + 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 ); - if (style & wxTE_READONLY) - { - if (!multi_line) - gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE ); - } - else - { - if (multi_line) - gtk_text_set_editable( GTK_TEXT(m_text), 1 ); - } + gtk_signal_connect( GTK_OBJECT(m_text), "focus_out_event", + GTK_SIGNAL_FUNC(gtk_text_focus_out_callback), (gpointer)this ); + } - Show( TRUE ); + 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) ); + } + } - SetBackgroundColour( parent->GetBackgroundColour() ); - SetForegroundColour( parent->GetForegroundColour() ); + if (style & wxTE_PASSWORD) + { + if (!multi_line) + gtk_entry_set_visibility( GTK_ENTRY(m_text), FALSE ); + } - return TRUE; -} + if (style & wxTE_READONLY) + { + if (!multi_line) + gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE ); + } + else + { + if (multi_line) + gtk_text_set_editable( GTK_TEXT(m_text), 1 ); + } -wxString wxTextCtrl::GetValue() const -{ - wxCHECK_MSG( m_text != NULL, "", "invalid text ctrl" ); + /* 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); - 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; - g_free( text ); - } - else - { - tmp = gtk_entry_get_text( GTK_ENTRY(m_text) ); - } - return tmp; -} + /* we don't set a valid background colour, because the window + manager should use a default one */ + m_backgroundColour = wxColour(); -void wxTextCtrl::SetValue( const wxString &value ) -{ - wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); + wxColour colFg = parent->GetForegroundColour(); + SetForegroundColour( colFg ); - wxString tmp = ""; - 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 ); - } - else - { - gtk_entry_set_text( GTK_ENTRY(m_text), tmp ); - } -} + m_cursor = wxCursor( wxCURSOR_IBEAM ); -void wxTextCtrl::WriteText( const wxString &text ) -{ - wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); + // FIXME: is the bg colour correct here? + wxTextAttr attrDef( colFg, + wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW), + parent->GetFont() ); + SetDefaultStyle( attrDef ); - if (text.IsNull()) return; + Show( TRUE ); - if (m_windowStyle & wxTE_MULTILINE) - { - gint len = gtk_text_get_length( GTK_TEXT(m_text) ); - gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len ); - } - else - { - gtk_entry_append_text( GTK_ENTRY(m_text), text ); - } + return TRUE; } -bool wxTextCtrl::LoadFile( const wxString &file ) +void wxTextCtrl::CalculateScrollbar() { - wxCHECK_MSG( m_text != NULL, FALSE, "invalid text ctrl" ); + if ((m_windowStyle & wxTE_MULTILINE) == 0) return; - if (!wxFileExists(file)) return FALSE; + GtkAdjustment *adj = GTK_TEXT(m_text)->vadj; - Clear(); + if (adj->upper - adj->page_size < 0.8) + { + if (m_vScrollbarVisible) + { + gtk_widget_hide( m_vScrollbar ); + m_vScrollbarVisible = FALSE; + } + } + else + { + if (!m_vScrollbarVisible) + { + gtk_widget_show( m_vScrollbar ); + m_vScrollbarVisible = TRUE; + } + } +} - FILE *fp = NULL; - struct stat statb; +wxString wxTextCtrl::GetValue() const +{ + wxCHECK_MSG( m_text != NULL, wxT(""), wxT("invalid text ctrl") ); - 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)))) + 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 = wxString(text,*wxConvCurrent); + g_free( text ); + } + else { - fclose (fp); - return FALSE; + tmp = wxString(gtk_entry_get_text( GTK_ENTRY(m_text) ),*wxConvCurrent); } - if (fread (text, sizeof (char), len, fp) != (size_t) len) - { - } - fclose (fp); + return tmp; +} - text[len] = 0; +void wxTextCtrl::SetValue( const wxString &value ) +{ + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); if (m_windowStyle & wxTE_MULTILINE) { - gtk_editable_insert_text( GTK_EDITABLE(m_text), text, 0, &len ); + 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 = value.mbc_str(); + gtk_editable_insert_text( GTK_EDITABLE(m_text), tmpbuf, strlen(tmpbuf), &len ); +#else + gtk_editable_insert_text( GTK_EDITABLE(m_text), value.mbc_str(), value.Length(), &len ); +#endif } else { - gtk_entry_set_text( GTK_ENTRY(m_text), text ); + gtk_entry_set_text( GTK_ENTRY(m_text), value.mbc_str() ); } - free (text); + // 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; - return TRUE; - } - return FALSE; } -bool wxTextCtrl::SaveFile( const wxString &file ) +void wxTextCtrl::WriteText( const wxString &text ) { - wxCHECK_MSG( m_text != NULL, FALSE, "invalid text ctrl" ); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (file == "") return FALSE; + if ( text.empty() ) + return; - FILE *fp; +#if wxUSE_UNICODE + wxWX2MBbuf buf = text.mbc_str(); + const char *txt = buf; + size_t txtlen = strlen(buf); +#else + const char *txt = text; + size_t txtlen = text.length(); +#endif - if (!(fp = fopen ((char*) (const char*) file, "w"))) + if ( m_windowStyle & wxTE_MULTILINE ) { - return FALSE; + /* this moves the cursor pos to behind the inserted text */ + gint len = GTK_EDITABLE(m_text)->current_pos; + + // if we have any special style, use it + if ( !m_defaultStyle.IsDefault() ) + { + GdkFont *font = m_defaultStyle.HasFont() + ? m_defaultStyle.GetFont().GetInternalFont() + : NULL; + + GdkColor *colFg = m_defaultStyle.HasTextColour() + ? m_defaultStyle.GetTextColour().GetColor() + : NULL; + + GdkColor *colBg = m_defaultStyle.HasBackgroundColour() + ? m_defaultStyle.GetBackgroundColour().GetColor() + : NULL; + + gtk_text_insert( GTK_TEXT(m_text), font, colFg, colBg, txt, txtlen ); + } + else // no style + { + gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len ); + } + + /* bring editable's cursor uptodate. bug in GTK. */ + GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); } - else + else // single line { - char *text = NULL; - gint len = 0; + /* this moves the cursor pos to behind the inserted text */ + gint len = GTK_EDITABLE(m_text)->current_pos; + gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len ); - 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) ); - } + /* bring editable's cursor uptodate. bug in GTK. */ + GTK_EDITABLE(m_text)->current_pos += text.Len(); - if (fwrite (text, sizeof (char), len, fp) != (size_t) len) - { - // Did not write whole file - } + /* bring entry's cursor uptodate. bug in GTK. */ + gtk_entry_set_position( GTK_ENTRY(m_text), GTK_EDITABLE(m_text)->current_pos ); + } +} - // Make sure newline terminates the file - if (text[len - 1] != '\n') - fputc ('\n', fp); +void wxTextCtrl::AppendText( const wxString &text ) +{ + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - fclose (fp); + if ( text.empty() ) + return; - if (m_windowStyle & wxTE_MULTILINE) g_free( text ); +#if wxUSE_UNICODE + wxWX2MBbuf buf = text.mbc_str(); + const char *txt = buf; + size_t txtlen = strlen(buf); +#else + const char *txt = text; + size_t txtlen = text.length(); +#endif - m_modified = FALSE; - return TRUE; + if (m_windowStyle & wxTE_MULTILINE) + { + if ( !m_defaultStyle.IsDefault() ) + { + GdkFont *font = m_defaultStyle.HasFont() + ? m_defaultStyle.GetFont().GetInternalFont() + : NULL; + + GdkColor *colFg = m_defaultStyle.HasTextColour() + ? m_defaultStyle.GetTextColour().GetColor() + : NULL; + + GdkColor *colBg = m_defaultStyle.HasBackgroundColour() + ? m_defaultStyle.GetBackgroundColour().GetColor() + : NULL; + + gtk_text_insert( GTK_TEXT(m_text), font, colFg, colBg, txt, txtlen ); + } + else // no style + { + /* 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), txt, txtlen, &len ); + } + + /* bring editable's cursor uptodate. bug in GTK. */ + GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); + } + else // single line + { + gtk_entry_append_text( GTK_ENTRY(m_text), txt ); } - - return TRUE; } wxString wxTextCtrl::GetLineText( long lineNo ) const @@ -328,7 +604,7 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const if (text) { - wxString buf(""); + wxString buf(wxT("")); long i; int currentLine = 0; for (i = 0; currentLine != lineNo && text[i]; i++ ) @@ -354,46 +630,62 @@ 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( 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)) - 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 ( 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 == wxT('\n')) + { + (*y)++; + *x=0; + } + else + (*x)++; + } + } + else // single line control { - if (text[i] == '\n') - { - (*y)++; - *x=1; - } - else - (*x)++; + 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; + if (!(m_windowStyle & wxTE_MULTILINE)) return 0; - for(int i=1;icurrent_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 = (guint32)pos; + } } void wxTextCtrl::SetInsertionPointEnd() { - wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); + wxCHECK_RET( m_text != NULL, wxT("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; - SetInsertionPoint((pos-1)>0 ? (pos-1):0); + if (m_windowStyle & wxTE_MULTILINE) + SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text))); + else + 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, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) - gtk_text_set_editable( GTK_TEXT(m_text), editable ); - else - gtk_entry_set_editable( GTK_ENTRY(m_text), editable ); + if (m_windowStyle & wxTE_MULTILINE) + gtk_text_set_editable( GTK_TEXT(m_text), editable ); + else + 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 ); + OnParentEnable(enable); + } + else + { + gtk_widget_set_sensitive( m_text, enable ); + } + + return TRUE; +} + +// wxGTK-specific: called recursively by Enable, +// to give widgets an oppprtunity to correct their colours after they +// have been changed by Enable +void wxTextCtrl::OnParentEnable( bool enable ) +{ + // If we have a custom background colour, we use this colour in both + // disabled and enabled mode, or we end up with a different colour under the + // text. + wxColour oldColour = GetBackgroundColour(); + if (oldColour.Ok()) + { + // Need to set twice or it'll optimize the useful stuff out + if (oldColour == * wxWHITE) + SetBackgroundColour(*wxBLACK); + else + SetBackgroundColour(*wxWHITE); + SetBackgroundColour(oldColour); + } +} + +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, 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 ); + 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, wxT("invalid text ctrl") ); - return (long) GTK_EDITABLE(m_text)->current_pos; + 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, wxT("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; + 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; } void wxTextCtrl::Remove( long from, long to ) { - wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to ); + 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, wxT("invalid text ctrl") ); + + gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to ); - gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to ); - if (value.IsNull()) return; - gint pos = (gint)to; - 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 + } } void wxTextCtrl::Cut() { - wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); -#if (GTK_MINOR_VERSION == 1) - gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) ); +#if (GTK_MINOR_VERSION > 0) + gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) ); #else - gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 ); + gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 ); #endif } void wxTextCtrl::Copy() { - wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); -#if (GTK_MINOR_VERSION == 1) - gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) ); +#if (GTK_MINOR_VERSION > 0) + gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) ); #else - gtk_editable_copy_clipboard( GTK_EDITABLE(m_text), 0 ); + gtk_editable_copy_clipboard( GTK_EDITABLE(m_text), 0 ); #endif } void wxTextCtrl::Paste() { - wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); -#if (GTK_MINOR_VERSION == 1) - gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) ); +#if (GTK_MINOR_VERSION > 0) + gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) ); #else - gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 ); + gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 ); #endif } -void wxTextCtrl::Clear() +bool wxTextCtrl::CanCopy() const { - SetValue( "" ); + // Can copy if there's a selection + long from, to; + GetSelection(& from, & to); + return (from != to) ; } -void wxTextCtrl::OnChar( wxKeyEvent &key_event ) +bool wxTextCtrl::CanCut() const { - 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); + // Can cut if there's a selection + long from, to; + GetSelection(& from, & to); + return (from != to) && (IsEditable()); +} - if (GetEventHandler()->ProcessEvent(event)) return; - } - key_event.Skip(); +bool wxTextCtrl::CanPaste() const +{ + return IsEditable() ; } -int wxTextCtrl::overflow( int WXUNUSED(c) ) +// Undo/redo +void wxTextCtrl::Undo() { - 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; + // TODO + wxFAIL_MSG( wxT("wxTextCtrl::Undo not implemented") ); } -int wxTextCtrl::sync() +void wxTextCtrl::Redo() { - 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; + // TODO + wxFAIL_MSG( wxT("wxTextCtrl::Redo not implemented") ); } -int wxTextCtrl::underflow() +bool wxTextCtrl::CanUndo() const { - return EOF; + // TODO + wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") ); + return FALSE; } -wxTextCtrl& wxTextCtrl::operator<<(const wxString& s) +bool wxTextCtrl::CanRedo() const { - WriteText(s); - return *this; + // TODO + wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") ); + return FALSE; } -wxTextCtrl& wxTextCtrl::operator<<(float f) +// If the return values from and to are the same, there is no +// selection. +void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const { - static char buf[100]; - sprintf(buf, "%.2f", f); - WriteText(buf); - return *this; + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); + + long from, to; + if ( !(GTK_EDITABLE(m_text)->has_selection) ) + { + from = + to = GetInsertionPoint(); + } + else // got selection + { + from = (long) GTK_EDITABLE(m_text)->selection_start_pos; + to = (long) GTK_EDITABLE(m_text)->selection_end_pos; + + if ( from > to ) + { + // exchange them to be compatible with wxMSW + long tmp = from; + from = to; + to = tmp; + } + } + + if ( fromOut ) + *fromOut = from; + if ( toOut ) + *toOut = to; } -wxTextCtrl& wxTextCtrl::operator<<(double d) +bool wxTextCtrl::IsEditable() const { - static char buf[100]; - sprintf(buf, "%.2f", d); - WriteText(buf); - return *this; + wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") ); + + return GTK_EDITABLE(m_text)->editable; } -wxTextCtrl& wxTextCtrl::operator<<(int i) +bool wxTextCtrl::IsModified() const { - static char buf[100]; - sprintf(buf, "%i", i); - WriteText(buf); - return *this; + return m_modified; } -wxTextCtrl& wxTextCtrl::operator<<(long i) +void wxTextCtrl::Clear() { - static char buf[100]; - sprintf(buf, "%ld", i); - WriteText(buf); - return *this; + SetValue( wxT("") ); } -wxTextCtrl& wxTextCtrl::operator<<(const char c) +void wxTextCtrl::OnChar( wxKeyEvent &key_event ) { - char buf[2]; + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - buf[0] = c; - buf[1] = 0; - WriteText(buf); - return *this; + 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; + } + + 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); + + if (window->default_widget) + { + gtk_widget_activate (window->default_widget); + return; + } + } + + key_event.Skip(); } GtkWidget* wxTextCtrl::GetConnectWidget() @@ -657,50 +1065,163 @@ 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_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") ); + + if ( !wxWindowBase::SetFont(font) ) + { + // font didn't change, nothing to do + return FALSE; + } + + if ( m_windowStyle & wxTE_MULTILINE ) + { + m_updateFont = TRUE; + + ChangeFontGlobally(); + } + + return TRUE; +} + +void wxTextCtrl::ChangeFontGlobally() { - wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); + // 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") ); - // doesn't work + wxString value = GetValue(); + if ( !value.IsEmpty() ) + { + Clear(); + AppendText(value); + + m_updateFont = FALSE; + } +} + +void wxTextCtrl::UpdateFontIfNeeded() +{ + if ( m_updateFont ) + ChangeFontGlobally(); } -void wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) ) +bool wxTextCtrl::SetForegroundColour(const wxColour& colour) { - wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); + if ( !wxControl::SetForegroundColour(colour) ) + return FALSE; - // doesn't work + // update default fg colour too + m_defaultStyle.SetTextColour(colour); + + return TRUE; } -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, wxT("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 ); } + + // change active background color too + m_defaultStyle.SetBackgroundColour( colour ); + + return TRUE; +} + +bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr &style ) +{ + /* VERY dirty way to do that - removes the required text and re-adds it + with styling (FIXME) */ + if ( m_windowStyle & wxTE_MULTILINE ) + { + if ( style.IsDefault() ) + { + // nothing to do + return TRUE; + } + + gint l = gtk_text_get_length( GTK_TEXT(m_text) ); + + wxCHECK_MSG( start >= 0 && end <= l, FALSE, + _T("invalid range in wxTextCtrl::SetStyle") ); + + gint old_pos = gtk_editable_get_position( GTK_EDITABLE(m_text) ); + char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), start, end ); + wxString tmp(text,*wxConvCurrent); + g_free( text ); + + gtk_editable_delete_text( GTK_EDITABLE(m_text), start, end ); + gtk_editable_set_position( GTK_EDITABLE(m_text), start ); + +#if wxUSE_UNICODE + wxWX2MBbuf buf = tmp.mbc_str(); + const char *txt = buf; + size_t txtlen = strlen(buf); +#else + const char *txt = tmp; + size_t txtlen = tmp.length(); +#endif + + GdkFont *font = style.HasFont() + ? style.GetFont().GetInternalFont() + : NULL; + + GdkColor *colFg = style.HasTextColour() + ? style.GetTextColour().GetColor() + : NULL; + + GdkColor *colBg = style.HasBackgroundColour() + ? style.GetBackgroundColour().GetColor() + : NULL; + + gtk_text_insert( GTK_TEXT(m_text), font, colFg, colBg, txt, txtlen ); + + /* does not seem to help under GTK+ 1.2 !!! + gtk_editable_set_position( GTK_EDITABLE(m_text), old_pos ); */ + SetInsertionPoint( old_pos ); + return TRUE; + } + else // singe line + { + // cannot do this for GTK+'s Entry widget + return FALSE; + } } void wxTextCtrl::ApplyWidgetStyle() { if (m_windowStyle & wxTE_MULTILINE) { - } + // how ? + } else { SetWidgetStyle(); @@ -708,3 +1229,86 @@ 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() ); +} + +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); +}