projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Font fixes for the font dialog
[wxWidgets.git]
/
include
/
wx
/
wx_cw_cm.h
diff --git
a/include/wx/wx_cw_cm.h
b/include/wx/wx_cw_cm.h
index 890b3c0a063af689828e69d588449bb78a4f2755..760742f7512ed3b1ece3a99b7e5554c7f58e551b 100644
(file)
--- a/
include/wx/wx_cw_cm.h
+++ b/
include/wx/wx_cw_cm.h
@@
-14,9
+14,12
@@
#define __MAC__
#define __WXMAC__
#elif (__MWERKS__ >= 0x0900) && __INTEL__
#define __MAC__
#define __WXMAC__
#elif (__MWERKS__ >= 0x0900) && __INTEL__
+ #define WIN32
+ #define _WINDOWS
#define __WXMSW__
#define __WINDOWS__
#define __WIN95__
#define __WXMSW__
#define __WINDOWS__
#define __WIN95__
+ #define __WIN32__
#define STRICT
#define NOMINMAX
#elif __BEOS__
#define STRICT
#define NOMINMAX
#elif __BEOS__
@@
-30,7
+33,7
@@
#include <ansi_prefix.win32.h>
#include <ansi_parms.h>
#ifdef __MWERKS__
#include <ansi_prefix.win32.h>
#include <ansi_parms.h>
#ifdef __MWERKS__
- #if defined( __MSL__ ) && __MSL__ >= 0x5012
+ #if defined( __MSL__ ) && __MSL__ >= 0x5012
&& __MSL__ < 0x7000
#define fileno _fileno
#define fdopen _fdopen
#define tell _tell
#define fileno _fileno
#define fdopen _fdopen
#define tell _tell
@@
-66,6
+69,6
@@
extern "C"
char *strdup(const char *s) ;
int isascii( int c ) ;
#ifdef __cplusplus
char *strdup(const char *s) ;
int isascii( int c ) ;
#ifdef __cplusplus
-}
;
+}
#endif
#endif