projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reorder event things a little.
[wxWidgets.git]
/
include
/
wx
/
metafile.h
diff --git
a/include/wx/metafile.h
b/include/wx/metafile.h
index 5f2ad07373f66950d279a38053ec7de83f6ae000..5005c42c3a161030e58aa4d409599eddd3c0fa4e 100644
(file)
--- a/
include/wx/metafile.h
+++ b/
include/wx/metafile.h
@@
-12,6
+12,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
@@
-24,16
+28,19
@@
#if defined(__WXPALMOS__)
#include "wx/palmos/enhmeta.h"
#else
#if defined(__WXPALMOS__)
#include "wx/palmos/enhmeta.h"
#else
- #include "wx/msw/enhmeta.h"
+
#include "wx/msw/enhmeta.h"
#endif
#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
// this flag will be set if wxMetafile class is wxEnhMetaFile
#define wxMETAFILE_IS_ENH
#endif // wxUSE_WIN_METAFILES_ALWAYS
@@
-41,8
+48,8
@@
#if defined(__WXPALMOS__)
#include "wx/palmos/metafile.h"
#else
#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"
#endif
#elif defined(__WXPM__)
#include "wx/os2/metafile.h"
@@
-50,5
+57,6
@@
#include "wx/mac/metafile.h"
#endif
#include "wx/mac/metafile.h"
#endif
-#endif
- // _WX_METAFILE_H_BASE_
+#endif // wxUSE_METAFILE
+
+#endif // _WX_METAFILE_H_BASE_