projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support using GetTextExtent() with empty string to get descent in wxOSX.
[wxWidgets.git]
/
include
/
wx
/
metafile.h
diff --git
a/include/wx/metafile.h
b/include/wx/metafile.h
index 2e5d0516c4ece1a5a40c944eeef3488325ac8beb..2e0064d18cd383a827b7ecad2ad571d26a33fcfb 100644
(file)
--- a/
include/wx/metafile.h
+++ b/
include/wx/metafile.h
@@
-25,35
+25,30
@@
#if defined(__WXMSW__)
#if wxUSE_ENH_METAFILE
#if defined(__WXMSW__)
#if wxUSE_ENH_METAFILE
- #if defined(__WXPALMOS__)
- #include "wx/palmos/enhmeta.h"
- #else
#include "wx/msw/enhmeta.h"
#include "wx/msw/enhmeta.h"
- #endif
- // 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
#else // !wxUSE_ENH_METAFILE
// 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(__WXPALMOS__)
- #include "wx/palmos/metafile.h"
- #else
#include "wx/msw/metafile.h"
#endif
#include "wx/msw/metafile.h"
#endif
- #endif
#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 // wxUSE_METAFILE
#endif
#endif // wxUSE_METAFILE
-#endif
-
// _WX_METAFILE_H_BASE_
+
+
#endif
// _WX_METAFILE_H_BASE_