GtkEntry: Sanity check the end_pos value in _get_display_text()

[~andy/gtk] / gtk / gtkentry.h

diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
index 50ca934bd47be446350ef2749dd7d79fde878a58..db80b9e5a51ab5a698143524055d527384a6f343 100644 (file)
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@ -26,14 +26,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_ENTRY_H__
 #define __GTK_ENTRY_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkeditable.h>
 #include <gtk/gtkimcontext.h>
 #include <gtk/gtkmenu.h>
@@ -85,7 +85,7 @@ struct _GtkEntryClass
 
   /* Hook to customize right-click popup */
   void (* populate_popup)   (GtkEntry       *entry,
-                             GtkMenu        *menu);
+                             GtkWidget      *popup);
 
   /* Action signals
    */