From 547ceb38ff8b3d6c1bcaeba047d656aaa122af20 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 26 Jun 2006 14:37:34 +0000
Subject: [PATCH] include wx/msw/metafile.h when wxUSE_WIN_METAFILES_ALWAYS==1

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/metafile.h | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index 2e5d0516c4..5005c42c3a 100644
--- a/include/wx/metafile.h
+++ b/include/wx/metafile.h
@@ -28,16 +28,19 @@
         #if defined(__WXPALMOS__)
             #include "wx/palmos/enhmeta.h"
         #else
-        #include "wx/msw/enhmeta.h"
+            #include "wx/msw/enhmeta.h"
         #endif
 
-        // map all metafile classes to enh metafile
-        #if !wxUSE_WIN_METAFILES_ALWAYS
+        #if wxUSE_WIN_METAFILES_ALWAYS
+            // use normal metafiles as well
+            #include "wx/msw/metafile.h"
+        #else // also map all metafile classes to enh metafile
             typedef wxEnhMetaFile wxMetafile;
             typedef wxEnhMetaFileDC wxMetafileDC;
-#if wxUSE_DRAG_AND_DROP
-            typedef wxEnhMetaFileDataObject wxMetafileDataObject;
-#endif
+            #if wxUSE_DRAG_AND_DROP
+                typedef wxEnhMetaFileDataObject wxMetafileDataObject;
+            #endif
+
             // this flag will be set if wxMetafile class is wxEnhMetaFile
             #define wxMETAFILE_IS_ENH
         #endif // wxUSE_WIN_METAFILES_ALWAYS
@@ -45,8 +48,8 @@
         #if defined(__WXPALMOS__)
             #include "wx/palmos/metafile.h"
         #else
-        #include "wx/msw/metafile.h"
-    #endif
+            #include "wx/msw/metafile.h"
+        #endif
     #endif
 #elif defined(__WXPM__)
     #include "wx/os2/metafile.h"
@@ -55,5 +58,5 @@
 #endif
 
 #endif // wxUSE_METAFILE
-#endif
-    // _WX_METAFILE_H_BASE_
+
+#endif // _WX_METAFILE_H_BASE_
-- 
2.47.2