More for wxPython 2.0b9 (hopefully the last...)

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

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index b8adf30bdab00c9de42d84963ac104d0dfeebd07..fc6e7041ff00e9feda87912aaf946dd58c87dc37 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -109,6 +109,28 @@ gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
+    /* reset the icon */
+    if (win->m_icon != wxNullIcon)
+    {
+        wxIcon icon( win->m_icon );
+        win->m_icon = wxNullIcon;
+       win->SetIcon( icon );
+    }
+    
+    return FALSE;
+}
+    
+//-----------------------------------------------------------------------------
+// "map" from m_widget
+//-----------------------------------------------------------------------------
+
+static gint 
+gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win )
+{
+    /* I haven''t been able to set the position of
+       the dialog before it is shown, so I do it here */
+    gtk_widget_set_uposition( widget, win->m_x, win->m_y );
+    
     /* all this is for Motif Window Manager "hints" and is supposed to be
        recognized by other WM as well. not tested. */
     long decor = (long) GDK_DECOR_ALL;
@@ -116,16 +138,18 @@ gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win )
     
     if ((win->m_windowStyle & wxCAPTION) == 0)
        decor |= GDK_DECOR_TITLE;
-/*  if ((win->m_windowStyle & wxMINIMIZE) == 0)
-       func |= GDK_FUNC_MINIMIZE;
-    if ((win->m_windowStyle & wxMAXIMIZE) == 0)
-       func |= GDK_FUNC_MAXIMIZE;            */
     if ((win->m_windowStyle & wxSYSTEM_MENU) == 0)
        decor |= GDK_DECOR_MENU;
     if ((win->m_windowStyle & wxMINIMIZE_BOX) == 0)
+    {
+       func |= GDK_FUNC_MINIMIZE;
        decor |= GDK_DECOR_MINIMIZE;
+    }
     if ((win->m_windowStyle & wxMAXIMIZE_BOX) == 0)
+    {
        decor |= GDK_DECOR_MAXIMIZE;
+       func |= GDK_FUNC_MAXIMIZE;           
+    }
     if ((win->m_windowStyle & wxRESIZE_BORDER) == 0)
        func |= GDK_FUNC_RESIZE;
        
@@ -138,26 +162,6 @@ gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *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;
-}
-    
-//-----------------------------------------------------------------------------
-// "map" from m_widget
-//-----------------------------------------------------------------------------
-
-static gint 
-gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win )
-{
-    gtk_widget_set_uposition( widget, win->m_x, win->m_y );
-    
     return FALSE;
 }