6 files changed, 14 insertions, 9 deletions
diff --git a/plugins/gme/game-music-emu-0.6pre/gme/ym2413.c b/plugins/gme/game-music-emu-0.6pre/gme/ym2413.c
index 28d6991f..7061eaaa 100644
--- a/plugins/gme/game-music-emu-0.6pre/gme/ym2413.c
+++ b/plugins/gme/game-music-emu-0.6pre/gme/ym2413.c
@@ -2104,3 +2104,4 @@ void ym2413_set_mask(void *_chip, UINT32 mask)
 
 	chip->mask = mask;
 }
+
diff --git a/plugins/gtkui/Makefile.am b/plugins/gtkui/Makefile.am
index 8ba410b9..8636eda8 100644
--- a/plugins/gtkui/Makefile.am
+++ b/plugins/gtkui/Makefile.am
@@ -97,6 +97,9 @@ endif
 endif
 
 if HAVE_GTK3
+if OS_OSX
+GTKGLEXT_SOURCES =
+else
 GTKGLEXT_SOURCES = \
 	gtkglext-gtk3/gtk/gtkglinit.c\
 	gtkglext-gtk3/gtk/gtkglversion.c\
@@ -149,11 +152,12 @@ GTKGLEXT_SOURCES = \
 	gtkglext-gtk3/gdk/x11/gdkx11glcontext.h\
 	gtkglext-gtk3/gdk/x11/gdkx11glquery.h\
 	gtkglext-gtk3/gdk/x11/gdkx11glwindow.h
+endif
 
-GTKGLEXT_CFLAGS = 
-GTKGLEXT_LIBS = 
+GTKGLEXT_CFLAGS = -I@top_srcdir@/plugins/gtkui/gtkglext-gtk3 -I@top_srcdir@/plugins/gtkui/gtkglext-gtk3/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION
+GTKGLEXT_LIBS = -lGL
 
-ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES)
+ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES) $(GTKGLEXT_SOURCES)
 ddb_gui_GTK3_la_LDFLAGS = -module
 
 if STATICLINK
diff --git a/plugins/gtkui/ddblistview.c b/plugins/gtkui/ddblistview.c
index 582d11e3..6dc96a5c 100644
--- a/plugins/gtkui/ddblistview.c
+++ b/plugins/gtkui/ddblistview.c
@@ -2317,7 +2317,7 @@ ddb_listview_header_configure_event              (GtkWidget       *widget,
 {
     DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
     draw_init_font (&ps->hdrctx, gtk_widget_get_style (widget));
-    int height = draw_get_listview_rowheight (&ps->hdrctx) + 4;
+    int height = draw_get_listview_rowheight (&ps->hdrctx);
     GtkAllocation a;
     gtk_widget_get_allocation (widget, &a);
     if (height != a.height) {
diff --git a/plugins/gtkui/ddbtabstrip.c b/plugins/gtkui/ddbtabstrip.c
index c7727a2a..bc180dc2 100644
--- a/plugins/gtkui/ddbtabstrip.c
+++ b/plugins/gtkui/ddbtabstrip.c
@@ -438,9 +438,9 @@ ddb_tabstrip_draw_tab (GtkWidget *widget, cairo_t *cr, int idx, int selected, in
 #endif
     }
 #if !GTK_CHECK_VERSION(3,0,0)
-    gdk_draw_polygon (drawable, bg, TRUE, points_filled, sizeof (points_filled)/sizeof(coord_t));
-    gdk_draw_lines (drawable, outer_frame, points_frame1, sizeof (points_frame1)/sizeof(coord_t));
-    gdk_draw_lines (drawable, inner_frame, points_frame2, sizeof (points_frame2)/sizeof(coord_t));
+    gdk_draw_polygon (drawable, bg, TRUE, (GdkPoint*)points_filled, sizeof (points_filled)/sizeof(coord_t));
+    gdk_draw_lines (drawable, outer_frame, (GdkPoint*)points_frame1, sizeof (points_frame1)/sizeof(coord_t));
+    gdk_draw_lines (drawable, inner_frame, (GdkPoint*)points_frame2, sizeof (points_frame2)/sizeof(coord_t));
     g_object_unref (bg);
     g_object_unref (outer_frame);
     g_object_unref (inner_frame);
diff --git a/plugins/gtkui/gtkuigl.c b/plugins/gtkui/gtkuigl.c
index 24423a10..dbf426ee 100644
--- a/plugins/gtkui/gtkuigl.c
+++ b/plugins/gtkui/gtkuigl.c
@@ -21,7 +21,7 @@
 #include "support.h"
 #include "gtkuigl.h"
 
-#if 0
+#ifndef __APPLE__
 static int gl_initialized;
 static int gl_init_state;
 //PFNGLXSWAPINTERVALSGIPROC glXSwapIntervalSGI;
diff --git a/plugins/gtkui/gtkuigl.h b/plugins/gtkui/gtkuigl.h
index a19b36e2..d547b8c9 100644
--- a/plugins/gtkui/gtkuigl.h
+++ b/plugins/gtkui/gtkuigl.h
@@ -19,7 +19,7 @@
 #ifndef __GTKUIGL_H
 #define __GTKUIGL_H
 
-#if 0
+#ifndef __APPLE__
 #include <gtk/gtkgl.h>
 #include <GL/gl.h>
 #include <GL/glu.h>