#include "wx/math.h"
#endif
+#include "wx/scopeguard.h"
#include "wx/strconv.h"
#include "wx/fontutil.h" // for wxNativeFontInfo (GetNativeFontInfo())
#include <sys/stat.h>
#include <ctype.h>
+#include <gtk/gtk.h>
#include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
// ----------------------------------------------------------------------------
// helpers
extern "C" {
static void wxGtkOnRemoveTag(GtkTextBuffer *buffer,
GtkTextTag *tag,
- GtkTextIter *start,
- GtkTextIter *end,
+ GtkTextIter * WXUNUSED(start),
+ GtkTextIter * WXUNUSED(end),
char *prefix)
{
gchar *name;
{
wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXFONT", start, end);
- PangoFontDescription *font_description = attr.GetFont().GetNativeFontInfo()->description;
+ wxFont font(attr.GetFont());
+
+ PangoFontDescription *font_description = font.GetNativeFontInfo()->description;
wxGtkString font_string(pango_font_description_to_string(font_description));
g_snprintf(buf, sizeof(buf), "WXFONT %s", font_string.c_str());
tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
NULL );
gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
- if (attr.GetFont().GetUnderlined())
+ if (font.GetUnderlined())
{
g_snprintf(buf, sizeof(buf), "WXFONTUNDERLINE");
tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
NULL );
gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
}
+ if ( font.GetStrikethrough() )
+ {
+ g_snprintf(buf, sizeof(buf), "WXFONTSTRIKETHROUGH");
+ 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,
+ "strikethrough-set", TRUE,
+ "strikethrough", TRUE,
+ NULL );
+ gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
+ }
}
if (attr.HasTextColour())
gtk_text_iter_get_line(start) );
gtk_text_iter_forward_line(¶_end);
- wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXALIGNMENT", start, end);
+ wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXALIGNMENT", ¶_start, ¶_end);
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;
+ case wxTEXT_ALIGNMENT_JUSTIFIED:
+#ifdef __WXGTK3__
+ align = GTK_JUSTIFY_FILL;
+ break;
+#elif GTK_CHECK_VERSION(2,11,0)
// gtk+ doesn't support justify before gtk+-2.11.0 with pango-1.17 being available
// (but if new enough pango isn't available it's a mere gtk warning)
-#if GTK_CHECK_VERSION(2,11,0)
- case wxTEXT_ALIGNMENT_JUSTIFIED:
if (!gtk_check_version(2,11,0))
+ {
align = GTK_JUSTIFY_FILL;
- else
- align = GTK_JUSTIFY_LEFT;
- break;
+ break;
+ }
+ // fallthrough
#endif
+ default:
+ align = GTK_JUSTIFY_LEFT;
+ break;
}
g_snprintf(buf, sizeof(buf), "WXALIGNMENT %d", align);
gtk_text_iter_get_line(start) );
gtk_text_iter_forward_line(¶_end);
- wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXINDENT", start, end);
+ wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXINDENT", ¶_start, ¶_end);
// Convert indent from 1/10th of a mm into pixels
- float factor;
-#if GTK_CHECK_VERSION(2,2,0)
- if (!gtk_check_version(2,2,0))
- factor = (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
+ float factor =
+ (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10;
- else
-#endif
- factor = (float)gdk_screen_width() / gdk_screen_width_mm() / 10;
const int indent = (int)(factor * attr.GetLeftIndent());
const int subIndent = (int)(factor * attr.GetLeftSubIndent());
gtk_text_iter_get_line(start) );
gtk_text_iter_forward_line(¶_end);
- wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXTABS", start, end);
+ wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXTABS", ¶_start, ¶_end);
const wxArrayInt& tabs = attr.GetTabs();
- wxString tagname = _T("WXTABS");
+ wxString tagname = wxT("WXTABS");
g_snprintf(buf, sizeof(buf), "WXTABS");
for (size_t i = 0; i < tabs.GetCount(); i++)
- tagname += wxString::Format(_T(" %d"), tabs[i]);
+ tagname += wxString::Format(wxT(" %d"), tabs[i]);
- const wxWX2MBbuf buf = tagname.mb_str(wxConvUTF8);
+ const wxWX2MBbuf buftag = tagname.utf8_str();
tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
- buf );
+ buftag );
if (!tag)
{
// Factor to convert from 1/10th of a mm into pixels
- float factor;
-#if GTK_CHECK_VERSION(2,2,0)
- if (!gtk_check_version(2,2,0))
- factor = (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
+ float factor =
+ (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10;
- else
-#endif
- factor = (float)gdk_screen_width() / gdk_screen_width_mm() / 10;
PangoTabArray* tabArray = pango_tab_array_new(tabs.GetCount(), TRUE);
for (size_t i = 0; i < tabs.GetCount(); i++)
pango_tab_array_set_tab(tabArray, i, PANGO_TAB_LEFT, (gint)(tabs[i] * factor));
- tag = gtk_text_buffer_create_tag( text_buffer, buf,
+ tag = gtk_text_buffer_create_tag( text_buffer, buftag,
"tabs", tabArray, NULL );
pango_tab_array_free(tabArray);
}
wxGtkTextApplyTagsFromAttr(text, text_buffer, attr, &start, &iter);
}
-// ----------------------------------------------------------------------------
-// "insert_text" for GtkEntry
-// ----------------------------------------------------------------------------
-
-extern "C" {
-static void
-gtk_insert_text_callback(GtkEditable *editable,
- const gchar *new_text,
- gint new_text_length,
- gint *position,
- wxTextCtrl *win)
-{
- // we should only be called if we have a max len limit at all
- GtkEntry *entry = GTK_ENTRY (editable);
-
- wxCHECK_RET( entry->text_max_length, _T("shouldn't be called") );
-
- // check that we don't overflow the max length limit
- //
- // FIXME: this doesn't work when we paste a string which is going to be
- // truncated
- if ( entry->text_length == entry->text_max_length )
- {
- // we don't need to run the base class version at all
- 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
- win->IgnoreNextTextUpdate();
-
- // and generate the correct one ourselves
- wxCommandEvent event(wxEVT_COMMAND_TEXT_MAXLEN, win->GetId());
- event.SetEventObject(win);
- event.SetString(win->GetValue());
- win->GetEventHandler()->ProcessEvent( event );
- }
-}
-}
-
// 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)
+ GtkTextIter * WXUNUSED(start),
+ GtkTextIter * WXUNUSED(end),
+ gpointer WXUNUSED(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");
extern "C" {
static gboolean
-pred_whitespace (gunichar ch, gpointer user_data)
+pred_whitespace(gunichar ch, gpointer WXUNUSED(user_data))
{
return g_unichar_isspace(ch);
}
extern "C" {
static gboolean
-pred_non_whitespace (gunichar ch, gpointer user_data)
+pred_non_whitespace (gunichar ch, gpointer WXUNUSED(user_data))
{
return !g_unichar_isspace(ch);
}
extern "C" {
static gboolean
-pred_nonpunct (gunichar ch, gpointer user_data)
+pred_nonpunct (gunichar ch, gpointer WXUNUSED(user_data))
{
return !g_unichar_ispunct(ch);
}
extern "C" {
static gboolean
-pred_nonpunct_or_slash (gunichar ch, gpointer user_data)
+pred_nonpunct_or_slash (gunichar ch, gpointer WXUNUSED(user_data))
{
return !g_unichar_ispunct(ch) || ch == '/';
}
static void
au_check_word( GtkTextIter *s, GtkTextIter *e )
{
- static const char *URIPrefixes[] =
+ static const char *const URIPrefixes[] =
{
"http://",
"ftp://",
for( n = 0; n < WXSIZEOF(URIPrefixes); ++n )
{
prefix_len = strlen(URIPrefixes[n]);
- if((len > prefix_len) && !strncasecmp(text, URIPrefixes[n], prefix_len))
+ if((len > prefix_len) && !wxStrnicmp(text, URIPrefixes[n], prefix_len))
break;
}
//-----------------------------------------------------------------------------
extern "C" {
+
+// Normal version used for detecting IME input and generating appropriate
+// events for it.
+void
+wx_insert_text_callback(GtkTextBuffer* buffer,
+ GtkTextIter* WXUNUSED(end),
+ gchar *text,
+ gint WXUNUSED(len),
+ wxTextCtrl *win)
+{
+ if ( win->GTKOnInsertText(text) )
+ {
+ // If we already handled the new text insertion, don't do it again.
+ g_signal_stop_emission_by_name (buffer, "insert_text");
+ }
+}
+
+
+// And an "after" version used for detecting URLs in the text.
static void
-au_insert_text_callback(GtkTextBuffer *buffer,
+au_insert_text_callback(GtkTextBuffer * WXUNUSED(buffer),
GtkTextIter *end,
gchar *text,
gint len,
extern "C" {
static void
-au_delete_range_callback(GtkTextBuffer *buffer,
+au_delete_range_callback(GtkTextBuffer * WXUNUSED(buffer),
GtkTextIter *start,
GtkTextIter *end,
wxTextCtrl *win)
}
}
-
//-----------------------------------------------------------------------------
-// "changed"
+// "populate_popup" from text control and "unmap" from its poup menu
//-----------------------------------------------------------------------------
extern "C" {
static void
-gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
+gtk_textctrl_popup_unmap( GtkMenu *WXUNUSED(menu), wxTextCtrl* win )
{
- if ( win->IgnoreTextUpdate() )
- return;
-
- if (!win->m_hasVMT) return;
+ win->GTKEnableFocusOutEvent();
+}
+}
- if ( win->MarkDirtyOnChange() )
- win->MarkDirty();
+extern "C" {
+static void
+gtk_textctrl_populate_popup( GtkEntry *WXUNUSED(entry), GtkMenu *menu, wxTextCtrl *win )
+{
+ win->GTKDisableFocusOutEvent();
- win->SendTextUpdatedEvent();
+ g_signal_connect (menu, "unmap", G_CALLBACK (gtk_textctrl_popup_unmap), win );
}
}
//-----------------------------------------------------------------------------
-// clipboard events: "copy-clipboard", "cut-clipboard", "paste-clipboard"
+// "changed"
//-----------------------------------------------------------------------------
-// common part of the event handlers below
-static void
-handle_text_clipboard_callback( GtkWidget *widget, wxTextCtrl *win,
- wxEventType eventType, const gchar * signal_name)
-{
- wxClipboardTextEvent event( eventType, win->GetId() );
- event.SetEventObject( win );
- if ( win->GetEventHandler()->ProcessEvent( event ) )
- {
- // don't let the default processing to take place if we did something
- // ourselves in the event handler
- g_signal_stop_emission_by_name (widget, signal_name);
- }
-}
-
extern "C" {
static void
-gtk_copy_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
+gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
{
- handle_text_clipboard_callback(
- widget, win, wxEVT_COMMAND_TEXT_COPY, "copy-clipboard" );
-}
+ if ( win->IgnoreTextUpdate() )
+ return;
-static void
-gtk_cut_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
-{
- handle_text_clipboard_callback(
- widget, win, wxEVT_COMMAND_TEXT_CUT, "cut-clipboard" );
-}
+ if ( win->MarkDirtyOnChange() )
+ win->MarkDirty();
-static void
-gtk_paste_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
-{
- handle_text_clipboard_callback(
- widget, win, wxEVT_COMMAND_TEXT_PASTE, "paste-clipboard" );
+ win->SendTextUpdatedEvent();
}
}
//-----------------------------------------------------------------------------
-// "expose_event" from scrolled window and textview
+// "mark_set"
//-----------------------------------------------------------------------------
extern "C" {
-static gboolean
-gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl *win )
+static void mark_set(GtkTextBuffer*, GtkTextIter*, GtkTextMark* mark, GSList** markList)
{
- return TRUE;
+ if (gtk_text_mark_get_name(mark) == NULL)
+ *markList = g_slist_prepend(*markList, mark);
}
}
-
//-----------------------------------------------------------------------------
// wxTextCtrl
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
-
BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
EVT_CHAR(wxTextCtrl::OnChar)
SetUpdateFont(false);
m_text = NULL;
- m_freezeCount = 0;
+ m_buffer = NULL;
m_showPositionOnThaw = NULL;
- m_gdkHandCursor = NULL;
- m_gdkXTermCursor = NULL;
+ m_anonymousMarkList = NULL;
}
wxTextCtrl::~wxTextCtrl()
{
- if(m_gdkHandCursor)
- gdk_cursor_unref(m_gdkHandCursor);
- if(m_gdkXTermCursor)
- gdk_cursor_unref(m_gdkXTermCursor);
+ if (m_text)
+ GTKDisconnect(m_text);
+ if (m_buffer)
+ GTKDisconnect(m_buffer);
+
+ // this is also done by wxWindowGTK dtor, but has to be done here so our
+ // DoThaw() override is called
+ while (IsFrozen())
+ Thaw();
+
+ if (m_anonymousMarkList)
+ g_slist_free(m_anonymousMarkList);
}
wxTextCtrl::wxTextCtrl( wxWindow *parent,
if (multi_line)
{
+ m_buffer = gtk_text_buffer_new(NULL);
+ gulong sig_id = g_signal_connect(m_buffer, "mark_set", G_CALLBACK(mark_set), &m_anonymousMarkList);
// Create view
- m_text = gtk_text_view_new();
-
- m_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
+ m_text = gtk_text_view_new_with_buffer(m_buffer);
+ // gtk_text_view_set_buffer adds its own reference
+ g_object_unref(m_buffer);
+ g_signal_handler_disconnect(m_buffer, sig_id);
// create "ShowPosition" marker
GtkTextIter iter;
? GTK_POLICY_NEVER
: GTK_POLICY_AUTOMATIC );
// for ScrollLines/Pages
- m_scrollBar[1] = (GtkRange*)((GtkScrolledWindow*)m_widget)->vscrollbar;
+ m_scrollBar[1] = GTK_RANGE(gtk_scrolled_window_get_vscrollbar(GTK_SCROLLED_WINDOW(m_widget)));
// Insert view into scrolled window
gtk_container_add( GTK_CONTAINER(m_widget), m_text );
GTKSetWrapMode();
- GtkScrolledWindowSetBorder(m_widget, style);
+ 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 );
+ gtk_widget_set_can_focus(m_widget, FALSE);
}
else
{
// a single-line text control: no need for scrollbars
m_widget =
m_text = gtk_entry_new();
+ // work around probable bug in GTK+ 2.18 when calling WriteText on a
+ // new, empty control, see http://trac.wxwidgets.org/ticket/11409
+ gtk_entry_get_text((GtkEntry*)m_text);
if (style & wxNO_BORDER)
g_object_set (m_text, "has-frame", FALSE, NULL);
+
}
+ g_object_ref(m_widget);
m_parent->DoAddChild( this );
G_CALLBACK (gtk_text_changed_callback), this);
}
+ // Catch to disable focus out handling
+ g_signal_connect (m_text, "populate_popup",
+ G_CALLBACK (gtk_textctrl_populate_popup),
+ this);
+
if (!value.empty())
{
SetValue( value );
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,
+ // don't have to check for the tag existence in callbacks,
// hereby it's guaranteed to exist.
gtk_text_buffer_create_tag(m_buffer, "wxUrl",
"foreground", "blue",
gtk_text_buffer_get_end_iter(m_buffer, &end);
au_check_range(&start, &end);
}
+
+ // Also connect a normal (not "after") signal handler for checking for
+ // the IME-generated input.
+ g_signal_connect(m_buffer, "insert_text",
+ G_CALLBACK(wx_insert_text_callback), this);
+ }
+ else // single line
+ {
+ // do the right thing with Enter presses depending on whether we have
+ // wxTE_PROCESS_ENTER or not
+ GTKSetActivatesDefault();
+
+ GTKConnectInsertTextSignal(GTK_ENTRY(m_text));
}
-
- g_signal_connect (m_text, "copy-clipboard",
- G_CALLBACK (gtk_copy_clipboard_callback), this);
- g_signal_connect (m_text, "cut-clipboard",
- G_CALLBACK (gtk_cut_clipboard_callback), this);
- g_signal_connect (m_text, "paste-clipboard",
- G_CALLBACK (gtk_paste_clipboard_callback), this);
+
+
+ GTKConnectClipboardSignals(m_text);
m_cursor = wxCursor( wxCURSOR_IBEAM );
return true;
}
+GtkEditable *wxTextCtrl::GetEditable() const
+{
+ wxCHECK_MSG( IsSingleLine(), NULL, "shouldn't be called for multiline" );
+
+ return GTK_EDITABLE(m_text);
+}
+
+GtkEntry *wxTextCtrl::GetEntry() const
+{
+ return GTK_ENTRY(m_text);
+}
+
+int wxTextCtrl::GTKIMFilterKeypress(GdkEventKey* event) const
+{
+#if GTK_CHECK_VERSION(2, 22, 0)
+ if ( gtk_check_version(2, 12, 0) == 0 )
+ {
+ if ( IsSingleLine() )
+ {
+ return wxTextEntry::GTKIMFilterKeypress(event);
+ }
+ else
+ {
+ return gtk_text_view_im_context_filter_keypress(
+ GTK_TEXT_VIEW(m_text),
+ event
+ );
+ }
+ }
+#else // GTK+ < 2.22
+ wxUnusedVar(event);
+#endif // GTK+ 2.22+
+
+ return FALSE;
+}
+
// ----------------------------------------------------------------------------
// flags handling
// ----------------------------------------------------------------------------
void wxTextCtrl::GTKSetVisibility()
{
- // VZ: shouldn't we assert if wxTE_PASSWORD is set for multiline control?
- if ( IsSingleLine() )
- gtk_entry_set_visibility(GTK_ENTRY(m_text), !HasFlag(wxTE_PASSWORD));
+ wxCHECK_RET( IsSingleLine(),
+ "wxTE_PASSWORD is for single line text controls only" );
+
+ gtk_entry_set_visibility(GTK_ENTRY(m_text), !HasFlag(wxTE_PASSWORD));
+}
+
+void wxTextCtrl::GTKSetActivatesDefault()
+{
+ wxCHECK_RET( IsSingleLine(),
+ "wxTE_PROCESS_ENTER is for single line text controls only" );
+
+ gtk_entry_set_activates_default(GTK_ENTRY(m_text),
+ !HasFlag(wxTE_PROCESS_ENTER));
}
void wxTextCtrl::GTKSetWrapMode()
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 // __WXGTK24__
- wrap = GTK_WRAP_WORD;
- }
+ wrap = GTK_WRAP_WORD_CHAR;
gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );
}
}
else // single line
{
-#ifdef __WXGTK24__
- // gtk_entry_set_alignment was introduced in gtk+-2.3.5
- if (!gtk_check_version(2,4,0))
- {
- gfloat align;
- if ( HasFlag(wxTE_RIGHT) )
- align = 1.0;
- else if ( HasFlag(wxTE_CENTRE) )
- align = 0.5;
- else // single line
- align = 0.0;
-
- gtk_entry_set_alignment(GTK_ENTRY(m_text), align);
- }
-#endif // __WXGTK24__
- }
+ gfloat align;
+ if ( HasFlag(wxTE_RIGHT) )
+ align = 1.0;
+ else if ( HasFlag(wxTE_CENTRE) )
+ align = 0.5;
+ else // single line
+ align = 0.0;
+ gtk_entry_set_alignment(GTK_ENTRY(m_text), align);
+ }
}
void wxTextCtrl::SetWindowStyleFlag(long style)
if ( (style & wxTE_PASSWORD) != (styleOld & wxTE_PASSWORD) )
GTKSetVisibility();
+ if ( (style & wxTE_PROCESS_ENTER) != (styleOld & wxTE_PROCESS_ENTER) )
+ GTKSetActivatesDefault();
+
static const long flagsWrap = wxTE_WORDWRAP | wxTE_CHARWRAP | wxTE_DONTWRAP;
if ( (style & flagsWrap) != (styleOld & flagsWrap) )
GTKSetWrapMode();
{
wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") );
- wxString tmp;
if ( IsMultiLine() )
{
GtkTextIter start;
return wxGTK_CONV_BACK(text);
}
- else
+ else // single line
{
- const gchar *text = gtk_entry_get_text( GTK_ENTRY(m_text) );
- return wxGTK_CONV_BACK(text);
+ return wxTextEntry::GetValue();
}
-
- return tmp;
}
wxFontEncoding wxTextCtrl::GetTextEncoding() const
// first check the default text style (we intentionally don't check the
// style for the current position as it doesn't make sense for SetValue())
const wxTextAttr& style = GetDefaultStyle();
- wxFontEncoding enc = style.HasFont() ? style.GetFont().GetEncoding()
+ wxFontEncoding enc = style.HasFontEncoding() ? style.GetFontEncoding()
: wxFONTENCODING_SYSTEM;
// fall back to the controls font if no style
if ( IsMultiLine() )
return gtk_text_buffer_get_char_count(m_buffer) == 0;
- return wxTextCtrlBase::IsEmpty();
+ return wxTextEntry::IsEmpty();
}
void wxTextCtrl::DoSetValue( const wxString &value, int flags )
m_modified = false;
+ if ( !IsMultiLine() )
+ {
+ wxTextEntry::DoSetValue(value, flags);
+ return;
+ }
+
+ if (value.IsEmpty())
+ {
+ if ( !(flags & SetValue_SendEvent) )
+ EnableTextChangedEvents(false);
+
+ gtk_text_buffer_set_text( m_buffer, "", 0 );
+
+ if ( !(flags & SetValue_SendEvent) )
+ EnableTextChangedEvents(true);
+
+ return;
+ }
+
+#if wxUSE_UNICODE
+ const wxCharBuffer buffer(value.utf8_str());
+#else
wxFontEncoding enc = m_defaultStyle.HasFont()
? m_defaultStyle.GetFont().GetEncoding()
: wxFONTENCODING_SYSTEM;
wxLogWarning(_("Failed to set text in the text control."));
return;
}
+#endif
- void* blockWidget = IsMultiLine() ? (void*)m_buffer : (void*)m_text;
- g_signal_handlers_block_by_func(blockWidget,
- (gpointer)gtk_text_changed_callback, this);
- if ( IsMultiLine() )
+ if ( !(flags & SetValue_SendEvent) )
{
- gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
-
- if ( !m_defaultStyle.IsDefault() )
- {
- GtkTextIter start, end;
- gtk_text_buffer_get_bounds( m_buffer, &start, &end );
- wxGtkTextApplyTagsFromAttr(m_widget, m_buffer, m_defaultStyle,
- &start, &end);
- }
+ EnableTextChangedEvents(false);
}
- else
+
+ gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
+
+ if ( !m_defaultStyle.IsDefault() )
{
- gtk_entry_set_text( GTK_ENTRY(m_text), buffer );
+ GtkTextIter start, end;
+ gtk_text_buffer_get_bounds( m_buffer, &start, &end );
+ wxGtkTextApplyTagsFromAttr(m_widget, m_buffer, m_defaultStyle,
+ &start, &end);
+ }
+
+ if ( !(flags & SetValue_SendEvent) )
+ {
+ EnableTextChangedEvents(true);
}
- g_signal_handlers_unblock_by_func(blockWidget,
- (gpointer)gtk_text_changed_callback, this);
-
- // This was added after discussion on the list
- SetInsertionPoint(0);
}
void wxTextCtrl::WriteText( const wxString &text )
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
- if ( text.empty() )
+ // we're changing the text programmatically
+ DontMarkDirtyOnNextChange();
+
+ if ( !IsMultiLine() )
+ {
+ wxTextEntry::WriteText(text);
return;
+ }
+#if wxUSE_UNICODE
+ const wxCharBuffer buffer(text.utf8_str());
+#else
// check if we have a specific style for the current position
wxFontEncoding enc = wxFONTENCODING_SYSTEM;
wxTextAttr style;
- if ( GetStyle(GetInsertionPoint(), style) && style.HasFont() )
+ if ( GetStyle(GetInsertionPoint(), style) && style.HasFontEncoding() )
{
- enc = style.GetFont().GetEncoding();
+ enc = style.GetFontEncoding();
}
if ( enc == wxFONTENCODING_SYSTEM )
wxLogWarning(_("Failed to insert text in the control."));
return;
}
+#endif
- // we're changing the text programmatically
- DontMarkDirtyOnNextChange();
-
- if ( IsMultiLine() )
- {
- // 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);
-
- // 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
- // won't work when frozen, text view is not using m_buffer then
- if (!IsFrozen() && wxIsSameDouble(adj->value, adj->upper - adj->page_size))
+ // 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);
+
+ // Insert the text
+ wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer );
+
+ // Scroll to cursor, but only if scrollbar thumb is at the very bottom
+ // won't work when frozen, text view is not using m_buffer then
+ if (!IsFrozen())
+ {
+ GtkAdjustment* adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(m_widget));
+ const double value = gtk_adjustment_get_value(adj);
+ const double upper = gtk_adjustment_get_upper(adj);
+ const double page_size = gtk_adjustment_get_page_size(adj);
+ if (wxIsSameDouble(value, upper - 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 );
+ gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(m_text),
+ gtk_text_buffer_get_insert(m_buffer), 0, false, 0, 1);
}
}
- else // single line
- {
- // First remove the selection if there is one
- gtk_editable_delete_selection( GTK_EDITABLE(m_text) );
-
- // This moves the cursor pos to behind the inserted text.
- gint len = gtk_editable_get_position(GTK_EDITABLE(m_text));
-
- gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len );
-
- // Bring entry's cursor uptodate.
- gtk_editable_set_position( GTK_EDITABLE(m_text), len );
- }
-}
-
-void wxTextCtrl::AppendText( const wxString &text )
-{
- SetInsertionPointEnd();
- WriteText( text );
}
wxString wxTextCtrl::GetLineText( long lineNo ) const
}
else // single line control
{
- if ( pos <= GTK_ENTRY(m_text)->text_length )
+ if (pos <= gtk_entry_get_text_length(GTK_ENTRY(m_text)))
{
if ( y )
*y = 0;
}
}
+wxPoint wxTextCtrl::DoPositionToCoords(long pos) const
+{
+ if ( !IsMultiLine() )
+ {
+ // Single line text entry (GtkTextEntry) doesn't have support for
+ // getting the coordinates for the given offset. Perhaps we could
+ // find them ourselves by using GetTextExtent() but for now just leave
+ // it unimplemented, this function is more useful for multiline
+ // controls anyhow.
+ return wxDefaultPosition;
+ }
+
+ // Window coordinates for the given position is calculated by getting
+ // the buffer coordinates and converting them to window coordinates.
+ GtkTextView *textview = GTK_TEXT_VIEW(m_text);
+
+ GtkTextIter iter;
+ gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos);
+
+ GdkRectangle bufferCoords;
+ gtk_text_view_get_iter_location(textview, &iter, &bufferCoords);
+
+ gint winCoordX = 0,
+ winCoordY = 0;
+ gtk_text_view_buffer_to_window_coords(textview, GTK_TEXT_WINDOW_WIDGET,
+ bufferCoords.x, bufferCoords.y,
+ &winCoordX, &winCoordY);
+
+ return wxPoint(winCoordX, winCoordY);
+}
+
int wxTextCtrl::GetNumberOfLines() const
{
if ( IsMultiLine() )
else
gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(m_text), mark);
}
- else
+ else // single line
{
- // FIXME: Is the editable's cursor really uptodate without double set_position in GTK2?
- gtk_editable_set_position(GTK_EDITABLE(m_text), int(pos));
+ wxTextEntry::SetInsertionPoint(pos);
}
}
-void wxTextCtrl::SetInsertionPointEnd()
-{
- SetInsertionPoint(-1);
-}
-
void wxTextCtrl::SetEditable( bool editable )
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
{
gtk_text_view_set_editable( GTK_TEXT_VIEW(m_text), editable );
}
- else
+ else // single line
{
- gtk_editable_set_editable( GTK_EDITABLE(m_text), editable );
+ wxTextEntry::SetEditable(editable);
}
}
}
gtk_widget_set_sensitive( m_text, enable );
+ SetCursor(enable ? wxCursor(wxCURSOR_IBEAM) : wxCursor());
return true;
}
-// wxGTK-specific: called recursively by Enable,
-// to give widgets an opportunity to correct their colours after they
-// have been changed by Enable
-void wxTextCtrl::OnEnabled( bool enable )
-{
- // If we have a custom background colour, we use this colour in both
- // disabled and enabled mode, or we end up with a different colour under the
- // text.
- wxColour oldColour = GetBackgroundColour();
- if (oldColour.Ok())
- {
- // Need to set twice or it'll optimize the useful stuff out
- if (oldColour == * wxWHITE)
- SetBackgroundColour(*wxBLACK);
- else
- SetBackgroundColour(*wxWHITE);
- SetBackgroundColour(oldColour);
- }
-}
-
void wxTextCtrl::MarkDirty()
{
m_modified = true;
}
// ----------------------------------------------------------------------------
-// max text length support
+// event handling
// ----------------------------------------------------------------------------
+void wxTextCtrl::EnableTextChangedEvents(bool enable)
+{
+ if ( enable )
+ {
+ g_signal_handlers_unblock_by_func(GetTextObject(),
+ (gpointer)gtk_text_changed_callback, this);
+ }
+ else // disable events
+ {
+ g_signal_handlers_block_by_func(GetTextObject(),
+ (gpointer)gtk_text_changed_callback, this);
+ }
+}
+
bool wxTextCtrl::IgnoreTextUpdate()
{
if ( m_countUpdatesToIgnore > 0 )
return true;
}
-void wxTextCtrl::SetMaxLength(unsigned long len)
-{
- if ( !HasFlag(wxTE_MULTILINE) )
- {
- gtk_entry_set_max_length(GTK_ENTRY(m_text), len);
-
- // there is a bug in GTK+ 1.2.x: "changed" signal is emitted even if
- // we had tried to enter more text than allowed by max text length and
- // the text wasn't really changed
- //
- // to detect this and generate TEXT_MAXLEN event instead of
- // TEXT_CHANGED one in this case we also catch "insert_text" signal
- //
- // when max len is set to 0 we disconnect our handler as it means that
- // we shouldn't check anything any more
- if ( len )
- {
- g_signal_connect (m_text, "insert_text",
- G_CALLBACK (gtk_insert_text_callback), this);
- }
- else // no checking
- {
- g_signal_handlers_disconnect_by_func (m_text,
- (gpointer) gtk_insert_text_callback, this);
- }
- }
-}
-
void wxTextCtrl::SetSelection( long from, long to )
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
- if (from == -1 && to == -1)
- {
- from = 0;
- to = GetValue().length();
- }
-
if ( IsMultiLine() )
{
+ if (from == -1 && to == -1)
+ {
+ from = 0;
+ to = GetValue().length();
+ }
+
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 );
+ gtk_text_buffer_select_range( m_buffer, &fromi, &toi );
}
- else
+ else // single line
{
- gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+ wxTextEntry::SetSelection(from, to);
}
}
}
else
{
- return (long) gtk_editable_get_position(GTK_EDITABLE(m_text));
+ return wxTextEntry::GetInsertionPoint();
}
}
pos = gtk_text_iter_get_offset( &end );
}
- else
+ else // single line
{
- pos = GTK_ENTRY(m_text)->text_length;
+ pos = wxTextEntry::GetLastPosition();
}
return (long)pos;
gtk_text_buffer_delete( m_buffer, &fromi, &toi );
}
else // single line
- gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
-}
-
-void wxTextCtrl::Replace( long from, long to, const wxString &value )
-{
- wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
-
- Remove( from, to );
-
- if (!value.empty())
{
- SetInsertionPoint( from );
- WriteText( value );
+ wxTextEntry::Remove(from, to);
}
}
if ( IsMultiLine() )
g_signal_emit_by_name (m_text, "cut-clipboard");
else
- gtk_editable_cut_clipboard(GTK_EDITABLE(m_text));
+ wxTextEntry::Cut();
}
void wxTextCtrl::Copy()
if ( IsMultiLine() )
g_signal_emit_by_name (m_text, "copy-clipboard");
else
- gtk_editable_copy_clipboard(GTK_EDITABLE(m_text));
+ wxTextEntry::Copy();
}
void wxTextCtrl::Paste()
if ( IsMultiLine() )
g_signal_emit_by_name (m_text, "paste-clipboard");
else
- gtk_editable_paste_clipboard(GTK_EDITABLE(m_text));
-}
-
-// Undo/redo
-void wxTextCtrl::Undo()
-{
- // TODO
- wxFAIL_MSG( wxT("wxTextCtrl::Undo not implemented") );
-}
-
-void wxTextCtrl::Redo()
-{
- // TODO
- wxFAIL_MSG( wxT("wxTextCtrl::Redo not implemented") );
-}
-
-bool wxTextCtrl::CanUndo() const
-{
- // TODO
- //wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );
- return false;
-}
-
-bool wxTextCtrl::CanRedo() const
-{
- // TODO
- //wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );
- return false;
+ wxTextEntry::Paste();
}
// If the return values from and to are the same, there is no
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
- gint from = -1;
- gint to = -1;
- bool haveSelection = false;
-
- if ( IsMultiLine() )
- {
- 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;
- }
- }
-
- if (! haveSelection )
- from = to = GetInsertionPoint();
-
- if ( from > to )
- {
- // exchange them to be compatible with wxMSW
- gint tmp = from;
- from = to;
- to = tmp;
- }
+ if ( !IsMultiLine() )
+ {
+ wxTextEntry::GetSelection(fromOut, toOut);
+ return;
+ }
+
+ gint from, to;
+
+ GtkTextIter ifrom, ito;
+ if ( gtk_text_buffer_get_selection_bounds(m_buffer, &ifrom, &ito) )
+ {
+ from = gtk_text_iter_get_offset(&ifrom);
+ to = gtk_text_iter_get_offset(&ito);
+
+ if ( from > to )
+ {
+ // exchange them to be compatible with wxMSW
+ gint tmp = from;
+ from = to;
+ to = tmp;
+ }
+ }
+ else // no selection
+ {
+ from =
+ to = GetInsertionPoint();
+ }
if ( fromOut )
*fromOut = from;
if ( IsMultiLine() )
{
- return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text));
+ return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text)) != 0;
}
else
{
- return gtk_editable_get_editable(GTK_EDITABLE(m_text));
+ return wxTextEntry::IsEditable();
}
}
return m_modified;
}
-void wxTextCtrl::Clear()
-{
- SetValue( wxEmptyString );
-}
-
void wxTextCtrl::OnChar( wxKeyEvent &key_event )
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
{
if ( HasFlag(wxTE_PROCESS_ENTER) )
{
- wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+ wxCommandEvent event(wxEVT_TEXT_ENTER, m_windowId);
event.SetEventObject(this);
event.SetString(GetValue());
- if ( GetEventHandler()->ProcessEvent(event) )
+ if ( HandleWindowEvent(event) )
return;
}
-
- // FIXME: this is not the right place to do it, wxDialog::OnCharHook()
- // probably is
- if ( IsSingleLine() )
- {
- // This will invoke the dialog default action, such
- // as the clicking the default button.
-
- wxWindow *top_frame = m_parent;
- while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
- top_frame = top_frame->GetParent();
-
- if (top_frame && GTK_IS_WINDOW(top_frame->m_widget))
- {
- GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
-
- if (window->default_widget)
- {
- gtk_widget_activate (window->default_widget);
- return;
- }
- }
- }
}
key_event.Skip();
}
else
{
- return GTK_ENTRY(m_text)->text_area;
+#ifdef __WXGTK3__
+ // no access to internal GdkWindows
+ return NULL;
+#else
+ return gtk_entry_get_text_window(GTK_ENTRY(m_text));
+#endif
}
}
//
// TODO: it can be implemented much more efficiently for GTK2
wxASSERT_MSG( IsMultiLine(),
- _T("shouldn't be called for single line controls") );
+ wxT("shouldn't be called for single line controls") );
wxString value = GetValue();
if ( !value.empty() )
if ( !wxControl::SetBackgroundColour( colour ) )
return false;
- if (!m_backgroundColour.Ok())
+ if (!m_backgroundColour.IsOk())
return false;
// change active background color too
gint l = gtk_text_buffer_get_char_count( m_buffer );
wxCHECK_MSG( start >= 0 && end <= l, false,
- _T("invalid range in wxTextCtrl::SetStyle") );
+ wxT("invalid range in wxTextCtrl::SetStyle") );
GtkTextIter starti, endi;
gtk_text_buffer_get_iter_at_offset( m_buffer, &starti, start );
return false;
}
+bool wxTextCtrl::GetStyle(long position, wxTextAttr& style)
+{
+ if ( !IsMultiLine() )
+ {
+ // no styles for GtkEntry
+ return false;
+ }
+
+ gint l = gtk_text_buffer_get_char_count( m_buffer );
+
+ wxCHECK_MSG( position >= 0 && position <= l, false,
+ wxT("invalid range in wxTextCtrl::GetStyle") );
+
+ GtkTextIter positioni;
+ gtk_text_buffer_get_iter_at_offset(m_buffer, &positioni, position);
+
+ // Obtain a copy of the default attributes
+ GtkTextAttributes * const
+ pattr = gtk_text_view_get_default_attributes(GTK_TEXT_VIEW(m_text));
+ wxON_BLOCK_EXIT1(gtk_text_attributes_unref, pattr);
+
+ // And query GTK for the attributes at the given position using it as base
+ if ( !gtk_text_iter_get_attributes(&positioni, pattr) )
+ {
+ style = m_defaultStyle;
+ }
+ else // have custom attributes
+ {
+ style.SetBackgroundColour(pattr->appearance.bg_color);
+ style.SetTextColour(pattr->appearance.fg_color);
+
+ const wxGtkString
+ pangoFontString(pango_font_description_to_string(pattr->font));
+
+ wxFont font;
+ if ( font.SetNativeFontInfo(wxString(pangoFontString)) )
+ style.SetFont(font);
+
+ // TODO: set alignment, tabs and indents
+ }
+
+ return true;
+}
+
void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style)
{
- gtk_widget_modify_style(m_text, style);
+ GTKApplyStyle(m_text, style);
}
void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))
wxSize wxTextCtrl::DoGetBestSize() const
{
- // FIXME should be different for multi-line controls...
- wxSize ret( wxControl::DoGetBestSize() );
- wxSize best(80, ret.y);
- CacheBestSize(best);
- return best;
+ return DoGetSizeFromTextSize(80);
+}
+
+wxSize wxTextCtrl::DoGetSizeFromTextSize(int xlen, int ylen) const
+{
+ wxASSERT_MSG( m_widget, wxS("GetSizeFromTextSize called before creation") );
+
+ wxSize tsize(xlen, 0);
+ int cHeight = GetCharHeight();
+
+ if ( IsSingleLine() )
+ {
+ if ( HasFlag(wxBORDER_NONE) )
+ {
+ tsize.y = cHeight;
+#ifdef __WXGTK3__
+ tsize.IncBy(9, 0);
+#else
+ tsize.IncBy(4, 0);
+#endif // GTK3
+ }
+ else
+ {
+ // default height
+ tsize.y = GTKGetPreferredSize(m_widget).y;
+ // Add the margins we have previously set, but only the horizontal border
+ // as vertical one has been taken account at GTKGetPreferredSize().
+ // Also get other GTK+ margins.
+ tsize.IncBy( GTKGetEntryMargins(GetEntry()).x, 0);
+ }
+ }
+
+ //multiline
+ else
+ {
+ // add space for vertical scrollbar
+ if ( m_scrollBar[1] && !(m_windowStyle & wxTE_NO_VSCROLL) )
+ tsize.IncBy(GTKGetPreferredSize(GTK_WIDGET(m_scrollBar[1])).x + 3, 0);
+
+ // height
+ tsize.y = cHeight;
+ if ( ylen <= 0 )
+ {
+ tsize.y = 1 + cHeight * wxMax(wxMin(GetNumberOfLines(), 10), 2);
+ // add space for horizontal scrollbar
+ if ( m_scrollBar[0] && (m_windowStyle & wxHSCROLL) )
+ tsize.IncBy(0, GTKGetPreferredSize(GTK_WIDGET(m_scrollBar[0])).y + 3);
+ }
+
+ if ( !HasFlag(wxBORDER_NONE) )
+ {
+ // hardcode borders, margins, etc
+ tsize.IncBy(5, 4);
+ }
+ }
+
+ // Perhaps the user wants something different from CharHeight, or ylen
+ // is used as the height of a multiline text.
+ if ( ylen > 0 )
+ tsize.IncBy(0, ylen - cHeight);
+
+ return tsize;
}
+
// ----------------------------------------------------------------------------
// freeze/thaw
// ----------------------------------------------------------------------------
-void wxTextCtrl::Freeze()
+void wxTextCtrl::DoFreeze()
{
wxCHECK_RET(m_text != NULL, wxT("invalid text ctrl"));
+ GTKFreezeWidget(m_text);
+
if ( HasFlag(wxTE_MULTILINE) )
{
- if (m_freezeCount++ == 0)
+ // removing buffer dramatically speeds up insertion:
+ g_object_ref(m_buffer);
+ GtkTextBuffer* buf_new = gtk_text_buffer_new(NULL);
+ gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), buf_new);
+ // gtk_text_view_set_buffer adds its own reference
+ g_object_unref(buf_new);
+ // These marks should be deleted when the buffer is changed,
+ // but they are not (in GTK+ up to at least 3.0.1).
+ // Otherwise these anonymous marks start to build up in the buffer,
+ // and Freeze takes longer and longer each time it is called.
+ if (m_anonymousMarkList)
{
- // freeze textview updates and remove buffer
- 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);
- GtkTextBuffer* buf_new = gtk_text_buffer_new(NULL);
- GtkTextMark* mark = GTK_TEXT_VIEW(m_text)->first_para_mark;
- gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), buf_new);
- // gtk_text_view_set_buffer adds its own reference
- g_object_unref(buf_new);
- // This mark should be deleted when the buffer is changed,
- // but it's not (in GTK+ up to at least 2.10.6).
- // Otherwise these anonymous marks start to build up in the buffer,
- // and Freeze takes longer and longer each time it is called.
- if (GTK_IS_TEXT_MARK(mark) && !gtk_text_mark_get_deleted(mark))
- gtk_text_buffer_delete_mark(m_buffer, mark);
+ for (GSList* item = m_anonymousMarkList; item; item = item->next)
+ {
+ GtkTextMark* mark = static_cast<GtkTextMark*>(item->data);
+ if (GTK_IS_TEXT_MARK(mark) && !gtk_text_mark_get_deleted(mark))
+ gtk_text_buffer_delete_mark(m_buffer, mark);
+ }
+ g_slist_free(m_anonymousMarkList);
+ m_anonymousMarkList = NULL;
}
}
}
-void wxTextCtrl::Thaw()
+void wxTextCtrl::DoThaw()
{
if ( HasFlag(wxTE_MULTILINE) )
{
- wxCHECK_RET(m_freezeCount != 0, _T("Thaw() without matching Freeze()"));
+ // reattach buffer:
+ gulong sig_id = g_signal_connect(m_buffer, "mark_set", G_CALLBACK(mark_set), &m_anonymousMarkList);
+ gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), m_buffer);
+ g_object_unref(m_buffer);
+ g_signal_handler_disconnect(m_buffer, sig_id);
- if (--m_freezeCount == 0)
+ if (m_showPositionOnThaw != NULL)
{
- // 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);
- if (m_showPositionOnThaw != NULL)
- {
- gtk_text_view_scroll_mark_onscreen(
- GTK_TEXT_VIEW(m_text), m_showPositionOnThaw);
- m_showPositionOnThaw = NULL;
- }
+ gtk_text_view_scroll_mark_onscreen(
+ GTK_TEXT_VIEW(m_text), m_showPositionOnThaw);
+ m_showPositionOnThaw = NULL;
}
}
+
+ GTKThawWidget(m_text);
}
// ----------------------------------------------------------------------------
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);
+ SetCursor(wxCursor(wxCURSOR_IBEAM));
return;
}
- gdk_window_set_cursor(gtk_text_view_get_window(GTK_TEXT_VIEW(m_text),
- GTK_TEXT_WINDOW_TEXT), m_gdkHandCursor);
+ SetCursor(wxCursor(wxCURSOR_HAND));
start = end;
if(!gtk_text_iter_begins_tag(&start, 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
+ // Consider making this dependent on ProcessEvent(wxTextUrlEvent) return value
if(event.GetEventType() == wxEVT_RIGHT_DOWN)
event.Skip(false);
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);
+ //event.Skip(!HandleWindowEvent(url_event));
+ HandleWindowEvent(url_event);
}
bool wxTextCtrl::GTKProcessEvent(wxEvent& event) const
wxVisualAttributes
wxTextCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
{
- return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true);
+ return GetDefaultAttributesFromGTKWidget(gtk_entry_new(), true);
}
#endif // wxUSE_TEXTCTRL
projects / wxWidgets.git / blobdiff