diff options
| author | Paul Eggert | 2012-09-23 12:36:31 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-09-23 12:36:31 -0700 |
| commit | 18e27ea822e42697a32a9757e7931004b86b1188 (patch) | |
| tree | 075e0a04fbc1b55f37037c5be8ee50f2b672339d /src/xmenu.c | |
| parent | 67d63151f28c1188dc22a525138198dd0ea81d8a (diff) | |
| download | emacs-18e27ea822e42697a32a9757e7931004b86b1188.tar.gz emacs-18e27ea822e42697a32a9757e7931004b86b1188.zip | |
gnutls.c, gtkutil.c: Use bool for boolean.
* gnutls.c (gnutls_global_initialized, init_gnutls_functions)
(emacs_gnutls_handle_error):
* gtkutil.c (xg_check_special_colors, xg_prepare_tooltip)
(xg_hide_tooltip, xg_create_frame_widgets)
(create_dialog, xg_uses_old_file_dialog)
(xg_get_file_with_chooser, xg_get_file_with_selection)
(xg_get_file_name, xg_have_tear_offs, create_menus, xg_create_widget)
(xg_item_label_same_p, xg_update_menubar)
(xg_modify_menubar_widgets, xg_event_is_for_menubar)
(xg_ignore_gtk_scrollbar, xg_set_toolkit_scroll_bar_thumb)
(xg_event_is_for_scrollbar, xg_pack_tool_bar, xg_make_tool_item)
(is_box_type, xg_tool_item_stale_p, xg_update_tool_bar_sizes)
(update_frame_tool_bar, free_frame_tool_bar):
* gtkutil.c, w32term.c, xterm.c (x_wm_set_size_hint):
* nsmenu.m (ns_update_menubar):
* nsmenu.m, w32menu.c, xmenu.c (set_frame_menubar):
* xfns.c (Fx_show_tip) [USE_GTK]:
Use bool for boolean.
* gtkutil.c (xg_update_frame_menubar):
* xmenu.c (update_frame_menubar):
Return void, not int, since caller ignores return value.
* gtkutil.c (xg_change_toolbar_position):
Return void, not 1.
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 06d6cb055c0..96a1ae87fdc 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -834,13 +834,13 @@ menubar_selection_callback (Widget widget, LWLIB_ID id, XtPointer client_data) | |||
| 834 | #endif /* not USE_GTK */ | 834 | #endif /* not USE_GTK */ |
| 835 | 835 | ||
| 836 | /* Recompute all the widgets of frame F, when the menu bar has been | 836 | /* Recompute all the widgets of frame F, when the menu bar has been |
| 837 | changed. Value is non-zero if widgets were updated. */ | 837 | changed. */ |
| 838 | 838 | ||
| 839 | static int | 839 | static void |
| 840 | update_frame_menubar (FRAME_PTR f) | 840 | update_frame_menubar (FRAME_PTR f) |
| 841 | { | 841 | { |
| 842 | #ifdef USE_GTK | 842 | #ifdef USE_GTK |
| 843 | return xg_update_frame_menubar (f); | 843 | xg_update_frame_menubar (f); |
| 844 | #else | 844 | #else |
| 845 | struct x_output *x; | 845 | struct x_output *x; |
| 846 | int columns, rows; | 846 | int columns, rows; |
| @@ -851,7 +851,7 @@ update_frame_menubar (FRAME_PTR f) | |||
| 851 | x = f->output_data.x; | 851 | x = f->output_data.x; |
| 852 | 852 | ||
| 853 | if (!x->menubar_widget || XtIsManaged (x->menubar_widget)) | 853 | if (!x->menubar_widget || XtIsManaged (x->menubar_widget)) |
| 854 | return 0; | 854 | return; |
| 855 | 855 | ||
| 856 | block_input (); | 856 | block_input (); |
| 857 | /* Save the size of the frame because the pane widget doesn't accept | 857 | /* Save the size of the frame because the pane widget doesn't accept |
| @@ -882,7 +882,6 @@ update_frame_menubar (FRAME_PTR f) | |||
| 882 | EmacsFrameSetCharSize (x->edit_widget, columns, rows); | 882 | EmacsFrameSetCharSize (x->edit_widget, columns, rows); |
| 883 | unblock_input (); | 883 | unblock_input (); |
| 884 | #endif | 884 | #endif |
| 885 | return 1; | ||
| 886 | } | 885 | } |
| 887 | 886 | ||
| 888 | #ifdef USE_LUCID | 887 | #ifdef USE_LUCID |
| @@ -921,7 +920,7 @@ apply_systemfont_to_menu (struct frame *f, Widget w) | |||
| 921 | it is set the first time this is called, from initialize_frame_menubar. */ | 920 | it is set the first time this is called, from initialize_frame_menubar. */ |
| 922 | 921 | ||
| 923 | void | 922 | void |
| 924 | set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) | 923 | set_frame_menubar (FRAME_PTR f, bool first_time, bool deep_p) |
| 925 | { | 924 | { |
| 926 | xt_or_gtk_widget menubar_widget; | 925 | xt_or_gtk_widget menubar_widget; |
| 927 | #ifdef USE_X_TOOLKIT | 926 | #ifdef USE_X_TOOLKIT |