// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#if wxUSE_TEXTCTRL
+
#include "wx/textctrl.h"
#ifndef WX_PRECOMP
}
}
+// remove all tags starting with the given prefix from the start..end range
+static void
+wxGtkTextRemoveTagsWithPrefix(GtkTextBuffer *text_buffer,
+ const char *prefix,
+ GtkTextIter *start,
+ GtkTextIter *end)
+{
+ gulong remove_handler_id = g_signal_connect
+ (
+ text_buffer,
+ "remove_tag",
+ G_CALLBACK(wxGtkOnRemoveTag),
+ gpointer(prefix)
+ );
+ gtk_text_buffer_remove_all_tags(text_buffer, start, end);
+ g_signal_handler_disconnect(text_buffer, remove_handler_id);
+}
+
static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
GtkTextBuffer *text_buffer,
const wxTextAttr& attr,
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())
{
+ wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXFONT", start, end);
+
PangoFontDescription *font_description = attr.GetFont().GetNativeFontInfo()->description;
wxGtkString font_string(pango_font_description_to_string(font_description));
g_snprintf(buf, sizeof(buf), "WXFONT %s", font_string.c_str());
if (attr.HasTextColour())
{
+ wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXFORECOLOR", start, end);
+
const GdkColor *colFg = attr.GetTextColour().GetColor();
g_snprintf(buf, sizeof(buf), "WXFORECOLOR %d %d %d",
colFg->red, colFg->green, colFg->blue);
if (attr.HasBackgroundColour())
{
+ wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXBACKCOLOR", start, end);
+
const GdkColor *colBg = attr.GetBackgroundColour().GetColor();
g_snprintf(buf, sizeof(buf), "WXBACKCOLOR %d %d %d",
colBg->red, colBg->green, colBg->blue);
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);
+ wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXALIGNMENT", start, end);
GtkJustification align;
switch (attr.GetAlignment())
case wxTEXT_ALIGNMENT_CENTER:
align = GTK_JUSTIFY_CENTER;
break;
- // gtk+ doesn't support justify as of gtk+-2.7.4
+// 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;
+#endif
}
g_snprintf(buf, sizeof(buf), "WXALIGNMENT %d", align);
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("WXINDENT"));
- gtk_text_buffer_remove_all_tags( text_buffer, ¶_start, ¶_end );
- g_signal_handler_disconnect (text_buffer, remove_handler_id);
+ wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXINDENT", start, end);
// Convert indent from 1/10th of a mm into pixels
float factor;
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("WXTABS"));
- gtk_text_buffer_remove_all_tags( text_buffer, ¶_start, ¶_end );
- g_signal_handler_disconnect (text_buffer, remove_handler_id);
+ wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXTABS", start, end);
const wxArrayInt& tabs = attr.GetTabs();
gint *position,
wxTextCtrl *win)
{
- if (g_isIdle)
- wxapp_install_idle_handler();
-
// we should only be called if we have a max len limit at all
GtkEntry *entry = GTK_ENTRY (editable);
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 );
+ wxGtkString text(gtk_text_iter_get_text( &start, &end ));
size_t len = strlen(text), prefix_len;
size_t n;
if (!win->m_hasVMT) return;
- if (g_isIdle)
- wxapp_install_idle_handler();
-
if ( win->MarkDirtyOnChange() )
win->MarkDirty();
const wxValidator& validator,
const wxString &name )
{
- m_needParent = true;
- m_acceptsFocus = true;
-
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
// 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 );
+ GTK_POLICY_AUTOMATIC,
+ style & wxTE_NO_VSCROLL
+ ? GTK_POLICY_NEVER
+ : GTK_POLICY_AUTOMATIC );
// for ScrollLines/Pages
m_scrollBar[1] = (GtkRange*)((GtkScrolledWindow*)m_widget)->vscrollbar;
gtk_widget_show(m_text);
}
+ // We want to be notified about text changes.
+ if (multi_line)
+ {
+ g_signal_connect (m_buffer, "changed",
+ G_CALLBACK (gtk_text_changed_callback), this);
+ }
+ else
+ {
+ g_signal_connect (m_text, "changed",
+ G_CALLBACK (gtk_text_changed_callback), this);
+ }
+
if (!value.empty())
{
SetValue( value );
if ( style & (wxTE_RIGHT | wxTE_CENTRE) )
GTKSetJustification();
- // We want to be notified about text changes.
if (multi_line)
{
- 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
+ // Handle URLs on multi-line controls with wxTE_AUTO_URL style
if (style & wxTE_AUTO_URL)
{
GtkTextIter start, end;
au_check_range(&start, &end);
}
}
- else
- {
- g_signal_connect (m_text, "changed",
- G_CALLBACK (gtk_text_changed_callback), this);
- }
-
+
g_signal_connect (m_text, "copy-clipboard",
G_CALLBACK (gtk_copy_clipboard_callback), this);
g_signal_connect (m_text, "cut-clipboard",
m_cursor = wxCursor( wxCURSOR_IBEAM );
- wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont());
- SetDefaultStyle( attrDef );
-
return true;
}
gtk_text_buffer_get_end_iter( m_buffer, &end );
wxGtkString text(gtk_text_buffer_get_text(m_buffer, &start, &end, true));
- const wxWxCharBuffer buf = wxGTK_CONV_BACK(text);
- if ( buf )
- tmp = buf;
+ return wxGTK_CONV_BACK(text);
}
else
{
const gchar *text = gtk_entry_get_text( GTK_ENTRY(m_text) );
- const wxWxCharBuffer buf = wxGTK_CONV_BACK( text );
- if ( buf )
- tmp = buf;
+ return wxGTK_CONV_BACK(text);
}
return tmp;
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
- // the control won't be modified any more as we programmatically replace
- // all the existing text, so reset the flag and don't set it again (and do
- // it now, before the text event handler is ran so that IsModified() called
- // from there returns the expected value)
m_modified = false;
- DontMarkDirtyOnNextChange();
- const wxCharBuffer buffer(wxGTK_CONV_ENC(value, GetTextEncoding()));
+ wxFontEncoding enc = m_defaultStyle.HasFont()
+ ? m_defaultStyle.GetFont().GetEncoding()
+ : wxFONTENCODING_SYSTEM;
+ if ( enc == wxFONTENCODING_SYSTEM )
+ enc = GetTextEncoding();
+
+ const wxCharBuffer buffer(wxGTK_CONV_ENC(value, enc));
if ( !buffer )
{
// see comment in WriteText() as to why we must warn the user about
return;
}
- // if the control is not empty, two "changed" signals are emitted,
- // otherwise only one and we need to ignore either both or one of them
- int ignore = flags & SetValue_SendEvent ? 0 : 1;
- if ( !IsEmpty() )
- ignore++;
-
- if ( ignore )
- IgnoreNextTextUpdate(ignore);
-
+ void* blockWidget = IsMultiLine() ? (void*)m_buffer : (void*)m_text;
+ g_signal_handlers_block_by_func(blockWidget,
+ (gpointer)gtk_text_changed_callback, this);
if ( IsMultiLine() )
{
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);
+ }
}
- else // single line
+ else
{
gtk_entry_set_text( GTK_ENTRY(m_text), buffer );
}
-
- // if, for whatever reason, the callback wasn't called the expected number
- // of times, still reset the flags to the default values
- m_dontMarkDirty = false;
- m_countUpdatesToIgnore = 0;
-
-
- // GRG, Jun/2000: Changed this after a lot of discussion in
- // the lists. wxWidgets 2.2 will have a set of flags to
- // customize this behaviour.
+ g_signal_handlers_unblock_by_func(blockWidget,
+ (gpointer)gtk_text_changed_callback, this);
+
+ // This was added after discussion on the list
SetInsertionPoint(0);
}
{
GtkTextIter line;
gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo);
+
GtkTextIter end = line;
- gtk_text_iter_forward_to_line_end(&end);
+ // avoid skipping to the next line end if this one is empty
+ if ( !gtk_text_iter_ends_line(&line) )
+ gtk_text_iter_forward_to_line_end(&end);
+
wxGtkString text(gtk_text_buffer_get_text(m_buffer, &line, &end, true));
result = wxGTK_CONV_BACK(text);
}
return false;
}
- if ( IsMultiLine() )
- {
- SetEditable( enable );
- }
- else
- {
- gtk_widget_set_sensitive( m_text, enable );
- }
+ 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
+// to give widgets an opportunity to correct their colours after they
// have been changed by Enable
-void wxTextCtrl::OnParentEnable( bool 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
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_widget, m_buffer, attr, &starti, &endi );
+ wxGtkTextApplyTagsFromAttr( m_widget, m_buffer, style, &starti, &endi );
return true;
}
+ //else: single line text controls don't support styles
- // else single line
- // cannot do this for GTK+'s Entry widget
return false;
}
{
return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true);
}
+
+#endif // wxUSE_TEXTCTRL
projects / wxWidgets.git / blobdiff