diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2012-01-02 20:49:10 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2012-01-03 07:25:35 -0800 |
| commit | 513df18f50afc13fcef9f2421b5a33b772eed380 (patch) | |
| tree | 1be4f906412b41303a5b1c80355014ed5f969d98 /display-gtk.h | |
| parent | 53ecd2025d00e844fbfb84b5765d975e1e8942be (diff) | |
| download | subsurface-513df18f50afc13fcef9f2421b5a33b772eed380.tar.gz | |
Even more Mac-i-ness
Move the About and Preferences menu item to the App menu.
Switch the accelerator key to be Meta (i.e., Command) instead of Control
This required a bit of restructuring of the code, but it's all for a good
cause.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'display-gtk.h')
| -rw-r--r-- | display-gtk.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/display-gtk.h b/display-gtk.h index 35380fa27..f624bf6cc 100644 --- a/display-gtk.h +++ b/display-gtk.h @@ -27,6 +27,14 @@ typedef enum { #define BOOL_TO_PTR(_cond) ((_cond) ? (void *)1 : NULL) #define PTR_TO_BOOL(_ptr) ((_ptr) != NULL) +#if defined __APPLE__ +#define CTRLCHAR "<Meta>" +#define PREFERENCE_ACCEL "<Meta>," +#else +#define CTRLCHAR "<Control>" +#define PREFERENCE_ACCEL NULL +#endif + extern void subsurface_open_conf(void); extern void subsurface_set_conf(char *name, pref_type_t type, const void *value); extern const void *subsurface_get_conf(char *name, pref_type_t type); @@ -34,7 +42,8 @@ extern void subsurface_close_conf(void); extern const char *subsurface_USB_name(void); extern const char *subsurface_icon_name(void); -extern void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar, GtkWidget *vbox); +extern void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar, + GtkWidget *vbox, GtkUIManager *ui_manager); extern const char *divelist_font; |