projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new native toolbar implementation (turned off by default, not supporting embedded...
[wxWidgets.git]
/
include
/
wx
/
metafile.h
diff --git
a/include/wx/metafile.h
b/include/wx/metafile.h
index db81c1f55580f61f285005b33cce98a5f342ff59..5f2ad07373f66950d279a38053ec7de83f6ae000 100644
(file)
--- a/
include/wx/metafile.h
+++ b/
include/wx/metafile.h
@@
-1,12
+1,12
@@
///////////////////////////////////////////////////////////////////////////////
// Name: wx/metafile.h
// Purpose: wxMetaFile class declaration
///////////////////////////////////////////////////////////////////////////////
// Name: wx/metafile.h
// Purpose: wxMetaFile class declaration
-// Author: wxWi
ndow
s team
+// Author: wxWi
dget
s team
// Modified by:
// Created: 13.01.00
// RCS-ID: $Id$
// Modified by:
// Created: 13.01.00
// RCS-ID: $Id$
-// Copyright: (c) wxWi
ndow
s team
-// Licence: wxWindows licen
s
e
+// Copyright: (c) wxWi
dget
s team
+// Licence: wxWindows licen
c
e
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_METAFILE_H_BASE_
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_METAFILE_H_BASE_
@@
-20,8
+20,12
@@
#define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable
#if defined(__WXMSW__)
#define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable
#if defined(__WXMSW__)
- #if defined(__WIN32__) && wxUSE_ENH_METAFILE
+ #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
// map all metafile classes to enh metafile
#if !wxUSE_WIN_METAFILES_ALWAYS
@@
-33,11
+37,17
@@
// 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
- #else // Win16
+ #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(__WXPM__)
#include "wx/os2/metafile.h"
+#elif defined(__WXMAC__)
+ #include "wx/mac/metafile.h"
#endif
#endif
#endif
#endif