From 1aecefa501029a2b25e719f42ecd8dd1ef07aaf4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 24 Apr 2010 16:59:09 +0000 Subject: [PATCH] A slightly better compilation fix after PCH-less build breakage in r64126. Include wx/frame.h header instead of casting wxFrame to wxWindow using C style cast. Although this does work now and probably will work later too it seems better to not use the cast nevertheless. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/menucmn.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp index dc9db4f268..883870a714 100644 --- a/src/common/menucmn.cpp +++ b/src/common/menucmn.cpp @@ -30,6 +30,7 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/menu.h" + #include "wx/frame.h" #endif #include "wx/stockitem.h" @@ -529,7 +530,7 @@ wxWindow *wxMenuBase::GetInvokingWindow() const wxWindow *wxMenuBase::GetWindow() const { - return GetMenuBar() ? (wxWindow*)GetMenuBar()->GetFrame() : GetInvokingWindow(); + return GetMenuBar() ? GetMenuBar()->GetFrame() : GetInvokingWindow(); } // ---------------------------------------------------------------------------- -- 2.47.2