X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1b82138efe9aacda4e0ad7ce4b1551d624524c4..0b7e6e7da208b6a95fb23cb50286a09dc90d96d2:/src/gtk1/textctrl.cpp diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index 8e7d38a886..0f8df9de99 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -35,7 +35,8 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnDrag; +extern wxCursor g_globalCursor; //----------------------------------------------------------------------------- // "changed" @@ -94,52 +95,43 @@ 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() { m_modified = FALSE; } -#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() -{ - if (allocate()) setp(base(),ebuf()); - m_modified = FALSE; - Create( parent, id, value, pos, size, style, validator, name ); -} -#else -wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value, - const wxPoint &pos, const wxSize &size, - int style, const wxValidator& validator, const wxString &name ) +wxTextCtrl::wxTextCtrl( wxWindow *parent, + wxWindowID id, + const wxString &value, + const wxPoint &pos, + const wxSize &size, + long 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; @@ -200,15 +192,21 @@ 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); @@ -267,6 +265,8 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, SetBackgroundColour( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ); SetForegroundColour( parent->GetForegroundColour() ); + m_cursor = wxCursor( wxCURSOR_IBEAM ); + Show( TRUE ); return TRUE; @@ -298,7 +298,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) @@ -317,12 +317,9 @@ wxString wxTextCtrl::GetValue() const void wxTextCtrl::SetValue( const wxString &value ) { - wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") ); + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - gtk_signal_disconnect_by_func( GTK_OBJECT(m_text), - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); - - wxString tmp = _T(""); + wxString tmp = wxT(""); if (!value.IsNull()) tmp = value; if (m_windowStyle & wxTE_MULTILINE) { @@ -340,20 +337,14 @@ void wxTextCtrl::SetValue( const wxString &value ) { gtk_entry_set_text( GTK_ENTRY(m_text), tmp.mbc_str() ); } - - gtk_signal_connect( GTK_OBJECT(m_text), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); } void wxTextCtrl::WriteText( const wxString &text ) { - 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 */ @@ -386,20 +377,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() || @@ -411,7 +396,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 @@ -433,111 +418,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 @@ -549,7 +429,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++ ) @@ -577,10 +457,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 ) { @@ -596,7 +476,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; @@ -672,7 +552,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) { @@ -703,13 +583,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))); @@ -719,7 +599,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 ); @@ -727,9 +607,34 @@ 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") ); gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to ); } @@ -741,14 +646,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) @@ -761,23 +666,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 ); @@ -791,31 +687,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) ); @@ -826,19 +713,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 @@ -866,26 +747,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; } @@ -893,7 +774,7 @@ 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)) { @@ -908,19 +789,24 @@ 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)) { @@ -929,6 +815,20 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event ) 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(); } @@ -948,7 +848,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) ) { @@ -974,7 +874,7 @@ bool wxTextCtrl::SetFont( const wxFont &font ) 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; @@ -982,7 +882,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 ); @@ -1075,3 +975,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); +}