wxFont can now raelly use the native fonts

[wxWidgets.git] / include / wx / platform.h

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 6ede4d027832cb021c44cfb4dd9ee231e96ace6a..f1f6df24dce70fff4dc6e9588046f4f41cc29c77 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -78,13 +78,32 @@
 #endif
 
 /*
 #endif
 
 /*

-   OS: first test for generic Unix defines, then for particular flavours and
+   OS: first of all, test for MS-DOS platform. We must do this before testing
+       for Unix, because DJGPP compiler defines __unix__ under MS-DOS
+ */
+#if defined(__GO32__) || defined(__DJGPP__) || defined(__DOS__)
+    #ifndef __DOS__
+        #define __DOS__
+    #endif
+    /* size_t is the same as unsigned int for Watcom 11 compiler, */
+    /* so define it if it hadn't been done by configure yet */
+    #if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
+        #ifdef __WATCOMC__
+            #define wxSIZE_T_IS_UINT
+        #endif
+        #ifdef __DJGPP__
+            #define wxSIZE_T_IS_ULONG
+        #endif
+    #endif
+
+/*
+   OS: then test for generic Unix defines, then for particular flavours and

        finally for Unix-like systems
  */
        finally for Unix-like systems
  */

-#if defined(__UNIX__) || defined(__unix) || defined(__unix__) || \
-    defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) || \
-    defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \
-    defined(__EMX__) || defined(__VMS) || defined(__BEOS__)
+#elif defined(__UNIX__) || defined(__unix) || defined(__unix__) || \
+      defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) || \
+      defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \
+      defined(__EMX__) || defined(__VMS) || defined(__BEOS__)

 
     #define __UNIX_LIKE__
 
 
     #define __UNIX_LIKE__
 


@@ -168,12 +187,6 @@
     #endif
     #define wxSIZE_T_IS_UINT
 
     #endif
     #define wxSIZE_T_IS_UINT
 

-#elif defined(__DOS__)
-    /* size_t is the same as unsigned int for Watcom 11 compiler, */
-    /* so define it if it hadn't been done by configure yet */
-    #if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
-        #define wxSIZE_T_IS_UINT
-    #endif

 #else   /* Windows */
     #ifndef __WINDOWS__
         #define __WINDOWS__
 #else   /* Windows */
     #ifndef __WINDOWS__
         #define __WINDOWS__