#include "wx/log.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 "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "gdk/gdkkeysyms.h"
+#include "wx/gtk/private.h"
+#include <gdk/gdkkeysyms.h>
//-----------------------------------------------------------------------------
// idle system
extern bool g_blockEventsOnDrag;
extern wxCursor g_globalCursor;
+extern wxWindowGTK *g_delayedFocus;
+
+// ----------------------------------------------------------------------------
+// helpers
+// ----------------------------------------------------------------------------
+
+#ifdef __WXGTK20__
+static void wxGtkTextInsert(GtkWidget *text,
+ GtkTextBuffer *text_buffer,
+ const wxTextAttr& attr,
+ wxCharBuffer buffer)
+
+{
+ PangoFontDescription *font_description = attr.HasFont()
+ ? attr.GetFont().GetNativeFontInfo()->description
+ : NULL;
+
+ GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor()
+ : NULL;
+
+ GdkColor *colBg = attr.HasBackgroundColour()
+ ? attr.GetBackgroundColour().GetColor()
+ : NULL;
+
+ GtkTextIter start, end;
+ GtkTextMark *mark;
+ // iterators are invalidated by any mutation that affects 'indexable' buffer contents,
+ // so we save current position in a mark
+ // we need a mark of left gravity, so we cannot use
+ // mark = gtk_text_buffer_get_insert (text_buffer)
+
+ gtk_text_buffer_get_iter_at_mark( text_buffer, &start,
+ gtk_text_buffer_get_insert (text_buffer) );
+ mark = gtk_text_buffer_create_mark( text_buffer, NULL, &start, TRUE/*left gravity*/ );
+
+ gtk_text_buffer_insert_at_cursor( text_buffer, buffer, strlen(buffer) );
+
+ gtk_text_buffer_get_iter_at_mark( text_buffer, &end,
+ gtk_text_buffer_get_insert (text_buffer) );
+ gtk_text_buffer_get_iter_at_mark( text_buffer, &start, mark );
+
+ GtkTextTag *tag;
+ tag = gtk_text_buffer_create_tag( text_buffer, NULL, "font-desc", font_description,
+ "foreground-gdk", colFg,
+ "background-gdk", colBg, NULL );
+ gtk_text_buffer_apply_tag( text_buffer, tag, &start, &end );
+}
+#else
+static void wxGtkTextInsert(GtkWidget *text,
+ const wxTextAttr& attr,
+ const char *txt,
+ size_t len)
+{
+ GdkFont *font = attr.HasFont() ? attr.GetFont().GetInternalFont()
+ : NULL;
+
+ GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor()
+ : NULL;
+
+ GdkColor *colBg = attr.HasBackgroundColour()
+ ? attr.GetBackgroundColour().GetColor()
+ : NULL;
+
+ gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len );
+}
+#endif // GTK 1.x
+
+// ----------------------------------------------------------------------------
+// "insert_text" for GtkEntry
+// ----------------------------------------------------------------------------
+
+static void
+gtk_insert_text_callback(GtkEditable *editable,
+ const gchar *new_text,
+ gint new_text_length,
+ 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);
+
+ 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
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(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 );
+ }
+}
//-----------------------------------------------------------------------------
// "changed"
//-----------------------------------------------------------------------------
static void
-gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
+gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
{
+ if ( win->IgnoreTextUpdate() )
+ return;
+
if (!win->m_hasVMT) return;
if (g_isIdle)
win->UpdateFontIfNeeded();
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
- event.SetString( win->GetValue() );
event.SetEventObject( win );
+ event.SetString( win->GetValue() );
win->GetEventHandler()->ProcessEvent( event );
}
// "changed" from vertical scrollbar
//-----------------------------------------------------------------------------
+#ifndef __WXGTK20__
static void
gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
{
win->CalculateScrollbar();
}
-
-//-----------------------------------------------------------------------------
-// "focus_in_event"
-//-----------------------------------------------------------------------------
-
-extern wxWindow *g_focusWindow;
-extern bool g_blockEventsOnDrag;
-// extern bool g_isIdle;
-
-static gint gtk_text_focus_in_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win )
-{
- // Necessary?
-#if 0
- if (g_isIdle)
- wxapp_install_idle_handler();
#endif
- if (!win->m_hasVMT) return FALSE;
- if (g_blockEventsOnDrag) return FALSE;
- g_focusWindow = win;
-
- wxPanel *panel = wxDynamicCast(win->GetParent(), wxPanel);
- if (panel)
- {
- panel->SetLastFocus(win);
- }
-
-#ifdef HAVE_XIM
- if (win->m_ic)
- gdk_im_begin(win->m_ic, win->m_wxwindow->window);
-#endif
+// ----------------------------------------------------------------------------
+// redraw callback for multiline text
+// ----------------------------------------------------------------------------
-#if 0
-#ifdef wxUSE_CARET
- // caret needs to be informed about focus change
- wxCaret *caret = win->GetCaret();
- if ( caret )
- {
- caret->OnSetFocus();
- }
-#endif // wxUSE_CARET
-#endif
+#ifndef __WXGTK20__
- wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() );
- event.SetEventObject( win );
+// 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()
- if (win->GetEventHandler()->ProcessEvent( event ))
- {
- gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus_in_event" );
- return TRUE;
- }
+extern bool wxIsInsideYield;
- return FALSE;
+extern "C" {
+ typedef void (*GtkDrawCallback)(GtkWidget *widget, GdkRectangle *rect);
}
-//-----------------------------------------------------------------------------
-// "focus_out_event"
-//-----------------------------------------------------------------------------
+static GtkDrawCallback gs_gtk_text_draw = NULL;
-static gint gtk_text_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win )
+extern "C"
+void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)
{
-#if 0
- if (g_isIdle)
- wxapp_install_idle_handler();
-#endif
-
- if (!win->m_hasVMT) return FALSE;
- if (g_blockEventsOnDrag) return FALSE;
-
-#if 0
- // if the focus goes out of our app alltogether, OnIdle() will send
- // wxActivateEvent, otherwise gtk_window_focus_in_callback() will reset
- // g_sendActivateEvent to -1
- g_sendActivateEvent = 0;
-#endif
-
- wxWindow *winFocus = wxFindFocusedChild(win);
- if ( winFocus )
- win = winFocus;
-
- g_focusWindow = (wxWindow *)NULL;
-
-#ifdef HAVE_XIM
- if (win->m_ic)
- gdk_im_end();
-#endif
-
-#if 0
-#ifdef wxUSE_CARET
- // caret needs to be informed about focus change
- wxCaret *caret = win->GetCaret();
- if ( caret )
+ if ( !wxIsInsideYield )
{
- caret->OnKillFocus();
- }
-#endif // wxUSE_CARET
-#endif
+ wxCHECK_RET( gs_gtk_text_draw != wxgtk_text_draw,
+ _T("infinite recursion in wxgtk_text_draw aborted") );
- wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
- event.SetEventObject( win );
-
- if (win->GetEventHandler()->ProcessEvent( event ))
- {
- gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus_out_event" );
- return TRUE;
+ gs_gtk_text_draw(widget, rect);
}
-
- return FALSE;
}
+#endif // __WXGTK20__
+
//-----------------------------------------------------------------------------
// wxTextCtrl
//-----------------------------------------------------------------------------
void wxTextCtrl::Init()
{
+ m_ignoreNextUpdate =
m_modified = FALSE;
m_updateFont = FALSE;
m_text =
m_vScrollbarVisible = FALSE;
bool multi_line = (style & wxTE_MULTILINE) != 0;
+
+#ifdef __WXGTK20__
+ GtkTextBuffer *buffer = NULL;
+#endif
+
if (multi_line)
{
-#if (GTK_MINOR_VERSION > 2)
- /* a multi-line edit control: create a vertical scrollbar by default and
- horizontal if requested */
- bool bHasHScrollbar = (style & wxHSCROLL) != 0;
-#else
- bool bHasHScrollbar = FALSE;
-#endif
+#ifdef __WXGTK20__
+ // Create view
+ m_text = gtk_text_view_new();
+
+ buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
- /* create our control ... */
+ // 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 );
+
+ 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 */
+ // ... and put into the upper left hand corner of the table
+ bool bHasHScrollbar = FALSE;
m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1,
(GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
0, 0);
- /* always wrap words */
+ // always wrap words
gtk_text_set_word_wrap( GTK_TEXT(m_text), TRUE );
-#if (GTK_MINOR_VERSION > 2)
- /* put the horizontal scrollbar in the lower left hand corner */
- if (bHasHScrollbar)
- {
- GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj);
- GTK_WIDGET_UNSET_FLAGS( hscrollbar, GTK_CAN_FOCUS );
- gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2,
- (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
- GTK_FILL,
- 0, 0);
- gtk_widget_show(hscrollbar);
-
- /* don't wrap lines, otherwise we wouldn't need the scrollbar */
- gtk_text_set_line_wrap( GTK_TEXT(m_text), FALSE );
- }
-#endif
-
- /* finally, put the vertical scrollbar in the upper right corner */
+ // 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 */
+ // a single-line text control: no need for scrollbars
m_widget =
- m_text = gtk_entry_new();
+ m_text = gtk_entry_new();
}
m_parent->DoAddChild( this );
+ m_focusWidget = m_text;
+
PostCreation();
SetFont( parent->GetFont() );
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 );
- gtk_signal_connect( GTK_OBJECT(GTK_TEXT(m_text)), "focus_in_event",
- GTK_SIGNAL_FUNC(gtk_text_focus_in_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;
- gtk_signal_connect( GTK_OBJECT(GTK_TEXT(m_text)), "focus_out_event",
- GTK_SIGNAL_FUNC(gtk_text_focus_out_callback), (gpointer)this );
- }
- else
- {
- gtk_signal_connect( GTK_OBJECT(m_text), "focus_in_event",
- GTK_SIGNAL_FUNC(gtk_text_focus_in_callback), (gpointer)this );
+ gs_gtk_text_draw = draw;
- gtk_signal_connect( GTK_OBJECT(m_text), "focus_out_event",
- GTK_SIGNAL_FUNC(gtk_text_focus_out_callback), (gpointer)this );
+ draw = wxgtk_text_draw;
+ }
}
+#endif // GTK+ 1.x
if (!value.IsEmpty())
{
- gint tmp = 0;
+#ifdef __WXGTK20__
+ SetValue( value );
+#else
-#if GTK_MINOR_VERSION == 0
+#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 // !Unicode
+#else
gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
-#endif // Unicode/!Unicode
+#endif
if (multi_line)
{
- /* bring editable's cursor uptodate. bug in GTK. */
-
- GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
+ // 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 (!multi_line)
gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );
+#ifdef __WXGTK20__
+ else
+ gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE);
+ }
+#else
}
else
{
if (multi_line)
gtk_text_set_editable( GTK_TEXT(m_text), 1 );
}
+#endif
- /* we want to be notified about text changes */
+ // 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);
+ }
+ else
+#endif
+ {
gtk_signal_connect( GTK_OBJECT(m_text), "changed",
- GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+ GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+ }
- /* we don't set a valid background colour, because the window
- manager should use a default one */
+ // we don't set a valid background colour, because the window
+ // manager should use a default one
m_backgroundColour = wxColour();
wxColour colFg = parent->GetForegroundColour();
m_cursor = wxCursor( wxCURSOR_IBEAM );
- // FIXME: is the bg colour correct here?
- wxTextAttr attrDef( colFg,
- wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW),
- parent->GetFont() );
+ wxTextAttr attrDef( colFg, m_backgroundColour, parent->GetFont() );
SetDefaultStyle( attrDef );
Show( TRUE );
void wxTextCtrl::CalculateScrollbar()
{
+#ifndef __WXGTK20__
if ((m_windowStyle & wxTE_MULTILINE) == 0) return;
GtkAdjustment *adj = GTK_TEXT(m_text)->vadj;
m_vScrollbarVisible = TRUE;
}
}
+#endif
}
wxString wxTextCtrl::GetValue() const
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 );
+ GtkTextIter end;
+ gtk_text_buffer_get_end_iter( text_buffer, &end );
+ gchar *text = gtk_text_buffer_get_text( text_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 = wxString(text,*wxConvCurrent);
+ tmp = text;
g_free( text );
+#endif
}
else
{
- tmp = wxString(gtk_entry_get_text( GTK_ENTRY(m_text) ),*wxConvCurrent);
+ 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;
-#if wxUSE_UNICODE
- wxWX2MBbuf tmpbuf = value.mbc_str();
- gtk_editable_insert_text( GTK_EDITABLE(m_text), tmpbuf, strlen(tmpbuf), &len );
-#else
gtk_editable_insert_text( GTK_EDITABLE(m_text), value.mbc_str(), value.Length(), &len );
#endif
}
else
{
- gtk_entry_set_text( GTK_ENTRY(m_text), value.mbc_str() );
+ gtk_entry_set_text( GTK_ENTRY(m_text), wxGTK_CONV( value ) );
}
// GRG, Jun/2000: Changed this after a lot of discussion in
if ( text.empty() )
return;
+ if ( m_windowStyle & wxTE_MULTILINE )
+ {
+#ifdef __WXGTK20__
+
#if wxUSE_UNICODE
- wxWX2MBbuf buf = text.mbc_str();
- const char *txt = buf;
- size_t txtlen = strlen(buf);
+ wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );
#else
- const char *txt = text;
- size_t txtlen = text.length();
+ wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) );
#endif
-
- if ( m_windowStyle & wxTE_MULTILINE )
+ GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
+
+ // TODO: Call whatever is needed to delete the selection.
+ wxGtkTextInsert( m_text, text_buffer, m_defaultStyle, buffer );
+
+ // Scroll to cursor.
+ GtkTextIter iter;
+ gtk_text_buffer_get_iter_at_mark( text_buffer, &iter, gtk_text_buffer_get_insert( text_buffer ) );
+ gtk_text_view_scroll_to_iter( GTK_TEXT_VIEW(m_text), &iter, 0.0, FALSE, 0.0, 1.0 );
+#else // GTK 1.x
+ // After cursor movements, gtk_text_get_point() is wrong by one.
+ gtk_text_set_point( GTK_TEXT(m_text), GET_EDITABLE_POS(m_text) );
+
+ // always use m_defaultStyle, even if it is empty as otherwise
+ // resetting the style and appending some more text wouldn't work: if
+ // we don't specify the style explicitly, the old style would be used
+ gtk_editable_delete_selection( GTK_EDITABLE(m_text) );
+ wxGtkTextInsert(m_text, m_defaultStyle, text.c_str(), text.Len());
+
+ // Bring editable's cursor back uptodate.
+ SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));
+#endif // GTK 1.x/2.0
+ }
+ else // single line
{
- /* this moves the cursor pos to behind the inserted text */
- gint len = GTK_EDITABLE(m_text)->current_pos;
+ // First remove the selection if there is one
+ gtk_editable_delete_selection( GTK_EDITABLE(m_text) );
- // if we have any special style, use it
- if ( !m_defaultStyle.IsDefault() )
- {
- GdkFont *font = m_defaultStyle.HasFont()
- ? m_defaultStyle.GetFont().GetInternalFont()
- : NULL;
+ // This moves the cursor pos to behind the inserted text.
+ gint len = GET_EDITABLE_POS(m_text);
- GdkColor *colFg = m_defaultStyle.HasTextColour()
- ? m_defaultStyle.GetTextColour().GetColor()
- : NULL;
+#ifdef __WXGTK20__
- GdkColor *colBg = m_defaultStyle.HasBackgroundColour()
- ? m_defaultStyle.GetBackgroundColour().GetColor()
- : NULL;
+#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 );
- gtk_text_insert( GTK_TEXT(m_text), font, colFg, colBg, txt, txtlen );
- }
- else // no style
- {
- gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len );
- }
+#else
+ gtk_editable_insert_text( GTK_EDITABLE(m_text), text.c_str(), text.Len(), &len );
+#endif
- /* bring editable's cursor uptodate. bug in GTK. */
- GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
+ // Bring entry's cursor uptodate.
+ gtk_entry_set_position( GTK_ENTRY(m_text), len );
}
- else // single line
- {
- /* this moves the cursor pos to behind the inserted text */
- gint len = GTK_EDITABLE(m_text)->current_pos;
- gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len );
-
- /* bring editable's cursor uptodate. bug in GTK. */
- GTK_EDITABLE(m_text)->current_pos += text.Len();
- /* bring entry's cursor uptodate. bug in GTK. */
- gtk_entry_set_position( GTK_ENTRY(m_text), GTK_EDITABLE(m_text)->current_pos );
- }
+ m_modified = TRUE;
}
void wxTextCtrl::AppendText( const wxString &text )
{
- wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
-
- if ( text.empty() )
- return;
-
-#if wxUSE_UNICODE
- wxWX2MBbuf buf = text.mbc_str();
- const char *txt = buf;
- size_t txtlen = strlen(buf);
-#else
- const char *txt = text;
- size_t txtlen = text.length();
-#endif
+ SetInsertionPointEnd();
+ WriteText( text );
+}
+wxString wxTextCtrl::GetLineText( long lineNo ) const
+{
if (m_windowStyle & wxTE_MULTILINE)
{
- if ( !m_defaultStyle.IsDefault() )
- {
- wxFont font = m_defaultStyle.HasFont() ? m_defaultStyle.GetFont()
- : m_font;
- GdkFont *fnt = font.Ok() ? font.GetInternalFont() : NULL;
-
- wxColour col = m_defaultStyle.HasTextColour()
- ? m_defaultStyle.GetTextColour()
- : m_foregroundColour;
- GdkColor *colFg = col.Ok() ? col.GetColor() : NULL;
+#ifndef __WXGTK20__
+ gint len = gtk_text_get_length( GTK_TEXT(m_text) );
+ char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
- col = m_defaultStyle.HasBackgroundColour()
- ? m_defaultStyle.GetBackgroundColour()
- : m_backgroundColour;
- GdkColor *colBg = col.Ok() ? col.GetColor() : NULL;
+ 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];
- gtk_text_insert( GTK_TEXT(m_text), fnt, colFg, colBg, txt, txtlen );
+ g_free( text );
+ return buf;
}
- else // no style
+ else
+#endif
{
- /* we'll insert at the last position */
- gint len = gtk_text_get_length( GTK_TEXT(m_text) );
- gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len );
+ return wxEmptyString;
}
-
- /* bring editable's cursor uptodate. bug in GTK. */
- GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
- }
- else // single line
- {
- gtk_entry_append_text( GTK_ENTRY(m_text), txt );
}
-}
-
-wxString wxTextCtrl::GetLineText( long lineNo ) const
-{
- if (m_windowStyle & wxTE_MULTILINE)
- {
- gint len = gtk_text_get_length( GTK_TEXT(m_text) );
- char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
-
- if (text)
+ else
{
- 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;
+ if (lineNo == 0) return GetValue();
+ return wxEmptyString;
}
- else
- return wxEmptyString;
- }
- else
- {
- if (lineNo == 0) return GetValue();
- return wxEmptyString;
- }
}
void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
{
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 );
{
return 0;
}
+#endif
}
else
{
if (m_windowStyle & wxTE_MULTILINE)
{
- /* seems to be broken in GTK 1.0.X:
- gtk_text_set_point( GTK_TEXT(m_text), (int)pos ); */
-
+#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 thos non-sense, we
+ 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_signal_connect( GTK_OBJECT(m_text), "changed",
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
- /* bring editable's cursor uptodate. another bug in GTK. */
-
- GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
+ // bring editable's cursor uptodate. Bug in GTK.
+ SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));
+#endif
}
else
{
gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );
- /* bring editable's cursor uptodate. bug in GTK. */
-
- GTK_EDITABLE(m_text)->current_pos = (guint32)pos;
+ // Bring editable's cursor uptodate. Bug in GTK.
+ SET_EDITABLE_POS(m_text, (guint32)pos);
}
}
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
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
+ }
else
+ {
gtk_entry_set_position( GTK_ENTRY(m_text), -1 );
+ }
}
void wxTextCtrl::SetEditable( bool editable )
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
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 );
+ }
}
bool wxTextCtrl::Enable( bool enable )
if (m_windowStyle & wxTE_MULTILINE)
{
+#ifdef __WXGTK20__
+ SetEditable( enable );
+#else
gtk_text_set_editable( GTK_TEXT(m_text), enable );
OnParentEnable(enable);
+#endif
}
else
{
m_modified = FALSE;
}
+// ----------------------------------------------------------------------------
+// max text length support
+// ----------------------------------------------------------------------------
+
+void wxTextCtrl::IgnoreNextTextUpdate()
+{
+ m_ignoreNextUpdate = TRUE;
+}
+
+bool wxTextCtrl::IgnoreTextUpdate()
+{
+ if ( m_ignoreNextUpdate )
+ {
+ m_ignoreNextUpdate = FALSE;
+
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+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 )
+ {
+ gtk_signal_connect( GTK_OBJECT(m_text),
+ "insert_text",
+ GTK_SIGNAL_FUNC(gtk_insert_text_callback),
+ (gpointer)this);
+ }
+ else // no checking
+ {
+ gtk_signal_disconnect_by_func
+ (
+ GTK_OBJECT(m_text),
+ GTK_SIGNAL_FUNC(gtk_insert_text_callback),
+ (gpointer)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();
+ }
+
+#ifndef __WXGTK20__
if ( (m_windowStyle & wxTE_MULTILINE) &&
!GTK_TEXT(m_text)->line_start_cache )
{
wxLogDebug(_T("Can't call SetSelection() before realizing the control"));
return;
}
+#endif
- gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+ if (m_windowStyle & wxTE_MULTILINE)
+ {
+#ifdef __WXGTK20__
+ GtkTextBuffer *buf = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
+
+ GtkTextIter fromi, toi;
+ gtk_text_buffer_get_iter_at_offset( buf, &fromi, from );
+ gtk_text_buffer_get_iter_at_offset( buf, &toi, to );
+
+ gtk_text_buffer_place_cursor( buf, &toi );
+ gtk_text_buffer_move_mark_by_name( buf, "selection_bound", &fromi );
+#else
+ gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+#endif
+ }
+ else
+ {
+ gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+ }
}
-void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )
+void wxTextCtrl::ShowPosition( long pos )
{
-// SetInsertionPoint( 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);
+ }
+#endif
}
long wxTextCtrl::GetInsertionPoint() const
{
wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
- return (long) GTK_EDITABLE(m_text)->current_pos;
+#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 );
+ GtkTextIter cursor;
+ gtk_text_buffer_get_iter_at_mark( text_buffer, &cursor, mark );
+
+ return gtk_text_iter_get_offset( &cursor );
+ }
+ else
+#endif
+ {
+ return (long) GET_EDITABLE_POS(m_text);
+ }
}
long 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 );
+
+ pos = gtk_text_iter_get_offset( &end );
+#else
pos = gtk_text_get_length( GTK_TEXT(m_text) );
+#endif
+ }
else
+ {
pos = GTK_ENTRY(m_text)->text_length;
+ }
return (long)pos;
}
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
+#ifdef __WXGTK20__
+ if ( m_windowStyle & wxTE_MULTILINE )
+ {
+ GtkTextBuffer *
+ text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
+
+ GtkTextIter fromi, toi;
+ gtk_text_buffer_get_iter_at_offset( text_buffer, &fromi, from );
+ gtk_text_buffer_get_iter_at_offset( text_buffer, &toi, to );
+
+ gtk_text_buffer_delete( text_buffer, &fromi, &toi );
+ }
+ else // single line
+#endif
gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
}
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
- gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+ Remove( from, to );
if (!value.IsEmpty())
{
+#ifdef __WXGTK20__
+ SetInsertionPoint( from );
+ WriteText( value );
+#else // GTK 1.x
gint pos = (gint)from;
#if wxUSE_UNICODE
wxWX2MBbuf buf = value.mbc_str();
gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &pos );
#else
gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos );
-#endif
+#endif // wxUSE_UNICODE
+#endif // GTK 1.x/2.x
}
}
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
-#if (GTK_MINOR_VERSION > 0)
- gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) );
-#else
- gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 );
+#ifndef __WXGTK20__
+ gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG );
#endif
}
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
-#if (GTK_MINOR_VERSION > 0)
- gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) );
-#else
- gtk_editable_copy_clipboard( GTK_EDITABLE(m_text), 0 );
+#ifndef __WXGTK20__
+ gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG );
#endif
}
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
-#if (GTK_MINOR_VERSION > 0)
- gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) );
-#else
- gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 );
+#ifndef __WXGTK20__
+ gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG );
#endif
}
bool wxTextCtrl::CanUndo() const
{
// TODO
- wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );
+ //wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );
return FALSE;
}
bool wxTextCtrl::CanRedo() const
{
// TODO
- wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );
+ //wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );
return FALSE;
}
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
- long from, to;
+ 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
- long tmp = from;
+ gint tmp = from;
from = to;
to = tmp;
}
{
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
}
bool wxTextCtrl::IsModified() const
{
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();
- GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
- if (window->default_widget)
+ if (top_frame && GTK_IS_WINDOW(top_frame->m_widget))
{
- gtk_widget_activate (window->default_widget);
- return;
+ GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
+
+ if (window->default_widget)
+ {
+ gtk_widget_activate (window->default_widget);
+ return;
+ }
}
}
bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window )
{
if (m_windowStyle & wxTE_MULTILINE)
+ {
+#ifdef __WXGTK20__
+ return window == gtk_text_view_get_window( GTK_TEXT_VIEW( m_text ), GTK_TEXT_WINDOW_TEXT ); // pure guesswork
+#else
return (window == GTK_TEXT(m_text)->text_area);
+#endif
+ }
else
+ {
return (window == GTK_ENTRY(m_text)->text_area);
+ }
}
// the font will change for subsequent text insertiongs
{
wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
- if ( !wxWindowBase::SetFont(font) )
+ if ( !wxTextCtrlBase::SetFont(font) )
{
// font didn't change, nothing to do
return FALSE;
wxString value = GetValue();
if ( !value.IsEmpty() )
{
+ m_updateFont = FALSE;
+
Clear();
AppendText(value);
-
- m_updateFont = FALSE;
}
}
if (!m_widget->window)
return FALSE;
- wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
+ wxColour sysbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
if (sysbg.Red() == colour.Red() &&
sysbg.Green() == colour.Green() &&
sysbg.Blue() == colour.Blue())
if (m_windowStyle & wxTE_MULTILINE)
{
+#ifndef __WXGTK20__
GdkWindow *window = GTK_TEXT(m_text)->text_area;
if (!window)
return FALSE;
m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
gdk_window_set_background( window, m_backgroundColour.GetColor() );
gdk_window_clear( window );
+#endif
}
// change active background color too
return TRUE;
}
-bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr &style )
+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 )
{
if ( style.IsDefault() )
// nothing to do
return TRUE;
}
+#ifdef __WXGTK20__
+ GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
+ gint l = gtk_text_buffer_get_char_count( text_buffer );
+
+ wxCHECK_MSG( start >= 0 && end <= l, FALSE,
+ _T("invalid range in wxTextCtrl::SetStyle") );
+
+ GtkTextIter starti, endi;
+ gtk_text_buffer_get_iter_at_offset( text_buffer, &starti, start );
+ gtk_text_buffer_get_iter_at_offset( text_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);
+ PangoFontDescription *font_description = attr.HasFont()
+ ? attr.GetFont().GetNativeFontInfo()->description
+ : NULL;
+
+ GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor()
+ : NULL;
+
+ GdkColor *colBg = attr.HasBackgroundColour()
+ ? attr.GetBackgroundColour().GetColor()
+ : NULL;
+
+ GtkTextTag *tag;
+ tag = gtk_text_buffer_create_tag( text_buffer, NULL, "font-desc", font_description,
+ "foreground-gdk", colFg,
+ "background-gdk", colBg, NULL );
+ gtk_text_buffer_apply_tag( text_buffer, tag, &starti, &endi );
+
+ return TRUE;
+#else
+ // VERY dirty way to do that - removes the required text and re-adds it
+ // with styling (FIXME)
+
gint l = gtk_text_get_length( GTK_TEXT(m_text) );
wxCHECK_MSG( start >= 0 && end <= l, FALSE,
size_t txtlen = tmp.length();
#endif
- GdkFont *font = style.HasFont()
- ? style.GetFont().GetInternalFont()
- : NULL;
-
- GdkColor *colFg = style.HasTextColour()
- ? style.GetTextColour().GetColor()
- : NULL;
-
- GdkColor *colBg = style.HasBackgroundColour()
- ? style.GetBackgroundColour().GetColor()
- : NULL;
-
- gtk_text_insert( GTK_TEXT(m_text), font, colFg, colBg, txt, txtlen );
+ // 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
if (cursor.Ok())
{
+#ifndef __WXGTK20__
GdkWindow *window = (GdkWindow*) NULL;
if (HasFlag(wxTE_MULTILINE))
window = GTK_TEXT(m_text)->text_area;
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))
+ {
+ gtk_widget_grab_focus( m_widget );
+ g_delayedFocus = NULL;
+ }
}
UpdateWindowUI();
void wxTextCtrl::Freeze()
{
+#ifndef __WXGTK20__
if ( HasFlag(wxTE_MULTILINE) )
{
gtk_text_freeze(GTK_TEXT(m_text));
}
+#endif
}
void wxTextCtrl::Thaw()
{
+#ifndef __WXGTK20__
if ( HasFlag(wxTE_MULTILINE) )
{
GTK_TEXT(m_text)->vadj->value = 0.0;
gtk_text_thaw(GTK_TEXT(m_text));
}
+#endif
}
// ----------------------------------------------------------------------------
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)
{
+#ifndef __WXGTK20__
float value = adj->value + diff;
if ( value < 0 )
gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed");
+#endif
return TRUE;
}
bool wxTextCtrl::ScrollLines(int lines)
{
+#ifdef __WXGTK20__
+ return FALSE;
+#else
GtkAdjustment *adj = GetVAdj();
if ( !adj )
return FALSE;
static const int KEY_SCROLL_PIXELS = 10;
return DoScroll(adj, lines*KEY_SCROLL_PIXELS);
+#endif
}
bool wxTextCtrl::ScrollPages(int pages)
{
+#ifdef __WXGTK20__
+ return FALSE;
+#else
GtkAdjustment *adj = GetVAdj();
if ( !adj )
return FALSE;
return DoScroll(adj, (int)ceil(pages*adj->page_increment));
+#endif
}
projects / wxWidgets.git / blobdiff