Bug #1040683: Remove assert when deleting menu entry.

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

diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index 17aebfdcc8f1370463a36109e11092bdf548c20f..ad4053a648fff3f3786268ba3123e6d0b4abe728 100644 (file)
--- a/include/wx/metafile.h
+++ b/include/wx/metafile.h
@@ -1,11 +1,53 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/metafile.h
+// Purpose:     wxMetaFile class declaration
+// Author:      wxWidgets team
+// Modified by:
+// Created:     13.01.00
+// RCS-ID:      $Id$
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
 #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__)
-#include "wx/msw/metafile.h"
+    #if wxUSE_ENH_METAFILE
+        #if defined(__PALMOS__)
+            #include "wx/palmos/enhmeta.h"
+        #else
+        #include "wx/msw/enhmeta.h"
+        #endif
+
+        // 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
-#if defined(__WXPM__)
-#include "wx/os2/metafile.h"
+            // 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(__PALMOS__)
+            #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