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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 34e00745ec740b3740acb1e0f0adb852344ce544..673f1d989af05736adf0d38bcf0ab39a734f757d 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -57,12 +57,6 @@
     #include "wx/univ/colschem.h"
 #endif // __WXUNIVERSAL__
 
     #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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index a4610c3c20405b3837a479835e515d2b2203f79c..93f05893b2f772d626ce87e8740ab9e90839a1ba 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -63,6 +63,12 @@
     #define ICON_SMALL 0
 #endif
 
     #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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------