compilation fixes for !wxUSE_FONTMAP

[wxWidgets.git] / src / common / textbuf.cpp

diff --git a/src/common/textbuf.cpp b/src/common/textbuf.cpp
index 5824b2014ca717e95e829f14f87d92113a69b438..629976253e35bf55c84e54389812c3910f487fe6 100644 (file)
--- a/src/common/textbuf.cpp
+++ b/src/common/textbuf.cpp
@@ -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 )