From: Jan Djärv Date: Sun, 2 Sep 2012 10:53:46 +0000 (+0200) Subject: Prototype for x_wm_set_size_hint restored. X-Git-Tag: emacs-24.2.90~433 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8b33967313f09a736a833816d32fd52e10640969;p=emacs.git Prototype for x_wm_set_size_hint restored. * frame.h: Add missing prototype for x_wm_set_size_hint. * gtkutil.h: Remove prototype for x_wm_set_size_hint. --- diff --git a/src/ChangeLog b/src/ChangeLog index 0bcfa6c85f6..2ea13df1261 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2012-09-02 Jan Djärv + + * gtkutil.h: Remove prototype for x_wm_set_size_hint. + + * frame.h: Add missing prototype for x_wm_set_size_hint. + 2012-09-02 Paul Eggert * doc.c, editfns.c, insdel.c, intervals.c: Use bool for boolean. diff --git a/src/frame.h b/src/frame.h index 76fde8ec96b..1fe3ebd9182 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1206,6 +1206,7 @@ extern Lisp_Object Qrun_hook_with_args; extern void x_set_scroll_bar_default_width (struct frame *); extern void x_set_offset (struct frame *, int, int, int); extern void x_wm_set_icon_position (struct frame *, int, int); +extern void x_wm_set_size_hint (FRAME_PTR f, long flags, int user_position); extern Lisp_Object x_new_font (struct frame *, Lisp_Object, int); diff --git a/src/gtkutil.h b/src/gtkutil.h index c1b6634999f..926478dd728 100644 --- a/src/gtkutil.h +++ b/src/gtkutil.h @@ -150,9 +150,6 @@ extern GdkCursor * xg_create_default_cursor (Display *dpy); extern int xg_create_frame_widgets (FRAME_PTR f); extern void xg_free_frame_widgets (FRAME_PTR f); -extern void x_wm_set_size_hint (FRAME_PTR f, - long flags, - int user_position); extern void xg_set_background_color (FRAME_PTR f, unsigned long bg); extern int xg_check_special_colors (struct frame *f, const char *color_name,