Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / samples / mfc / mfctest.cpp

diff --git a/samples/mfc/mfctest.cpp b/samples/mfc/mfctest.cpp
index a67b88d026479ce8addc4f638ac9eb250608ca6b..31a7ded470045ef977833a993c2798ca42de2ec5 100644 (file)
--- a/samples/mfc/mfctest.cpp
+++ b/samples/mfc/mfctest.cpp
@@ -50,6 +50,18 @@
 //     -  [version] -> 42 or 70 or 80 etc
 //     -  u if using Unicode
 
+// Disable deprecation warnings from headers included from stdafx.h for VC8+
+#ifndef _CRT_SECURE_NO_WARNINGS
+    #define _CRT_SECURE_NO_WARNINGS
+#endif
+
+// Also define WINVER to avoid warnings about it being undefined from the
+// platform SDK headers (usually this is not necessary because it is done by wx
+// headers but here we include the system ones before them)
+#ifndef WINVER
+    #define WINVER 0x0600
+#endif
+
 #include "stdafx.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".