From 57751708cbe75f38f84858a47416ded22c624d00 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 20 Oct 2000 13:16:22 +0000 Subject: [PATCH] added crash-preventing check to Iconize git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/frame.cpp | 11 ++++++++--- src/gtk1/frame.cpp | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 3705e6ab60..0f54dc32b9 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -1117,9 +1117,14 @@ void wxFrame::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 3705e6ab60..0f54dc32b9 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -1117,9 +1117,14 @@ void wxFrame::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())); } }