*** empty log message ***

[gnu-emacs] / src / gtkutil.h

diff --git a/src/gtkutil.h b/src/gtkutil.h
index fd29ed573e37edf20b5f88e22be737f4e11bf29f..b2e2c5f2fffc2c75805b6b41433b33b5b509d7a9 100644 (file)
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -30,8 +30,9 @@ Boston, MA 02111-1307, USA.  */
 
 /* Minimum and maximum values used for GTK scroll bars  */
 
-#define XG_SB_MIN 0
+#define XG_SB_MIN 1
 #define XG_SB_MAX 10000000
+#define XG_SB_RANGE (XG_SB_MAX-XG_SB_MIN)
 
 /* Key for data that is valid for menus in a frame  */
 #define XG_FRAME_DATA "emacs_frame"
@@ -95,10 +96,12 @@ typedef struct xg_menu_item_cb_data_
 typedef struct _widget_value
 {
   /* name of widget */
+  Lisp_Object   lname;
   char         *name;
   /* value (meaning depend on widget type) */
   char         *value;
   /* keyboard equivalent. no implications for XtTranslations */
+  Lisp_Object   lkey;
   char         *key;
   /* Help string or nil if none.
      GC finds this string through the frame's menu_bar_vector
@@ -129,7 +132,8 @@ extern void free_widget_value P_ ((widget_value *));
 extern char *xg_get_file_name P_ ((FRAME_PTR f,
                                    char *prompt,
                                    char *default_filename,
-                                   int mustmatch_p));
+                                   int mustmatch_p,
+                                   int only_dir_p));
 
 extern GtkWidget *xg_create_widget P_ ((char *type,
                                         char *name,
@@ -149,9 +153,9 @@ extern void xg_modify_menubar_widgets P_ ((GtkWidget *menubar,
 
 extern int xg_update_frame_menubar P_ ((FRAME_PTR f));
 
-extern void xg_keep_popup P_ ((GtkWidget *menu, GtkWidget *submenu));
+extern int xg_have_tear_offs P_ ((void));
 
-extern int xg_get_scroll_id_for_window P_ ((Window wid));
+extern int xg_get_scroll_id_for_window P_ ((Display *dpy, Window wid));
 
 extern void xg_create_scroll_bar P_ ((FRAME_PTR f,
                                       struct scroll_bar *bar,
@@ -179,9 +183,13 @@ 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 GtkWidget * xg_win_to_widget P_ ((Display *dpy, Window wdesc));
+
+extern int xg_display_open P_ ((char *display_name, Display **dpy));
+extern void xg_display_close P_ ((Display *dpy));
+extern GdkCursor * xg_create_default_cursor P_ ((Display *dpy));
+
 extern int xg_create_frame_widgets P_ ((FRAME_PTR f));
 extern void x_wm_set_size_hint P_ ((FRAME_PTR f,
                                     long flags,
@@ -198,16 +206,8 @@ 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
-   have been detached.  */
-extern GtkWidget *xg_did_tearoff;
-
 #endif /* USE_GTK */
 #endif /* GTKUTIL_H */
+
+/* arch-tag: 0757f3dc-00c7-4cee-9e4c-282cf1d34c72
+   (do not change this comment) */