more extra semicolons removed (patch 1303724)

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

diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index db81c1f55580f61f285005b33cce98a5f342ff59..2e5d0516c4ece1a5a40c944eeef3488325ac8beb 100644 (file)
--- a/include/wx/metafile.h
+++ b/include/wx/metafile.h
@@ -1,17 +1,21 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/metafile.h
 // Purpose:     wxMetaFile class declaration
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/metafile.h
 // Purpose:     wxMetaFile class declaration

-// Author:      wxWindows team
+// Author:      wxWidgets team

 // Modified by:
 // Created:     13.01.00
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     13.01.00
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_METAFILE_H_BASE_
 #define _WX_METAFILE_H_BASE_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #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
 // provide synonyms for all metafile classes
 #define wxMetaFile wxMetafile
 #define wxMetaFileDC wxMetafileDC


@@ -20,8 +24,12 @@
 #define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable
 
 #if defined(__WXMSW__)
 #define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable
 
 #if defined(__WXMSW__)

-    #if defined(__WIN32__) && wxUSE_ENH_METAFILE
+    #if wxUSE_ENH_METAFILE
+        #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
 
         // map all metafile classes to enh metafile
         #if !wxUSE_WIN_METAFILES_ALWAYS


@@ -33,12 +41,19 @@
             // this flag will be set if wxMetafile class is wxEnhMetaFile
             #define wxMETAFILE_IS_ENH
         #endif // wxUSE_WIN_METAFILES_ALWAYS
             // this flag will be set if wxMetafile class is wxEnhMetaFile
             #define wxMETAFILE_IS_ENH
         #endif // wxUSE_WIN_METAFILES_ALWAYS

-    #else // Win16
+    #else // !wxUSE_ENH_METAFILE
+        #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"
 #elif defined(__WXPM__)
     #include "wx/os2/metafile.h"

+#elif defined(__WXMAC__)
+    #include "wx/mac/metafile.h"

 #endif
 
 #endif
 

+#endif // wxUSE_METAFILE

 #endif
     // _WX_METAFILE_H_BASE_
 #endif
     // _WX_METAFILE_H_BASE_