diff options
| author | Jan Djärv | 2012-09-02 12:53:46 +0200 |
|---|---|---|
| committer | Jan Djärv | 2012-09-02 12:53:46 +0200 |
| commit | 8b33967313f09a736a833816d32fd52e10640969 (patch) | |
| tree | d6d23f7c8ff995144827272c45836e564f408acc /src | |
| parent | 403e17698e49a7a336d0aeca5d1eb59ec37c85a5 (diff) | |
| download | emacs-8b33967313f09a736a833816d32fd52e10640969.tar.gz emacs-8b33967313f09a736a833816d32fd52e10640969.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/frame.h | 1 | ||||
| -rw-r--r-- | src/gtkutil.h | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0bcfa6c85f6..2ea13df1261 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-09-02 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * gtkutil.h: Remove prototype for x_wm_set_size_hint. | ||
| 4 | |||
| 5 | * frame.h: Add missing prototype for x_wm_set_size_hint. | ||
| 6 | |||
| 1 | 2012-09-02 Paul Eggert <eggert@cs.ucla.edu> | 7 | 2012-09-02 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 8 | ||
| 3 | * doc.c, editfns.c, insdel.c, intervals.c: Use bool for boolean. | 9 | * 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; | |||
| 1206 | extern void x_set_scroll_bar_default_width (struct frame *); | 1206 | extern void x_set_scroll_bar_default_width (struct frame *); |
| 1207 | extern void x_set_offset (struct frame *, int, int, int); | 1207 | extern void x_set_offset (struct frame *, int, int, int); |
| 1208 | extern void x_wm_set_icon_position (struct frame *, int, int); | 1208 | extern void x_wm_set_icon_position (struct frame *, int, int); |
| 1209 | extern void x_wm_set_size_hint (FRAME_PTR f, long flags, int user_position); | ||
| 1209 | 1210 | ||
| 1210 | extern Lisp_Object x_new_font (struct frame *, Lisp_Object, int); | 1211 | extern Lisp_Object x_new_font (struct frame *, Lisp_Object, int); |
| 1211 | 1212 | ||
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); | |||
| 150 | 150 | ||
| 151 | extern int xg_create_frame_widgets (FRAME_PTR f); | 151 | extern int xg_create_frame_widgets (FRAME_PTR f); |
| 152 | extern void xg_free_frame_widgets (FRAME_PTR f); | 152 | extern void xg_free_frame_widgets (FRAME_PTR f); |
| 153 | extern void x_wm_set_size_hint (FRAME_PTR f, | ||
| 154 | long flags, | ||
| 155 | int user_position); | ||
| 156 | extern void xg_set_background_color (FRAME_PTR f, unsigned long bg); | 153 | extern void xg_set_background_color (FRAME_PTR f, unsigned long bg); |
| 157 | extern int xg_check_special_colors (struct frame *f, | 154 | extern int xg_check_special_colors (struct frame *f, |
| 158 | const char *color_name, | 155 | const char *color_name, |