extern "C" {
static void wxGtkOnRemoveTag(GtkTextBuffer *buffer,
GtkTextTag *tag,
- GtkTextIter *start,
- GtkTextIter *end,
+ GtkTextIter * WXUNUSED(start),
+ GtkTextIter * WXUNUSED(end),
char *prefix)
{
gchar *name;
{
wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXFONT", start, end);
- PangoFontDescription *font_description = attr.GetFont().GetNativeFontInfo()->description;
+ wxFont font(attr.GetFont());
+
+ PangoFontDescription *font_description = font.GetNativeFontInfo()->description;
wxGtkString font_string(pango_font_description_to_string(font_description));
g_snprintf(buf, sizeof(buf), "WXFONT %s", font_string.c_str());
tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
NULL );
gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
- if (attr.GetFont().GetUnderlined())
+ if (font.GetUnderlined())
{
g_snprintf(buf, sizeof(buf), "WXFONTUNDERLINE");
tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXINDENT", start, end);
// Convert indent from 1/10th of a mm into pixels
- float factor;
-#if GTK_CHECK_VERSION(2,2,0)
- if (!gtk_check_version(2,2,0))
- factor = (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
+ float factor =
+ (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10;
- else
-#endif
- factor = (float)gdk_screen_width() / gdk_screen_width_mm() / 10;
const int indent = (int)(factor * attr.GetLeftIndent());
const int subIndent = (int)(factor * attr.GetLeftSubIndent());
for (size_t i = 0; i < tabs.GetCount(); i++)
tagname += wxString::Format(_T(" %d"), tabs[i]);
- const wxWX2MBbuf buf = tagname.mb_str(wxConvUTF8);
+ const wxWX2MBbuf buftag = tagname.utf8_str();
tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
- buf );
+ buftag );
if (!tag)
{
// Factor to convert from 1/10th of a mm into pixels
- float factor;
-#if GTK_CHECK_VERSION(2,2,0)
- if (!gtk_check_version(2,2,0))
- factor = (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
+ float factor =
+ (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10;
- else
-#endif
- factor = (float)gdk_screen_width() / gdk_screen_width_mm() / 10;
PangoTabArray* tabArray = pango_tab_array_new(tabs.GetCount(), TRUE);
for (size_t i = 0; i < tabs.GetCount(); i++)
pango_tab_array_set_tab(tabArray, i, PANGO_TAB_LEFT, (gint)(tabs[i] * factor));
- tag = gtk_text_buffer_create_tag( text_buffer, buf,
+ tag = gtk_text_buffer_create_tag( text_buffer, buftag,
"tabs", tabArray, NULL );
pango_tab_array_free(tabArray);
}
wxGtkTextApplyTagsFromAttr(text, text_buffer, attr, &start, &iter);
}
-// ----------------------------------------------------------------------------
-// "insert_text" for GtkEntry
-// ----------------------------------------------------------------------------
-
-extern "C" {
-static void
-gtk_insert_text_callback(GtkEditable *editable,
- const gchar *new_text,
- gint new_text_length,
- gint *position,
- wxTextCtrl *win)
-{
- // 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
- 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->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 );
- }
-}
-}
-
// 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)
+ GtkTextIter * WXUNUSED(start),
+ GtkTextIter * WXUNUSED(end),
+ gpointer WXUNUSED(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");
extern "C" {
static gboolean
-pred_whitespace (gunichar ch, gpointer user_data)
+pred_whitespace(gunichar ch, gpointer WXUNUSED(user_data))
{
return g_unichar_isspace(ch);
}
extern "C" {
static gboolean
-pred_non_whitespace (gunichar ch, gpointer user_data)
+pred_non_whitespace (gunichar ch, gpointer WXUNUSED(user_data))
{
return !g_unichar_isspace(ch);
}
extern "C" {
static gboolean
-pred_nonpunct (gunichar ch, gpointer user_data)
+pred_nonpunct (gunichar ch, gpointer WXUNUSED(user_data))
{
return !g_unichar_ispunct(ch);
}
extern "C" {
static gboolean
-pred_nonpunct_or_slash (gunichar ch, gpointer user_data)
+pred_nonpunct_or_slash (gunichar ch, gpointer WXUNUSED(user_data))
{
return !g_unichar_ispunct(ch) || ch == '/';
}
extern "C" {
static void
-au_insert_text_callback(GtkTextBuffer *buffer,
+au_insert_text_callback(GtkTextBuffer * WXUNUSED(buffer),
GtkTextIter *end,
gchar *text,
gint len,
extern "C" {
static void
-au_delete_range_callback(GtkTextBuffer *buffer,
+au_delete_range_callback(GtkTextBuffer * WXUNUSED(buffer),
GtkTextIter *start,
GtkTextIter *end,
wxTextCtrl *win)
extern "C" {
static void
-gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
+gtk_text_changed_callback( GtkWidget * WXUNUSED(widget), wxTextCtrl *win )
{
if ( win->IgnoreTextUpdate() )
return;
{
wxClipboardTextEvent event( eventType, win->GetId() );
event.SetEventObject( win );
- if ( win->GetEventHandler()->ProcessEvent( event ) )
+ if ( win->HandleWindowEvent( event ) )
{
// don't let the default processing to take place if we did something
// ourselves in the event handler
extern "C" {
static gboolean
-gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl *win )
+gtk_text_exposed_callback( GtkWidget * WXUNUSED(widget),
+ GdkEventExpose * WXUNUSED(event),
+ wxTextCtrl * WXUNUSED(win) )
{
return TRUE;
}
SetUpdateFont(false);
m_text = NULL;
- m_freezeCount = 0;
m_showPositionOnThaw = NULL;
m_gdkHandCursor = NULL;
m_gdkXTermCursor = NULL;
if (style & wxNO_BORDER)
g_object_set (m_text, "has-frame", FALSE, NULL);
+
}
m_parent->DoAddChild( this );
au_check_range(&start, &end);
}
}
-
+ else // single line
+ {
+ // do the right thing with Enter presses depending on whether we have
+ // wxTE_PROCESS_ENTER or not
+ GTKSetActivatesDefault();
+ }
+
+
g_signal_connect (m_text, "copy-clipboard",
G_CALLBACK (gtk_copy_clipboard_callback), this);
g_signal_connect (m_text, "cut-clipboard",
return true;
}
+GtkEditable *wxTextCtrl::GetEditable() const
+{
+ wxCHECK_MSG( IsSingleLine(), NULL, "shouldn't be called for multiline" );
+
+ return GTK_EDITABLE(m_text);
+}
+
// ----------------------------------------------------------------------------
// flags handling
// ----------------------------------------------------------------------------
void wxTextCtrl::GTKSetVisibility()
{
- // VZ: shouldn't we assert if wxTE_PASSWORD is set for multiline control?
- if ( IsSingleLine() )
- gtk_entry_set_visibility(GTK_ENTRY(m_text), !HasFlag(wxTE_PASSWORD));
+ wxCHECK_RET( IsSingleLine(),
+ "wxTE_PASSWORD is for single line text controls only" );
+
+ gtk_entry_set_visibility(GTK_ENTRY(m_text), !HasFlag(wxTE_PASSWORD));
+}
+
+void wxTextCtrl::GTKSetActivatesDefault()
+{
+ wxCHECK_RET( IsSingleLine(),
+ "wxTE_PROCESS_ENTER is for single line text controls only" );
+
+ gtk_entry_set_activates_default(GTK_ENTRY(m_text),
+ !HasFlag(wxTE_PROCESS_ENTER));
}
void wxTextCtrl::GTKSetWrapMode()
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 // __WXGTK24__
- wrap = GTK_WRAP_WORD;
- }
+ wrap = GTK_WRAP_WORD_CHAR;
gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );
}
}
else // single line
{
-#ifdef __WXGTK24__
- // gtk_entry_set_alignment was introduced in gtk+-2.3.5
- if (!gtk_check_version(2,4,0))
- {
- gfloat align;
- if ( HasFlag(wxTE_RIGHT) )
- align = 1.0;
- else if ( HasFlag(wxTE_CENTRE) )
- align = 0.5;
- else // single line
- align = 0.0;
-
- gtk_entry_set_alignment(GTK_ENTRY(m_text), align);
- }
-#endif // __WXGTK24__
- }
+ gfloat align;
+ if ( HasFlag(wxTE_RIGHT) )
+ align = 1.0;
+ else if ( HasFlag(wxTE_CENTRE) )
+ align = 0.5;
+ else // single line
+ align = 0.0;
+ gtk_entry_set_alignment(GTK_ENTRY(m_text), align);
+ }
}
void wxTextCtrl::SetWindowStyleFlag(long style)
if ( (style & wxTE_PASSWORD) != (styleOld & wxTE_PASSWORD) )
GTKSetVisibility();
+ if ( (style & wxTE_PROCESS_ENTER) != (styleOld & wxTE_PROCESS_ENTER) )
+ GTKSetActivatesDefault();
+
static const long flagsWrap = wxTE_WORDWRAP | wxTE_CHARWRAP | wxTE_DONTWRAP;
if ( (style & flagsWrap) != (styleOld & flagsWrap) )
GTKSetWrapMode();
{
wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") );
- wxString tmp;
if ( IsMultiLine() )
{
GtkTextIter start;
return wxGTK_CONV_BACK(text);
}
- else
+ else // single line
{
- const gchar *text = gtk_entry_get_text( GTK_ENTRY(m_text) );
- return wxGTK_CONV_BACK(text);
+ return wxTextEntry::GetValue();
}
-
- return tmp;
}
wxFontEncoding wxTextCtrl::GetTextEncoding() const
// first check the default text style (we intentionally don't check the
// style for the current position as it doesn't make sense for SetValue())
const wxTextAttr& style = GetDefaultStyle();
- wxFontEncoding enc = style.HasFont() ? style.GetFont().GetEncoding()
+ wxFontEncoding enc = style.HasFontEncoding() ? style.GetFontEncoding()
: wxFONTENCODING_SYSTEM;
// fall back to the controls font if no style
if ( IsMultiLine() )
return gtk_text_buffer_get_char_count(m_buffer) == 0;
- return wxTextCtrlBase::IsEmpty();
+ return wxTextEntry::IsEmpty();
}
void wxTextCtrl::DoSetValue( const wxString &value, int flags )
m_modified = false;
+ if ( !IsMultiLine() )
+ {
+ wxTextEntry::DoSetValue(value, flags);
+ return;
+ }
+
wxFontEncoding enc = m_defaultStyle.HasFont()
? m_defaultStyle.GetFont().GetEncoding()
: wxFONTENCODING_SYSTEM;
if ( !(flags & SetValue_SendEvent) )
{
- g_signal_handlers_block_by_func(GetTextObject(),
- (gpointer)gtk_text_changed_callback, this);
+ EnableTextChangedEvents(false);
}
- if ( IsMultiLine() )
- {
- gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
-
- if ( !m_defaultStyle.IsDefault() )
- {
- GtkTextIter start, end;
- gtk_text_buffer_get_bounds( m_buffer, &start, &end );
- wxGtkTextApplyTagsFromAttr(m_widget, m_buffer, m_defaultStyle,
- &start, &end);
- }
- }
- else // single line
+ gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
+
+ if ( !m_defaultStyle.IsDefault() )
{
- gtk_entry_set_text( GTK_ENTRY(m_text), buffer );
+ GtkTextIter start, end;
+ gtk_text_buffer_get_bounds( m_buffer, &start, &end );
+ wxGtkTextApplyTagsFromAttr(m_widget, m_buffer, m_defaultStyle,
+ &start, &end);
}
if ( !(flags & SetValue_SendEvent) )
{
- g_signal_handlers_unblock_by_func(GetTextObject(),
- (gpointer)gtk_text_changed_callback, this);
+ EnableTextChangedEvents(true);
}
-
+
// This was added after discussion on the list
SetInsertionPoint(0);
}
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
- if ( text.empty() )
+ // we're changing the text programmatically
+ DontMarkDirtyOnNextChange();
+
+ if ( !IsMultiLine() )
+ {
+ wxTextEntry::WriteText(text);
return;
+ }
// check if we have a specific style for the current position
wxFontEncoding enc = wxFONTENCODING_SYSTEM;
wxTextAttr style;
- if ( GetStyle(GetInsertionPoint(), style) && style.HasFont() )
+ if ( GetStyle(GetInsertionPoint(), style) && style.HasFontEncoding() )
{
- enc = style.GetFont().GetEncoding();
+ enc = style.GetFontEncoding();
}
if ( enc == wxFONTENCODING_SYSTEM )
return;
}
- // we're changing the text programmatically
- DontMarkDirtyOnNextChange();
-
- if ( IsMultiLine() )
- {
- // 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);
+ // 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);
- // Insert the text
- wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer );
+ // Insert the text
+ wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer );
- 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
- // won't work when frozen, text view is not using m_buffer then
- if (!IsFrozen() && 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
+ 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
+ // won't work when frozen, text view is not using m_buffer then
+ if (!IsFrozen() && wxIsSameDouble(adj->value, adj->upper - adj->page_size))
{
- // 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 = gtk_editable_get_position(GTK_EDITABLE(m_text));
-
- gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len );
-
- // Bring entry's cursor uptodate.
- gtk_editable_set_position( GTK_EDITABLE(m_text), len );
+ 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 );
}
}
-void wxTextCtrl::AppendText( const wxString &text )
-{
- SetInsertionPointEnd();
- WriteText( text );
-}
-
wxString wxTextCtrl::GetLineText( long lineNo ) const
{
wxString result;
else
gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(m_text), mark);
}
- else
+ else // single line
{
- // FIXME: Is the editable's cursor really uptodate without double set_position in GTK2?
- gtk_editable_set_position(GTK_EDITABLE(m_text), int(pos));
+ wxTextEntry::SetInsertionPoint(pos);
}
}
-void wxTextCtrl::SetInsertionPointEnd()
-{
- SetInsertionPoint(-1);
-}
-
void wxTextCtrl::SetEditable( bool editable )
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
{
gtk_text_view_set_editable( GTK_TEXT_VIEW(m_text), editable );
}
- else
+ else // single line
{
- gtk_editable_set_editable( GTK_EDITABLE(m_text), editable );
+ wxTextEntry::SetEditable(editable);
}
}
// wxGTK-specific: called recursively by Enable,
// to give widgets an opportunity to correct their colours after they
// have been changed by Enable
-void wxTextCtrl::OnEnabled( bool enable )
+void wxTextCtrl::OnEnabled(bool WXUNUSED(enable))
{
// If we have a custom background colour, we use this colour in both
// disabled and enabled mode, or we end up with a different colour under the
}
// ----------------------------------------------------------------------------
-// max text length support
+// event handling
// ----------------------------------------------------------------------------
+void wxTextCtrl::EnableTextChangedEvents(bool enable)
+{
+ if ( enable )
+ {
+ g_signal_handlers_unblock_by_func(GetTextObject(),
+ (gpointer)gtk_text_changed_callback, this);
+ }
+ else // disable events
+ {
+ g_signal_handlers_block_by_func(GetTextObject(),
+ (gpointer)gtk_text_changed_callback, this);
+ }
+}
+
bool wxTextCtrl::IgnoreTextUpdate()
{
if ( m_countUpdatesToIgnore > 0 )
return true;
}
-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 )
- {
- g_signal_connect (m_text, "insert_text",
- G_CALLBACK (gtk_insert_text_callback), this);
- }
- else // no checking
- {
- g_signal_handlers_disconnect_by_func (m_text,
- (gpointer) gtk_insert_text_callback, this);
- }
- }
-}
-
void wxTextCtrl::SetSelection( long from, long to )
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
gtk_text_buffer_place_cursor( m_buffer, &toi );
gtk_text_buffer_move_mark_by_name( m_buffer, "selection_bound", &fromi );
}
- else
+ else // single line
{
- gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+ wxTextEntry::SetSelection(from, to);
}
}
}
else
{
- return (long) gtk_editable_get_position(GTK_EDITABLE(m_text));
+ return wxTextEntry::GetInsertionPoint();
}
}
pos = gtk_text_iter_get_offset( &end );
}
- else
+ else // single line
{
- pos = GTK_ENTRY(m_text)->text_length;
+ pos = wxTextEntry::GetLastPosition();
}
return (long)pos;
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") );
-
- Remove( from, to );
-
- if (!value.empty())
{
- SetInsertionPoint( from );
- WriteText( value );
+ wxTextEntry::Remove(from, to);
}
}
if ( IsMultiLine() )
g_signal_emit_by_name (m_text, "cut-clipboard");
else
- gtk_editable_cut_clipboard(GTK_EDITABLE(m_text));
+ wxTextEntry::Cut();
}
void wxTextCtrl::Copy()
if ( IsMultiLine() )
g_signal_emit_by_name (m_text, "copy-clipboard");
else
- gtk_editable_copy_clipboard(GTK_EDITABLE(m_text));
+ wxTextEntry::Copy();
}
void wxTextCtrl::Paste()
if ( IsMultiLine() )
g_signal_emit_by_name (m_text, "paste-clipboard");
else
- gtk_editable_paste_clipboard(GTK_EDITABLE(m_text));
-}
-
-// Undo/redo
-void wxTextCtrl::Undo()
-{
- // TODO
- wxFAIL_MSG( wxT("wxTextCtrl::Undo not implemented") );
-}
-
-void wxTextCtrl::Redo()
-{
- // TODO
- wxFAIL_MSG( wxT("wxTextCtrl::Redo not implemented") );
-}
-
-bool wxTextCtrl::CanUndo() const
-{
- // TODO
- //wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );
- return false;
-}
-
-bool wxTextCtrl::CanRedo() const
-{
- // TODO
- //wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );
- return false;
+ wxTextEntry::Paste();
}
// If the return values from and to are the same, there is no
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
- gint from = -1;
- gint to = -1;
- bool haveSelection = false;
-
- if ( IsMultiLine() )
- {
- 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 ( !IsMultiLine() )
+ {
+ wxTextEntry::GetSelection(fromOut, toOut);
+ return;
+ }
+
+ gint from, to;
+
+ GtkTextIter ifrom, ito;
+ if ( gtk_text_buffer_get_selection_bounds(m_buffer, &ifrom, &ito) )
+ {
+ from = gtk_text_iter_get_offset(&ifrom);
+ to = gtk_text_iter_get_offset(&ito);
+
+ if ( from > to )
+ {
+ // exchange them to be compatible with wxMSW
+ gint tmp = from;
+ from = to;
+ to = tmp;
+ }
+ }
+ else // no selection
+ {
+ from =
+ to = GetInsertionPoint();
+ }
if ( fromOut )
*fromOut = from;
}
else
{
- return gtk_editable_get_editable(GTK_EDITABLE(m_text));
+ return wxTextEntry::IsEditable();
}
}
return m_modified;
}
-void wxTextCtrl::Clear()
-{
- SetValue( wxEmptyString );
-}
-
void wxTextCtrl::OnChar( wxKeyEvent &key_event )
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
event.SetEventObject(this);
event.SetString(GetValue());
- if ( GetEventHandler()->ProcessEvent(event) )
+ if ( HandleWindowEvent(event) )
return;
}
-
- // FIXME: this is not the right place to do it, wxDialog::OnCharHook()
- // probably is
- if ( IsSingleLine() )
- {
- // 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 (window->default_widget)
- {
- gtk_widget_activate (window->default_widget);
- return;
- }
- }
- }
}
key_event.Skip();
// freeze/thaw
// ----------------------------------------------------------------------------
-void wxTextCtrl::Freeze()
+void wxTextCtrl::DoFreeze()
{
wxCHECK_RET(m_text != NULL, wxT("invalid text ctrl"));
if ( HasFlag(wxTE_MULTILINE) )
{
- if (m_freezeCount++ == 0)
- {
- // 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);
- GtkTextBuffer* buf_new = gtk_text_buffer_new(NULL);
- GtkTextMark* mark = GTK_TEXT_VIEW(m_text)->first_para_mark;
- gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), buf_new);
- // gtk_text_view_set_buffer adds its own reference
- g_object_unref(buf_new);
- // This mark should be deleted when the buffer is changed,
- // but it's not (in GTK+ up to at least 2.10.6).
- // Otherwise these anonymous marks start to build up in the buffer,
- // and Freeze takes longer and longer each time it is called.
- if (GTK_IS_TEXT_MARK(mark) && !gtk_text_mark_get_deleted(mark))
- gtk_text_buffer_delete_mark(m_buffer, mark);
- }
- }
-}
-
-void wxTextCtrl::Thaw()
+ // 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);
+ GtkTextBuffer* buf_new = gtk_text_buffer_new(NULL);
+ GtkTextMark* mark = GTK_TEXT_VIEW(m_text)->first_para_mark;
+ gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), buf_new);
+ // gtk_text_view_set_buffer adds its own reference
+ g_object_unref(buf_new);
+ // This mark should be deleted when the buffer is changed,
+ // but it's not (in GTK+ up to at least 2.10.6).
+ // Otherwise these anonymous marks start to build up in the buffer,
+ // and Freeze takes longer and longer each time it is called.
+ if (GTK_IS_TEXT_MARK(mark) && !gtk_text_mark_get_deleted(mark))
+ gtk_text_buffer_delete_mark(m_buffer, mark);
+ }
+}
+
+void wxTextCtrl::DoThaw()
{
if ( HasFlag(wxTE_MULTILINE) )
{
- wxCHECK_RET(m_freezeCount != 0, _T("Thaw() without matching Freeze()"));
-
- if (--m_freezeCount == 0)
+ // 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);
+ if (m_showPositionOnThaw != NULL)
{
- // 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);
- if (m_showPositionOnThaw != NULL)
- {
- gtk_text_view_scroll_mark_onscreen(
- GTK_TEXT_VIEW(m_text), m_showPositionOnThaw);
- m_showPositionOnThaw = NULL;
- }
+ gtk_text_view_scroll_mark_onscreen(
+ GTK_TEXT_VIEW(m_text), m_showPositionOnThaw);
+ m_showPositionOnThaw = NULL;
}
}
}
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);
+ //event.Skip(!HandleWindowEvent(url_event));
+ HandleWindowEvent(url_event);
}
bool wxTextCtrl::GTKProcessEvent(wxEvent& event) const
projects / wxWidgets.git / blobdiff