X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/191ae1cf7cd2571277635b3b8e488e773ca5c9b9..587e4b13796f78ed582f36ff8b2ea261c6902b6f:/src/gtkutil.h

diff --git a/src/gtkutil.h b/src/gtkutil.h
index c3957223a1..602228f97b 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -1,12 +1,13 @@
 /* Definitions and headers for GTK widgets.
-   Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+     Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef GTKUTIL_H
 #define GTKUTIL_H
@@ -33,12 +32,9 @@ Boston, MA 02110-1301, USA.  */
 #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  */
+/* Key for data that is valid for menus and scroll bars in a frame  */
 #define XG_FRAME_DATA "emacs_frame"
 
-/* Key for data that is the last scrollbar value  */
-#define XG_LAST_SB_DATA "emacs_last_sb_value"
-
 /* Key for data that menu items hold.  */
 #define XG_ITEM_DATA "emacs_menuitem"
 
@@ -138,6 +134,8 @@ extern char *xg_get_file_name P_ ((FRAME_PTR f,
                                    int mustmatch_p,
                                    int only_dir_p));
 
+extern char *xg_get_font_name P_ ((FRAME_PTR f, char *));
+
 extern GtkWidget *xg_create_widget P_ ((char *type,
                                         char *name,
                                         FRAME_PTR f,
@@ -163,6 +161,7 @@ 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,
                                       GCallback scroll_callback,
+                                      GCallback end_callback,
                                       char *scroll_bar_name));
 extern void xg_show_scroll_bar P_ ((int scrollbar_id));
 extern void xg_remove_scroll_bar P_ ((FRAME_PTR f, int scrollbar_id));
@@ -178,14 +177,14 @@ extern void xg_set_toolkit_scroll_bar_thumb P_ ((struct scroll_bar *bar,
                                                  int portion,
                                                  int position,
                                                  int whole));
-
+extern int xg_event_is_for_scrollbar P_ ((FRAME_PTR f, XEvent *event));
 
 extern void update_frame_tool_bar P_ ((FRAME_PTR f));
 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_resized P_ ((FRAME_PTR f,
+                                  int pixelwidth,
+                                  int pixelheight));
 extern void xg_frame_set_char_size P_ ((FRAME_PTR f, int cols, int rows));
 extern GtkWidget * xg_win_to_widget P_ ((Display *dpy, Window wdesc));