[gtk+/refactor: 14/16] Add _gtk_entry_get_im_context() internal accessor
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/refactor: 14/16] Add _gtk_entry_get_im_context() internal accessor
- Date: Fri, 22 Oct 2010 09:39:16 +0000 (UTC)
commit 94a82c4b049cb64a34234c979c5c169c53049aa3
Author: Javier Jardón <jjardon gnome org>
Date: Thu Oct 21 14:06:47 2010 +0200
Add _gtk_entry_get_im_context() internal accessor
It's needed by gtktreeview
gtk/gtkentry.c | 5 +++++
gtk/gtkentryprivate.h | 1 +
gtk/gtktreeview.c | 5 ++++-
3 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 7a041ca..d1c1b32 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -5780,6 +5780,11 @@ gtk_entry_im_context_filter_keypress (GtkEntry *entry,
return gtk_im_context_filter_keypress (entry->im_context, event);
}
+GtkIMContext*
+_gtk_entry_get_im_context (GtkEntry *entry)
+{
+ return entry->im_context;
+}
static gint
gtk_entry_find_position (GtkEntry *entry,
diff --git a/gtk/gtkentryprivate.h b/gtk/gtkentryprivate.h
index baf0b9f..63a5cd0 100644
--- a/gtk/gtkentryprivate.h
+++ b/gtk/gtkentryprivate.h
@@ -84,6 +84,7 @@ void _gtk_entry_get_borders (GtkEntry *entry,
void _gtk_entry_effective_inner_border (GtkEntry *entry,
GtkBorder *border);
void _gtk_entry_reset_im_context (GtkEntry *entry);
+GtkIMContext* _gtk_entry_get_im_context (GtkEntry *entry);
G_END_DECLS
#endif /* __GTK_ENTRY_PRIVATE_H__ */
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index fa45ead..2a9b2c7 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -47,6 +47,7 @@
#include "gtkscrollable.h"
#include "gtkprivate.h"
#include "gtkwidgetprivate.h"
+#include "gtkentryprivate.h"
#define GTK_TREE_VIEW_PRIORITY_VALIDATE (GDK_PRIORITY_REDRAW + 5)
#define GTK_TREE_VIEW_PRIORITY_SCROLL_SYNC (GTK_TREE_VIEW_PRIORITY_VALIDATE + 2)
@@ -10349,10 +10350,12 @@ gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view)
g_signal_connect (tree_view->priv->search_entry,
"activate", G_CALLBACK (gtk_tree_view_search_activate),
tree_view);
- g_signal_connect (GTK_ENTRY (tree_view->priv->search_entry)->im_context,
+
+ g_signal_connect (_gtk_entry_get_im_context (GTK_ENTRY (tree_view->priv->search_entry)),
"preedit-changed",
G_CALLBACK (gtk_tree_view_search_preedit_changed),
tree_view);
+
gtk_container_add (GTK_CONTAINER (vbox),
tree_view->priv->search_entry);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]