casa-mp-base
Public
Commits
Marcus Calhoun-Lopez authored a86ab0fa8c2
| 1 + | --- configure.ac.orig 2014-05-12 11:51:09.000000000 -0700 |
| 2 + | +++ configure.ac 2016-04-24 10:05:45.000000000 -0700 |
| 3 + | |
| 4 + | _gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0` |
| 5 + | AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz]) |
| 6 + | if test "x$_gdk_tgt" = xquartz; then |
| 7 + | - PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration) |
| 8 + | + PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk2) |
| 9 + | |
| 10 + | GTK_MAC_BUNDLE_FLAG= |
| 11 + | |
| 12 + | --- src/glade-window.c.orig 2016-04-24 18:30:58.000000000 -0700 |
| 13 + | +++ src/glade-window.c 2016-04-24 18:33:31.000000000 -0700 |
| 14 + | |
| 15 + | { |
| 16 + | /* Fix up the menubar for MacOSX Quartz builds */ |
| 17 + | GtkWidget *sep; |
| 18 + | - GtkOSXApplication *theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL); |
| 19 + | + GtkosxApplication *theApp = g_object_new(GTKOSX_TYPE_APPLICATION, NULL); |
| 20 + | gtk_widget_hide (menubar); |
| 21 + | - gtk_osxapplication_set_menu_bar(theApp, GTK_MENU_SHELL(menubar)); |
| 22 + | + gtkosx_application_set_menu_bar(theApp, GTK_MENU_SHELL(menubar)); |
| 23 + | widget = |
| 24 + | gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/FileMenu/Quit"); |
| 25 + | gtk_widget_hide (widget); |
| 26 + | widget = |
| 27 + | gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/HelpMenu/About"); |
| 28 + | - gtk_osxapplication_insert_app_menu_item (theApp, widget, 0); |
| 29 + | + gtkosx_application_insert_app_menu_item (theApp, widget, 0); |
| 30 + | sep = gtk_separator_menu_item_new(); |
| 31 + | g_object_ref(sep); |
| 32 + | - gtk_osxapplication_insert_app_menu_item (theApp, sep, 1); |
| 33 + | + gtkosx_application_insert_app_menu_item (theApp, sep, 1); |
| 34 + | |
| 35 + | widget = |
| 36 + | gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/EditMenu/Preferences"); |
| 37 + | - gtk_osxapplication_insert_app_menu_item (theApp, widget, 2); |
| 38 + | + gtkosx_application_insert_app_menu_item (theApp, widget, 2); |
| 39 + | sep = gtk_separator_menu_item_new(); |
| 40 + | g_object_ref(sep); |
| 41 + | - gtk_osxapplication_insert_app_menu_item (theApp, sep, 3); |
| 42 + | + gtkosx_application_insert_app_menu_item (theApp, sep, 3); |
| 43 + | |
| 44 + | widget = |
| 45 + | gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/HelpMenu"); |
| 46 + | - gtk_osxapplication_set_help_menu(theApp, GTK_MENU_ITEM(widget)); |
| 47 + | + gtkosx_application_set_help_menu(theApp, GTK_MENU_ITEM(widget)); |
| 48 + | |
| 49 + | g_signal_connect(theApp, "NSApplicationWillTerminate", |
| 50 + | G_CALLBACK(quit_cb), window); |
| 51 + | |
| 52 + | - gtk_osxapplication_ready(theApp); |
| 53 + | + gtkosx_application_ready(theApp); |
| 54 + | |
| 55 + | } |
| 56 + | #endif |