Even more Mac-i-ness

[ext/subsurface.git] / display-gtk.h

diff --git a/display-gtk.h b/display-gtk.h
index 35380fa278f84d68b83069ee21f50acbb6d82374..f624bf6cc99cad9caedec68995f1f9029ffa2270 100644 (file)
--- 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;