More Watcom C++ compilation stuff

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

diff --git a/distrib/msw/tmake/wat.t b/distrib/msw/tmake/wat.t
index c441ec7a9380282e73ea1e3c8dfea7983d1b2c25..2e7350af2e763aaec10f93fe86d3853cd2d9f2f2 100644 (file)
--- a/distrib/msw/tmake/wat.t
+++ b/distrib/msw/tmake/wat.t
@@ -3,7 +3,7 @@
 #! Purpose: tmake template file from which makefile.wat is generated by running
 #!          tmake -t wat wxwin.pro -o makefile.wat
 #!          TODO:
-#!            - unzip.c must be compiled with $(CC), not $(CCC).
+#!            - extended.c, unzip.c must be compiled with $(CC), not $(CCC).
 #!            - extended.c, unzip.c targets must be as per b32.t etc.
 #!            - OLE files not generated correctly (need 'ole/' directory)
 #! Author:  Vadim Zeitlin

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 1dca866f7e5e65ae8565f96edcd76ed0bb1dbf5a..adfca344d12702ac2beae35120d0ab8927855eef 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -396,6 +396,14 @@
 #define wxUSE_ODBC 0
 #endif
 
+#if defined(__WXMSW__) && defined(__WATCOMC__)
+#undef wxUSE_ODBC
+#define wxUSE_ODBC 0
+
+#undef wxUSE_LIBJPEG
+#define wxUSE_LIBJPEG 0
+#endif
+
 #if defined(__WXMSW__) && !defined(__WIN32__)
 
 #undef wxUSE_THREADS

diff --git a/src/makewat.env b/src/makewat.env
index 440c1821b7b156acbf7172afe522dd532286b8d5..f3b86cacff3dd07f3259e69f3fe144a20e9df4d9 100644 (file)
--- a/src/makewat.env
+++ b/src/makewat.env
@@ -54,7 +54,7 @@ STACK       = option stack=64k
 LIBS   = $(WXDIR)\lib\wx.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\xpm.lib &
       $(WATLIBDIR)\comctl32.lib $(WATLIBDIR)\comdlg32.lib &
       $(WATLIBDIR)\ole32.lib $(WATLIBDIR)\oleaut32.lib &
-      $(WATLIBDIR)\uuid.lib # $(WATLIBDIR)\odbc32.lib 
+      $(WATLIBDIR)\uuid.lib $(WATLIBDIR)\odbc32.lib 
 IFLAGS      = -i=$(WXINC) -i=$(%watcom)\h;$(%watcom)\h\nt;$(WXDIR)\src\png;$(WXDIR)\src\zlib;$(WXDIR)\src\jpeg;$(WXDIR)\include\wx\msw\gnuwin32
 RESFLAGS1   = -r -bt=nt /i$(WXDIR)\include
 RESFLAGS2   = -R $(name) /i$(WXDIR)\include

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 1dbd38b74cba1755cd4527c662d5197064221759..16744b020639e663c0eba1d0be9292ee0947846f 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -405,7 +405,7 @@ gdiobj.obj:     $(MSWDIR)\gdiobj.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 gsocket.obj:     $(MSWDIR)\gsocket.c
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
 helpwin.obj:     $(MSWDIR)\helpwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@ -446,7 +446,7 @@ msgdlg.obj:     $(MSWDIR)\msgdlg.cpp
 nativdlg.obj:     $(MSWDIR)\nativdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-oleutils.obj:     $(MSWDIR)\oleutils.cpp
+oleutils.obj:     $(MSWDIR)\ole\oleutils.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 ownerdrw.obj:     $(MSWDIR)\ownerdrw.cpp
@@ -620,7 +620,7 @@ event.obj:     $(COMMDIR)\event.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 extended.obj:     $(COMMDIR)\extended.c
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
 ffile.obj:     $(COMMDIR)\ffile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 5cc44d6be0f82f3ee403b04dba3fc0e3df1236f7..96298bf72e574f527c55042c986bfeb1ed9e07db 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -218,7 +218,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
       dc.Blit(rc.x + (GetMarginWidth() - nBmpWidth) / 2, 
               rc.y + (m_nHeight - nBmpHeight) /2, 
               nBmpWidth, nBmpHeight, 
-              &dcMem, 0, 0, wxCOPY,true);
+              &dcMem, 0, 0, wxCOPY, TRUE);
 
       if ( st & wxODSelected ) {
         #ifdef  O_DRAW_NATIVE_API

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index c3f1af3b27ac02c5f7a9ce43611ae05360036850..aeb70b374d4b80e113d172a418af08383adf7758 100644 (file)
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -209,7 +209,7 @@ bool wxSpinButton::MSWOnScroll(int orientation, WXWORD wParam,
 bool wxSpinButton::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 {
 #ifndef __GNUWIN32__
-#ifdef __BORLANDC__
+#if defined(__BORLANDC__) || defined(__WATCOMC__)
     LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;
 #elif defined(__VISUALC__) && (__VISUALC__ == 1010)
     LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;

diff --git a/src/wxvc.dsp b/src/wxvc.dsp
index fc79913c22b67b2af089a284c9b0d4243c6cfdc9..7a021d35c692c5aa55e11bb7a723d411fe94cb6e 100644 (file)
--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@@ -103,6 +103,10 @@ SOURCE=.\common\ctrlcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\ctrlsub.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\date.cpp
 # End Source File
 # Begin Source File
@@ -256,6 +260,10 @@ SOURCE=.\common\layout.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\lboxcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\list.cpp
 # End Source File
 # Begin Source File

diff --git a/src/wxvc6.dsp b/src/wxvc6.dsp
index 5f2624c4eb3811f08ba80c80057a6e0fa52b5c0c..294fd1e5f436e5669e1445a4618089d0c009de1c 100644 (file)
--- a/src/wxvc6.dsp
+++ b/src/wxvc6.dsp
@@ -109,6 +109,10 @@ SOURCE=.\common\ctrlcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\ctrlsub.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\date.cpp
 # End Source File
 # Begin Source File
@@ -262,6 +266,10 @@ SOURCE=.\common\layout.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\lboxcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\list.cpp
 # End Source File
 # Begin Source File

diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index 51a29716a086c065dec5828eb8d12ffa4121bf31..8dd7b4f53692257bf6dc8dada1911e328ce8e06b 100644 (file)
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -116,6 +116,10 @@ SOURCE=.\common\ctrlcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\ctrlsub.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\date.cpp
 # End Source File
 # Begin Source File
@@ -264,6 +268,10 @@ SOURCE=.\common\layout.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\lboxcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\list.cpp
 # End Source File
 # Begin Source File