* macterm.c: Remove consolidated defines and code.

[gnu-emacs] / src / gtkutil.h

diff --git a/src/gtkutil.h b/src/gtkutil.h
index 103b97814172e45caee85cf8f318263a44ab2635..2284ff6e113dd8968c473d6d3e3ecc7e513e22c0 100644 (file)
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -66,7 +66,7 @@ typedef struct xg_list_node_
 typedef struct xg_menu_cb_data_
 {
   xg_list_node  ptrs;
-  
+
   FRAME_PTR     f;
   Lisp_Object   menu_bar_vector;
   int           menu_bar_items_used;
@@ -85,7 +85,7 @@ typedef struct xg_menu_item_cb_data_
   Lisp_Object   help;
   gpointer     call_data;
   xg_menu_cb_data *cl_data;
-  
+
 } xg_menu_item_cb_data;
 
 
@@ -98,7 +98,7 @@ typedef struct _widget_value
   char         *name;
   /* value (meaning depend on widget type) */
   char         *value;
-  /* keyboard equivalent. no implications for XtTranslations */ 
+  /* keyboard equivalent. no implications for XtTranslations */
   char         *key;
   /* Help string or nil if none.
      GC finds this string through the frame's menu_bar_vector
@@ -151,6 +151,8 @@ extern int xg_update_frame_menubar P_ ((FRAME_PTR f));
 
 extern void xg_keep_popup P_ ((GtkWidget *menu, GtkWidget *submenu));
 
+extern int xg_get_scroll_id_for_window P_ ((Window wid));
+
 extern void xg_create_scroll_bar P_ ((FRAME_PTR f,
                                       struct scroll_bar *bar,
                                       GCallback scroll_callback,
@@ -177,6 +179,7 @@ extern void free_frame_tool_bar P_ ((FRAME_PTR f));
 extern void xg_resize_widgets P_ ((FRAME_PTR f,
                                    int pixelwidth,
                                    int pixelheight));
+extern void xg_frame_cleared P_ ((FRAME_PTR f));
 extern void xg_frame_set_char_size P_ ((FRAME_PTR f, int cols, int rows));
 extern GtkWidget * xg_win_to_widget P_ ((Window));
 extern int xg_create_frame_widgets P_ ((FRAME_PTR f));
@@ -195,11 +198,6 @@ extern void xg_initialize P_ ((void));
    to indicate that the callback should do nothing.  */
 extern int xg_ignore_gtk_scrollbar;
 
-/* After we send a scroll bar event,  x_set_toolkit_scroll_bar_thumb will
-   be called.  For some reason that needs to be debugged, it gets called
-   with bad values.  Thus, we set this variable to ignore those calls.  */
-extern int xg_ignore_next_thumb;
-
 /* If a detach of a menu is done, this is the menu widget that got
    detached.  Must be set to NULL before popping up popup menus.
    Used with xg_keep_popup to delay deleting popup menus when they