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/nsmenu.m | |
| 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/nsmenu.m')
| -rw-r--r-- | src/nsmenu.m | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index ed5e76cad0d..b60cc005c5f 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m | |||
| @@ -115,13 +115,13 @@ popup_activated (void) | |||
| 115 | 115 | ||
| 116 | /* -------------------------------------------------------------------------- | 116 | /* -------------------------------------------------------------------------- |
| 117 | Update menubar. Three cases: | 117 | Update menubar. Three cases: |
| 118 | 1) deep_p = 0, submenu = nil: Fresh switch onto a frame -- either set up | 118 | 1) ! deep_p, submenu = nil: Fresh switch onto a frame -- either set up |
| 119 | just top-level menu strings (OS X), or goto case (2) (GNUstep). | 119 | just top-level menu strings (OS X), or goto case (2) (GNUstep). |
| 120 | 2) deep_p = 1, submenu = nil: Recompute all submenus. | 120 | 2) deep_p, submenu = nil: Recompute all submenus. |
| 121 | 3) deep_p = 1, submenu = non-nil: Update contents of a single submenu. | 121 | 3) deep_p, submenu = non-nil: Update contents of a single submenu. |
| 122 | -------------------------------------------------------------------------- */ | 122 | -------------------------------------------------------------------------- */ |
| 123 | void | 123 | void |
| 124 | ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) | 124 | ns_update_menubar (struct frame *f, bool deep_p, EmacsMenu *submenu) |
| 125 | { | 125 | { |
| 126 | NSAutoreleasePool *pool; | 126 | NSAutoreleasePool *pool; |
| 127 | id menu = [NSApp mainMenu]; | 127 | id menu = [NSApp mainMenu]; |
| @@ -507,7 +507,7 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) | |||
| 507 | frame's menus have changed, and the *step representation should be updated | 507 | frame's menus have changed, and the *step representation should be updated |
| 508 | from Lisp. */ | 508 | from Lisp. */ |
| 509 | void | 509 | void |
| 510 | set_frame_menubar (struct frame *f, int first_time, int deep_p) | 510 | set_frame_menubar (struct frame *f, bool first_time, bool deep_p) |
| 511 | { | 511 | { |
| 512 | ns_update_menubar (f, deep_p, nil); | 512 | ns_update_menubar (f, deep_p, nil); |
| 513 | } | 513 | } |
| @@ -1766,7 +1766,7 @@ ns_popup_dialog (Lisp_Object position, Lisp_Object contents, Lisp_Object header) | |||
| 1766 | } | 1766 | } |
| 1767 | 1767 | ||
| 1768 | 1768 | ||
| 1769 | 1769 | ||
| 1770 | - (void)timeout_handler: (NSTimer *)timedEntry | 1770 | - (void)timeout_handler: (NSTimer *)timedEntry |
| 1771 | { | 1771 | { |
| 1772 | NSEvent *nxev = [NSEvent otherEventWithType: NSApplicationDefined | 1772 | NSEvent *nxev = [NSEvent otherEventWithType: NSApplicationDefined |