Changeset 11337

Timestamp:

Oct 18, 2010, 10:18:15 PM (12 years ago)

Author:

charles

Message:

(trunk gtk) #3644 "About Dialog appear with main window" -- handle another special case. Fix confirmed by kovalev

Location:

trunk/gtk

Files:

• main.c (modified) (3 diffs)
• msgwin.c (modified) (2 diffs)
• msgwin.h (modified) (1 diff)

trunk/gtk/main.c

@@ -1408 +1408 @@
 
 static void
-about( GtkWindow * parent UNUSED )
+about( GtkWindow * parent )
 {
     GtkWidget * d;
@@ -1438 +1438 @@
 #endif
                       NULL );
-
-    gtk_dialog_run( GTK_DIALOG( d ) );
-    gtk_widget_destroy( d );
+    gtk_window_set_transient_for( GTK_WINDOW( d ), parent );
+    g_signal_connect_swapped( d, "response", G_CALLBACK (gtk_widget_destroy), d );
+    gtk_widget_show_all( d );
 }
 
@@ -1728 +1728 @@
         if( !data->msgwin )
         {
-            GtkWidget * win = msgwin_new( data->core );
-            g_signal_connect( win, "destroy", G_CALLBACK( msgwinclosed ),
-                              NULL );
+            GtkWidget * win = msgwin_new( data->core, data->wind );
+            g_signal_connect( win, "destroy", G_CALLBACK( msgwinclosed ), NULL );
             data->msgwin = win;
         }

trunk/gtk/msgwin.c

@@ -375 +375 @@
 
 GtkWidget *
-msgwin_new( TrCore * core )
+msgwin_new( TrCore * core, GtkWindow * parent )
 {
     GtkWidget *      win;
@@ -389 +389 @@
 
     win = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+    gtk_window_set_transient_for( GTK_WINDOW( win ), parent );
     gtk_window_set_title( GTK_WINDOW( win ), _( "Message Log" ) );
     gtk_window_set_default_size( GTK_WINDOW( win ), 560, 350 );

trunk/gtk/msgwin.h

@@ -14 +14 @@
 #define TG_MSGWIN_H
 
-GtkWidget * msgwin_new( TrCore * core );
+GtkWidget * msgwin_new( TrCore * core, GtkWindow * parent );
 
 #endif