X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a164d4c4e75bd48f6a0a484fb267b0dc337c541..60ebcb8a491cf5132a326490cd148dcba384f729:/src/gtk1/textctrl.cpp diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index 5ffdf7d7d4..547c804242 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: textctrl.cpp +// Name: src/gtk1/textctrl.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,28 +7,30 @@ // 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" #include "wx/textctrl.h" -#include "wx/utils.h" -#include "wx/intl.h" -#include "wx/log.h" -#include "wx/settings.h" -#include "wx/panel.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/panel.h" + #include "wx/settings.h" + #include "wx/math.h" +#endif + #include "wx/strconv.h" #include "wx/fontutil.h" // for wxNativeFontInfo (GetNativeFontInfo()) +#include "wx/evtloop.h" #include #include #include -#include "wx/math.h" -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" #include //----------------------------------------------------------------------------- @@ -49,111 +51,27 @@ extern wxWindowGTK *g_delayedFocus; // helpers // ---------------------------------------------------------------------------- -#ifdef __WXGTK20__ -extern "C" { -static void wxGtkOnRemoveTag(GtkTextBuffer *buffer, - GtkTextTag *tag, - GtkTextIter *start, - GtkTextIter *end, - gpointer user_data) -{ - gchar *name; - g_object_get (tag, "name", &name, NULL); - - if (!name || strncmp(name, "WX", 2)) // anonymous tag or not starting with "WX" - 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, - GtkTextIter *end) +static void wxGtkTextInsert(GtkWidget *text, + const wxTextAttr& attr, + const char *txt, + size_t len) { - static gchar buf[1024]; - GtkTextTag *tag; - - gulong remove_handler_id = g_signal_connect( text_buffer, "remove_tag", - G_CALLBACK(wxGtkOnRemoveTag), NULL); - gtk_text_buffer_remove_all_tags(text_buffer, start, end); - g_signal_handler_disconnect( text_buffer, remove_handler_id ); - + wxFont tmpFont; + GdkFont *font; if (attr.HasFont()) { - char *font_string; - PangoFontDescription *font_description = attr.GetFont().GetNativeFontInfo()->description; - font_string = pango_font_description_to_string(font_description); - g_snprintf(buf, sizeof(buf), "WXFONT %s", font_string); - 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, - "font-desc", font_description, - NULL ); - gtk_text_buffer_apply_tag (text_buffer, tag, start, end); - g_free (font_string); - } + tmpFont = attr.GetFont(); - if (attr.HasTextColour()) - { - GdkColor *colFg = attr.GetTextColour().GetColor(); - g_snprintf(buf, sizeof(buf), "WXFORECOLOR %d %d %d", - colFg->red, colFg->green, colFg->blue); - 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, - "foreground-gdk", colFg, NULL ); - gtk_text_buffer_apply_tag (text_buffer, tag, start, end); - } + // FIXME: if this crashes because tmpFont goes out of scope and the GdkFont is + // deleted, then we need to call gdk_font_ref on font. + // This is because attr.GetFont() now returns a temporary font since wxTextAttr + // no longer stores a wxFont object, for efficiency. - if (attr.HasBackgroundColour()) - { - GdkColor *colBg = attr.GetBackgroundColour().GetColor(); - g_snprintf(buf, sizeof(buf), "WXBACKCOLOR %d %d %d", - colBg->red, colBg->green, colBg->blue); - 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, - "background-gdk", colBg, NULL ); - gtk_text_buffer_apply_tag (text_buffer, tag, start, end); + font = tmpFont.GetInternalFont(); } -} -} - -extern "C" { -static void wxGtkTextInsert(GtkWidget *text, - GtkTextBuffer *text_buffer, - const wxTextAttr& attr, - wxCharBuffer buffer) - -{ - gint start_offset; - GtkTextIter iter, start; - - gtk_text_buffer_get_iter_at_mark( text_buffer, &iter, - gtk_text_buffer_get_insert (text_buffer) ); - start_offset = gtk_text_iter_get_offset (&iter); - gtk_text_buffer_insert( text_buffer, &iter, buffer, strlen(buffer) ); - - gtk_text_buffer_get_iter_at_offset (text_buffer, &start, start_offset); - - 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; + else + font = NULL; GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor() : NULL; @@ -165,7 +83,6 @@ static void wxGtkTextInsert(GtkWidget *text, gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len ); } } -#endif // GTK 1.x // ---------------------------------------------------------------------------- // "insert_text" for GtkEntry @@ -174,9 +91,9 @@ static void wxGtkTextInsert(GtkWidget *text, extern "C" { static void gtk_insert_text_callback(GtkEditable *editable, - const gchar *new_text, - gint new_text_length, - gint *position, + const gchar *WXUNUSED(new_text), + gint WXUNUSED(new_text_length), + gint *WXUNUSED(position), wxTextCtrl *win) { if (g_isIdle) @@ -204,227 +121,18 @@ gtk_insert_text_callback(GtkEditable *editable, wxCommandEvent event(wxEVT_COMMAND_TEXT_MAXLEN, win->GetId()); event.SetEventObject(win); event.SetString(win->GetValue()); - win->GetEventHandler()->ProcessEvent( event ); + win->HandleWindowEvent( 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, - GtkTextIter *start, - GtkTextIter *end, - 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"); -} -} - -//----------------------------------------------------------------------------- -// 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 -//----------------------------------------------------------------------------- - -// 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 ) -{ - static const char *URIPrefixes[] = - { - "http://", - "ftp://", - "www.", - "ftp.", - "mailto://", - "https://", - "file://", - "nntp://", - "news://", - "telnet://", - "mms://", - "gopher://", - "prospero://", - "wais://", - }; - - 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"); - - // Get rid of punctuation from beginning and end. - // Might want to move this to au_check_range if an improved link checking doesn't - // use some intelligent punctuation checking itself (beware of undesired iter modifications). - if(g_unichar_ispunct( gtk_text_iter_get_char( &start ) ) ) - gtk_text_iter_forward_find_char( &start, pred_nonpunct, NULL, e ); - - gtk_text_iter_backward_find_char( &end, pred_nonpunct_or_slash, NULL, &start ); - gtk_text_iter_forward_char(&end); - - gchar* text = gtk_text_iter_get_text( &start, &end ); - size_t len = strlen(text), prefix_len; - size_t n; - - for( n = 0; n < WXSIZEOF(URIPrefixes); ++n ) - { - prefix_len = strlen(URIPrefixes[n]); - if((len > prefix_len) && !strncasecmp(text, URIPrefixes[n], prefix_len)) - break; - } - - 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); - - g_signal_handler_block(buffer, signal_id); - gtk_text_buffer_apply_tag(buffer, tag, &start, &end); - g_signal_handler_unblock(buffer, signal_id); - } -} -} - -extern "C" { -static void -au_check_range(GtkTextIter *s, - GtkTextIter *range_end) -{ - GtkTextIter range_start = *s; - GtkTextIter word_end; - GtkTextBuffer *buffer = gtk_text_iter_get_buffer(s); - GtkTextTag *tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl"); - - gtk_text_buffer_remove_tag(buffer, tag, s, range_end); - - if(g_unichar_isspace(gtk_text_iter_get_char(&range_start))) - gtk_text_iter_forward_find_char(&range_start, pred_non_whitespace, NULL, range_end); - - while(!gtk_text_iter_equal(&range_start, range_end)) - { - word_end = range_start; - gtk_text_iter_forward_find_char(&word_end, pred_whitespace, NULL, range_end); - - // Now we should have a word delimited by range_start and word_end, correct link tags - au_check_word(&range_start, &word_end); - - range_start = word_end; - 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, - gchar *text, - gint len, - wxTextCtrl *win) -{ - if (!len || !(win->GetWindowStyleFlag() & wxTE_AUTO_URL) ) - return; - - GtkTextIter start = *end; - gtk_text_iter_backward_chars(&start, g_utf8_strlen(text, len)); - - GtkTextIter line_start = start; - GtkTextIter line_end = *end; - GtkTextIter words_start = start; - GtkTextIter words_end = *end; - - gtk_text_iter_set_line(&line_start, gtk_text_iter_get_line(&start)); - gtk_text_iter_forward_to_line_end(&line_end); - gtk_text_iter_backward_find_char(&words_start, pred_whitespace, NULL, &line_start); - gtk_text_iter_forward_find_char(&words_end, pred_whitespace, NULL, &line_end); - - au_check_range(&words_start, &words_end); -} -} - -//----------------------------------------------------------------------------- -// "delete-range" for GtkTextBuffer -//----------------------------------------------------------------------------- - -extern "C" { -static void -au_delete_range_callback(GtkTextBuffer *buffer, - GtkTextIter *start, - GtkTextIter *end, - wxTextCtrl *win) -{ - if( !(win->GetWindowStyleFlag() & wxTE_AUTO_URL) ) - return; - - GtkTextIter line_start = *start, line_end = *end; - - gtk_text_iter_set_line(&line_start, gtk_text_iter_get_line(start)); - gtk_text_iter_forward_to_line_end(&line_end); - gtk_text_iter_backward_find_char(start, pred_whitespace, NULL, &line_start); - gtk_text_iter_forward_find_char(end, pred_whitespace, NULL, &line_end); - - au_check_range(start, end); -} -} - - -#endif - //----------------------------------------------------------------------------- // "changed" //----------------------------------------------------------------------------- extern "C" { static void -gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win ) +gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) { if ( win->IgnoreTextUpdate() ) return; @@ -435,35 +143,18 @@ 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; + win->HandleWindowEvent( event ); } } -#endif //----------------------------------------------------------------------------- // "changed" from vertical scrollbar //----------------------------------------------------------------------------- -#ifndef __WXGTK20__ extern "C" { static void gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) @@ -476,21 +167,16 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) 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); } @@ -500,7 +186,8 @@ static GtkDrawCallback gs_gtk_text_draw = NULL; extern "C" { static void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect) { - if ( !wxIsInsideYield ) + wxEventLoopBase* loop = wxEventLoopBase::GetActive(); + if ( loop && !loop->IsYielding() ) { wxCHECK_RET( gs_gtk_text_draw != wxgtk_text_draw, _T("infinite recursion in wxgtk_text_draw aborted") ); @@ -510,15 +197,13 @@ static void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect) } } -#endif // __WXGTK20__ - //----------------------------------------------------------------------------- // wxTextCtrl //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase) -BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) +BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase) EVT_CHAR(wxTextCtrl::OnChar) EVT_MENU(wxID_CUT, wxTextCtrl::OnCut) @@ -532,18 +217,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste) 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) - EVT_LEFT_DOWN (wxTextCtrl::OnUrlMouseEvent) - EVT_LEFT_UP (wxTextCtrl::OnUrlMouseEvent) - EVT_LEFT_DCLICK (wxTextCtrl::OnUrlMouseEvent) - EVT_RIGHT_DOWN (wxTextCtrl::OnUrlMouseEvent) - EVT_RIGHT_UP (wxTextCtrl::OnUrlMouseEvent) - EVT_RIGHT_DCLICK(wxTextCtrl::OnUrlMouseEvent) -#endif END_EVENT_TABLE() void wxTextCtrl::Init() @@ -552,22 +225,11 @@ void wxTextCtrl::Init() m_modified = false; SetUpdateFont(false); m_text = - m_vScrollbar = (GtkWidget *)NULL; -#ifdef __WXGTK20__ - m_frozenness = 0; - m_gdkHandCursor = NULL; - m_gdkXTermCursor = NULL; -#endif + m_vScrollbar = NULL; } 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, @@ -610,52 +272,8 @@ bool wxTextCtrl::Create( wxWindow *parent, if (multi_line) { -#ifdef __WXGTK20__ - // Create view - m_text = gtk_text_view_new(); - - m_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); - - // create scrolled window - m_widget = gtk_scrolled_window_new( NULL, NULL ); - gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( m_widget ), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); - - // Insert view into scrolled window - gtk_container_add( GTK_CONTAINER(m_widget), m_text ); - - // 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 ); - - 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 ); + m_text = gtk_text_new( NULL, NULL ); // ... and put into the upper left hand corner of the table bool bHasHScrollbar = false; @@ -676,18 +294,12 @@ bool wxTextCtrl::Create( wxWindow *parent, GTK_FILL, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK), 0, 0); -#endif // GTK+ 2/1 } else { // a single-line text control: no need for scrollbars 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 ); @@ -699,7 +311,6 @@ 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", @@ -717,14 +328,9 @@ bool wxTextCtrl::Create( wxWindow *parent, 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() @@ -736,7 +342,7 @@ bool wxTextCtrl::Create( wxWindow *parent, 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 ); + gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.length(), &tmp ); #endif if (multi_line) @@ -744,8 +350,6 @@ bool wxTextCtrl::Create( wxWindow *parent, // 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) @@ -758,92 +362,16 @@ 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) - gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_RIGHT ); - else if (style & wxTE_CENTRE) - gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_CENTER ); - // Left justify (alignment) is the default and we don't need to apply GTK_JUSTIFY_LEFT - } - else - { -#ifdef __WXGTK24__ - // gtk_entry_set_alignment was introduced in gtk+-2.3.5 - if (!gtk_check_version(2,4,0)) - { - if (style & wxTE_RIGHT) - gtk_entry_set_alignment( GTK_ENTRY(m_text), 1.0 ); - else if (style & wxTE_CENTRE) - gtk_entry_set_alignment( GTK_ENTRY(m_text), 0.5 ); - } -#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); - - // .. and handle URLs on multi-line controls with wxTE_AUTO_URL style - if (style & wxTE_AUTO_URL) - { - GtkTextIter start, end; - m_gdkHandCursor = gdk_cursor_new(GDK_HAND2); - m_gdkXTermCursor = gdk_cursor_new(GDK_XTERM); - - // We create our wxUrl tag here for slight efficiency gain - we - // don't have to check for the tag existance in callbacks, - // hereby it's guaranteed to exist. - gtk_text_buffer_create_tag(m_buffer, "wxUrl", - "foreground", "blue", - "underline", PANGO_UNDERLINE_SINGLE, - 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); - - // Block all wxUrl tag applying unless we do it ourselves, in which case we - // block this callback temporarily. This takes care of gtk+ internal - // gtk_text_buffer_insert_range* calls that would copy our URL tag otherwise, - // 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); - - // Check for URLs in the initial string passed to Create - gtk_text_buffer_get_start_iter(m_buffer, &start); - gtk_text_buffer_get_end_iter(m_buffer, &end); - au_check_range(&start, &end); - } - } - else -#endif - - { - gtk_signal_connect( GTK_OBJECT(m_text), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); - } + gtk_signal_connect( GTK_OBJECT(m_text), "changed", + GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); m_cursor = wxCursor( wxCURSOR_IBEAM ); @@ -856,7 +384,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; @@ -877,38 +404,19 @@ void wxTextCtrl::CalculateScrollbar() m_vScrollbarVisible = true; } } -#endif } -wxString wxTextCtrl::GetValue() const +wxString wxTextCtrl::DoGetValue() const { 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; - 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; - - 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 { @@ -918,36 +426,22 @@ wxString wxTextCtrl::GetValue() const return tmp; } -void wxTextCtrl::SetValue( const wxString &value ) +void wxTextCtrl::DoSetValue( const wxString &value, int flags ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + if ( !(flags & SetValue_SendEvent) ) { -#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(); - - if ( !buffer ) - { - // what else can we do? at least don't crash... - return; - } - - gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) ); + // do not generate events + IgnoreNextTextUpdate(); + } -#else + if (m_windowStyle & wxTE_MULTILINE) + { gint len = gtk_text_get_length( GTK_TEXT(m_text) ); gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len ); len = 0; - gtk_editable_insert_text( GTK_EDITABLE(m_text), value.mbc_str(), value.Length(), &len ); -#endif + gtk_editable_insert_text( GTK_EDITABLE(m_text), value.mbc_str(), value.length(), &len ); } else { @@ -976,30 +470,6 @@ 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; - } - - // TODO: Call whatever is needed to delete the selection. - 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 ) - { - 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) ); @@ -1007,7 +477,7 @@ void wxTextCtrl::WriteText( const wxString &text ) // 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()); + wxGtkTextInsert(m_text, m_defaultStyle, text.c_str(), text.length()); // we called wxGtkTextInsert with correct font, no need to do anything // in UpdateFontIfNeeded() any longer @@ -1018,7 +488,6 @@ void wxTextCtrl::WriteText( const wxString &text ) // 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 { @@ -1028,24 +497,7 @@ 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 - if ( !buffer ) - { - // what else can we do? at least don't crash... - return; - } - - 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 + gtk_editable_insert_text( GTK_EDITABLE(m_text), text.c_str(), text.length(), &len ); // Bring entry's cursor uptodate. gtk_entry_set_position( GTK_ENTRY(m_text), len ); @@ -1064,7 +516,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 ); @@ -1088,16 +539,6 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const { return wxEmptyString; } -#else - GtkTextIter line; - gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo); - 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; -#endif } else { @@ -1120,7 +561,7 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const wxString text = GetValue(); // cast to prevent warning. But pos really should've been unsigned. - if( (unsigned long)pos > text.Len() ) + if( (unsigned long)pos > text.length() ) return false; *x=0; // First Col @@ -1169,16 +610,13 @@ long wxTextCtrl::XYToPosition(long x, long y ) const int wxTextCtrl::GetLineLength(long lineNo) const { wxString str = GetLineText (lineNo); - return (int) str.Length(); + 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 ); @@ -1199,7 +637,6 @@ int wxTextCtrl::GetNumberOfLines() const { return 0; } -#endif } else { @@ -1213,16 +650,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 ); - gtk_text_view_scroll_mark_onscreen - ( - 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); @@ -1239,7 +666,6 @@ void wxTextCtrl::SetInsertionPoint( long pos ) // 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 { @@ -1256,13 +682,7 @@ 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 { @@ -1276,11 +696,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 { @@ -1288,36 +704,26 @@ void wxTextCtrl::SetEditable( bool editable ) } } -bool wxTextCtrl::Enable( bool enable ) +void wxTextCtrl::DoEnable( bool enable ) { - if (!wxWindowBase::Enable(enable)) - { - // nothing to do - return false; - } - if (m_windowStyle & wxTE_MULTILINE) { -#ifdef __WXGTK20__ - SetEditable( enable ); -#else gtk_text_set_editable( GTK_TEXT(m_text), enable ); - OnParentEnable(enable); -#endif } else { gtk_widget_set_sensitive( m_text, enable ); } - - return true; } // wxGTK-specific: called recursively by Enable, // to give widgets an oppprtunity to correct their colours after they // have been changed by Enable -void wxTextCtrl::OnParentEnable( bool enable ) +void wxTextCtrl::OnEnabled( bool WXUNUSED(enable) ) { + if ( IsSingleLine() ) + return; + // If we have a custom background colour, we use this colour in both // disabled and enabled mode, or we end up with a different colour under the // text. @@ -1405,10 +811,9 @@ void wxTextCtrl::SetSelection( long from, long to ) if (from == -1 && to == -1) { from = 0; - to = GetValue().Length(); + to = GetValue().length(); } -#ifndef __WXGTK20__ if ( (m_windowStyle & wxTE_MULTILINE) && !GTK_TEXT(m_text)->line_start_cache ) { @@ -1416,20 +821,10 @@ void wxTextCtrl::SetSelection( long from, long to ) 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 { @@ -1441,13 +836,6 @@ 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; @@ -1456,62 +844,13 @@ void wxTextCtrl::ShowPosition( long pos ) 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 -{ - if ( !IsMultiLine() ) - { - // not supported - return wxTE_HT_UNKNOWN; } - - int x, y; - gtk_text_view_window_to_buffer_coords - ( - GTK_TEXT_VIEW(m_text), - GTK_TEXT_WINDOW_TEXT, - pt.x, pt.y, - &x, &y - ); - - GtkTextIter iter; - gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(m_text), &iter, x, y); - if ( pos ) - *pos = gtk_text_iter_get_offset(&iter); - - 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 - // internally, the cursor is the "mark" called - // "insert" in the text view's btree structure. - - GtkTextMark *mark = gtk_text_buffer_get_insert( m_buffer ); - GtkTextIter cursor; - gtk_text_buffer_get_iter_at_mark( m_buffer, &cursor, mark ); - - return gtk_text_iter_get_offset( &cursor ); - } - else -#endif - { - return (long) GET_EDITABLE_POS(m_text); - } + return (long) GET_EDITABLE_POS(m_text); } wxTextPos wxTextCtrl::GetLastPosition() const @@ -1522,14 +861,7 @@ 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 { @@ -1542,18 +874,6 @@ wxTextPos wxTextCtrl::GetLastPosition() const 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; - 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_delete( m_buffer, &fromi, &toi ); - } - else // single line -#endif gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to ); } @@ -1565,55 +885,32 @@ 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 ); + gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.length(), &pos ); #endif // wxUSE_UNICODE -#endif // GTK 1.x/2.x } } 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"); - else -#endif - gtk_editable_cut_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG); + gtk_editable_cut_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG); } 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"); - else -#endif - gtk_editable_copy_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG); + gtk_editable_copy_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG); } 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"); - else -#endif - gtk_editable_paste_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG); + gtk_editable_paste_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG); } // Undo/redo @@ -1653,33 +950,12 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const gint to = -1; bool haveSelection = false; -#ifdef __WXGTK20__ - if (m_windowStyle & wxTE_MULTILINE) - { - GtkTextIter ifrom, ito; - if ( gtk_text_buffer_get_selection_bounds(m_buffer, &ifrom, &ito) ) - { - haveSelection = true; - from = gtk_text_iter_get_offset(&ifrom); - to = gtk_text_iter_get_offset(&ito); - } - } - else // not multi-line - { - if ( gtk_editable_get_selection_bounds( GTK_EDITABLE(m_text), - &from, &to) ) - { - 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(); @@ -1702,19 +978,7 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const 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)); - } - else - { - return gtk_editable_get_editable(GTK_EDITABLE(m_text)); - } -#else return GTK_EDITABLE(m_text)->editable; -#endif } bool wxTextCtrl::IsModified() const @@ -1731,12 +995,12 @@ 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); event.SetString(GetValue()); - if (GetEventHandler()->ProcessEvent(event)) return; + if (HandleWindowEvent(event)) return; } if ((key_event.GetKeyCode() == WXK_RETURN) && !(m_windowStyle & wxTE_MULTILINE)) @@ -1772,11 +1036,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 { @@ -1811,16 +1071,9 @@ void wxTextCtrl::ChangeFontGlobally() { // this method is very inefficient and hence should be called as rarely as // 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() ) @@ -1832,16 +1085,12 @@ 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) ) @@ -1860,24 +1109,20 @@ 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 @@ -1896,23 +1141,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, - _T("invalid range in wxTextCtrl::SetStyle") ); - - GtkTextIter starti, endi; - gtk_text_buffer_get_iter_at_offset( m_buffer, &starti, start ); - gtk_text_buffer_get_iter_at_offset( m_buffer, &endi, end ); - - // 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 - 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) @@ -1949,7 +1177,6 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style ) /* 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; } @@ -2021,8 +1248,7 @@ void wxTextCtrl::OnInternalIdle() if (cursor.Ok()) { -#ifndef __WXGTK20__ - GdkWindow *window = (GdkWindow*) NULL; + GdkWindow *window = NULL; if (HasFlag(wxTE_MULTILINE)) window = GTK_TEXT(m_text)->text_area; else @@ -2037,7 +1263,6 @@ void wxTextCtrl::OnInternalIdle() window = m_widget->window; if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget))) gdk_window_set_cursor( window, cursor.GetCursor() ); -#endif } if (g_delayedFocus == this) @@ -2066,107 +1291,23 @@ wxSize wxTextCtrl::DoGetBestSize() const // freeze/thaw // ---------------------------------------------------------------------------- -void wxTextCtrl::Freeze() +void wxTextCtrl::DoFreeze() { 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); - 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 } } -void wxTextCtrl::Thaw() +void wxTextCtrl::DoThaw() { if ( HasFlag(wxTE_MULTILINE) ) { -#ifdef __WXGTK20__ - wxASSERT_MSG( m_frozenness > 0, _T("Thaw() without matching Freeze()") ); - - if ( !--m_frozenness ) - { - // Reattach buffer and thaw textview updates - 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); - } -#else GTK_TEXT(m_text)->vadj->value = 0.0; gtk_text_thaw(GTK_TEXT(m_text)); -#endif - } -} - -// ---------------------------------------------------------------------------- -// 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 -void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event) -{ - event.Skip(); - if(!(m_windowStyle & wxTE_AUTO_URL)) - return; - - gint x, y; - GtkTextIter start, end; - GtkTextTag *tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(m_buffer), - "wxUrl"); - - gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(m_text), GTK_TEXT_WINDOW_WIDGET, - event.GetX(), event.GetY(), &x, &y); - - gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(m_text), &end, x, y); - if (!gtk_text_iter_has_tag(&end, tag)) - { - gdk_window_set_cursor(gtk_text_view_get_window(GTK_TEXT_VIEW(m_text), - GTK_TEXT_WINDOW_TEXT), m_gdkXTermCursor); - return; } - - gdk_window_set_cursor(gtk_text_view_get_window(GTK_TEXT_VIEW(m_text), - GTK_TEXT_WINDOW_TEXT), m_gdkHandCursor); - - start = end; - if(!gtk_text_iter_begins_tag(&start, tag)) - gtk_text_iter_backward_to_tag_toggle(&start, tag); - if(!gtk_text_iter_ends_tag(&end, tag)) - gtk_text_iter_forward_to_tag_toggle(&end, tag); - - // Native context menu is probably not desired on an URL. - // Consider making this dependant on ProcessEvent(wxTextUrlEvent) return value - if(event.GetEventType() == wxEVT_RIGHT_DOWN) - event.Skip(false); - - wxTextUrlEvent url_event(m_windowId, event, - gtk_text_iter_get_offset(&start), - gtk_text_iter_get_offset(&end)); - - InitCommandEvent(url_event); - // Is that a good idea? Seems not (pleasure with gtk_text_view_start_selection_drag) - //event.Skip(!GetEventHandler()->ProcessEvent(url_event)); - GetEventHandler()->ProcessEvent(url_event); } -#endif // gtk2 // ---------------------------------------------------------------------------- // scrolling @@ -2177,11 +1318,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) @@ -2203,12 +1340,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; } @@ -2219,12 +1351,8 @@ 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); }