X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=display-gtk.h;h=f43e3746feca1cce796283f299d99b6415ed226d;hb=6e0ea1ce618d9d28d9512e2afe587bde9ae76fda;hp=35380fa278f84d68b83069ee21f50acbb6d82374;hpb=605e063203f8a2a35a5c3be1e7129e80099dd68a;p=ext%2Fsubsurface.git
diff --git a/display-gtk.h b/display-gtk.h
index 35380fa..f43e374 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 ""
+#define PREFERENCE_ACCEL "comma"
+#else
+#define CTRLCHAR ""
+#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;
@@ -52,7 +61,8 @@ extern GtkWidget *dive_profile_widget(void);
extern GtkWidget *dive_info_frame(void);
extern GtkWidget *extended_dive_info_widget(void);
extern GtkWidget *equipment_widget(void);
-extern GtkWidget *stats_widget(void);
+extern GtkWidget *single_stats_widget(void);
+extern GtkWidget *total_stats_widget(void);
extern GtkWidget *cylinder_list_widget(void);
extern GtkWidget *dive_list_create(void);