Return the old file descriptor/pointer from wx(F)File::Detach().

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

diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index 524e572ef664b13fb88dfa95e7795863dbeafcf5..c34d8acef392f510e701cfeb6906dfe60797ae31 100644 (file)
--- a/include/wx/metafile.h
+++ b/include/wx/metafile.h
@@ -4,7 +4,6 @@
 // Author:      wxWidgets team
 // Modified by:
 // Created:     13.01.00
 // Author:      wxWidgets team
 // Modified by:
 // Created:     13.01.00

-// RCS-ID:      $Id$

 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -12,6 +11,10 @@
 #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


@@ -23,13 +26,16 @@
     #if wxUSE_ENH_METAFILE
         #include "wx/msw/enhmeta.h"
 
     #if wxUSE_ENH_METAFILE
         #include "wx/msw/enhmeta.h"
 

-        // map all metafile classes to enh metafile
-        #if !wxUSE_WIN_METAFILES_ALWAYS
+        #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;
             typedef wxEnhMetaFile wxMetafile;
             typedef wxEnhMetaFileDC wxMetafileDC;

-#if wxUSE_DRAG_AND_DROP
-            typedef wxEnhMetaFileDataObject wxMetafileDataObject;
-#endif
+            #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
             // this flag will be set if wxMetafile class is wxEnhMetaFile
             #define wxMETAFILE_IS_ENH
         #endif // wxUSE_WIN_METAFILES_ALWAYS


@@ -39,8 +45,9 @@
 #elif defined(__WXPM__)
     #include "wx/os2/metafile.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXPM__)
     #include "wx/os2/metafile.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/metafile.h"
+    #include "wx/osx/metafile.h"

 #endif
 
 #endif
 

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