/////////////////////////////////////////////////////////////////////////////
-// Name: textctrl.cpp
+// Name: src/gtk/textctrl.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
#include "wx/wxprec.h"
#include "wx/textctrl.h"
-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/utils.h"
+#endif
+
#include "wx/math.h"
#include "wx/settings.h"
#include "wx/panel.h"
NULL );
gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
g_free (font_string);
+
+ if (attr.GetFont().GetUnderlined())
+ {
+ g_snprintf(buf, sizeof(buf), "WXFONTUNDERLINE");
+ 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,
+ "underline-set", TRUE,
+ "underline", PANGO_UNDERLINE_SINGLE,
+ NULL );
+ gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
+ }
}
if (attr.HasTextColour())
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 );
+ GtkScrolledWindowSetBorder(m_widget, style);
gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK );
gtk_text_buffer_get_end_iter( m_buffer, &end );
gchar *text = gtk_text_buffer_get_text( m_buffer, &start, &end, TRUE );
-#if wxUSE_UNICODE
- wxWCharBuffer buffer( wxConvUTF8.cMB2WX( text ) );
-#else
- wxCharBuffer buffer( wxConvLocal.cWC2WX( wxConvUTF8.cMB2WC( text ) ) );
-#endif
- if ( buffer )
- tmp = buffer;
+ const wxWxCharBuffer buf = wxGTK_CONV_BACK(text);
+ if ( buf )
+ tmp = buf;
g_free( text );
}
else
{
- tmp = wxGTK_CONV_BACK( gtk_entry_get_text( GTK_ENTRY(m_text) ) );
+ const gchar *text = gtk_entry_get_text( GTK_ENTRY(m_text) );
+ const wxWxCharBuffer buf = wxGTK_CONV_BACK( text );
+ if ( buf )
+ tmp = buf;
}
return tmp;
if (m_windowStyle & wxTE_MULTILINE)
{
-#if wxUSE_UNICODE
- wxCharBuffer buffer( wxConvUTF8.cWX2MB( value) );
-#else
- wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( value ) ) );
-#endif
- if (gtk_text_buffer_get_char_count(m_buffer) != 0)
- IgnoreNextTextUpdate();
-
+ const wxCharBuffer buffer(wxGTK_CONV(value));
if ( !buffer )
{
// what else can we do? at least don't crash...
return;
}
+ if (gtk_text_buffer_get_char_count(m_buffer) != 0)
+ IgnoreNextTextUpdate();
+
gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
}
- else
+ else // single line
{
- gtk_entry_set_text( GTK_ENTRY(m_text), wxGTK_CONV( value ) );
+ // gtk_entry_set_text() emits two "changed" signals because internally
+ // it calls gtk_editable_delete_text() and gtk_editable_insert_text()
+ // but we want to have only one event
+ IgnoreNextTextUpdate();
+
+ 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;
+ const wxCharBuffer buffer(wxGTK_CONV(text));
+ if ( !buffer )
+ {
+ // what else can we do? at least don't crash...
+ 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
if ( m_windowStyle & wxTE_MULTILINE )
{
-#if wxUSE_UNICODE
- wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );
-#else
- wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) );
-#endif
- if ( !buffer )
- {
- // what else can we do? at least don't crash...
- return;
- }
+ // First remove the selection if there is one
+ // TODO: Is there an easier GTK specific way to do this?
+ long from, to;
+ GetSelection(&from, &to);
+ if (from != to)
+ Remove(from, to);
- // TODO: Call whatever is needed to delete the selection.
+ // Insert the text
wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer );
GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(m_widget) );
// This moves the cursor pos to behind the inserted text.
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
- if ( !buffer )
- {
- // what else can we do? at least don't crash...
- return;
- }
-
gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len );
// Bring entry's cursor uptodate.
else
{
wxString str = GetLineText (lineNo);
- return (int) str.Length();
+ return (int) str.length();
}
}
int wxTextCtrl::GetNumberOfLines() const
{
- if (m_windowStyle & wxTE_MULTILINE)
- return gtk_text_buffer_get_line_count( m_buffer );
- else
+ if ( m_windowStyle & wxTE_MULTILINE )
+ {
+ GtkTextIter iter;
+ gtk_text_buffer_get_iter_at_offset( m_buffer, &iter, 0 );
+
+ // move forward by one display line until the end is reached
+ int lineCount = 1;
+ while ( gtk_text_view_forward_display_line(GTK_TEXT_VIEW(m_text), &iter) )
+ {
+ lineCount++;
+ }
+
+ // If the last character in the text buffer is a newline,
+ // gtk_text_view_forward_display_line() will return false without that
+ // line being counted. Must add one manually in that case.
+ GtkTextIter lastCharIter;
+ gtk_text_buffer_get_iter_at_offset
+ (
+ m_buffer,
+ &lastCharIter,
+ gtk_text_buffer_get_char_count(m_buffer) - 1
+ );
+ gchar lastChar = gtk_text_iter_get_char( &lastCharIter );
+ if ( lastChar == wxT('\n') )
+ lineCount++;
+
+ return lineCount;
+ }
+ else // single line
+ {
return 1;
+ }
}
void wxTextCtrl::SetInsertionPoint( long pos )
if (from == -1 && to == -1)
{
from = 0;
- to = GetValue().Length();
+ to = GetValue().length();
}
if (m_windowStyle & wxTE_MULTILINE)
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
- if ((key_event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
+ if ((key_event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxTE_PROCESS_ENTER))
{
wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
event.SetEventObject(this);
projects / wxWidgets.git / blobdiff