cleanup - remove duplicate decl., added #include, etc.

[wxWidgets.git] / include / wx / metafile.h

diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index 524e572ef664b13fb88dfa95e7795863dbeafcf5..2e5d0516c4ece1a5a40c944eeef3488325ac8beb 100644 (file)
--- a/include/wx/metafile.h
+++ b/include/wx/metafile.h
@@ -12,6 +12,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,7 +25,11 @@
 
 #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
@@ -34,13 +42,18 @@
             #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"
 #endif
 
+#endif // wxUSE_METAFILE
 #endif
     // _WX_METAFILE_H_BASE_