From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 2 Jul 2001 16:07:32 +0000 (+0000)
Subject: backported crash fix for wxFrame::Iconize() from 2.2
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/48ff57aed84b062d21e567f604ead07f44a03680

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 65ac5783e4..63af2106f8 100644
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -1231,9 +1231,14 @@ void wxFrameGTK::Iconize( bool 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 65ac5783e4..63af2106f8 100644
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -1231,9 +1231,14 @@ void wxFrameGTK::Iconize( bool 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() ) );
    }
 }