From a46fbf1bcdd91c63df9acdc09a074efe9ec486e0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 4 Mar 2014 14:07:43 +0000
Subject: [PATCH] Compilation fix for wxUniv/MSW in wxTLW code dealing with
 menus.

The code used by WM_INITMENUPOPUP and WM_EXITMENULOOP handlers shouldn't be
used in wxUniv build as it's not used there anyhow and doesn't even compile.

Closes #16039.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/msw/toplevel.h | 4 ++--
 src/msw/toplevel.cpp      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index fd1de18d80..5692a86383 100644
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -121,7 +121,7 @@ public:
     // returns true if the platform should explicitly apply a theme border
     virtual bool CanApplyThemeBorder() const { return false; }
 
-#if wxUSE_MENUS
+#if wxUSE_MENUS && !defined(__WXUNIVERSAL__)
     bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
 
     // handle WM_EXITMENULOOP message for Win95 only
@@ -135,7 +135,7 @@ public:
 
     // Find the menu corresponding to the given handle.
     virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu);
-#endif // wxUSE_MENUS
+#endif // wxUSE_MENUS && !__WXUNIVERSAL__
 
 protected:
     // common part of all ctors
diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 37b3a3d0a7..cda70de511 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -1481,7 +1481,7 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event)
     }
 }
 
-#if wxUSE_MENUS
+#if wxUSE_MENUS && !defined(__WXUNIVERSAL__)
 
 bool
 wxTopLevelWindowMSW::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
@@ -1588,7 +1588,7 @@ wxMenu* wxTopLevelWindowMSW::MSWFindMenuFromHMENU(WXHMENU WXUNUSED(hMenu))
     return NULL;
 }
 
-#endif // wxUSE_MENUS
+#endif // wxUSE_MENUS && !__WXUNIVERSAL__