From 179692ccd8d1ae5b588770931798f70d1692932c Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Wed, 25 Dec 2013 19:32:20 +0100 Subject: [PATCH] Ease building with Gtk+ 3.0 --- tools/iconlist.c | 4 ++++ tools/project.conf | 2 ++ 2 files changed, 6 insertions(+) diff --git a/tools/iconlist.c b/tools/iconlist.c index 0d86bf6..602eb9d 100644 --- a/tools/iconlist.c +++ b/tools/iconlist.c @@ -104,7 +104,11 @@ static int _iconlist_do(GtkIconTheme * icontheme) gtk_window_set_default_size(GTK_WINDOW(window), 640, 480); g_signal_connect(window, "delete-event", G_CALLBACK(_on_closex), NULL); /* vbox */ +#if GTK_CHECK_VERSION(3, 0, 0) + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); +#else vbox = gtk_vbox_new(FALSE, 0); +#endif /* toolbar */ toolbar = gtk_toolbar_new(); toolitem = gtk_tool_item_new(); diff --git a/tools/project.conf b/tools/project.conf index d3080fb..3b608df 100644 --- a/tools/project.conf +++ b/tools/project.conf @@ -1,6 +1,8 @@ targets=dirtree,iconlist +#cflags_force=-W `pkg-config --cflags gtk+-3.0` cflags_force=-W `pkg-config --cflags gtk+-2.0` cflags=-Wall -g -O2 +#ldflags_force=`pkg-config --libs gtk+-3.0` ldflags_force=`pkg-config --libs gtk+-2.0` dist=Makefile