X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3a584a7a6ade199990dd4463488e4bbf3545349..1a83b9bd10b7d92520c202e6ed6cff2015f13315:/src/common/textbuf.cpp

diff --git a/src/common/textbuf.cpp b/src/common/textbuf.cpp
index 5824b2014c..1e6c9a9e83 100644
--- a/src/common/textbuf.cpp
+++ b/src/common/textbuf.cpp
@@ -3,15 +3,15 @@
 // Purpose:     implementation of wxTextBuffer class
 // Created:     14.11.01
 // Author:      Morten Hanssen, Vadim Zeitlin
-// Copyright:   (c) 1998-2001 wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) 1998-2001 wxWidgets team
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 // headers
 // ============================================================================
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "textbuf.h"
 #endif
 
@@ -43,7 +43,7 @@
 //   - Mac when compiling with CodeWarrior (__WXMAC__)
 
 const wxTextFileType wxTextBuffer::typeDefault =
-#if   defined(__WINDOWS__)
+#if defined(__WINDOWS__) || defined(__DOS__)
   wxTextFileType_Dos;
 #elif defined(__UNIX__)
   wxTextFileType_Unix;
@@ -251,7 +251,8 @@ wxTextFileType wxTextBuffer::GuessType() const
                                                     : wxTextFileType_##t2
 
         // Watcom C++ doesn't seem to be able to handle the macro
-#if !defined(__WATCOMC__)
+        // VS: Watcom 11 doesn't have a problem...
+#if !(defined(__WATCOMC__) && (__WATCOMC__ < 1100))
         if ( nDos > nUnix )
             return GREATER_OF(Dos, Mac);
         else if ( nDos < nUnix )