X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=display-gtk.h;h=f43e3746feca1cce796283f299d99b6415ed226d;hb=34d682416faee9c8beef8b0747d5f1587dea847c;hp=9e5093d400b524af5e3dea518e4f90ae742917ea;hpb=671f6544ac8b4a6eb68576b37344e84808511eb8;p=ext%2Fsubsurface.git
diff --git a/display-gtk.h b/display-gtk.h
index 9e5093d..f43e374 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 ""
+#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);
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;
@@ -46,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);
@@ -57,7 +73,17 @@ 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
+#define UNSORTABLE 8
+
extern GtkTreeViewColumn *tree_view_column(GtkWidget *tree_view, int index, const char *title,
- data_func_t data_func, PangoAlignment align, gboolean visible);
+ data_func_t data_func, unsigned int flags);
#endif