Watford C++ related changes. Unfortunately, the linker now gives a GPF.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 3106546ca8c9f1b63dd64418c408c05eb20a3de2..a12338bef151ab8fd63037726df09b7f15f49860 100644 (file)
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -276,6 +276,9 @@ Note (1): setup.h overrides wxUSE_LIBJPEG and sets it to 0, since
 imagjpeg.cpp doesn't compile.
 Note (2): makewat.env uses the odbc32.lib supplied in wxWindows' lib\watcom
 directory. See the notes in that directory.
+Note (3): makefile compilation seems broken (28/12/99) with a
+GPF in the linker. Too many object files? Could try switching
+some options off in setup.h.
 
 Metrowerks CodeWarrior compilation
 ----------------------------------

diff --git a/include/wx/datetime.h b/include/wx/datetime.h
index 657d1a507babf6ae2d2ac03039a0cf5b18b05cff..a159dc517a7c28c9032a5af013487112eda7db7d 100644 (file)
--- a/include/wx/datetime.h
+++ b/include/wx/datetime.h
@@ -97,6 +97,13 @@ class WXDLLEXPORT wxDateSpan;
 
 class WXDLLEXPORT wxDateTime
 {
+private:
+    // invalid wxDateTime object - returned by all functions which return
+    // "wxDateTime &" on failure.
+    // This variable has to be declared at the start of the class,
+    // or some compilers (e.g. Watcom C++) won't like it being used further down.
+    static wxDateTime ms_InvDateTime;
+
 public:
     // types
     // ------------------------------------------------------------------------
@@ -904,10 +911,6 @@ private:
     // fixed to 1000
     static const long TIME_T_FACTOR;
 
-    // invalid wxDateTime object - returned by all functions which return
-    // "wxDateTime &" on failure
-    static wxDateTime ms_InvDateTime;
-
     // returns TRUE if we fall in range in which we can use standard ANSI C
     // functions
     inline bool IsInStdRange() const;

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index 8a83c550ea605b060792c638c5d5c3861df43ef1..26be8638bb6551b1c16dd650a1485b187c65f053 100644 (file)
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -56,9 +56,12 @@
     #endif
 #else // no native long long type
     // both warning and pragma warning are not portable, but at least an
-    // unknown pragma should never be an error
+    // unknown pragma should never be an error.
+    // Err, actually, Watcom C++ doesn't like it.
+#ifndef __WATCOMC__
     #pragma warning "Your compiler does not appear to support 64 bit "\
                     "integers, using emulation class instead."
+#endif
 
     #define wxUSE_LONGLONG_WX 1
 #endif // compiler

diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp
index cbf2e82cb9e4f15d2e66a6abb14cf1b137537cb5..f33fcde10a926c01e8fd1ee1969b1a3648e8ad26 100644 (file)
--- a/src/msw/dialup.cpp
+++ b/src/msw/dialup.cpp
@@ -46,8 +46,8 @@
 
 #include "wx/dialup.h"
 
-// Doesn't yet compile under BC++ nor with mingw: no wininet.h
-#if !defined(__BORLANDC__) && !defined(__GNUWIN32_OLD__) && !defined(__GNUWIN32__)
+// Doesn't yet compile under BC++, mingw, Watcom C++: no wininet.h
+#if !defined(__BORLANDC__) && !defined(__GNUWIN32_OLD__) && !defined(__GNUWIN32__) && !defined(__WATCOMC__)
 
 #include <ras.h>
 #include <raserror.h>