X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4055ed8281971e3d35bf04177193c27043d42ed1..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/metafile.h?ds=sidebyside

diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index 5f2ad07373..c34d8acef3 100644
--- a/include/wx/metafile.h
+++ b/include/wx/metafile.h
@@ -4,7 +4,6 @@
 // Author:      wxWidgets team
 // Modified by:
 // Created:     13.01.00
-// RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -12,6 +11,10 @@
 #ifndef _WX_METAFILE_H_BASE_
 #define _WX_METAFILE_H_BASE_
 
+#include "wx/defs.h"
+
+#if wxUSE_METAFILE
+
 // provide synonyms for all metafile classes
 #define wxMetaFile wxMetafile
 #define wxMetaFileDC wxMetafileDC
@@ -21,34 +24,30 @@
 
 #if defined(__WXMSW__)
     #if wxUSE_ENH_METAFILE
-        #if defined(__WXPALMOS__)
-            #include "wx/palmos/enhmeta.h"
-        #else
         #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
     #else // !wxUSE_ENH_METAFILE
-        #if defined(__WXPALMOS__)
-            #include "wx/palmos/metafile.h"
-        #else
         #include "wx/msw/metafile.h"
     #endif
-    #endif
 #elif defined(__WXPM__)
     #include "wx/os2/metafile.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/metafile.h"
+    #include "wx/osx/metafile.h"
 #endif
 
-#endif
-    // _WX_METAFILE_H_BASE_
+#endif // wxUSE_METAFILE
+
+#endif // _WX_METAFILE_H_BASE_