backported crash fix for wxFrame::Iconize() from 2.2

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 65ac5783e4a3580f6e1b48c36df5b9d1e7cfe0fa..63af2106f811e16b92541ed3e1365c52797872a7 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -1231,9 +1231,14 @@ void wxFrameGTK::Iconize( bool iconize )
 {
    if (iconize)
    {
 {
    if (iconize)
    {

-        XIconifyWindow( GDK_WINDOW_XDISPLAY( m_widget->window ),
-                        GDK_WINDOW_XWINDOW( m_widget->window ),
-                        DefaultScreen( GDK_DISPLAY() ) );
+       GdkWindow *window = m_widget->window;
+
+       // you should do it later, for example from OnCreate() handler
+       wxCHECK_RET( window, _T("frame not created yet - can't iconize") );
+
+       XIconifyWindow( GDK_WINDOW_XDISPLAY( window ),
+                       GDK_WINDOW_XWINDOW( window ),
+                       DefaultScreen( GDK_DISPLAY() ) );

    }
 }
 
    }
 }
 

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 65ac5783e4a3580f6e1b48c36df5b9d1e7cfe0fa..63af2106f811e16b92541ed3e1365c52797872a7 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -1231,9 +1231,14 @@ void wxFrameGTK::Iconize( bool iconize )
 {
    if (iconize)
    {
 {
    if (iconize)
    {

-        XIconifyWindow( GDK_WINDOW_XDISPLAY( m_widget->window ),
-                        GDK_WINDOW_XWINDOW( m_widget->window ),
-                        DefaultScreen( GDK_DISPLAY() ) );
+       GdkWindow *window = m_widget->window;
+
+       // you should do it later, for example from OnCreate() handler
+       wxCHECK_RET( window, _T("frame not created yet - can't iconize") );
+
+       XIconifyWindow( GDK_WINDOW_XDISPLAY( window ),
+                       GDK_WINDOW_XWINDOW( window ),
+                       DefaultScreen( GDK_DISPLAY() ) );

    }
 }
 
    }
 }