X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbfb8bcc3fa17e079d4219655b173f8ed2ccc65a..b50747ea53f4a9906d572d4bca4e452e66c8dbd5:/src/gtk/textctrl.cpp diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index ea62e18185..3b3cd28c2d 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -1,9 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: textctrl.cpp +// Name: src/gtk/textctrl.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ -// Copyright: (c) 1998 Robert Roebling, Vadim Zeitlin +// Copyright: (c) 1998 Robert Roebling, Vadim Zeitlin, 2005 Mart Raudsepp // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -11,9 +11,14 @@ #include "wx/wxprec.h" #include "wx/textctrl.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" +#endif + #include "wx/utils.h" -#include "wx/intl.h" -#include "wx/log.h" +#include "wx/math.h" #include "wx/settings.h" #include "wx/panel.h" #include "wx/strconv.h" @@ -27,13 +32,6 @@ #include "wx/gtk/private.h" #include -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -45,7 +43,6 @@ extern wxWindowGTK *g_delayedFocus; // helpers // ---------------------------------------------------------------------------- -#ifdef __WXGTK20__ extern "C" { static void wxGtkOnRemoveTag(GtkTextBuffer *buffer, GtkTextTag *tag, @@ -58,7 +55,7 @@ static void wxGtkOnRemoveTag(GtkTextBuffer *buffer, if (!name || strncmp(name, prefix, strlen(prefix))) // anonymous tag or not starting with prefix - don't remove - g_signal_stop_emission_by_name(buffer, "remove_tag"); + g_signal_stop_emission_by_name (buffer, "remove_tag"); g_free(name); } @@ -73,10 +70,10 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, static gchar buf[1024]; GtkTextTag *tag; - gulong remove_handler_id = g_signal_connect( text_buffer, "remove_tag", - G_CALLBACK(wxGtkOnRemoveTag), gpointer("WX")); + gulong remove_handler_id = g_signal_connect (text_buffer, "remove_tag", + G_CALLBACK (wxGtkOnRemoveTag), gpointer("WX")); gtk_text_buffer_remove_all_tags(text_buffer, start, end); - g_signal_handler_disconnect( text_buffer, remove_handler_id ); + g_signal_handler_disconnect (text_buffer, remove_handler_id); if (attr.HasFont()) { @@ -92,6 +89,19 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, NULL ); gtk_text_buffer_apply_tag (text_buffer, tag, start, end); g_free (font_string); + + if (attr.GetFont().GetUnderlined()) + { + g_snprintf(buf, sizeof(buf), "WXFONTUNDERLINE"); + tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ), + buf ); + if (!tag) + tag = gtk_text_buffer_create_tag( text_buffer, buf, + "underline-set", TRUE, + "underline", PANGO_UNDERLINE_SINGLE, + NULL ); + gtk_text_buffer_apply_tag (text_buffer, tag, start, end); + } } if (attr.HasTextColour()) @@ -128,11 +138,11 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, gtk_text_iter_get_line(start) ); gtk_text_iter_forward_line(¶_end); - remove_handler_id = g_signal_connect( text_buffer, "remove_tag", + remove_handler_id = g_signal_connect (text_buffer, "remove_tag", G_CALLBACK(wxGtkOnRemoveTag), gpointer("WXALIGNMENT")); gtk_text_buffer_remove_all_tags( text_buffer, ¶_start, ¶_end ); - g_signal_handler_disconnect( text_buffer, remove_handler_id ); + g_signal_handler_disconnect (text_buffer, remove_handler_id); GtkJustification align; switch (attr.GetAlignment()) @@ -180,27 +190,6 @@ static void wxGtkTextInsert(GtkWidget *text, wxGtkTextApplyTagsFromAttr(text_buffer, attr, &start, &iter); } } -#else -extern "C" { -static void wxGtkTextInsert(GtkWidget *text, - const wxTextAttr& attr, - const char *txt, - size_t len) -{ - GdkFont *font = attr.HasFont() ? attr.GetFont().GetInternalFont() - : NULL; - - GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor() - : NULL; - - GdkColor *colBg = attr.HasBackgroundColour() - ? attr.GetBackgroundColour().GetColor() - : NULL; - - gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len ); -} -} -#endif // GTK 1.x // ---------------------------------------------------------------------------- // "insert_text" for GtkEntry @@ -229,7 +218,7 @@ gtk_insert_text_callback(GtkEditable *editable, if ( entry->text_length == entry->text_max_length ) { // we don't need to run the base class version at all - gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text"); + g_signal_stop_emission_by_name (editable, "insert_text"); // remember that the next changed signal is to be ignored to avoid // generating a dummy wxEVT_COMMAND_TEXT_UPDATED event @@ -244,7 +233,6 @@ gtk_insert_text_callback(GtkEditable *editable, } } -#ifdef __WXGTK20__ // Implementation of wxTE_AUTO_URL for wxGTK2 by Mart Raudsepp, extern "C" { @@ -256,7 +244,7 @@ au_apply_tag_callback(GtkTextBuffer *buffer, gpointer textctrl) { if(tag == gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl")) - g_signal_stop_emission_by_name(buffer, "apply_tag"); + g_signal_stop_emission_by_name (buffer, "apply_tag"); } } @@ -352,14 +340,14 @@ au_check_word( GtkTextIter *s, GtkTextIter *e ) if(n < WXSIZEOF(URIPrefixes)) { - gulong signal_id = g_signal_handler_find(buffer, - (GSignalMatchType) (G_SIGNAL_MATCH_FUNC), - 0, 0, NULL, - (gpointer)au_apply_tag_callback, NULL); + gulong signal_id = g_signal_handler_find (buffer, + (GSignalMatchType) (G_SIGNAL_MATCH_FUNC), + 0, 0, NULL, + (gpointer)au_apply_tag_callback, NULL); - g_signal_handler_block(buffer, signal_id); + g_signal_handler_block (buffer, signal_id); gtk_text_buffer_apply_tag(buffer, tag, &start, &end); - g_signal_handler_unblock(buffer, signal_id); + g_signal_handler_unblock (buffer, signal_id); } } } @@ -451,8 +439,6 @@ au_delete_range_callback(GtkTextBuffer *buffer, } -#endif - //----------------------------------------------------------------------------- // "changed" //----------------------------------------------------------------------------- @@ -470,9 +456,6 @@ gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win ) wxapp_install_idle_handler(); win->SetModified(); -#ifndef __WXGTK20__ - win->UpdateFontIfNeeded(); -#endif // !__WXGTK20__ wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); event.SetEventObject( win ); @@ -484,7 +467,6 @@ gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win ) // "expose_event" from scrolled window and textview //----------------------------------------------------------------------------- -#ifdef __WXGTK20__ extern "C" { static gboolean gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl *win ) @@ -492,60 +474,7 @@ gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl return TRUE; } } -#endif - -//----------------------------------------------------------------------------- -// "changed" from vertical scrollbar -//----------------------------------------------------------------------------- - -#ifndef __WXGTK20__ -extern "C" { -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(); -} -} -#endif - -// ---------------------------------------------------------------------------- -// redraw callback for multiline text -// ---------------------------------------------------------------------------- - -#ifndef __WXGTK20__ - -// redrawing a GtkText from inside a wxYield() call results in crashes (the -// text sample shows it in its "Add lines" command which shows wxProgressDialog -// which implicitly calls wxYield()) so we override GtkText::draw() and simply -// don't do anything if we're inside wxYield() - -extern bool wxIsInsideYield; - -extern "C" { - typedef void (*GtkDrawCallback)(GtkWidget *widget, GdkRectangle *rect); -} - -static GtkDrawCallback gs_gtk_text_draw = NULL; - -extern "C" { -static void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect) -{ - if ( !wxIsInsideYield ) - { - wxCHECK_RET( gs_gtk_text_draw != wxgtk_text_draw, - _T("infinite recursion in wxgtk_text_draw aborted") ); - - gs_gtk_text_draw(widget, rect); - } -} -} - -#endif // __WXGTK20__ //----------------------------------------------------------------------------- // wxTextCtrl @@ -568,7 +497,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo) EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo) -#ifdef __WXGTK20__ // wxTE_AUTO_URL wxTextUrl support. Currently only creates // wxTextUrlEvent in the same cases as wxMSW, more can be added here. EVT_MOTION (wxTextCtrl::OnUrlMouseEvent) @@ -578,7 +506,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_RIGHT_DOWN (wxTextCtrl::OnUrlMouseEvent) EVT_RIGHT_UP (wxTextCtrl::OnUrlMouseEvent) EVT_RIGHT_DCLICK(wxTextCtrl::OnUrlMouseEvent) -#endif END_EVENT_TABLE() void wxTextCtrl::Init() @@ -588,21 +515,17 @@ void wxTextCtrl::Init() SetUpdateFont(false); m_text = m_vScrollbar = (GtkWidget *)NULL; -#ifdef __WXGTK20__ m_frozenness = 0; m_gdkHandCursor = NULL; m_gdkXTermCursor = NULL; -#endif } wxTextCtrl::~wxTextCtrl() { -#ifdef __WXGTK20__ if(m_gdkHandCursor) gdk_cursor_unref(m_gdkHandCursor); if(m_gdkXTermCursor) gdk_cursor_unref(m_gdkXTermCursor); -#endif } wxTextCtrl::wxTextCtrl( wxWindow *parent, @@ -645,7 +568,6 @@ bool wxTextCtrl::Create( wxWindow *parent, if (multi_line) { -#ifdef __WXGTK20__ // Create view m_text = gtk_text_view_new(); @@ -682,36 +604,11 @@ bool wxTextCtrl::Create( wxWindow *parent, gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap ); - if (!HasFlag(wxNO_BORDER)) - gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN ); + GtkScrolledWindowSetBorder(m_widget, style); gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK ); GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); -#else // GTK+ 1 - // create our control ... - m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); - - // ... and put into the upper left hand corner of the table - bool bHasHScrollbar = false; - 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); - - // always wrap words - gtk_text_set_word_wrap( GTK_TEXT(m_text), TRUE ); - - // 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); -#endif // GTK+ 2/1 } else { @@ -719,10 +616,8 @@ bool wxTextCtrl::Create( wxWindow *parent, m_widget = m_text = gtk_entry_new(); -#ifdef __WXGTK20__ if (style & wxNO_BORDER) g_object_set( GTK_ENTRY(m_text), "has-frame", FALSE, NULL ); -#endif } m_parent->DoAddChild( this ); @@ -731,56 +626,15 @@ bool wxTextCtrl::Create( wxWindow *parent, PostCreation(size); - if (multi_line) - gtk_widget_show(m_text); - -#ifndef __WXGTK20__ if (multi_line) { - gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed", - (GtkSignalFunc) gtk_scrollbar_changed_callback, (gpointer) this ); - - // only initialize gs_gtk_text_draw once, starting from the next the - // klass::draw will already be wxgtk_text_draw - if ( !gs_gtk_text_draw ) - { - GtkDrawCallback& - draw = GTK_WIDGET_CLASS(GTK_OBJECT(m_text)->klass)->draw; - - gs_gtk_text_draw = draw; - - draw = wxgtk_text_draw; - } + gtk_widget_show(m_text); + SetVScrollAdjustment(gtk_scrolled_window_get_vadjustment((GtkScrolledWindow*)m_widget)); } -#endif // GTK+ 1.x if (!value.empty()) { -#ifdef __WXGTK20__ SetValue( value ); -#else - -#if !GTK_CHECK_VERSION(1, 2, 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 - - gint tmp = 0; -#if wxUSE_UNICODE - wxWX2MBbuf val = value.mbc_str(); - gtk_editable_insert_text( GTK_EDITABLE(m_text), val, strlen(val), &tmp ); -#else - gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp ); -#endif - - if (multi_line) - { - // Bring editable's cursor uptodate. Bug in GTK. - SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) )); - } - -#endif } if (style & wxTE_PASSWORD) @@ -792,20 +646,11 @@ bool wxTextCtrl::Create( wxWindow *parent, if (style & wxTE_READONLY) { if (!multi_line) - gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE ); -#ifdef __WXGTK20__ + gtk_editable_set_editable( GTK_EDITABLE(m_text), FALSE ); else gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE); -#else - } - else - { - if (multi_line) - gtk_text_set_editable( GTK_TEXT(m_text), 1 ); -#endif } -#ifdef __WXGTK20__ if (multi_line) { if (style & wxTE_RIGHT) @@ -827,14 +672,12 @@ bool wxTextCtrl::Create( wxWindow *parent, } #endif } -#endif // __WXGTK20__ // We want to be notified about text changes. -#ifdef __WXGTK20__ if (multi_line) { - g_signal_connect( G_OBJECT(m_buffer), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); + g_signal_connect (m_buffer, "changed", + G_CALLBACK (gtk_text_changed_callback), this); // .. and handle URLs on multi-line controls with wxTE_AUTO_URL style if (style & wxTE_AUTO_URL) @@ -852,10 +695,10 @@ bool wxTextCtrl::Create( wxWindow *parent, NULL); // Check for URLs after each text change - g_signal_connect_after( G_OBJECT(m_buffer), "insert_text", - GTK_SIGNAL_FUNC(au_insert_text_callback), (gpointer)this); - g_signal_connect_after( G_OBJECT(m_buffer), "delete_range", - GTK_SIGNAL_FUNC(au_delete_range_callback), (gpointer)this); + g_signal_connect_after (m_buffer, "insert_text", + G_CALLBACK (au_insert_text_callback), this); + g_signal_connect_after (m_buffer, "delete_range", + G_CALLBACK (au_delete_range_callback), this); // Block all wxUrl tag applying unless we do it ourselves, in which case we // block this callback temporarily. This takes care of gtk+ internal @@ -863,8 +706,8 @@ bool wxTextCtrl::Create( wxWindow *parent, // which is undesired because only a part of the URL might be copied. // The insert-text signal emitted inside it will take care of newly formed // or wholly copied URLs. - g_signal_connect( G_OBJECT(m_buffer), "apply_tag", - GTK_SIGNAL_FUNC(au_apply_tag_callback), NULL); + g_signal_connect (m_buffer, "apply_tag", + G_CALLBACK (au_apply_tag_callback), NULL); // Check for URLs in the initial string passed to Create gtk_text_buffer_get_start_iter(m_buffer, &start); @@ -873,11 +716,9 @@ bool wxTextCtrl::Create( wxWindow *parent, } } else -#endif - { - gtk_signal_connect( GTK_OBJECT(m_text), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); + g_signal_connect (m_text, "changed", + G_CALLBACK (gtk_text_changed_callback), this); } m_cursor = wxCursor( wxCURSOR_IBEAM ); @@ -891,28 +732,6 @@ bool wxTextCtrl::Create( wxWindow *parent, void wxTextCtrl::CalculateScrollbar() { -#ifndef __WXGTK20__ - 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; - } - } - else - { - if (!m_vScrollbarVisible) - { - gtk_widget_show( m_vScrollbar ); - m_vScrollbarVisible = true; - } - } -#endif } wxString wxTextCtrl::GetValue() const @@ -922,32 +741,24 @@ wxString wxTextCtrl::GetValue() const wxString tmp; if (m_windowStyle & wxTE_MULTILINE) { -#ifdef __WXGTK20__ GtkTextIter start; gtk_text_buffer_get_start_iter( m_buffer, &start ); GtkTextIter end; gtk_text_buffer_get_end_iter( m_buffer, &end ); gchar *text = gtk_text_buffer_get_text( m_buffer, &start, &end, TRUE ); -#if wxUSE_UNICODE - wxWCharBuffer buffer( wxConvUTF8.cMB2WX( text ) ); -#else - wxCharBuffer buffer( wxConvLocal.cWC2WX( wxConvUTF8.cMB2WC( text ) ) ); -#endif - if ( buffer ) - tmp = buffer; + const wxWxCharBuffer buf = wxGTK_CONV_BACK(text); + if ( buf ) + tmp = buf; g_free( text ); -#else - 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 ); -#endif } else { - tmp = wxGTK_CONV_BACK( gtk_entry_get_text( GTK_ENTRY(m_text) ) ); + const gchar *text = gtk_entry_get_text( GTK_ENTRY(m_text) ); + const wxWxCharBuffer buf = wxGTK_CONV_BACK( text ); + if ( buf ) + tmp = buf; } return tmp; @@ -959,34 +770,26 @@ void wxTextCtrl::SetValue( const wxString &value ) if (m_windowStyle & wxTE_MULTILINE) { -#ifdef __WXGTK20__ - -#if wxUSE_UNICODE - wxCharBuffer buffer( wxConvUTF8.cWX2MB( value) ); -#else - wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( value ) ) ); -#endif - if (gtk_text_buffer_get_char_count(m_buffer) != 0) - IgnoreNextTextUpdate(); - + const wxCharBuffer buffer(wxGTK_CONV(value)); if ( !buffer ) { // what else can we do? at least don't crash... return; } - gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) ); + if (gtk_text_buffer_get_char_count(m_buffer) != 0) + IgnoreNextTextUpdate(); -#else - 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), value.mbc_str(), value.Length(), &len ); -#endif + gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) ); } - else + else // single line { - gtk_entry_set_text( GTK_ENTRY(m_text), wxGTK_CONV( value ) ); + // gtk_entry_set_text() emits two "changed" signals because internally + // it calls gtk_editable_delete_text() and gtk_editable_insert_text() + // but we want to have only one event + IgnoreNextTextUpdate(); + + gtk_entry_set_text( GTK_ENTRY(m_text), wxGTK_CONV(value) ); } // GRG, Jun/2000: Changed this after a lot of discussion in @@ -1004,6 +807,13 @@ void wxTextCtrl::WriteText( const wxString &text ) if ( text.empty() ) return; + const wxCharBuffer buffer(wxGTK_CONV(text)); + if ( !buffer ) + { + // what else can we do? at least don't crash... + return; + } + // gtk_text_changed_callback() will set m_modified to true but m_modified // shouldn't be changed by the program writing to the text control itself, // so save the old value and restore when we're done @@ -1011,49 +821,23 @@ void wxTextCtrl::WriteText( const wxString &text ) if ( m_windowStyle & wxTE_MULTILINE ) { -#ifdef __WXGTK20__ - -#if wxUSE_UNICODE - wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) ); -#else - wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) ); -#endif - if ( !buffer ) - { - // what else can we do? at least don't crash... - return; - } + // First remove the selection if there is one + // TODO: Is there an easier GTK specific way to do this? + long from, to; + GetSelection(&from, &to); + if (from != to) + Remove(from, to); - // TODO: Call whatever is needed to delete the selection. + // Insert the text wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer ); GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(m_widget) ); // Scroll to cursor, but only if scrollbar thumb is at the very bottom - if ( adj->value == adj->upper - adj->page_size ) + if ( wxIsSameDouble(adj->value, adj->upper - adj->page_size) ) { gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text), gtk_text_buffer_get_insert( m_buffer ), 0.0, FALSE, 0.0, 1.0 ); } -#else // GTK 1.x - // After cursor movements, gtk_text_get_point() is wrong by one. - gtk_text_set_point( GTK_TEXT(m_text), GET_EDITABLE_POS(m_text) ); - - // always use m_defaultStyle, even if it is empty as otherwise - // resetting the style and appending some more text wouldn't work: if - // we don't specify the style explicitly, the old style would be used - gtk_editable_delete_selection( GTK_EDITABLE(m_text) ); - wxGtkTextInsert(m_text, m_defaultStyle, text.c_str(), text.Len()); - - // we called wxGtkTextInsert with correct font, no need to do anything - // in UpdateFontIfNeeded() any longer - if ( !text.empty() ) - { - SetUpdateFont(false); - } - - // Bring editable's cursor back uptodate. - SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) )); -#endif // GTK 1.x/2.0 } else // single line { @@ -1061,29 +845,12 @@ void wxTextCtrl::WriteText( const wxString &text ) gtk_editable_delete_selection( GTK_EDITABLE(m_text) ); // This moves the cursor pos to behind the inserted text. - gint len = GET_EDITABLE_POS(m_text); - -#ifdef __WXGTK20__ - -#if wxUSE_UNICODE - wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) ); -#else - wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) ); -#endif - if ( !buffer ) - { - // what else can we do? at least don't crash... - return; - } + gint len = gtk_editable_get_position(GTK_EDITABLE(m_text)); gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len ); -#else - gtk_editable_insert_text( GTK_EDITABLE(m_text), text.c_str(), text.Len(), &len ); -#endif - // Bring entry's cursor uptodate. - gtk_entry_set_position( GTK_ENTRY(m_text), len ); + gtk_editable_set_position( GTK_EDITABLE(m_text), len ); } m_modified = oldModified; @@ -1099,31 +866,6 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const { if (m_windowStyle & wxTE_MULTILINE) { -#ifndef __WXGTK20__ - gint len = gtk_text_get_length( GTK_TEXT(m_text) ); - char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len ); - - if (text) - { - wxString buf; - long i; - int currentLine = 0; - for (i = 0; currentLine != lineNo && text[i]; i++ ) - if (text[i] == '\n') - currentLine++; - // Now get the text - int j; - for (j = 0; text[i] && text[i] != '\n'; i++, j++ ) - buf += text[i]; - - g_free( text ); - return buf; - } - else - { - return wxEmptyString; - } -#else GtkTextIter line; gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo); GtkTextIter end = line; @@ -1132,7 +874,6 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const wxString result(wxGTK_CONV_BACK(text)); g_free(text); return result; -#endif } else { @@ -1152,7 +893,6 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const { if ( m_windowStyle & wxTE_MULTILINE ) { -#ifdef __WXGTK20__ GtkTextIter iter; gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos); if (gtk_text_iter_is_end(&iter)) @@ -1160,28 +900,6 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const *y = gtk_text_iter_get_line(&iter); *x = gtk_text_iter_get_line_offset(&iter); -#else - 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)++; - } -#endif } else // single line control { @@ -1204,7 +922,6 @@ long wxTextCtrl::XYToPosition(long x, long y ) const { if (!(m_windowStyle & wxTE_MULTILINE)) return 0; -#ifdef __WXGTK20__ GtkTextIter iter; if (y >= gtk_text_buffer_get_line_count (m_buffer)) return -1; @@ -1214,18 +931,10 @@ long wxTextCtrl::XYToPosition(long x, long y ) const return -1; return gtk_text_iter_get_offset(&iter) + x; -#else - long pos=0; - for( int i=0; iline_start_cache ) - { - // tell the programmer that it didn't work - wxLogDebug(_T("Can't call SetSelection() before realizing the control")); - return; + to = GetValue().length(); } -#endif if (m_windowStyle & wxTE_MULTILINE) { -#ifdef __WXGTK20__ GtkTextIter fromi, toi; gtk_text_buffer_get_iter_at_offset( m_buffer, &fromi, from ); gtk_text_buffer_get_iter_at_offset( m_buffer, &toi, to ); gtk_text_buffer_place_cursor( m_buffer, &toi ); gtk_text_buffer_move_mark_by_name( m_buffer, "selection_bound", &fromi ); -#else - gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to ); -#endif } else { @@ -1514,27 +1169,14 @@ void wxTextCtrl::ShowPosition( long pos ) { if (m_windowStyle & wxTE_MULTILINE) { -#ifdef __WXGTK20__ GtkTextIter iter; gtk_text_buffer_get_start_iter( m_buffer, &iter ); gtk_text_iter_set_offset( &iter, pos ); GtkTextMark *mark = gtk_text_buffer_create_mark( m_buffer, NULL, &iter, TRUE ); gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text), mark, 0.0, FALSE, 0.0, 0.0 ); -#else // GTK 1.x - GtkAdjustment *vp = GTK_TEXT(m_text)->vadj; - float totalLines = (float) GetNumberOfLines(); - long posX; - long posY; - PositionToXY(pos, &posX, &posY); - float posLine = (float) posY; - float p = (posLine/totalLines)*(vp->upper - vp->lower) + vp->lower; - gtk_adjustment_set_value(GTK_TEXT(m_text)->vadj, p); -#endif // GTK 1.x/2.x } } -#ifdef __WXGTK20__ - wxTextCtrlHitTestResult wxTextCtrl::HitTest(const wxPoint& pt, long *pos) const { @@ -1561,13 +1203,10 @@ wxTextCtrl::HitTest(const wxPoint& pt, long *pos) const return wxTE_HT_ON_TEXT; } -#endif // __WXGTK20__ - long wxTextCtrl::GetInsertionPoint() const { wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") ); -#ifdef __WXGTK20__ if (m_windowStyle & wxTE_MULTILINE) { // There is no direct accessor for the cursor, but @@ -1581,9 +1220,8 @@ long wxTextCtrl::GetInsertionPoint() const return gtk_text_iter_get_offset( &cursor ); } else -#endif { - return (long) GET_EDITABLE_POS(m_text); + return (long) gtk_editable_get_position(GTK_EDITABLE(m_text)); } } @@ -1595,14 +1233,10 @@ wxTextPos wxTextCtrl::GetLastPosition() const if (m_windowStyle & wxTE_MULTILINE) { -#ifdef __WXGTK20__ GtkTextIter end; gtk_text_buffer_get_end_iter( m_buffer, &end ); pos = gtk_text_iter_get_offset( &end ); -#else - pos = gtk_text_get_length( GTK_TEXT(m_text) ); -#endif } else { @@ -1616,7 +1250,6 @@ void wxTextCtrl::Remove( long from, long to ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); -#ifdef __WXGTK20__ if (m_windowStyle & wxTE_MULTILINE) { GtkTextIter fromi, toi; @@ -1626,8 +1259,7 @@ void wxTextCtrl::Remove( long from, long to ) gtk_text_buffer_delete( m_buffer, &fromi, &toi ); } else // single line -#endif - 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 ) @@ -1638,18 +1270,8 @@ void wxTextCtrl::Replace( long from, long to, const wxString &value ) if (!value.empty()) { -#ifdef __WXGTK20__ SetInsertionPoint( from ); WriteText( value ); -#else // GTK 1.x - 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 // wxUSE_UNICODE -#endif // GTK 1.x/2.x } } @@ -1657,36 +1279,30 @@ void wxTextCtrl::Cut() { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); -#ifdef __WXGTK20__ if (m_windowStyle & wxTE_MULTILINE) - g_signal_emit_by_name(m_text, "cut-clipboard"); + g_signal_emit_by_name (m_text, "cut-clipboard"); else -#endif - gtk_editable_cut_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG); + gtk_editable_cut_clipboard(GTK_EDITABLE(m_text)); } void wxTextCtrl::Copy() { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); -#ifdef __WXGTK20__ if (m_windowStyle & wxTE_MULTILINE) - g_signal_emit_by_name(m_text, "copy-clipboard"); + g_signal_emit_by_name (m_text, "copy-clipboard"); else -#endif - gtk_editable_copy_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG); + gtk_editable_copy_clipboard(GTK_EDITABLE(m_text)); } void wxTextCtrl::Paste() { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); -#ifdef __WXGTK20__ if (m_windowStyle & wxTE_MULTILINE) - g_signal_emit_by_name(m_text, "paste-clipboard"); + g_signal_emit_by_name (m_text, "paste-clipboard"); else -#endif - gtk_editable_paste_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG); + gtk_editable_paste_clipboard(GTK_EDITABLE(m_text)); } // Undo/redo @@ -1726,7 +1342,6 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const gint to = -1; bool haveSelection = false; -#ifdef __WXGTK20__ if (m_windowStyle & wxTE_MULTILINE) { GtkTextIter ifrom, ito; @@ -1745,14 +1360,6 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const haveSelection = true; } } -#else // not GTK2 - if ( (GTK_EDITABLE(m_text)->has_selection) ) - { - haveSelection = true; - from = (long) GTK_EDITABLE(m_text)->selection_start_pos; - to = (long) GTK_EDITABLE(m_text)->selection_end_pos; - } -#endif if (! haveSelection ) from = to = GetInsertionPoint(); @@ -1776,7 +1383,6 @@ bool wxTextCtrl::IsEditable() const { wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") ); -#ifdef __WXGTK20__ if (m_windowStyle & wxTE_MULTILINE) { return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text)); @@ -1785,9 +1391,6 @@ bool wxTextCtrl::IsEditable() const { return gtk_editable_get_editable(GTK_EDITABLE(m_text)); } -#else - return GTK_EDITABLE(m_text)->editable; -#endif } bool wxTextCtrl::IsModified() const @@ -1804,7 +1407,7 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if ((key_event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER)) + if ((key_event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxTE_PROCESS_ENTER)) { wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); event.SetEventObject(this); @@ -1845,11 +1448,7 @@ bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window ) { if (m_windowStyle & wxTE_MULTILINE) { -#ifdef __WXGTK20__ return window == gtk_text_view_get_window( GTK_TEXT_VIEW( m_text ), GTK_TEXT_WINDOW_TEXT ); // pure guesswork -#else - return (window == GTK_TEXT(m_text)->text_area); -#endif } else { @@ -1886,14 +1485,8 @@ void wxTextCtrl::ChangeFontGlobally() // possible! // // TODO: it can be implemented much more efficiently for GTK2 -#ifndef __WXGTK20__ - wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont, - - _T("shouldn't be called for single line controls") ); -#else wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE), _T("shouldn't be called for single line controls") ); -#endif wxString value = GetValue(); if ( !value.empty() ) @@ -1905,16 +1498,6 @@ void wxTextCtrl::ChangeFontGlobally() } } -#ifndef __WXGTK20__ - -void wxTextCtrl::UpdateFontIfNeeded() -{ - if ( m_updateFont ) - ChangeFontGlobally(); -} - -#endif // GTK+ 1.x - bool wxTextCtrl::SetForegroundColour(const wxColour& colour) { if ( !wxControl::SetForegroundColour(colour) ) @@ -1933,26 +1516,9 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour ) if ( !wxControl::SetBackgroundColour( colour ) ) return false; -#ifndef __WXGTK20__ - if (!m_widget->window) - return false; -#endif - if (!m_backgroundColour.Ok()) return false; - if (m_windowStyle & wxTE_MULTILINE) - { -#ifndef __WXGTK20__ - 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 ); -#endif - } - // change active background color too m_defaultStyle.SetBackgroundColour( colour ); @@ -1969,7 +1535,6 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style ) return true; } -#ifdef __WXGTK20__ gint l = gtk_text_buffer_get_char_count( m_buffer ); wxCHECK_MSG( start >= 0 && end <= l, false, @@ -1985,44 +1550,6 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style ) wxTextAttr attr = wxTextAttr::Combine(style, m_defaultStyle, this); wxGtkTextApplyTagsFromAttr( m_buffer, attr, &starti, &endi ); -#else - // VERY dirty way to do that - removes the required text and re-adds it - // with styling (FIXME) - - 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 - - // use the attributes from style which are set in it and fall back - // first to the default style and then to the text control default - // colours for the others - wxGtkTextInsert(m_text, - wxTextAttr::Combine(style, m_defaultStyle, this), - txt, - txtlen); - - /* does not seem to help under GTK+ 1.2 !!! - gtk_editable_set_position( GTK_EDITABLE(m_text), old_pos ); */ - SetInsertionPoint( old_pos ); -#endif return true; } @@ -2092,27 +1619,6 @@ void wxTextCtrl::OnInternalIdle() wxCursor cursor = m_cursor; if (g_globalCursor.Ok()) cursor = g_globalCursor; - if (cursor.Ok()) - { -#ifndef __WXGTK20__ - 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() ); -#endif - } - if (g_delayedFocus == this) { if (GTK_WIDGET_REALIZED(m_widget)) @@ -2143,21 +1649,17 @@ void wxTextCtrl::Freeze() { if ( HasFlag(wxTE_MULTILINE) ) { -#ifdef __WXGTK20__ if ( !m_frozenness++ ) { // freeze textview updates and remove buffer - g_signal_connect( G_OBJECT(m_text), "expose_event", - GTK_SIGNAL_FUNC(gtk_text_exposed_callback), (gpointer)this); - g_signal_connect( G_OBJECT(m_widget), "expose_event", - GTK_SIGNAL_FUNC(gtk_text_exposed_callback), (gpointer)this); + g_signal_connect (m_text, "expose_event", + G_CALLBACK (gtk_text_exposed_callback), this); + g_signal_connect (m_widget, "expose_event", + G_CALLBACK (gtk_text_exposed_callback), this); gtk_widget_set_sensitive(m_widget, false); g_object_ref(m_buffer); gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), gtk_text_buffer_new(NULL)); } -#else - gtk_text_freeze(GTK_TEXT(m_text)); -#endif } } @@ -2165,7 +1667,6 @@ void wxTextCtrl::Thaw() { if ( HasFlag(wxTE_MULTILINE) ) { -#ifdef __WXGTK20__ wxASSERT_MSG( m_frozenness > 0, _T("Thaw() without matching Freeze()") ); if ( !--m_frozenness ) @@ -2174,14 +1675,11 @@ void wxTextCtrl::Thaw() gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), m_buffer); g_object_unref(m_buffer); gtk_widget_set_sensitive(m_widget, true); - g_signal_handlers_disconnect_by_func(m_widget, (gpointer)gtk_text_exposed_callback, this); - g_signal_handlers_disconnect_by_func(m_text, (gpointer)gtk_text_exposed_callback, this); + g_signal_handlers_disconnect_by_func (m_widget, + (gpointer) gtk_text_exposed_callback, this); + g_signal_handlers_disconnect_by_func (m_text, + (gpointer) gtk_text_exposed_callback, this); } -#else - GTK_TEXT(m_text)->vadj->value = 0.0; - - gtk_text_thaw(GTK_TEXT(m_text)); -#endif } } @@ -2189,8 +1687,6 @@ void wxTextCtrl::Thaw() // wxTextUrlEvent passing if style & wxTE_AUTO_URL // ---------------------------------------------------------------------------- -#ifdef __WXGTK20__ - // FIXME: when dragging on a link the sample gets an "Unknown event". // This might be an excessive event from us or a buggy wxMouseEvent::Moving() or // a buggy sample, or something else @@ -2239,78 +1735,6 @@ void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event) //event.Skip(!GetEventHandler()->ProcessEvent(url_event)); GetEventHandler()->ProcessEvent(url_event); } -#endif // gtk2 - -// ---------------------------------------------------------------------------- -// scrolling -// ---------------------------------------------------------------------------- - -GtkAdjustment *wxTextCtrl::GetVAdj() const -{ - if ( !IsMultiLine() ) - return NULL; - -#ifdef __WXGTK20__ - return gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(m_widget)); -#else - return GTK_TEXT(m_text)->vadj; -#endif -} - -bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff) -{ - float value = adj->value + diff; - - if ( value < 0 ) - value = 0; - - float upper = adj->upper - adj->page_size; - if ( value > upper ) - value = upper; - - // did we noticeably change the scroll position? - if ( fabs(adj->value - value) < 0.2 ) - { - // well, this is what Robert does in wxScrollBar, so it must be good... - return false; - } - - adj->value = value; - -#ifdef __WXGTK20__ - gtk_adjustment_value_changed(GTK_ADJUSTMENT(adj)); -#else - gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed"); -#endif - - return true; -} - -bool wxTextCtrl::ScrollLines(int lines) -{ - GtkAdjustment *adj = GetVAdj(); - if ( !adj ) - return false; - -#ifdef __WXGTK20__ - int diff = (int)ceil(lines*adj->step_increment); -#else - // this is hardcoded to 10 in GTK+ 1.2 (great idea) - int diff = 10*lines; -#endif - - return DoScroll(adj, diff); -} - -bool wxTextCtrl::ScrollPages(int pages) -{ - GtkAdjustment *adj = GetVAdj(); - if ( !adj ) - return false; - - return DoScroll(adj, (int)ceil(pages*adj->page_increment)); -} - // static wxVisualAttributes