Changeset 825 for trunk/deushax/gtk/editor.cppTweet

Timestamp:

Aug 13, 2011, 10:05:53 PM (12 years ago)

Author:

sam

Message:

gtk: refactor the GTK mess once again.

File:

• trunk/deushax/gtk/editor.cpp (modified) (2 diffs)

trunk/deushax/gtk/editor.cpp

@@ -22 +22 @@
 
 #include "glmapview.h"
-
-/* Closing the window does not quit directly, we must first make sure the
- * GL widget is destroyed cleanly. */
-static gboolean close_window(GtkWidget *w, GdkEvent *e, void *data)
-{
-    (void)w;
-    (void)e;
-    GlMapView *glmapview = (GlMapView *)data;
-    glmapview->Shutdown();
-    gtk_main_quit();
-    return FALSE;
-}
 
 int main(int argc, char **argv)
@@ -60 +48 @@
 
     /* Add our custom GL map viewer */
-    GlMapView *glmapview = new GlMapView(builder);
+    GlMapView *glmapview = new GlMapView(
+           GTK_CONTAINER(gtk_builder_get_object(builder, "gl_container")),
+           GTK_ADJUSTMENT(gtk_builder_get_object(builder, "gl_hadj")),
+           GTK_ADJUSTMENT(gtk_builder_get_object(builder, "gl_vadj")));
 
     /* Show window. We're good to go! */
     GtkWidget *window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
     gtk_widget_show_all(window);
-    gtk_signal_connect(GTK_OBJECT(window), "delete_event",
-                       GTK_SIGNAL_FUNC(close_window), glmapview);
+    g_signal_connect(GTK_OBJECT(window), "delete_event",
+                     GTK_SIGNAL_FUNC(gtk_main_quit), glmapview);
+    g_signal_connect(GTK_OBJECT(window), "delete_event",
+                     GTK_SIGNAL_FUNC(gtk_main_quit), glmapview2);
     g_object_unref(G_OBJECT(builder));