casa-mp-base

--- gtkextra/gtkitementry.c 2010/03/13 09:45:54 1.7

+++ gtkextra/gtkitementry.c 2010/06/12 00:37:15 1.8

@@ -131,7 +131,9 @@

 static PangoLayout *gtk_entry_ensure_layout            (GtkEntry       *entry,

                                                         gboolean        include_preedit);

 static void         gtk_entry_queue_draw               (GtkEntry       *entry);

+#if GTK_CHECK_VERSION(2,21,0) == 0

 static void         gtk_entry_reset_im_context         (GtkEntry       *entry);

+#endif 

 static void         gtk_entry_recompute                (GtkEntry       *entry);

 static void         gtk_entry_get_cursor_locations     (GtkEntry       *entry,

                            CursorType      type,

@@ -1754,6 +1756,7 @@

     gdk_window_invalidate_rect (entry->text_area, NULL, FALSE);

 }

+#if GTK_CHECK_VERSION(2,21,0) == 0

 static void

 gtk_entry_reset_im_context (GtkEntry *entry)

 {

@@ -1763,6 +1766,7 @@

       gtk_im_context_reset (entry->im_context);

     }

 }

+#endif // GTK_CHECK_VERSION(2,21,0) == 0

 static void

 gtk_entry_get_cursor_locations (GtkEntry   *entry,