Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index 17aebfdcc8f1370463a36109e11092bdf548c20f..c34d8acef392f510e701cfeb6906dfe60797ae31 100644 (file)
--- a/include/wx/metafile.h
+++ b/include/wx/metafile.h
@@ -1,12 +1,53 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/metafile.h
+// Purpose:     wxMetaFile class declaration
+// Author:      wxWidgets team
+// Modified by:
+// Created:     13.01.00
+// 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
+#define wxMetaFileDataObject wxMetafileDataObject
+
+#define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable
+

 #if defined(__WXMSW__)
 #if defined(__WXMSW__)

-#include "wx/msw/metafile.h"
-#endif
-#if defined(__WXPM__)
-#include "wx/os2/metafile.h"
-#endif
+    #if wxUSE_ENH_METAFILE
+        #include "wx/msw/enhmeta.h"
+
+        #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

 
 

+            // this flag will be set if wxMetafile class is wxEnhMetaFile
+            #define wxMETAFILE_IS_ENH
+        #endif // wxUSE_WIN_METAFILES_ALWAYS
+    #else // !wxUSE_ENH_METAFILE
+        #include "wx/msw/metafile.h"
+    #endif
+#elif defined(__WXPM__)
+    #include "wx/os2/metafile.h"
+#elif defined(__WXMAC__)
+    #include "wx/osx/metafile.h"

 #endif
 #endif

-    // _WX_METAFILE_H_BASE_
+
+#endif // wxUSE_METAFILE
+
+#endif // _WX_METAFILE_H_BASE_