Gtk 3 Port

[grits] / src / grits-demo.c

diff --git a/src/grits-demo.c b/src/grits-demo.c
index e5f18b63af44ea0787b1c9d3978eab8c0ab5209e..c4e9b2bc6abd50ade39c088b846984bd6fc44ea2 100644 (file)
--- a/src/grits-demo.c
+++ b/src/grits-demo.c
@@ -127,7 +127,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,14 +166,13 @@ 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();
+       //gdk_threads_enter();
 
        GtkWidget    *notebook = NULL;
        GtkUIManager *manager  = setup_actions();
@@ -188,7 +187,7 @@ int main(int argc, char **argv)
        grits_plugins_free(plugins);
        g_object_unref(prefs);
 
-       gdk_threads_leave();
+       //gdk_threads_leave();
 
        g_debug("GritsDemo: main - refs=%d,%d",
                        G_OBJECT(manager)->ref_count,