column autosizing added

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 40fc6e054f75f14c85309de89a81c771c2fa3463..5a81d4ac0cc45eae5a4df29f050a65e6d444b745 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -138,9 +138,13 @@
 // we are setting this define because of the complex check
 // using NORLANDER as Cygwin may follow. (header author is Anders Norlander)
 #if defined(__MINGW32__) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
-#ifndef wxUSE_NORLANDER_HEADERS
-#   define wxUSE_NORLANDER_HEADERS 1
-#endif
+    #ifndef wxUSE_NORLANDER_HEADERS
+        #define wxUSE_NORLANDER_HEADERS 1
+    #endif
+#else
+    #ifndef wxUSE_NORLANDER_HEADERS
+        #define wxUSE_NORLANDER_HEADERS 0
+    #endif
 #endif
 
 // "old" GNUWIN32 is the one without Norlander's headers: it lacks the standard
@@ -1817,17 +1821,16 @@ typedef WXHWND WXWidget;
 #endif
 
 // the keywords needed for WinMain() declaration
+
 #ifdef __WIN16__
-    #ifndef FAR
         #ifdef __VISUALC__
-            #define FAR __far
+            #define WXFAR __far
         #else // !VC++
-            #define FAR _far
+            #define WXFAR _far
         #endif
-    #endif // no FAR
 #else // Win32
-    #ifndef FAR
-        #define FAR
+    #ifndef WXFAR
+        #define WXFAR
     #endif
 #endif // Win16/32