Make tests build under GTK+ 3

6 files changed, 25 insertions, 12 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a2c0716..cb667fd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -399,7 +399,7 @@ test_gtk_objects_CFLAGS = \
 
 test_gtk_objects_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
-	../libdbusmenu-gtk/libdbusmenu-gtk.la \
+	../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \
 	$(DBUSMENUGLIB_LIBS) \
 	$(DBUSMENUGTK_LIBS)
 
@@ -429,7 +429,7 @@ test_gtk_parser_CFLAGS = \
 
 test_gtk_parser_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
-	../libdbusmenu-gtk/libdbusmenu-gtk.la \
+	../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \
 	$(DBUSMENUGLIB_LIBS) \
 	$(DBUSMENUGTK_LIBS)
 
@@ -456,7 +456,7 @@ test_gtk_label_server_CFLAGS = \
 
 test_gtk_label_server_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
-	../libdbusmenu-gtk/libdbusmenu-gtk.la \
+	../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \
 	libdbusmenu-jsonloader.la \
 	$(DBUSMENUGTK_LIBS) \
 	$(DBUSMENUTESTS_LIBS)
@@ -472,7 +472,7 @@ test_gtk_label_client_CFLAGS = \
 
 test_gtk_label_client_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
-	../libdbusmenu-gtk/libdbusmenu-gtk.la \
+	../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \
 	$(DBUSMENUGTK_LIBS) \
 	$(DBUSMENUTESTS_LIBS)
 
@@ -497,7 +497,7 @@ test_gtk_shortcut_server_CFLAGS = \
 
 test_gtk_shortcut_server_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
-	../libdbusmenu-gtk/libdbusmenu-gtk.la \
+	../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \
 	$(DBUSMENUGTK_LIBS) \
 	$(DBUSMENUTESTS_LIBS)
 
@@ -512,7 +512,7 @@ test_gtk_shortcut_client_CFLAGS = \
 
 test_gtk_shortcut_client_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
-	../libdbusmenu-gtk/libdbusmenu-gtk.la \
+	../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \
 	$(DBUSMENUGTK_LIBS) \
 	$(DBUSMENUTESTS_LIBS)
 
@@ -550,7 +550,7 @@ test_gtk_reorder_server_CFLAGS = \
 
 test_gtk_reorder_server_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
-	../libdbusmenu-gtk/libdbusmenu-gtk.la \
+	../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \
 	$(DBUSMENUGTK_LIBS) \
 	$(DBUSMENUTESTS_LIBS)
 
@@ -575,7 +575,7 @@ test_gtk_submenu_server_CFLAGS = \
 
 test_gtk_submenu_server_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
-	../libdbusmenu-gtk/libdbusmenu-gtk.la \
+	../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \
 	$(DBUSMENUGTK_LIBS) \
 	$(DBUSMENUTESTS_LIBS)
 
@@ -590,7 +590,7 @@ test_gtk_submenu_client_CFLAGS = \
 
 test_gtk_submenu_client_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
-	../libdbusmenu-gtk/libdbusmenu-gtk.la \
+	../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \
 	$(DBUSMENUGTK_LIBS) \
 	$(DBUSMENUTESTS_LIBS)
 
@@ -658,3 +658,8 @@ distclean-local:
 DISTCLEANFILES += \
 	$(filter-out %.py, $(TESTS))
 
+if USE_GTK3
+VER=3
+else
+VER=
+endif
diff --git a/tests/test-gtk-label-client.c b/tests/test-gtk-label-client.c
index 14eb5bd..415c6b0 100644
--- a/tests/test-gtk-label-client.c
+++ b/tests/test-gtk-label-client.c
@@ -160,7 +160,7 @@ main (int argc, char ** argv)
 	GtkWidget * menuitem = gtk_menu_item_new_with_label("Test");
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(dbusmenu_gtkmenu_new ("glib.label.test", "/org/test")));
 	gtk_widget_show(menuitem);
-	gtk_menu_bar_append(menubar, menuitem);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menubar), menuitem);
 	gtk_widget_show(menubar);
 	gtk_container_add(GTK_CONTAINER(window), menubar);
 	gtk_window_set_title(GTK_WINDOW(window), "libdbusmenu-gtk test");
diff --git a/tests/test-gtk-objects.c b/tests/test-gtk-objects.c
index 30fc022..4bd26d3 100644
--- a/tests/test-gtk-objects.c
+++ b/tests/test-gtk-objects.c
@@ -97,7 +97,11 @@ test_object_prop_shortcut (void)
 	g_assert(G_IS_OBJECT(item));
 	g_assert(DBUSMENU_IS_MENUITEM(item));
 
+#if GTK_CHECK_VERSION(3,0,0)
+	guint key = GDK_KEY_c;
+#else
 	guint key = GDK_c;
+#endif
 	GdkModifierType modifier = GDK_CONTROL_MASK;
 
 	/* Set a shortcut */
diff --git a/tests/test-gtk-shortcut-client.c b/tests/test-gtk-shortcut-client.c
index 003885c..259e177 100644
--- a/tests/test-gtk-shortcut-client.c
+++ b/tests/test-gtk-shortcut-client.c
@@ -53,7 +53,7 @@ main (int argc, char ** argv)
 
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(dmenu));
 	gtk_widget_show(menuitem);
-	gtk_menu_bar_append(menubar, menuitem);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menubar), menuitem);
 	gtk_widget_show(menubar);
 	gtk_container_add(GTK_CONTAINER(window), menubar);
 	gtk_window_set_title(GTK_WINDOW(window), "libdbusmenu-gtk test");
diff --git a/tests/test-gtk-shortcut-server.c b/tests/test-gtk-shortcut-server.c
index b205d03..5df4881 100644
--- a/tests/test-gtk-shortcut-server.c
+++ b/tests/test-gtk-shortcut-server.c
@@ -46,7 +46,11 @@ build_menu (void)
 
 	item = dbusmenu_menuitem_new();
 	dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, "Control-L");
+#if GTK_CHECK_VERSION(3,0,0)
+	dbusmenu_menuitem_property_set_shortcut(item, GDK_KEY_l, GDK_CONTROL_MASK);
+#else
 	dbusmenu_menuitem_property_set_shortcut(item, GDK_l, GDK_CONTROL_MASK);
+#endif
 	dbusmenu_menuitem_child_append(root, item);
 	g_object_unref(item);
 
diff --git a/tests/test-gtk-submenu-client.c b/tests/test-gtk-submenu-client.c
index ec46122..81637f1 100644
--- a/tests/test-gtk-submenu-client.c
+++ b/tests/test-gtk-submenu-client.c
@@ -127,7 +127,7 @@ main (int argc, char ** argv)
 	GtkWidget * menuitem = gtk_menu_item_new_with_label("Test");
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(dbusmenu_gtkmenu_new ("glib.label.test", "/org/test")));
 	gtk_widget_show(menuitem);
-	gtk_menu_bar_append(menubar, menuitem);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menubar), menuitem);
 	gtk_widget_show(menubar);
 	gtk_container_add(GTK_CONTAINER(window), menubar);
 	gtk_window_set_title(GTK_WINDOW(window), "libdbusmenu-gtk test");