diff options
| author | Adrian Robert | 2009-01-21 16:34:24 +0000 |
|---|---|---|
| committer | Adrian Robert | 2009-01-21 16:34:24 +0000 |
| commit | cbe0b5bfa9426db7f60af0ec3bb555eaa6ccd43c (patch) | |
| tree | cc6245f25f0d2c01a8022fb503038109d1ca1f26 /src/nsmenu.m | |
| parent | 24c7b4608a8c069da6959bbcb5f6e566963a17fb (diff) | |
| download | emacs-cbe0b5bfa9426db7f60af0ec3bb555eaa6ccd43c.tar.gz emacs-cbe0b5bfa9426db7f60af0ec3bb555eaa6ccd43c.zip | |
* nsmenu.m (NSMENUPROFILE): Change #if style.
Diffstat (limited to 'src/nsmenu.m')
| -rw-r--r-- | src/nsmenu.m | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index 3d190a9b253..6f9f3728dee 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m | |||
| @@ -36,9 +36,12 @@ Carbon version by Yamamoto Mitsuharu. */ | |||
| 36 | #include "termhooks.h" | 36 | #include "termhooks.h" |
| 37 | #include "keyboard.h" | 37 | #include "keyboard.h" |
| 38 | 38 | ||
| 39 | /* for profiling */ | 39 | #define NSMENUPROFILE 0 |
| 40 | |||
| 41 | #if NSMENUPROFILE | ||
| 40 | #include <sys/timeb.h> | 42 | #include <sys/timeb.h> |
| 41 | #include <sys/types.h> | 43 | #include <sys/types.h> |
| 44 | #endif | ||
| 42 | 45 | ||
| 43 | #define MenuStagger 10.0 | 46 | #define MenuStagger 10.0 |
| 44 | 47 | ||
| @@ -114,7 +117,6 @@ popup_activated () | |||
| 114 | 2) deep_p = 1, submenu = nil: Recompute all submenus. | 117 | 2) deep_p = 1, submenu = nil: Recompute all submenus. |
| 115 | 3) deep_p = 1, submenu = non-nil: Update contents of a single submenu. | 118 | 3) deep_p = 1, submenu = non-nil: Update contents of a single submenu. |
| 116 | -------------------------------------------------------------------------- */ | 119 | -------------------------------------------------------------------------- */ |
| 117 | /*#define NSMENUPROFILE 1 */ | ||
| 118 | void | 120 | void |
| 119 | ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) | 121 | ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) |
| 120 | { | 122 | { |
| @@ -129,7 +131,7 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) | |||
| 129 | widget_value *wv, *first_wv, *prev_wv = 0; | 131 | widget_value *wv, *first_wv, *prev_wv = 0; |
| 130 | int i; | 132 | int i; |
| 131 | 133 | ||
| 132 | #ifdef NSMENUPROFILE | 134 | #if NSMENUPROFILE |
| 133 | struct timeb tb; | 135 | struct timeb tb; |
| 134 | long t; | 136 | long t; |
| 135 | #endif | 137 | #endif |
| @@ -163,7 +165,7 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) | |||
| 163 | [attMenu close]; | 165 | [attMenu close]; |
| 164 | } | 166 | } |
| 165 | 167 | ||
| 166 | #ifdef NSMENUPROFILE | 168 | #if NSMENUPROFILE |
| 167 | ftime (&tb); | 169 | ftime (&tb); |
| 168 | t = -(1000*tb.time+tb.millitm); | 170 | t = -(1000*tb.time+tb.millitm); |
| 169 | #endif | 171 | #endif |
| @@ -329,7 +331,7 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) | |||
| 329 | { | 331 | { |
| 330 | /* No change.. */ | 332 | /* No change.. */ |
| 331 | 333 | ||
| 332 | #ifdef NSMENUPROFILE | 334 | #if NSMENUPROFILE |
| 333 | ftime (&tb); | 335 | ftime (&tb); |
| 334 | t += 1000*tb.time+tb.millitm; | 336 | t += 1000*tb.time+tb.millitm; |
| 335 | fprintf (stderr, "NO CHANGE! CUTTING OUT after %ld msec.\n", t); | 337 | fprintf (stderr, "NO CHANGE! CUTTING OUT after %ld msec.\n", t); |
| @@ -480,7 +482,7 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) | |||
| 480 | free_menubar_widget_value_tree (first_wv); | 482 | free_menubar_widget_value_tree (first_wv); |
| 481 | 483 | ||
| 482 | 484 | ||
| 483 | #ifdef NSMENUPROFILE | 485 | #if NSMENUPROFILE |
| 484 | ftime (&tb); | 486 | ftime (&tb); |
| 485 | t += 1000*tb.time+tb.millitm; | 487 | t += 1000*tb.time+tb.millitm; |
| 486 | fprintf (stderr, "Menu update took %ld msec.\n", t); | 488 | fprintf (stderr, "Menu update took %ld msec.\n", t); |