diff options
| author |  Alexey Yakovenko <waker@users.sourceforge.net> | 2013-08-29 19:54:33 +0200 |
|---|---|---|
| committer | Alexey Yakovenko <waker@users.sourceforge.net> | 2013-08-29 19:54:33 +0200 |
| commit | 5a2fc2fb88cd198d542d29146128a78a0f0b6f2d (patch) | |
| tree | 829d2f0089ae459177f3d621c98dfccdeebd8380 /plugins/gtkui | |
| parent | ef15eec5093deeea23ab2e1967c8fd7de378001b (diff) | |
osx: failed menu integration attempt
Diffstat (limited to 'plugins/gtkui')
| -rw-r--r-- | plugins/gtkui/Makefile.am | 4 | ||||
| -rw-r--r-- | plugins/gtkui/gtkui.c | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/plugins/gtkui/Makefile.am b/plugins/gtkui/Makefile.am index b6651f8a..8ba410b9 100644 --- a/plugins/gtkui/Makefile.am +++ b/plugins/gtkui/Makefile.am @@ -164,8 +164,8 @@ ddb_gui_GTK3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1. ddb_gui_GTK3_la_CFLAGS = -std=c99 -I$(GTK_ROOT_300)/include/gtk-3.0 -I$(GTK_ROOT_300)/include/pango-1.0 -I$(GTK_ROOT_300)/include/gio-unix-2.0/ -I$(GTK_ROOT_300)/include/atk-1.0 -I$(GTK_ROOT_300)/include/cairo -I$(GTK_ROOT_300)/include/gdk-pixbuf-2.0 -I$(GTK_ROOT_300)/include/freetype2 -I$(GTK_ROOT_300)/include/glib-2.0 -I$(GTK_ROOT_300)/lib/glib-2.0/include $(SM_CFLAGS) $(GTKGLEXT_CFLAGS) else -ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) $(GTKGLEXT_LIBS) -ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS) +ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) $(GTKGLEXT_LIBS) $(GTK_MAC_LIBS) +ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS) $(GTK_MAC_CFLAGS) endif endif diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c index c4ed1f74..808f50c4 100644 --- a/plugins/gtkui/gtkui.c +++ b/plugins/gtkui/gtkui.c @@ -18,6 +18,9 @@ */ #include "../../deadbeef.h" #include <gtk/gtk.h> +#ifdef __APPLE__ +#include "gtkosxapplication.h" +#endif #ifdef HAVE_CONFIG_H #include "../../config.h" #endif @@ -1071,6 +1074,15 @@ gtkui_thread (void *ctx) { progress_init (); cover_art_init (); +#ifdef __APPLE__ +#if 0 + GtkWidget *menubar = lookup_widget (mainwin, "menubar"); + gtk_widget_hide (menubar); + GtkosxApplication *theApp = g_object_new(GTKOSX_TYPE_APPLICATION, NULL); + gtkosx_application_set_menu_bar(theApp, GTK_MENU_SHELL(menubar)); +#endif +#endif + gtk_widget_show (mainwin); init_widget_layout (); |