X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fgrits-demo.c;h=c0d72674aea6de40667548d0fc0fbf498a003cef;hp=e5f18b63af44ea0787b1c9d3978eab8c0ab5209e;hb=5c17e7d79895982036139dcffb5c17cefb1d4d9f;hpb=95561789ea91d7aea0d6dcd7b9321f0d1fc97188

diff --git a/src/grits-demo.c b/src/grits-demo.c
index e5f18b6..c0d7267 100644
--- a/src/grits-demo.c
+++ b/src/grits-demo.c
@@ -21,6 +21,7 @@
 
 #include "grits.h"
 
+#include "compat.h"
 
 static GritsPrefs   *prefs;
 static GritsPlugins *plugins;
@@ -127,7 +128,7 @@ static GtkWidget *setup_window(GtkUIManager *manager, GtkWidget **_notebook)
 	GtkWidget *window   = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	GtkWidget *menu     = gtk_ui_manager_get_widget(manager, "/Menu");
 	GtkWidget *notebook = gtk_notebook_new();
-	GtkWidget *vbox     = gtk_vbox_new(FALSE, 0);
+	GtkWidget *vbox     = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	gtk_container_add(GTK_CONTAINER(window), vbox);
 	gtk_box_pack_start(GTK_BOX(vbox), menu,               FALSE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(viewer), TRUE,  TRUE, 0);
@@ -166,15 +167,12 @@ static void restore_states(GtkUIManager *manager)
 
 int main(int argc, char **argv)
 {
-	gdk_threads_init();
 	gtk_init(&argc, &argv);
 
 	prefs   = grits_prefs_new(NULL, NULL);
 	plugins = grits_plugins_new(g_getenv("GRITS_PLUGIN_PATH"), prefs);
 	viewer  = grits_opengl_new(plugins, prefs);
 
-	gdk_threads_enter();
-
 	GtkWidget    *notebook = NULL;
 	GtkUIManager *manager  = setup_actions();
 	GtkWidget    *window   = setup_window(manager, &notebook);
@@ -188,8 +186,6 @@ int main(int argc, char **argv)
 	grits_plugins_free(plugins);
 	g_object_unref(prefs);
 
-	gdk_threads_leave();
-
 	g_debug("GritsDemo: main - refs=%d,%d",
 			G_OBJECT(manager)->ref_count,
 			G_OBJECT(window)->ref_count);
@@ -200,7 +196,7 @@ int main(int argc, char **argv)
 	plugins = NULL;
 	viewer  = NULL;
 
-	gdk_display_close(gdk_display_get_default());
+	//gdk_display_close(gdk_display_get_default());
 
 	return 0;
 }