#include "wx/gtk/private.h"
#include <gdk/gdkkeysyms.h>
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
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())
PostCreation(size);
if (multi_line)
+ {
gtk_widget_show(m_text);
+ SetVScrollAdjustment(gtk_scrolled_window_get_vadjustment((GtkScrolledWindow*)m_widget));
+ }
if (!value.empty())
{
if (style & wxTE_READONLY)
{
if (!multi_line)
- gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );
+ gtk_editable_set_editable( GTK_EDITABLE(m_text), FALSE );
else
gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE);
}
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);
+ gint len = gtk_editable_get_position(GTK_EDITABLE(m_text));
#if wxUSE_UNICODE
wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );
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 = oldModified;
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 )
}
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));
}
}
}
else
{
- gtk_entry_set_position( GTK_ENTRY(m_text), -1 );
+ gtk_editable_set_position( GTK_EDITABLE(m_text), -1 );
}
}
}
else
{
- gtk_entry_set_editable( GTK_ENTRY(m_text), editable );
+ gtk_editable_set_editable( GTK_EDITABLE(m_text), editable );
}
}
}
else
{
- return (long) GET_EDITABLE_POS(m_text);
+ return (long) gtk_editable_get_position(GTK_EDITABLE(m_text));
}
}
if (m_windowStyle & wxTE_MULTILINE)
g_signal_emit_by_name (m_text, "cut-clipboard");
else
- gtk_editable_cut_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);
+ gtk_editable_cut_clipboard(GTK_EDITABLE(m_text));
}
void wxTextCtrl::Copy()
if (m_windowStyle & wxTE_MULTILINE)
g_signal_emit_by_name (m_text, "copy-clipboard");
else
- gtk_editable_copy_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);
+ gtk_editable_copy_clipboard(GTK_EDITABLE(m_text));
}
void wxTextCtrl::Paste()
if (m_windowStyle & wxTE_MULTILINE)
g_signal_emit_by_name (m_text, "paste-clipboard");
else
- gtk_editable_paste_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);
+ gtk_editable_paste_clipboard(GTK_EDITABLE(m_text));
}
// Undo/redo
GetEventHandler()->ProcessEvent(url_event);
}
-// ----------------------------------------------------------------------------
-// scrolling
-// ----------------------------------------------------------------------------
-
-GtkAdjustment *wxTextCtrl::GetVAdj() const
-{
- if ( !IsMultiLine() )
- return NULL;
-
- return gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(m_widget));
-}
-
-bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff)
-{
- float value = adj->value + diff;
-
- if ( value < 0 )
- value = 0;
-
- float upper = adj->upper - adj->page_size;
- if ( value > upper )
- value = upper;
-
- // did we noticeably change the scroll position?
- if ( fabs(adj->value - value) < 0.2 )
- {
- // well, this is what Robert does in wxScrollBar, so it must be good...
- return false;
- }
-
- adj->value = value;
-
- gtk_adjustment_value_changed(GTK_ADJUSTMENT(adj));
-
- return true;
-}
-
-bool wxTextCtrl::ScrollLines(int lines)
-{
- GtkAdjustment *adj = GetVAdj();
- if ( !adj )
- return false;
-
- int diff = (int)ceil(lines*adj->step_increment);
-
- return DoScroll(adj, diff);
-}
-
-bool wxTextCtrl::ScrollPages(int pages)
-{
- GtkAdjustment *adj = GetVAdj();
- if ( !adj )
- return false;
-
- return DoScroll(adj, (int)ceil(pages*adj->page_increment));
-}
-
-
// static
wxVisualAttributes
wxTextCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
projects / wxWidgets.git / blobdiff