Removed streams from VC++ makefile for now; corrected typo in log.h

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

diff --git a/include/wx/log.h b/include/wx/log.h
index c63271a868be42aac3b37e3f11a4313468a104be..c70ab1a09bb22f69a9f505feeaf67cd0f60bf359 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -331,7 +331,7 @@ const char* WXDLLEXPORT wxSysErrorMsg(unsigned long nErrCode = 0);
   #define wxLogLastError(api) wxLogApiError(api, wxSysErrorCode())
 #else   //!debug
   inline void wxLogApiError(const char *, long) { }
   #define wxLogLastError(api) wxLogApiError(api, wxSysErrorCode())
 #else   //!debug
   inline void wxLogApiError(const char *, long) { }

-  inline void wxLogLastErrror(const char *) { }
+  inline void wxLogLastError(const char *) { }

 #endif  //debug/!debug
 
 #endif  //__LOGH__
 #endif  //debug/!debug
 
 #endif  //__LOGH__

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index b438c2b386b4e525bdd756c200d50a0ab6e6f76a..430ffde22788f3a2685cd3c161a15fca62b1fdcd 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -13,6 +13,17 @@
 #pragma implementation "stream.h"
 #endif
 
 #pragma implementation "stream.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/setup.h"
+#endif
+

 #include "wx/object.h"
 #include "wx/stream.h"
 
 #include "wx/object.h"
 #include "wx/stream.h"
 

diff --git a/src/msw/makefile.nt b/src/msw/makefile.nt
index e4a1cdba0e277c15c939f49d9027a8a7d8fdd164..1e2e750054e5aae73207d369ce0fae6c14c5bb1d 100644 (file)
--- a/src/msw/makefile.nt
+++ b/src/msw/makefile.nt
@@ -107,16 +107,13 @@ COMMONOBJS = \
   $(COMMDIR)\time.obj \
   $(COMMDIR)\wxexpr.obj \
   $(COMMDIR)\y_tab.obj \
   $(COMMDIR)\time.obj \
   $(COMMDIR)\wxexpr.obj \
   $(COMMDIR)\y_tab.obj \

-  $(COMMDIR)\stream.obj \
-  $(COMMDIR)\fstream.obj \
-  $(COMMDIR)\mstream.obj \
-  $(COMMDIR)\datstrm.obj \

   $(COMMDIR)\extended.obj \
   $(COMMDIR)\process.obj
 
   $(COMMDIR)\extended.obj \
   $(COMMDIR)\process.obj
 

-#  $(COMMDIR)\wxstrgnu\wxstrgnu.obj \
-#  $(COMMDIR)\wxstrgnu\wxregex.obj \
-#  $(COMMDIR)\matrix.obj \
+# $(COMMDIR)\fstream.obj \
+#  $(COMMDIR)\mstream.obj \
+#  $(COMMDIR)\datstrm.obj \
+#  $(COMMDIR)\stream.obj \

 
 MSWOBJS = \
   $(MSWDIR)\app.obj \
 
 MSWOBJS = \
   $(MSWDIR)\app.obj \

diff --git a/src/ntwxwin.mak b/src/ntwxwin.mak
index 83bc3116e66d612da6c7a460bb620d468b349474..ec854fd8b2105a388dfd076c80a91b6dd32fecb1 100644 (file)
--- a/src/ntwxwin.mak
+++ b/src/ntwxwin.mak
@@ -141,9 +141,9 @@ PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb
 MAKEPRECOMP=/YcWX/WXPREC.H
 !endif
 
 MAKEPRECOMP=/YcWX/WXPREC.H
 !endif
 

-CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__ /DWXDEBUG=1
+CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__WXDEBUG__ /DWXDEBUG=1

 # If you don't include wxprec.h, use CPPFLAGS2
 # If you don't include wxprec.h, use CPPFLAGS2

-CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__ /DWXDEBUG=1
+CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__WXDEBUG__ /DWXDEBUG=1

 LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup
 DUMMY=dummy
 
 LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup
 DUMMY=dummy