From bceb01f728c7f3ca872cee1864f3fad29ecd4cfb Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 19 Mar 2013 02:58:33 +0000
Subject: [PATCH] Fix WM_UNINITMENUPOPUP missing definition for VC6.

The previous workaround of defining it explicitly if it's not defined was left
in src/msw/frame.cpp while the code using WM_UNINITMENUPOPUP was moved to
src/msw/toplevel.cpp in r73562. Move the fallback definition there too.

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 34e00745ec..673f1d989a 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -57,12 +57,6 @@
     #include "wx/univ/colschem.h"
 #endif // __WXUNIVERSAL__
 
-// FIXME-VC6: Only VC6 doesn't have this in its standard headers so this
-//            could be removed once support for it is dropped.
-#ifndef WM_UNINITMENUPOPUP
-    #define WM_UNINITMENUPOPUP 0x0125
-#endif
-
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index a4610c3c20..93f05893b2 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -63,6 +63,12 @@
     #define ICON_SMALL 0
 #endif
 
+// FIXME-VC6: Only VC6 doesn't have this in its standard headers so this
+//            could be removed once support for it is dropped.
+#ifndef WM_UNINITMENUPOPUP
+    #define WM_UNINITMENUPOPUP 0x0125
+#endif
+
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------