// Purpose:
// Author: Robert Roebling
// Id: $Id$
-// Copyright: (c) 1998 Robert Roebling, Vadim Zeitlin
+// Copyright: (c) 1998 Robert Roebling, Vadim Zeitlin, 2005 Mart Raudsepp
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#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/math.h"
#include "wx/settings.h"
#include "wx/panel.h"
#include "wx/strconv.h"
+#include "wx/fontutil.h" // for wxNativeFontInfo (GetNativeFontInfo())
#include <sys/types.h>
#include <sys/stat.h>
#include <ctype.h>
-#include <math.h> // for fabs
+#include "wx/math.h"
#include "wx/gtk/private.h"
#include <gdk/gdkkeysyms.h>
// data
//-----------------------------------------------------------------------------
-extern bool g_blockEventsOnDrag;
extern wxCursor g_globalCursor;
extern wxWindowGTK *g_delayedFocus;
// helpers
// ----------------------------------------------------------------------------
+extern "C" {
+static void wxGtkOnRemoveTag(GtkTextBuffer *buffer,
+ GtkTextTag *tag,
+ GtkTextIter *start,
+ GtkTextIter *end,
+ char *prefix)
+{
+ gchar *name;
+ g_object_get (tag, "name", &name, NULL);
+
+ if (!name || strncmp(name, prefix, strlen(prefix)))
+ // anonymous tag or not starting with prefix - don't remove
+ g_signal_stop_emission_by_name (buffer, "remove_tag");
+
+ g_free(name);
+}
+}
+
+extern "C" {
+static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
+ const wxTextAttr& attr,
+ GtkTextIter *start,
+ GtkTextIter *end)
+{
+ static gchar buf[1024];
+ GtkTextTag *tag;
+
+ gulong remove_handler_id = g_signal_connect (text_buffer, "remove_tag",
+ G_CALLBACK (wxGtkOnRemoveTag), gpointer("WX"));
+ gtk_text_buffer_remove_all_tags(text_buffer, start, end);
+ g_signal_handler_disconnect (text_buffer, remove_handler_id);
+
+ if (attr.HasFont())
+ {
+ char *font_string;
+ 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);
+ }
+
+ 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);
+ }
+
+ 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);
+ }
+
+ if (attr.HasAlignment())
+ {
+ GtkTextIter para_start, para_end = *end;
+ gtk_text_buffer_get_iter_at_line( text_buffer,
+ ¶_start,
+ gtk_text_iter_get_line(start) );
+ gtk_text_iter_forward_line(¶_end);
+
+ remove_handler_id = g_signal_connect (text_buffer, "remove_tag",
+ G_CALLBACK(wxGtkOnRemoveTag),
+ gpointer("WXALIGNMENT"));
+ gtk_text_buffer_remove_all_tags( text_buffer, ¶_start, ¶_end );
+ g_signal_handler_disconnect (text_buffer, remove_handler_id);
+
+ GtkJustification align;
+ switch (attr.GetAlignment())
+ {
+ default:
+ align = GTK_JUSTIFY_LEFT;
+ break;
+ case wxTEXT_ALIGNMENT_RIGHT:
+ align = GTK_JUSTIFY_RIGHT;
+ break;
+ case wxTEXT_ALIGNMENT_CENTER:
+ align = GTK_JUSTIFY_CENTER;
+ break;
+ // gtk+ doesn't support justify as of gtk+-2.7.4
+ }
+
+ g_snprintf(buf, sizeof(buf), "WXALIGNMENT %d", align);
+ tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
+ buf );
+ if (!tag)
+ tag = gtk_text_buffer_create_tag( text_buffer, buf,
+ "justification", align, NULL );
+ gtk_text_buffer_apply_tag( text_buffer, tag, ¶_start, ¶_end );
+ }
+}
+}
+
+extern "C" {
static void wxGtkTextInsert(GtkWidget *text,
+ GtkTextBuffer *text_buffer,
const wxTextAttr& attr,
- const char *txt,
- size_t len)
+ const wxCharBuffer& buffer)
+
{
-#ifndef __WXGTK__
- GdkFont *font = attr.HasFont() ? attr.GetFont().GetInternalFont()
- : NULL;
+ gint start_offset;
+ GtkTextIter iter, start;
- GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor()
- : NULL;
+ 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) );
- GdkColor *colBg = attr.HasBackgroundColour()
- ? attr.GetBackgroundColour().GetColor()
- : NULL;
+ gtk_text_buffer_get_iter_at_offset (text_buffer, &start, start_offset);
- gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len );
-#endif
+ wxGtkTextApplyTagsFromAttr(text_buffer, attr, &start, &iter);
+}
}
// ----------------------------------------------------------------------------
// "insert_text" for GtkEntry
// ----------------------------------------------------------------------------
+extern "C" {
static void
gtk_insert_text_callback(GtkEditable *editable,
const gchar *new_text,
if ( entry->text_length == entry->text_max_length )
{
// we don't need to run the base class version at all
- gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text");
+ g_signal_stop_emission_by_name (editable, "insert_text");
// remember that the next changed signal is to be ignored to avoid
// generating a dummy wxEVT_COMMAND_TEXT_UPDATED event
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)
+{
+ if(tag == gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl"))
+ g_signal_stop_emission_by_name (buffer, "apply_tag");
+}
+}
//-----------------------------------------------------------------------------
-// "changed"
+// GtkTextCharPredicates for gtk_text_iter_*_find_char
//-----------------------------------------------------------------------------
-static void
-gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
+extern "C" {
+static gboolean
+pred_whitespace (gunichar ch, gpointer user_data)
{
- if ( win->IgnoreTextUpdate() )
- return;
+ return g_unichar_isspace(ch);
+}
+}
- if (!win->m_hasVMT) return;
+extern "C" {
+static gboolean
+pred_non_whitespace (gunichar ch, gpointer user_data)
+{
+ return !g_unichar_isspace(ch);
+}
+}
- if (g_isIdle)
- wxapp_install_idle_handler();
-
- win->SetModified();
- win->UpdateFontIfNeeded();
-
- wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
- event.SetEventObject( win );
- event.SetString( win->GetValue() );
- win->GetEventHandler()->ProcessEvent( event );
+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 == '/';
+}
}
//-----------------------------------------------------------------------------
-// "changed" from vertical scrollbar
+// Check for links between s and e and correct tags as necessary
//-----------------------------------------------------------------------------
-#ifndef __WXGTK20__
+// 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
-gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
+au_check_word( GtkTextIter *s, GtkTextIter *e )
{
- if (!win->m_hasVMT) return;
+ static const char *URIPrefixes[] =
+ {
+ "http://",
+ "ftp://",
+ "www.",
+ "ftp.",
+ "mailto://",
+ "https://",
+ "file://",
+ "nntp://",
+ "news://",
+ "telnet://",
+ "mms://",
+ "gopher://",
+ "prospero://",
+ "wais://",
+ };
- if (g_isIdle)
- wxapp_install_idle_handler();
+ 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;
+ }
- win->CalculateScrollbar();
+ 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);
+ }
+}
}
-#endif
-// ----------------------------------------------------------------------------
-// redraw callback for multiline text
-// ----------------------------------------------------------------------------
+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);
-#ifndef __WXGTK20__
+ // Now we should have a word delimited by range_start and word_end, correct link tags
+ au_check_word(&range_start, &word_end);
-// 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()
+ range_start = word_end;
+ gtk_text_iter_forward_find_char(&range_start, pred_non_whitespace, NULL, range_end);
+ }
+}
+}
-extern bool wxIsInsideYield;
+//-----------------------------------------------------------------------------
+// "insert-text" for GtkTextBuffer
+//-----------------------------------------------------------------------------
extern "C" {
- typedef void (*GtkDrawCallback)(GtkWidget *widget, GdkRectangle *rect);
+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);
+}
}
-static GtkDrawCallback gs_gtk_text_draw = NULL;
+//-----------------------------------------------------------------------------
+// "delete-range" for GtkTextBuffer
+//-----------------------------------------------------------------------------
-extern "C"
-void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)
+extern "C" {
+static void
+au_delete_range_callback(GtkTextBuffer *buffer,
+ GtkTextIter *start,
+ GtkTextIter *end,
+ wxTextCtrl *win)
{
- if ( !wxIsInsideYield )
- {
- wxCHECK_RET( gs_gtk_text_draw != wxgtk_text_draw,
- _T("infinite recursion in wxgtk_text_draw aborted") );
+ if( !(win->GetWindowStyleFlag() & wxTE_AUTO_URL) )
+ return;
- gs_gtk_text_draw(widget, rect);
- }
+ 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);
+}
+}
+
+
+//-----------------------------------------------------------------------------
+// "changed"
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void
+gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
+{
+ if ( win->IgnoreTextUpdate() )
+ return;
+
+ if (!win->m_hasVMT) return;
+
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+
+ win->SetModified();
+
+ wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
+ event.SetEventObject( win );
+ win->GetEventHandler()->ProcessEvent( event );
+}
+}
+
+//-----------------------------------------------------------------------------
+// "expose_event" from scrolled window and textview
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gboolean
+gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl *win )
+{
+ return TRUE;
+}
}
-#endif // __WXGTK20__
//-----------------------------------------------------------------------------
// wxTextCtrl
EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste)
EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo)
EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
+
+ // 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)
END_EVENT_TABLE()
void wxTextCtrl::Init()
{
m_ignoreNextUpdate =
- m_modified = FALSE;
- m_updateFont = FALSE;
+ m_modified = false;
+ SetUpdateFont(false);
m_text =
m_vScrollbar = (GtkWidget *)NULL;
+ m_frozenness = 0;
+ m_gdkHandCursor = NULL;
+ m_gdkXTermCursor = NULL;
+}
+
+wxTextCtrl::~wxTextCtrl()
+{
+ if(m_gdkHandCursor)
+ gdk_cursor_unref(m_gdkHandCursor);
+ if(m_gdkXTermCursor)
+ gdk_cursor_unref(m_gdkXTermCursor);
}
wxTextCtrl::wxTextCtrl( wxWindow *parent,
const wxValidator& validator,
const wxString &name )
{
- m_needParent = TRUE;
- m_acceptsFocus = TRUE;
+ m_needParent = true;
+ m_acceptsFocus = true;
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxTextCtrl creation failed") );
- return FALSE;
+ return false;
}
- m_vScrollbarVisible = FALSE;
+ m_vScrollbarVisible = false;
bool multi_line = (style & wxTE_MULTILINE) != 0;
-
-#ifdef __WXGTK20__
- GtkTextBuffer *buffer = NULL;
-#endif
if (multi_line)
{
-#ifdef __WXGTK20__
// Create view
m_text = gtk_text_view_new();
-
- buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-
+
+ 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 );
-
- // Global settings which can be overridden by tags, I guess.
- if (HasFlag( wxHSCROLL ))
- gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_NONE );
- else
- gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_WORD );
+
+ // translate wx wrapping style to GTK+
+ GtkWrapMode wrap;
+ if ( HasFlag( wxTE_DONTWRAP ) )
+ wrap = GTK_WRAP_NONE;
+ else if ( HasFlag( wxTE_CHARWRAP ) )
+ wrap = GTK_WRAP_CHAR;
+ else if ( HasFlag( wxTE_WORDWRAP ) )
+ wrap = GTK_WRAP_WORD;
+ else // HasFlag(wxTE_BESTWRAP) always true as wxTE_BESTWRAP == 0
+ {
+ // GTK_WRAP_WORD_CHAR seems to be new in GTK+ 2.4
+#ifdef __WXGTK24__
+ if ( !gtk_check_version(2,4,0) )
+ {
+ wrap = GTK_WRAP_WORD_CHAR;
+ }
+ else
+#endif
+ wrap = GTK_WRAP_WORD;
+ }
+
+ gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );
if (!HasFlag(wxNO_BORDER))
gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );
-#else
- // create our control ...
- m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
- // ... and put into the upper left hand corner of the table
- bool bHasHScrollbar = FALSE;
- m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
+ gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK );
+
GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
- gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1,
- (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
- (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
- 0, 0);
-
- // always wrap words
- gtk_text_set_word_wrap( GTK_TEXT(m_text), TRUE );
-
- // finally, put the vertical scrollbar in the upper right corner
- m_vScrollbar = gtk_vscrollbar_new( GTK_TEXT(m_text)->vadj );
- GTK_WIDGET_UNSET_FLAGS( m_vScrollbar, GTK_CAN_FOCUS );
- gtk_table_attach(GTK_TABLE(m_widget), m_vScrollbar, 1, 2, 0, 1,
- GTK_FILL,
- (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
- 0, 0);
-#endif
}
else
{
// a single-line text control: no need for scrollbars
m_widget =
m_text = gtk_entry_new();
+
+ if (style & wxNO_BORDER)
+ g_object_set( GTK_ENTRY(m_text), "has-frame", FALSE, NULL );
}
m_parent->DoAddChild( this );
m_focusWidget = m_text;
- PostCreation();
-
- SetFont( parent->GetFont() );
+ PostCreation(size);
- wxSize size_best( DoGetBestSize() );
- wxSize new_size( size );
- if (new_size.x == -1)
- new_size.x = size_best.x;
- if (new_size.y == -1)
- new_size.y = size_best.y;
- if ((new_size.x != size.x) || (new_size.y != size.y))
- SetSize( new_size.x, new_size.y );
-
- if (multi_line)
- gtk_widget_show(m_text);
-
-#ifndef __WXGTK20__
if (multi_line)
{
- gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed",
- (GtkSignalFunc) gtk_scrollbar_changed_callback, (gpointer) this );
-
- // only initialize gs_gtk_text_draw once, starting from the next the
- // klass::draw will already be wxgtk_text_draw
- if ( !gs_gtk_text_draw )
- {
- GtkDrawCallback&
- draw = GTK_WIDGET_CLASS(GTK_OBJECT(m_text)->klass)->draw;
-
- gs_gtk_text_draw = draw;
-
- draw = wxgtk_text_draw;
- }
+ gtk_widget_show(m_text);
+ SetVScrollAdjustment(gtk_scrolled_window_get_vadjustment((GtkScrolledWindow*)m_widget));
}
-#endif // GTK+ 1.x
- if (!value.IsEmpty())
+ if (!value.empty())
{
-#ifdef __WXGTK20__
SetValue( value );
-#else
-
-#if !GTK_CHECK_VERSION(1, 2, 0)
- // if we don't realize it, GTK 1.0.6 dies with a SIGSEGV in
- // gtk_editable_insert_text()
- gtk_widget_realize(m_text);
-#endif // GTK 1.0
-
- gint tmp = 0;
-#if wxUSE_UNICODE
- wxWX2MBbuf val = value.mbc_str();
- gtk_editable_insert_text( GTK_EDITABLE(m_text), val, strlen(val), &tmp );
-#else
- gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
-#endif
-
- if (multi_line)
- {
- // Bring editable's cursor uptodate. Bug in GTK.
- SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));
- }
-
-#endif
}
if (style & wxTE_PASSWORD)
if (style & wxTE_READONLY)
{
if (!multi_line)
- gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );
-#ifdef __WXGTK20__
+ gtk_editable_set_editable( GTK_EDITABLE(m_text), FALSE );
else
gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE);
}
-#else
+
+ 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
{
- if (multi_line)
- gtk_text_set_editable( GTK_TEXT(m_text), 1 );
- }
+#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
+ }
// We want to be notified about text changes.
-#ifdef __WXGTK20__
if (multi_line)
{
- g_signal_connect( G_OBJECT(buffer), "changed",
- GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+ g_signal_connect (m_buffer, "changed",
+ G_CALLBACK (gtk_text_changed_callback), this);
+
+ // .. and handle URLs on multi-line controls with wxTE_AUTO_URL style
+ if (style & wxTE_AUTO_URL)
+ {
+ 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 (m_buffer, "insert_text",
+ G_CALLBACK (au_insert_text_callback), this);
+ g_signal_connect_after (m_buffer, "delete_range",
+ G_CALLBACK (au_delete_range_callback), this);
+
+ // Block all wxUrl tag applying unless we do it ourselves, in which case we
+ // block this callback temporarily. This takes care of gtk+ internal
+ // 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 (m_buffer, "apply_tag",
+ G_CALLBACK (au_apply_tag_callback), NULL);
+
+ // Check for URLs in the initial string passed to Create
+ gtk_text_buffer_get_start_iter(m_buffer, &start);
+ 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);
+ g_signal_connect (m_text, "changed",
+ G_CALLBACK (gtk_text_changed_callback), this);
}
- // we don't set a valid background colour, because the window
- // manager should use a default one
- m_backgroundColour = wxColour();
-
- wxColour colFg = parent->GetForegroundColour();
- SetForegroundColour( colFg );
-
m_cursor = wxCursor( wxCURSOR_IBEAM );
-#ifndef __WXGTK20__
- wxTextAttr attrDef( colFg, m_backgroundColour, parent->GetFont() );
+ wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont());
SetDefaultStyle( attrDef );
-#endif
-
- Show( TRUE );
- return TRUE;
+ return true;
}
+
void wxTextCtrl::CalculateScrollbar()
{
-#ifndef __WXGTK20__
- if ((m_windowStyle & wxTE_MULTILINE) == 0) return;
-
- GtkAdjustment *adj = GTK_TEXT(m_text)->vadj;
-
- if (adj->upper - adj->page_size < 0.8)
- {
- if (m_vScrollbarVisible)
- {
- gtk_widget_hide( m_vScrollbar );
- m_vScrollbarVisible = FALSE;
- }
- }
- else
- {
- if (!m_vScrollbarVisible)
- {
- gtk_widget_show( m_vScrollbar );
- m_vScrollbarVisible = TRUE;
- }
- }
-#endif
}
wxString wxTextCtrl::GetValue() const
{
- wxCHECK_MSG( m_text != NULL, wxT(""), wxT("invalid text ctrl") );
+ wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") );
wxString tmp;
if (m_windowStyle & wxTE_MULTILINE)
{
-#ifdef __WXGTK20__
- GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-
GtkTextIter start;
- gtk_text_buffer_get_start_iter( text_buffer, &start );
+ gtk_text_buffer_get_start_iter( m_buffer, &start );
GtkTextIter end;
- gtk_text_buffer_get_end_iter( text_buffer, &end );
- gchar *text = gtk_text_buffer_get_text( text_buffer, &start, &end, TRUE );
-
+ 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
- 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;
+ if ( buffer )
+ tmp = buffer;
+
g_free( text );
-#endif
}
else
{
tmp = wxGTK_CONV_BACK( gtk_entry_get_text( GTK_ENTRY(m_text) ) );
}
-
+
return tmp;
}
if (m_windowStyle & wxTE_MULTILINE)
{
-#ifdef __WXGTK20__
-
#if wxUSE_UNICODE
wxCharBuffer buffer( wxConvUTF8.cWX2MB( value) );
#else
wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( value ) ) );
-#endif
- GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
- gtk_text_buffer_set_text( text_buffer, buffer, strlen(buffer) );
-
-#else
- gint len = gtk_text_get_length( GTK_TEXT(m_text) );
- gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len );
- len = 0;
- gtk_editable_insert_text( GTK_EDITABLE(m_text), value.mbc_str(), value.Length(), &len );
#endif
+ 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) );
}
else
{
}
// GRG, Jun/2000: Changed this after a lot of discussion in
- // the lists. wxWindows 2.2 will have a set of flags to
+ // the lists. wxWidgets 2.2 will have a set of flags to
// customize this behaviour.
SetInsertionPoint(0);
-
- m_modified = FALSE;
+
+ m_modified = false;
}
void wxTextCtrl::WriteText( const wxString &text )
if ( text.empty() )
return;
+ // gtk_text_changed_callback() will set m_modified to true but m_modified
+ // shouldn't be changed by the program writing to the text control itself,
+ // so save the old value and restore when we're done
+ bool oldModified = m_modified;
+
if ( m_windowStyle & wxTE_MULTILINE )
{
-#ifdef __WXGTK20__
-
#if wxUSE_UNICODE
wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );
#else
wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) );
-#endif
- GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
- gtk_text_buffer_insert_at_cursor( text_buffer, buffer, strlen(buffer) );
-
-#else
- // After cursor movements, gtk_text_get_point() is wrong by one.
- gtk_text_set_point( GTK_TEXT(m_text), GET_EDITABLE_POS(m_text) );
+#endif
+ if ( !buffer )
+ {
+ // what else can we do? at least don't crash...
+ return;
+ }
- // always use m_defaultStyle, even if it is empty as otherwise
- // resetting the style and appending some more text wouldn't work: if
- // we don't specify the style explicitly, the old style would be used
- wxGtkTextInsert(m_text, m_defaultStyle, text.c_str(), text.Len());
+ // TODO: Call whatever is needed to delete the selection.
+ wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer );
- // Bring editable's cursor back uptodate.
- SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));
-#endif
+ 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 ( wxIsSameDouble(adj->value, adj->upper - adj->page_size) )
+ {
+ gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text),
+ gtk_text_buffer_get_insert( m_buffer ), 0.0, FALSE, 0.0, 1.0 );
+ }
}
else // 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 = GET_EDITABLE_POS(m_text);
-
-#ifdef __WXGTK20__
+ gint len = gtk_editable_get_position(GTK_EDITABLE(m_text));
#if wxUSE_UNICODE
wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );
#else
wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) );
-#endif
- gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len );
-
-#else
- gtk_editable_insert_text( GTK_EDITABLE(m_text), text.c_str(), text.Len(), &len );
#endif
+ if ( !buffer )
+ {
+ // what else can we do? at least don't crash...
+ return;
+ }
- // Bring editable's cursor uptodate.
- len += text.Len();
+ gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len );
// Bring entry's cursor uptodate.
- gtk_entry_set_position( GTK_ENTRY(m_text), len );
+ gtk_editable_set_position( GTK_EDITABLE(m_text), len );
}
- m_modified = TRUE;
+ m_modified = oldModified;
}
void wxTextCtrl::AppendText( const wxString &text )
{
if (m_windowStyle & wxTE_MULTILINE)
{
-#ifndef __WXGTK20__
- gint len = gtk_text_get_length( GTK_TEXT(m_text) );
- char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
-
- if (text)
- {
- wxString buf(wxT(""));
- long i;
- int currentLine = 0;
- for (i = 0; currentLine != lineNo && text[i]; i++ )
- if (text[i] == '\n')
- currentLine++;
- // Now get the text
- int j;
- for (j = 0; text[i] && text[i] != '\n'; i++, j++ )
- buf += text[i];
-
- g_free( text );
- return buf;
- }
- else
-#endif
- {
- return wxEmptyString;
- }
+ 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;
}
else
{
{
if ( m_windowStyle & wxTE_MULTILINE )
{
- wxString text = GetValue();
-
- // cast to prevent warning. But pos really should've been unsigned.
- if( (unsigned long)pos > text.Len() )
- return FALSE;
-
- *x=0; // First Col
- *y=0; // First Line
+ GtkTextIter iter;
+ gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos);
+ if (gtk_text_iter_is_end(&iter))
+ return false;
- const wxChar* stop = text.c_str() + pos;
- for ( const wxChar *p = text.c_str(); p < stop; p++ )
- {
- if (*p == wxT('\n'))
- {
- (*y)++;
- *x=0;
- }
- else
- (*x)++;
- }
+ *y = gtk_text_iter_get_line(&iter);
+ *x = gtk_text_iter_get_line_offset(&iter);
}
else // single line control
{
else
{
// index out of bounds
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
}
long wxTextCtrl::XYToPosition(long x, long y ) const
{
if (!(m_windowStyle & wxTE_MULTILINE)) return 0;
- long pos=0;
- for( int i=0; i<y; i++ ) pos += GetLineLength(i) + 1; // one for '\n'
+ GtkTextIter iter;
+ if (y >= gtk_text_buffer_get_line_count (m_buffer))
+ return -1;
- pos += x;
- return pos;
-}
+ gtk_text_buffer_get_iter_at_line(m_buffer, &iter, y);
+ if (x >= gtk_text_iter_get_chars_in_line (&iter))
+ return -1;
-int wxTextCtrl::GetLineLength(long lineNo) const
-{
- wxString str = GetLineText (lineNo);
- return (int) str.Length();
+ return gtk_text_iter_get_offset(&iter) + x;
}
-int wxTextCtrl::GetNumberOfLines() const
+int wxTextCtrl::GetLineLength(long lineNo) const
{
if (m_windowStyle & wxTE_MULTILINE)
{
-#ifdef __WXGTK20__
- GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-
- return gtk_text_buffer_get_line_count( buffer );
-#else
- gint len = gtk_text_get_length( GTK_TEXT(m_text) );
- char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
+ int last_line = gtk_text_buffer_get_line_count( m_buffer ) - 1;
+ if (lineNo > last_line)
+ return -1;
- if (text)
- {
- int currentLine = 0;
- for (int i = 0; i < len; i++ )
- {
- if (text[i] == '\n')
- currentLine++;
- }
- g_free( text );
-
- // currentLine is 0 based, add 1 to get number of lines
- return currentLine + 1;
- }
- else
- {
- return 0;
- }
-#endif
+ GtkTextIter iter;
+ gtk_text_buffer_get_iter_at_line(m_buffer, &iter, lineNo);
+ // get_chars_in_line return includes paragraph delimiters, so need to subtract 1 IF it is not the last line
+ return gtk_text_iter_get_chars_in_line(&iter) - ((lineNo == last_line) ? 0 : 1);
}
else
{
- return 1;
+ wxString str = GetLineText (lineNo);
+ return (int) str.Length();
}
}
+int wxTextCtrl::GetNumberOfLines() const
+{
+ if (m_windowStyle & wxTE_MULTILINE)
+ return gtk_text_buffer_get_line_count( m_buffer );
+ else
+ return 1;
+}
+
void wxTextCtrl::SetInsertionPoint( long pos )
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
- if (m_windowStyle & wxTE_MULTILINE)
+ if ( IsMultiLine() )
{
-#ifdef __WXGTK20__
- GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
GtkTextIter iter;
- gtk_text_buffer_get_iter_at_offset( text_buffer, &iter, pos );
- gtk_text_buffer_place_cursor( text_buffer, &iter );
-#else
- gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
- GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-
- /* we fake a set_point by inserting and deleting. as the user
- isn't supposed to get to know about this non-sense, we
- disconnect so that no events are sent to the user program. */
-
- gint tmp = (gint)pos;
- gtk_editable_insert_text( GTK_EDITABLE(m_text), " ", 1, &tmp );
- gtk_editable_delete_text( GTK_EDITABLE(m_text), tmp-1, tmp );
-
- gtk_signal_connect( GTK_OBJECT(m_text), "changed",
- GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-
- // bring editable's cursor uptodate. Bug in GTK.
- SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));
-#endif
+ gtk_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_entry_set_position( GTK_ENTRY(m_text), (int)pos );
-
- // Bring editable's cursor uptodate. Bug in GTK.
- SET_EDITABLE_POS(m_text, (guint32)pos);
+ // FIXME: Is the editable's cursor really uptodate without double set_position in GTK2?
+ gtk_editable_set_position(GTK_EDITABLE(m_text), int(pos));
}
}
if (m_windowStyle & wxTE_MULTILINE)
{
-#ifdef __WXGTK20__
- GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
GtkTextIter end;
- gtk_text_buffer_get_end_iter( text_buffer, &end );
- gtk_text_buffer_place_cursor( text_buffer, &end );
-#else
- SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text)));
-#endif
+ gtk_text_buffer_get_end_iter( m_buffer, &end );
+ gtk_text_buffer_place_cursor( m_buffer, &end );
}
else
{
- gtk_entry_set_position( GTK_ENTRY(m_text), -1 );
+ gtk_editable_set_position( GTK_EDITABLE(m_text), -1 );
}
}
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
{
- gtk_entry_set_editable( GTK_ENTRY(m_text), editable );
+ gtk_editable_set_editable( GTK_EDITABLE(m_text), editable );
}
}
if (!wxWindowBase::Enable(enable))
{
// nothing to do
- return FALSE;
+ 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;
+ return true;
}
// wxGTK-specific: called recursively by Enable,
}
}
+void wxTextCtrl::MarkDirty()
+{
+ m_modified = true;
+}
+
void wxTextCtrl::DiscardEdits()
{
- m_modified = FALSE;
+ m_modified = false;
}
// ----------------------------------------------------------------------------
void wxTextCtrl::IgnoreNextTextUpdate()
{
- m_ignoreNextUpdate = TRUE;
+ m_ignoreNextUpdate = true;
}
bool wxTextCtrl::IgnoreTextUpdate()
{
if ( m_ignoreNextUpdate )
{
- m_ignoreNextUpdate = FALSE;
+ m_ignoreNextUpdate = false;
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
void wxTextCtrl::SetMaxLength(unsigned long len)
// we shouldn't check anything any more
if ( len )
{
- gtk_signal_connect( GTK_OBJECT(m_text),
- "insert_text",
- GTK_SIGNAL_FUNC(gtk_insert_text_callback),
- (gpointer)this);
+ g_signal_connect (m_text, "insert_text",
+ G_CALLBACK (gtk_insert_text_callback), this);
}
else // no checking
{
- gtk_signal_disconnect_by_func
- (
- GTK_OBJECT(m_text),
- GTK_SIGNAL_FUNC(gtk_insert_text_callback),
- (gpointer)this
- );
+ g_signal_handlers_disconnect_by_func (m_text,
+ (gpointer) gtk_insert_text_callback, this);
}
}
}
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
-#ifndef __WXGTK20__
- if ( (m_windowStyle & wxTE_MULTILINE) &&
- !GTK_TEXT(m_text)->line_start_cache )
+ if (from == -1 && to == -1)
{
- // tell the programmer that it didn't work
- wxLogDebug(_T("Can't call SetSelection() before realizing the control"));
- return;
+ from = 0;
+ to = GetValue().Length();
}
-#endif
if (m_windowStyle & wxTE_MULTILINE)
{
-#ifdef __WXGTK20__
- // ????
-#else
- gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
-#endif
+ 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
{
void wxTextCtrl::ShowPosition( long pos )
{
-#ifndef __WXGTK20__
if (m_windowStyle & wxTE_MULTILINE)
{
- GtkAdjustment *vp = GTK_TEXT(m_text)->vadj;
- float totalLines = (float) GetNumberOfLines();
- long posX;
- long posY;
- PositionToXY(pos, &posX, &posY);
- float posLine = (float) posY;
- float p = (posLine/totalLines)*(vp->upper - vp->lower) + vp->lower;
- gtk_adjustment_set_value(GTK_TEXT(m_text)->vadj, p);
+ 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 );
}
-#endif
+}
+
+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;
}
long wxTextCtrl::GetInsertionPoint() const
{
wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
-#ifdef __WXGTK20__
if (m_windowStyle & wxTE_MULTILINE)
{
- GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-
// 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( text_buffer );
+
+ GtkTextMark *mark = gtk_text_buffer_get_insert( m_buffer );
GtkTextIter cursor;
- gtk_text_buffer_get_iter_at_mark( text_buffer, &cursor, mark );
-
+ 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) gtk_editable_get_position(GTK_EDITABLE(m_text));
}
}
-long wxTextCtrl::GetLastPosition() const
+wxTextPos wxTextCtrl::GetLastPosition() const
{
wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
int pos = 0;
-
+
if (m_windowStyle & wxTE_MULTILINE)
{
-#ifdef __WXGTK20__
- GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
GtkTextIter end;
- gtk_text_buffer_get_end_iter( text_buffer, &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
{
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
-#ifndef __WXGTK20__
- gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
-#endif
+ 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
+ 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") );
-#ifndef __WXGTK20__
- gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+ Remove( from, to );
- if (!value.IsEmpty())
+ if (!value.empty())
{
- gint pos = (gint)from;
-#if wxUSE_UNICODE
- wxWX2MBbuf buf = value.mbc_str();
- gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &pos );
-#else
- gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos );
-#endif
+ SetInsertionPoint( from );
+ WriteText( value );
}
-#endif
}
void wxTextCtrl::Cut()
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
-#ifndef __WXGTK20__
- gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG );
-#endif
+ if (m_windowStyle & wxTE_MULTILINE)
+ g_signal_emit_by_name (m_text, "cut-clipboard");
+ else
+ gtk_editable_cut_clipboard(GTK_EDITABLE(m_text));
}
void wxTextCtrl::Copy()
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
-#ifndef __WXGTK20__
- gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG );
-#endif
+ if (m_windowStyle & wxTE_MULTILINE)
+ g_signal_emit_by_name (m_text, "copy-clipboard");
+ else
+ gtk_editable_copy_clipboard(GTK_EDITABLE(m_text));
}
void wxTextCtrl::Paste()
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
-#ifndef __WXGTK20__
- gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG );
-#endif
+ if (m_windowStyle & wxTE_MULTILINE)
+ g_signal_emit_by_name (m_text, "paste-clipboard");
+ else
+ gtk_editable_paste_clipboard(GTK_EDITABLE(m_text));
}
// Undo/redo
{
// TODO
//wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );
- return FALSE;
+ return false;
}
bool wxTextCtrl::CanRedo() const
{
// TODO
//wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );
- return FALSE;
+ return false;
}
// If the return values from and to are the same, there is no
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
- gint from, to;
-#ifdef __WXGTK20__
- if ( !gtk_editable_get_selection_bounds(GTK_EDITABLE(m_text), &from, &to) )
-#else
- if ( !(GTK_EDITABLE(m_text)->has_selection) )
-#endif
- {
- from =
- to = GetInsertionPoint();
- }
- else // got selection
- {
-#ifndef __WXGTK20__
- from = (long) GTK_EDITABLE(m_text)->selection_start_pos;
- to = (long) GTK_EDITABLE(m_text)->selection_end_pos;
-#endif
-
- if ( from > to )
- {
- // exchange them to be compatible with wxMSW
- gint tmp = from;
- from = to;
- to = tmp;
- }
- }
+ gint from = -1;
+ gint to = -1;
+ bool haveSelection = false;
+
+ 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;
+ }
+ }
+
+ if (! haveSelection )
+ from = to = GetInsertionPoint();
+
+ if ( from > to )
+ {
+ // exchange them to be compatible with wxMSW
+ gint tmp = from;
+ from = to;
+ to = tmp;
+ }
if ( fromOut )
*fromOut = from;
*toOut = to;
}
+
bool wxTextCtrl::IsEditable() const
{
- wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
+ wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );
-#ifdef __WXGTK20__
- return gtk_editable_get_editable(GTK_EDITABLE(m_text));
-#else
- return GTK_EDITABLE(m_text)->editable;
-#endif
+ 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));
+ }
}
bool wxTextCtrl::IsModified() const
void wxTextCtrl::Clear()
{
- SetValue( wxT("") );
+ SetValue( wxEmptyString );
}
void wxTextCtrl::OnChar( wxKeyEvent &key_event )
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
- if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
+ if ((key_event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
{
wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
event.SetEventObject(this);
if (GetEventHandler()->ProcessEvent(event)) return;
}
- if ((key_event.KeyCode() == WXK_RETURN) && !(m_windowStyle & wxTE_MULTILINE))
+ if ((key_event.GetKeyCode() == WXK_RETURN) && !(m_windowStyle & wxTE_MULTILINE))
{
// 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 (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
{
// the font will change for subsequent text insertiongs
bool wxTextCtrl::SetFont( const wxFont &font )
{
- wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
+ wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );
if ( !wxTextCtrlBase::SetFont(font) )
{
// font didn't change, nothing to do
- return FALSE;
+ return false;
}
if ( m_windowStyle & wxTE_MULTILINE )
{
- m_updateFont = TRUE;
+ SetUpdateFont(true);
m_defaultStyle.SetFont(font);
ChangeFontGlobally();
}
- return TRUE;
+ return true;
}
void wxTextCtrl::ChangeFontGlobally()
{
// this method is very inefficient and hence should be called as rarely as
// possible!
- wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont,
+ //
+ // TODO: it can be implemented much more efficiently for GTK2
+ wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE),
_T("shouldn't be called for single line controls") );
wxString value = GetValue();
- if ( !value.IsEmpty() )
+ if ( !value.empty() )
{
- m_updateFont = FALSE;
+ SetUpdateFont(false);
Clear();
AppendText(value);
}
}
-void wxTextCtrl::UpdateFontIfNeeded()
-{
- if ( m_updateFont )
- ChangeFontGlobally();
-}
-
bool wxTextCtrl::SetForegroundColour(const wxColour& colour)
{
if ( !wxControl::SetForegroundColour(colour) )
- return FALSE;
+ return false;
// update default fg colour too
m_defaultStyle.SetTextColour(colour);
- return TRUE;
+ return true;
}
bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
{
- wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
+ wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );
if ( !wxControl::SetBackgroundColour( colour ) )
- return FALSE;
-
- if (!m_widget->window)
- return FALSE;
-
- wxColour sysbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
- if (sysbg.Red() == colour.Red() &&
- sysbg.Green() == colour.Green() &&
- sysbg.Blue() == colour.Blue())
- {
- return FALSE; // FIXME or TRUE?
- }
+ return false;
if (!m_backgroundColour.Ok())
- return FALSE;
-
- if (m_windowStyle & wxTE_MULTILINE)
- {
-#ifndef __WXGTK__
- 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
- }
+ return false;
// change active background color too
m_defaultStyle.SetBackgroundColour( colour );
- return TRUE;
+ return true;
}
bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
{
- /* VERY dirty way to do that - removes the required text and re-adds it
- with styling (FIXME) */
if ( m_windowStyle & wxTE_MULTILINE )
{
-#ifndef __WXGTK20__
if ( style.IsDefault() )
{
// nothing to do
- return TRUE;
+ return true;
}
- gint l = gtk_text_get_length( GTK_TEXT(m_text) );
+ gint l = gtk_text_buffer_get_char_count( m_buffer );
- wxCHECK_MSG( start >= 0 && end <= l, FALSE,
+ wxCHECK_MSG( start >= 0 && end <= l, false,
_T("invalid range in wxTextCtrl::SetStyle") );
- gint old_pos = gtk_editable_get_position( GTK_EDITABLE(m_text) );
- char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), start, end );
- wxString tmp(text,*wxConvCurrent);
- g_free( text );
-
- gtk_editable_delete_text( GTK_EDITABLE(m_text), start, end );
- gtk_editable_set_position( GTK_EDITABLE(m_text), start );
-
-#if wxUSE_UNICODE
- wxWX2MBbuf buf = tmp.mbc_str();
- const char *txt = buf;
- size_t txtlen = strlen(buf);
-#else
- const char *txt = tmp;
- size_t txtlen = tmp.length();
-#endif
+ 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
- wxGtkTextInsert(m_text,
- wxTextAttr::Combine(style, m_defaultStyle, this),
- txt,
- txtlen);
-
- /* does not seem to help under GTK+ 1.2 !!!
- gtk_editable_set_position( GTK_EDITABLE(m_text), old_pos ); */
- SetInsertionPoint( old_pos );
-#endif
- return TRUE;
- }
- else // singe line
- {
- // cannot do this for GTK+'s Entry widget
- return FALSE;
+ wxTextAttr attr = wxTextAttr::Combine(style, m_defaultStyle, this);
+
+ wxGtkTextApplyTagsFromAttr( m_buffer, attr, &starti, &endi );
+
+ return true;
}
+
+ // else single line
+ // cannot do this for GTK+'s Entry widget
+ return false;
}
-void wxTextCtrl::ApplyWidgetStyle()
+void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style)
{
- if (m_windowStyle & wxTE_MULTILINE)
- {
- // how ?
- }
- else
- {
- SetWidgetStyle();
- gtk_widget_set_style( m_text, m_widgetStyle );
- }
+ gtk_widget_modify_style(m_text, style);
}
void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))
wxCursor cursor = m_cursor;
if (g_globalCursor.Ok()) cursor = g_globalCursor;
- if (cursor.Ok())
- {
-#ifndef __WXGTK20__
- GdkWindow *window = (GdkWindow*) NULL;
- if (HasFlag(wxTE_MULTILINE))
- window = GTK_TEXT(m_text)->text_area;
- else
- window = GTK_ENTRY(m_text)->text_area;
-
- if (window)
- gdk_window_set_cursor( window, cursor.GetCursor() );
-
- if (!g_globalCursor.Ok())
- cursor = *wxSTANDARD_CURSOR;
-
- window = m_widget->window;
- if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget)))
- gdk_window_set_cursor( window, cursor.GetCursor() );
-#endif
- }
-
if (g_delayedFocus == this)
{
if (GTK_WIDGET_REALIZED(m_widget))
}
}
- UpdateWindowUI();
+ if (wxUpdateUIEvent::CanUpdate(this))
+ UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
}
wxSize wxTextCtrl::DoGetBestSize() const
{
// FIXME should be different for multi-line controls...
wxSize ret( wxControl::DoGetBestSize() );
- return wxSize(80, ret.y);
+ wxSize best(80, ret.y);
+ CacheBestSize(best);
+ return best;
}
// ----------------------------------------------------------------------------
void wxTextCtrl::Freeze()
{
-#ifndef __WXGTK20__
if ( HasFlag(wxTE_MULTILINE) )
{
- gtk_text_freeze(GTK_TEXT(m_text));
+ if ( !m_frozenness++ )
+ {
+ // 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);
+ gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), gtk_text_buffer_new(NULL));
+ }
}
-#endif
}
void wxTextCtrl::Thaw()
{
-#ifndef __WXGTK20__
if ( HasFlag(wxTE_MULTILINE) )
{
- GTK_TEXT(m_text)->vadj->value = 0.0;
+ wxASSERT_MSG( m_frozenness > 0, _T("Thaw() without matching Freeze()") );
- gtk_text_thaw(GTK_TEXT(m_text));
+ 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);
+ }
}
-#endif
}
// ----------------------------------------------------------------------------
-// scrolling
+// wxTextUrlEvent passing if style & wxTE_AUTO_URL
// ----------------------------------------------------------------------------
-GtkAdjustment *wxTextCtrl::GetVAdj() const
-{
-#ifdef __WXGTK20__
- return NULL;
-#else
- return HasFlag(wxTE_MULTILINE) ? GTK_TEXT(m_text)->vadj : NULL;
-#endif
-}
-
-bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff)
+// 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)
{
-#ifndef __WXGTK20__
- float value = adj->value + diff;
+ event.Skip();
+ if(!(m_windowStyle & wxTE_AUTO_URL))
+ return;
- if ( value < 0 )
- value = 0;
+ gint x, y;
+ GtkTextIter start, end;
+ GtkTextTag *tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(m_buffer),
+ "wxUrl");
- float upper = adj->upper - adj->page_size;
- if ( value > upper )
- value = upper;
+ gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(m_text), GTK_TEXT_WINDOW_WIDGET,
+ event.GetX(), event.GetY(), &x, &y);
- // did we noticeably change the scroll position?
- if ( fabs(adj->value - value) < 0.2 )
+ gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(m_text), &end, x, y);
+ if (!gtk_text_iter_has_tag(&end, tag))
{
- // well, this is what Robert does in wxScrollBar, so it must be good...
- return FALSE;
+ gdk_window_set_cursor(gtk_text_view_get_window(GTK_TEXT_VIEW(m_text),
+ GTK_TEXT_WINDOW_TEXT), m_gdkXTermCursor);
+ return;
}
- adj->value = value;
+ gdk_window_set_cursor(gtk_text_view_get_window(GTK_TEXT_VIEW(m_text),
+ GTK_TEXT_WINDOW_TEXT), m_gdkHandCursor);
- gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed");
+ 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);
-#endif
- return TRUE;
-}
+ // 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);
-bool wxTextCtrl::ScrollLines(int lines)
-{
-#ifdef __WXGTK20__
- return FALSE;
-#else
- GtkAdjustment *adj = GetVAdj();
- if ( !adj )
- return FALSE;
+ wxTextUrlEvent url_event(m_windowId, event,
+ gtk_text_iter_get_offset(&start),
+ gtk_text_iter_get_offset(&end));
- // this is hardcoded to 10 in GTK+ 1.2 (great idea)
- static const int KEY_SCROLL_PIXELS = 10;
-
- return DoScroll(adj, lines*KEY_SCROLL_PIXELS);
-#endif
+ 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);
}
-bool wxTextCtrl::ScrollPages(int pages)
+// static
+wxVisualAttributes
+wxTextCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
{
-#ifdef __WXGTK20__
- return FALSE;
-#else
- GtkAdjustment *adj = GetVAdj();
- if ( !adj )
- return FALSE;
-
- return DoScroll(adj, (int)ceil(pages*adj->page_increment));
-#endif
+ return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true);
}
-
projects / wxWidgets.git / blobdiff