X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e327fddf5f0f45a159b53946d55637fb60634f69..4c410aa14e7818b946351842fed2905239c15592:/src/gtk/textctrl.cpp diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index 3cd7d06b2c..c3a28902cb 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -3,14 +3,10 @@ // 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 ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "textctrl.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -18,6 +14,7 @@ #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" @@ -42,7 +39,6 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; extern wxCursor g_globalCursor; extern wxWindowGTK *g_delayedFocus; @@ -50,7 +46,25 @@ extern wxWindowGTK *g_delayedFocus; // helpers // ---------------------------------------------------------------------------- -#ifdef __WXGTK20__ +extern "C" { +static void wxGtkOnRemoveTag(GtkTextBuffer *buffer, + GtkTextTag *tag, + GtkTextIter *start, + GtkTextIter *end, + char *prefix) +{ + gchar *name; + g_object_get (tag, "name", &name, NULL); + + 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_free(name); +} +} + +extern "C" { static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, const wxTextAttr& attr, GtkTextIter *start, @@ -59,6 +73,11 @@ 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")); + gtk_text_buffer_remove_all_tags(text_buffer, start, end); + g_signal_handler_disconnect (text_buffer, remove_handler_id); + if (attr.HasFont()) { char *font_string; @@ -100,12 +119,52 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, "background-gdk", colBg, NULL ); gtk_text_buffer_apply_tag (text_buffer, tag, start, end); } + + if (attr.HasAlignment()) + { + GtkTextIter para_start, para_end = *end; + gtk_text_buffer_get_iter_at_line( text_buffer, + ¶_start, + gtk_text_iter_get_line(start) ); + gtk_text_iter_forward_line(¶_end); + + 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); + + GtkJustification align; + switch (attr.GetAlignment()) + { + default: + align = GTK_JUSTIFY_LEFT; + break; + case wxTEXT_ALIGNMENT_RIGHT: + align = GTK_JUSTIFY_RIGHT; + break; + case wxTEXT_ALIGNMENT_CENTER: + align = GTK_JUSTIFY_CENTER; + break; + // gtk+ doesn't support justify as of gtk+-2.7.4 + } + + g_snprintf(buf, sizeof(buf), "WXALIGNMENT %d", align); + 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, + "justification", align, NULL ); + gtk_text_buffer_apply_tag( text_buffer, tag, ¶_start, ¶_end ); + } +} } +extern "C" { static void wxGtkTextInsert(GtkWidget *text, GtkTextBuffer *text_buffer, const wxTextAttr& attr, - wxCharBuffer buffer) + const wxCharBuffer& buffer) { gint start_offset; @@ -120,30 +179,13 @@ static void wxGtkTextInsert(GtkWidget *text, wxGtkTextApplyTagsFromAttr(text_buffer, attr, &start, &iter); } -#else -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 // ---------------------------------------------------------------------------- +extern "C" { static void gtk_insert_text_callback(GtkEditable *editable, const gchar *new_text, @@ -166,7 +208,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 @@ -179,10 +221,11 @@ gtk_insert_text_callback(GtkEditable *editable, win->GetEventHandler()->ProcessEvent( event ); } } +} -#ifdef __WXGTK20__ // Implementation of wxTE_AUTO_URL for wxGTK2 by Mart Raudsepp, +extern "C" { static void au_apply_tag_callback(GtkTextBuffer *buffer, GtkTextTag *tag, @@ -191,36 +234,45 @@ 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"); +} } //----------------------------------------------------------------------------- // GtkTextCharPredicates for gtk_text_iter_*_find_char //----------------------------------------------------------------------------- +extern "C" { static gboolean pred_whitespace (gunichar ch, gpointer user_data) { return g_unichar_isspace(ch); } +} +extern "C" { static gboolean pred_non_whitespace (gunichar ch, gpointer user_data) { return !g_unichar_isspace(ch); } +} +extern "C" { static gboolean pred_nonpunct (gunichar ch, gpointer user_data) { return !g_unichar_ispunct(ch); } +} +extern "C" { static gboolean pred_nonpunct_or_slash (gunichar ch, gpointer user_data) { return !g_unichar_ispunct(ch) || ch == '/'; } +} //----------------------------------------------------------------------------- // Check for links between s and e and correct tags as necessary @@ -228,6 +280,7 @@ pred_nonpunct_or_slash (gunichar ch, gpointer user_data) // This function should be made match better while being efficient at one point. // Most probably with a row of regular expressions. +extern "C" { static void au_check_word( GtkTextIter *s, GtkTextIter *e ) { @@ -251,7 +304,7 @@ au_check_word( GtkTextIter *s, GtkTextIter *e ) GtkTextIter start = *s, end = *e; GtkTextBuffer *buffer = gtk_text_iter_get_buffer(s); - + // Get our special link tag GtkTextTag *tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl"); @@ -277,17 +330,19 @@ 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); } } +} +extern "C" { static void au_check_range(GtkTextIter *s, GtkTextIter *range_end) @@ -314,11 +369,13 @@ au_check_range(GtkTextIter *s, gtk_text_iter_forward_find_char(&range_start, pred_non_whitespace, NULL, range_end); } } +} //----------------------------------------------------------------------------- // "insert-text" for GtkTextBuffer //----------------------------------------------------------------------------- +extern "C" { static void au_insert_text_callback(GtkTextBuffer *buffer, GtkTextIter *end, @@ -344,11 +401,13 @@ au_insert_text_callback(GtkTextBuffer *buffer, au_check_range(&words_start, &words_end); } +} //----------------------------------------------------------------------------- // "delete-range" for GtkTextBuffer //----------------------------------------------------------------------------- +extern "C" { static void au_delete_range_callback(GtkTextBuffer *buffer, GtkTextIter *start, @@ -367,14 +426,14 @@ au_delete_range_callback(GtkTextBuffer *buffer, au_check_range(start, end); } +} -#endif - //----------------------------------------------------------------------------- // "changed" //----------------------------------------------------------------------------- +extern "C" { static void gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win ) { @@ -387,76 +446,25 @@ 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 ); win->GetEventHandler()->ProcessEvent( event ); } +} //----------------------------------------------------------------------------- // "expose_event" from scrolled window and textview //----------------------------------------------------------------------------- -#ifdef __WXGTK20__ +extern "C" { static gboolean gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl *win ) { return TRUE; } -#endif - -//----------------------------------------------------------------------------- -// "changed" from vertical scrollbar -//----------------------------------------------------------------------------- - -#ifndef __WXGTK20__ -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" -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 @@ -479,7 +487,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) @@ -489,7 +496,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() @@ -499,21 +505,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, @@ -556,7 +558,6 @@ bool wxTextCtrl::Create( wxWindow *parent, if (multi_line) { -#ifdef __WXGTK20__ // Create view m_text = gtk_text_view_new(); @@ -570,11 +571,28 @@ bool wxTextCtrl::Create( wxWindow *parent, // Insert view into scrolled window gtk_container_add( GTK_CONTAINER(m_widget), m_text ); - // Global settings which can be overridden by tags, I guess. - if (HasFlag( wxHSCROLL ) || HasFlag( wxTE_DONTWRAP )) - gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_NONE ); - else - gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_WORD ); + // translate wx wrapping style to GTK+ + GtkWrapMode wrap; + if ( HasFlag( wxTE_DONTWRAP ) ) + wrap = GTK_WRAP_NONE; + else if ( HasFlag( wxTE_CHARWRAP ) ) + wrap = GTK_WRAP_CHAR; + else if ( HasFlag( wxTE_WORDWRAP ) ) + wrap = GTK_WRAP_WORD; + else // HasFlag(wxTE_BESTWRAP) always true as wxTE_BESTWRAP == 0 + { + // GTK_WRAP_WORD_CHAR seems to be new in GTK+ 2.4 +#ifdef __WXGTK24__ + if ( !gtk_check_version(2,4,0) ) + { + wrap = GTK_WRAP_WORD_CHAR; + } + else +#endif + wrap = GTK_WRAP_WORD; + } + + 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 ); @@ -582,30 +600,6 @@ bool wxTextCtrl::Create( wxWindow *parent, 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 - // 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 } else { @@ -613,10 +607,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 ); @@ -628,53 +620,9 @@ bool wxTextCtrl::Create( wxWindow *parent, 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; - } - } -#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) @@ -687,19 +635,10 @@ bool wxTextCtrl::Create( wxWindow *parent, { if (!multi_line) gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE ); -#ifdef __WXGTK20__ 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) @@ -721,14 +660,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) @@ -746,10 +683,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 @@ -757,8 +694,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); @@ -767,11 +704,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 ); @@ -785,38 +720,15 @@ 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 { - wxCHECK_MSG( m_text != NULL, wxT(""), wxT("invalid text ctrl") ); + wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") ); wxString tmp; if (m_windowStyle & wxTE_MULTILINE) { -#ifdef __WXGTK20__ GtkTextIter start; gtk_text_buffer_get_start_iter( m_buffer, &start ); GtkTextIter end; @@ -832,12 +744,6 @@ wxString wxTextCtrl::GetValue() const tmp = buffer; 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 { @@ -853,8 +759,6 @@ void wxTextCtrl::SetValue( const wxString &value ) if (m_windowStyle & wxTE_MULTILINE) { -#ifdef __WXGTK20__ - #if wxUSE_UNICODE wxCharBuffer buffer( wxConvUTF8.cWX2MB( value) ); #else @@ -863,14 +767,13 @@ void wxTextCtrl::SetValue( const wxString &value ) if (gtk_text_buffer_get_char_count(m_buffer) != 0) IgnoreNextTextUpdate(); - gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) ); + if ( !buffer ) + { + // what else can we do? at least don't crash... + return; + } -#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 { @@ -899,8 +802,6 @@ void wxTextCtrl::WriteText( const wxString &text ) if ( m_windowStyle & wxTE_MULTILINE ) { -#ifdef __WXGTK20__ - #if wxUSE_UNICODE wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) ); #else @@ -917,31 +818,11 @@ void wxTextCtrl::WriteText( const wxString &text ) 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 { @@ -951,18 +832,18 @@ void wxTextCtrl::WriteText( const wxString &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 - gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len ); + if ( !buffer ) + { + // what else can we do? at least don't crash... + return; + } -#else - gtk_editable_insert_text( GTK_EDITABLE(m_text), text.c_str(), text.Len(), &len ); -#endif + gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len ); // Bring entry's cursor uptodate. gtk_entry_set_position( GTK_ENTRY(m_text), len ); @@ -981,40 +862,14 @@ 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(wxT("")); - 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; - gtk_text_buffer_get_end_iter(m_buffer,&end ); + GtkTextIter end = line; + gtk_text_iter_forward_to_line_end(&end); gchar *text = gtk_text_buffer_get_text(m_buffer,&line,&end,TRUE); wxString result(wxGTK_CONV_BACK(text)); g_free(text); - return result.BeforeFirst(wxT('\n')); -#endif + return result; } else { @@ -1034,26 +889,13 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const { 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() ) + GtkTextIter iter; + gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos); + if (gtk_text_iter_is_end(&iter)) 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)++; - } + *y = gtk_text_iter_get_line(&iter); + *x = gtk_text_iter_get_line_offset(&iter); } else // single line control { @@ -1076,52 +918,43 @@ long wxTextCtrl::XYToPosition(long x, long y ) const { if (!(m_windowStyle & wxTE_MULTILINE)) return 0; - long pos=0; - for( int i=0; i= gtk_text_buffer_get_line_count (m_buffer)) + return -1; - pos += x; - return pos; + gtk_text_buffer_get_iter_at_line(m_buffer, &iter, y); + if (x >= gtk_text_iter_get_chars_in_line (&iter)) + return -1; + + return gtk_text_iter_get_offset(&iter) + x; } int wxTextCtrl::GetLineLength(long lineNo) const { - wxString str = GetLineText (lineNo); - return (int) str.Length(); + if (m_windowStyle & wxTE_MULTILINE) + { + int last_line = gtk_text_buffer_get_line_count( m_buffer ) - 1; + if (lineNo > last_line) + return -1; + + GtkTextIter iter; + gtk_text_buffer_get_iter_at_line(m_buffer, &iter, lineNo); + // get_chars_in_line return includes paragraph delimiters, so need to subtract 1 IF it is not the last line + return gtk_text_iter_get_chars_in_line(&iter) - ((lineNo == last_line) ? 0 : 1); + } + else + { + wxString str = GetLineText (lineNo); + return (int) str.Length(); + } } int wxTextCtrl::GetNumberOfLines() const { if (m_windowStyle & wxTE_MULTILINE) - { -#ifdef __WXGTK20__ return gtk_text_buffer_get_line_count( m_buffer ); -#else - gint len = gtk_text_get_length( GTK_TEXT(m_text) ); - char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len ); - - if (text) - { - int currentLine = 0; - for (int i = 0; i < len; i++ ) - { - if (text[i] == '\n') - currentLine++; - } - g_free( text ); - - // currentLine is 0 based, add 1 to get number of lines - return currentLine + 1; - } - else - { - return 0; - } -#endif - } else - { return 1; - } } void wxTextCtrl::SetInsertionPoint( long pos ) @@ -1130,7 +963,6 @@ void wxTextCtrl::SetInsertionPoint( long pos ) if ( IsMultiLine() ) { -#ifdef __WXGTK20__ GtkTextIter iter; gtk_text_buffer_get_iter_at_offset( m_buffer, &iter, pos ); gtk_text_buffer_place_cursor( m_buffer, &iter ); @@ -1139,24 +971,6 @@ void wxTextCtrl::SetInsertionPoint( long pos ) GTK_TEXT_VIEW(m_text), gtk_text_buffer_get_insert( m_buffer ) ); -#else // GTK+ 1.x - gtk_signal_disconnect_by_func( GTK_OBJECT(m_text), - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); - - /* we fake a set_point by inserting and deleting. as the user - isn't supposed to get to know about this non-sense, we - disconnect so that no events are sent to the user program. */ - - gint tmp = (gint)pos; - gtk_editable_insert_text( GTK_EDITABLE(m_text), " ", 1, &tmp ); - gtk_editable_delete_text( GTK_EDITABLE(m_text), tmp-1, tmp ); - - gtk_signal_connect( GTK_OBJECT(m_text), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); - - // bring editable's cursor uptodate. Bug in GTK. - SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) )); -#endif // GTK+ 2/1 } else { @@ -1173,13 +987,9 @@ void wxTextCtrl::SetInsertionPointEnd() if (m_windowStyle & wxTE_MULTILINE) { -#ifdef __WXGTK20__ GtkTextIter end; gtk_text_buffer_get_end_iter( m_buffer, &end ); gtk_text_buffer_place_cursor( m_buffer, &end ); -#else - SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text))); -#endif } else { @@ -1193,11 +1003,7 @@ void wxTextCtrl::SetEditable( bool editable ) if (m_windowStyle & wxTE_MULTILINE) { -#ifdef __WXGTK20__ gtk_text_view_set_editable( GTK_TEXT_VIEW(m_text), editable ); -#else - gtk_text_set_editable( GTK_TEXT(m_text), editable ); -#endif } else { @@ -1215,12 +1021,7 @@ bool wxTextCtrl::Enable( bool enable ) if (m_windowStyle & wxTE_MULTILINE) { -#ifdef __WXGTK20__ SetEditable( enable ); -#else - gtk_text_set_editable( GTK_TEXT(m_text), enable ); - OnParentEnable(enable); -#endif } else { @@ -1298,19 +1099,13 @@ void wxTextCtrl::SetMaxLength(unsigned long len) // we shouldn't check anything any more if ( len ) { - gtk_signal_connect( GTK_OBJECT(m_text), - "insert_text", - GTK_SIGNAL_FUNC(gtk_insert_text_callback), - (gpointer)this); + g_signal_connect (m_text, "insert_text", + G_CALLBACK (gtk_insert_text_callback), this); } else // no checking { - gtk_signal_disconnect_by_func - ( - GTK_OBJECT(m_text), - GTK_SIGNAL_FUNC(gtk_insert_text_callback), - (gpointer)this - ); + g_signal_handlers_disconnect_by_func (m_text, + (gpointer) gtk_insert_text_callback, this); } } } @@ -1325,28 +1120,14 @@ void wxTextCtrl::SetSelection( long from, long to ) to = GetValue().Length(); } -#ifndef __WXGTK20__ - 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; - } -#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 { @@ -1358,27 +1139,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 { @@ -1405,13 +1173,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 @@ -1425,9 +1190,8 @@ long wxTextCtrl::GetInsertionPoint() const return gtk_text_iter_get_offset( &cursor ); } else -#endif { - return (long) GET_EDITABLE_POS(m_text); + return (long) GET_EDITABLE_POS(m_text); } } @@ -1439,14 +1203,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 { @@ -1460,7 +1220,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; @@ -1470,8 +1229,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 ) @@ -1482,18 +1240,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 } } @@ -1501,11 +1249,9 @@ 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); } @@ -1513,11 +1259,9 @@ 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); } @@ -1525,11 +1269,9 @@ 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); } @@ -1570,7 +1312,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; @@ -1589,14 +1330,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(); @@ -1620,7 +1353,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)); @@ -1629,9 +1361,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 @@ -1641,7 +1370,7 @@ bool wxTextCtrl::IsModified() const void wxTextCtrl::Clear() { - SetValue( wxT("") ); + SetValue( wxEmptyString ); } void wxTextCtrl::OnChar( wxKeyEvent &key_event ) @@ -1689,11 +1418,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 { @@ -1730,14 +1455,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() ) @@ -1749,16 +1468,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) ) @@ -1777,26 +1486,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 ); @@ -1812,7 +1504,7 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style ) // nothing to do return true; } -#ifdef __WXGTK20__ + gint l = gtk_text_buffer_get_char_count( m_buffer ); wxCHECK_MSG( start >= 0 && end <= l, false, @@ -1830,51 +1522,11 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style ) wxGtkTextApplyTagsFromAttr( m_buffer, attr, &starti, &endi ); return true; -#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; - } - else // singe line - { - // cannot do this for GTK+'s Entry widget - return false; } + + // else single line + // cannot do this for GTK+'s Entry widget + return false; } void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style) @@ -1937,27 +1589,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)) @@ -1988,21 +1619,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 + } } } @@ -2010,7 +1637,6 @@ void wxTextCtrl::Thaw() { if ( HasFlag(wxTE_MULTILINE) ) { -#ifdef __WXGTK20__ wxASSERT_MSG( m_frozenness > 0, _T("Thaw() without matching Freeze()") ); if ( !--m_frozenness ) @@ -2019,14 +1645,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 } } @@ -2034,8 +1657,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 @@ -2084,7 +1705,6 @@ void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event) //event.Skip(!GetEventHandler()->ProcessEvent(url_event)); GetEventHandler()->ProcessEvent(url_event); } -#endif // gtk2 // ---------------------------------------------------------------------------- // scrolling @@ -2095,11 +1715,7 @@ 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) @@ -2122,11 +1738,7 @@ bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff) 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; } @@ -2137,12 +1749,7 @@ bool wxTextCtrl::ScrollLines(int lines) 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); }