X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/metafile.h diff --git a/include/wx/metafile.h b/include/wx/metafile.h index 524e572ef6..2e0064d18c 100644 --- a/include/wx/metafile.h +++ b/include/wx/metafile.h @@ -12,6 +12,10 @@ #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 @@ -23,13 +27,16 @@ #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; -#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 @@ -39,8 +46,9 @@ #elif defined(__WXPM__) #include "wx/os2/metafile.h" #elif defined(__WXMAC__) - #include "wx/mac/metafile.h" + #include "wx/osx/metafile.h" #endif -#endif - // _WX_METAFILE_H_BASE_ +#endif // wxUSE_METAFILE + +#endif // _WX_METAFILE_H_BASE_