Uses wxUSE_WCHAR_T for compilers that don't support wchar_t.

[wxWidgets.git] / src / gtk / dialog.cpp

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 427557a8c6d79e93e2d54e191134a6e4fcfc2cbb..ee8da61ef8e0dafc8793f443e006caf01e699423 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -86,11 +86,11 @@ static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEvent
 // "realize" from m_widget
 //-----------------------------------------------------------------------------
 
-/* we cannot MWM hints before the widget has been realized, 
+/* we cannot MWM hints and icons before the widget has been realized, 
    so we do this directly after realization */
 
 static gint 
-gtk_dialog_realized_callback( GtkWidget *widget, wxWindow *win )
+gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win )
 {
     /* all this is for Motif Window Manager "hints" and is supposed to be
        recognized by other WM as well. not tested. */
@@ -121,6 +121,14 @@ gtk_dialog_realized_callback( GtkWidget *widget, wxWindow *win )
     else
         gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
     
+    /* reset the icon */
+    if (win->m_icon != wxNullIcon)
+    {
+        wxIcon icon( win->m_icon );
+        win->m_icon = wxNullIcon;
+       win->SetIcon( icon );
+    }
+    
     return FALSE;
 }