diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-01 14:37:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-01 14:37:38 -0800 |
| commit | 1d51c7772996705fb69b2b3433cd94af3543583d (patch) | |
| tree | c269437a6fc35ed24c2ac675c1a4bd0ba740b303 /gtk-gui.c | |
| parent | 16b6df559f7b5aabbcbec7d7d08f3687b30384dc (diff) | |
| parent | 605e063203f8a2a35a5c3be1e7129e80099dd68a (diff) | |
| download | subsurface-1d51c7772996705fb69b2b3433cd94af3543583d.tar.gz | |
Merge branch 'mac' of git://git.hohndel.org/subsurface
* 'mac' of git://git.hohndel.org/subsurface:
Turn subsurface into a real Mac application
Diffstat (limited to 'gtk-gui.c')
| -rw-r--r-- | gtk-gui.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -22,7 +22,6 @@ GtkWidget *error_label; GtkWidget *vpane, *hpane; int error_count; -#define DIVELIST_DEFAULT_FONT "Sans 8" const char *divelist_font; struct units output_units; @@ -681,9 +680,6 @@ void init_ui(int *argcp, char ***argvp) divelist_font = subsurface_get_conf("divelist_font", PREF_STRING); - if (!divelist_font) - divelist_font = DIVELIST_DEFAULT_FONT; - error_info_bar = NULL; win = gtk_window_new(GTK_WINDOW_TOPLEVEL); g_set_application_name ("subsurface"); @@ -709,7 +705,8 @@ void init_ui(int *argcp, char ***argvp) main_vbox = vbox; menubar = get_menubar_menu(win); - gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); + + subsurface_ui_setup(settings, menubar, vbox); vpane = gtk_vpaned_new(); gtk_box_pack_start(GTK_BOX(vbox), vpane, TRUE, TRUE, 3); |