IsTopLevel() may return true not only for wxTLW: this fixes crash when opening a...

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 968b0f03d4030994f28fe039feb3824fa6c5b37f..1f42a61bf970f56571df4b87238ce81823dbc4ea 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -256,6 +256,10 @@ wxMSW:
 - support for alpha channel in toolbar bitmaps (Jurgen Doornik)
 - wxFileDialog can now be moved and centered (Randall Fox)
 
 - support for alpha channel in toolbar bitmaps (Jurgen Doornik)
 - wxFileDialog can now be moved and centered (Randall Fox)
 

+wxUniv/X11:
+
+- fixed fatal crash when opening a menu
+

 wxWinCE:
 
 - added automatized but customizable handling of native SmartPhone menus
 wxWinCE:
 
 - added automatized but customizable handling of native SmartPhone menus

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 9a5fff8ef2cfa8136323bb83ed78db81d879d08d..5d1ab3726cf139c4a01dbc1cccf2f29563718782 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -446,16 +446,15 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
             if (event->update.utype == GR_UPDATE_SIZE)
 #endif
             {
             if (event->update.utype == GR_UPDATE_SIZE)
 #endif
             {

-                if (win->IsTopLevel())
+                wxTopLevelWindow *tlw = wxDynamicCast(win, wxTopLevelWindow);
+                if ( tlw )

                 {
                 {

-                    wxTopLevelWindow *tlw = (wxTopLevelWindow*) win;

                     tlw->SetConfigureGeometry( XConfigureEventGetX(event), XConfigureEventGetY(event),
                         XConfigureEventGetWidth(event), XConfigureEventGetHeight(event) );
                 }
 
                     tlw->SetConfigureGeometry( XConfigureEventGetX(event), XConfigureEventGetY(event),
                         XConfigureEventGetWidth(event), XConfigureEventGetHeight(event) );
                 }
 

-                if (win->IsTopLevel() && win->IsShown())
+                if ( tlw && tlw->IsShown() )

                 {
                 {

-                    wxTopLevelWindowX11 *tlw = (wxTopLevelWindowX11 *) win;

                     tlw->SetNeedResizeInIdle();
                 }
                 else
                     tlw->SetNeedResizeInIdle();
                 }
                 else


@@ -467,7 +466,6 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
                 }
             }
             return FALSE;
                 }
             }
             return FALSE;

-            break;

         }
 #if !wxUSE_NANOX
         case PropertyNotify:
         }
 #if !wxUSE_NANOX
         case PropertyNotify: