Fix profile and average depth for freedives

[ext/subsurface.git] / macos.c

diff --git a/macos.c b/macos.c
index 35793f56ef1c6ec7599d2aaaaad60b42200b0b53..1b7da1ec6192e6143809cda9787a91fafc5045e8 100644 (file)
--- a/macos.c
+++ b/macos.c
@@ -59,13 +59,18 @@ const void *subsurface_get_conf(char *name, pref_type_t type)
        return NULL;
 }
 
-void subsurface_close_conf(void)
+void subsurface_flush_conf(void)
 {
        int ok = CFPreferencesAppSynchronize(SUBSURFACE_PREFERENCES);
        if (!ok)
                fprintf(stderr,"Could not save preferences\n");
 }
 
+void subsurface_close_conf(void)
+{
+       /* Nothing */
+}
+
 const char *subsurface_USB_name()
 {
        return "/dev/tty.SLAB_USBtoUART";
@@ -92,18 +97,27 @@ void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar,
        osx_app = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
        gtk_widget_hide (menubar);
        gtk_osxapplication_set_menu_bar(osx_app, GTK_MENU_SHELL(menubar));
+
+       sep = gtk_ui_manager_get_widget(ui_manager, "/MainMenu/FileMenu/Separator2");
+       if (sep)
+               gtk_widget_destroy(sep);
+
        menu_item = gtk_ui_manager_get_widget(ui_manager, "/MainMenu/FileMenu/Quit");
        gtk_widget_hide (menu_item);
        menu_item = gtk_ui_manager_get_widget(ui_manager, "/MainMenu/Help/About");
        gtk_osxapplication_insert_app_menu_item(osx_app, menu_item, 0);
+
        sep = gtk_separator_menu_item_new();
        g_object_ref(sep);
        gtk_osxapplication_insert_app_menu_item (osx_app, sep, 1);
+
        menu_item = gtk_ui_manager_get_widget(ui_manager, "/MainMenu/FileMenu/Preferences");
        gtk_osxapplication_insert_app_menu_item(osx_app, menu_item, 2);
+
        sep = gtk_separator_menu_item_new();
        g_object_ref(sep);
        gtk_osxapplication_insert_app_menu_item (osx_app, sep, 3);
+
        gtk_osxapplication_set_use_quartz_accelerators(osx_app, TRUE);
        gtk_osxapplication_ready(osx_app);
 }