Fixed these:

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

diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index d3eefe4240ea76cc5fbe96d29152b06ba64b6bc1..db81c1f55580f61f285005b33cce98a5f342ff59 100644 (file)
--- a/include/wx/metafile.h
+++ b/include/wx/metafile.h
@@ -1,9 +1,44 @@
-#ifndef __METAFILEH_BASE__
-#define __METAFILEH_BASE__
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/metafile.h
+// Purpose:     wxMetaFile class declaration
+// Author:      wxWindows team
+// Modified by:
+// Created:     13.01.00
+// RCS-ID:      $Id$
+// Copyright:   (c) wxWindows team
+// Licence:     wxWindows license
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_METAFILE_H_BASE_
+#define _WX_METAFILE_H_BASE_
+
+// 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"
+    #if defined(__WIN32__) && wxUSE_ENH_METAFILE
+        #include "wx/msw/enhmeta.h"
+
+        // map all metafile classes to enh metafile
+        #if !wxUSE_WIN_METAFILES_ALWAYS
+            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 // Win16
+        #include "wx/msw/metafile.h"
+    #endif
+#elif defined(__WXPM__)
+    #include "wx/os2/metafile.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __METAFILEH_BASE__
+    // _WX_METAFILE_H_BASE_