X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=display-gtk.h;h=b55dc96167ad70b092c83f51a99cad04b2c3e31f;hb=68a1ff9cf56576ee3e3f32e08bc7f7ad2b03697f;hp=d5ffcb246de00702985882648e3372184745d7ae;hpb=f078bc04e1f55ad9ecd0632fcfa5753440ba2267;p=ext%2Fsubsurface.git

diff --git a/display-gtk.h b/display-gtk.h
index d5ffcb2..b55dc96 100644
--- a/display-gtk.h
+++ b/display-gtk.h
@@ -27,11 +27,26 @@ 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>comma"
+#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);
 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, GtkUIManager *ui_manager);
+
+extern const char *divelist_font;
+
 extern visible_cols_t visible_cols;
 
 extern const char *divelist_font;
@@ -57,6 +72,11 @@ typedef void (*data_func_t)(GtkTreeViewColumn *col,
 			    GtkTreeIter *iter,
 			    gpointer data);
 
+typedef gint (*sort_func_t)(GtkTreeModel *model,
+			    GtkTreeIter *a,
+			    GtkTreeIter *b,
+			    gpointer user_data);
+
 #define ALIGN_LEFT 1
 #define ALIGN_RIGHT 2
 #define INVISIBLE 4