projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implemented wxIsDebuggerRunning() for Win32
[wxWidgets.git]
/
include
/
wx
/
fontutil.h
diff --git
a/include/wx/fontutil.h
b/include/wx/fontutil.h
index e944c158e7c9955962bef1c9c3d88b97324bf51d..1a1b917ba1675fad1aa772e43d544df0945bdfe6 100644
(file)
--- a/
include/wx/fontutil.h
+++ b/
include/wx/fontutil.h
@@
-26,7
+26,7
@@
#include "wx/font.h" // for wxFont and wxFontEncoding
#include "wx/font.h" // for wxFont and wxFontEncoding
-#if defined(__WXMSW__)
&& !defined(__WXPALMOS__)
+#if defined(__WXMSW__)
#include "wx/msw/wrapwin.h"
#endif
#include "wx/msw/wrapwin.h"
#endif
@@
-109,7
+109,7
@@
public:
// set the XFLD
void SetXFontName(const wxString& xFontName);
// set the XFLD
void SetXFontName(const wxString& xFontName);
-#elif defined(__WXMSW__)
&& !defined(__WXPALMOS__)
+#elif defined(__WXMSW__)
LOGFONT lf;
#elif defined(__WXPM__)
// OS/2 native structures that define a font
LOGFONT lf;
#elif defined(__WXPM__)
// OS/2 native structures that define a font