Some minors changes, like adding empty lines at end of files, to be able to compile...

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 565f80c520d3816fda4872fbd952bafb2e8b7fbd..c049542ebcd236517c7a63b0b1fd04845d1950da 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -108,6 +108,14 @@
 #   pragma suppress 571             // Virtual function hiding
 #endif // __SALFORDC__
 
+#ifdef __VISUALC__
+#ifndef WIN32
+// VC1.5 does not have LPTSTR type
+#define LPTSTR LPSTR
+#define LPCTSTR LPCSTR
+#endif
+#endif
+
 // Digital Unix C++ compiler only defines this symbol for .cxx and .hxx files,
 // so define it ourselves
 #ifdef __DECCXX

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index 1c3283e77934d96901c85928b3d5a65e10cf6f9f..83ae0ba3b5f844554270c6d7b6ed4975a971defa 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -37,4 +37,5 @@ class wxMemoryOutputStream:  public wxOutputStream {
   // wxUSE_STREAMS
 
 #endif
-  // _WX_WXMMSTREAM_H__
\ No newline at end of file
+  // _WX_WXMMSTREAM_H__
+

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index 52c23478a7e937be65e1ed866bd6d21153c51898..65313efd053e5b1ccef81a86c981d1b0ddc514e7 100644 (file)
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -86,4 +86,5 @@ class wxFileStream: public wxFileInputStream, public wxFileOutputStream {
   // wxUSE_STREAMS && wxUSE_FILE
 
 #endif
-  // _WX_WXFSTREAM_H__
\ No newline at end of file
+  // _WX_WXFSTREAM_H__
+

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 40396a125163825c1463e66f9470643b566250a6..b1cb0f476017373931f8a40c2af023577f281557 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -55,4 +55,5 @@ class WXDLLEXPORT wxZlibOutputStream: public wxFilterOutputStream {
   // wxUSE_ZLIB && wxUSE_STREAMS
 
 #endif
-   // _WX_WXZSTREAM_H__
\ No newline at end of file
+   // _WX_WXZSTREAM_H__
+

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 8f1f1deb762606cfac42867b9ea351884eabc576..55e153dee467f7febca2541facaad5e73da0af08 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -575,4 +575,5 @@ void wxTempFile::Discard()
         wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
 }
 
-#endif
\ No newline at end of file
+#endif
+

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index 5191307d4a22d9fa10e8c509348d8ded07d2a7ff..4bae72adc7e5c3a80090f382f41d7eca6f131731 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -177,3 +177,4 @@ wxFileStream::wxFileStream(const wxString& fileName)
 
 #endif
   // wxUSE_STREAMS && wxUSE_FILE
+

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index 1424f3b22bf2b18b638ebecb9c1fc092f04ab05f..361bb9ce82201648b004f2f66837b0dff4090863 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -30,7 +30,7 @@
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/log.h"
-#include "zlib.h"
+#include "..\zlib\zlib.h"
 
 #define ZSTREAM_BUFFER_SIZE 1024
 

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 7455eb2dab59b2a27f55793e752579e07c4ba10d..226b187b75c5df1c4a4202a2cf2fee7ff1a6be6d 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -168,6 +168,7 @@ COMMONOBJS = \
   ..\common\$D\variant.obj \
   ..\common\$D\dlgcmn.obj \
   ..\common\$D\wincmn.obj \
+  ..\common\$D\txtstrm.obj \
   ..\common\$D\wxchar.obj
 
 MSWOBJS = \
@@ -250,7 +251,6 @@ MSWOBJS = \
   ..\msw\$D\tbar95.obj \
   ..\msw\$D\tbarmsw.obj \
   ..\msw\$D\textctrl.obj \
-  ..\msw\$D\txtstrm.obj \
   ..\msw\$D\thread.obj \
   ..\msw\$D\timer.obj \
   ..\msw\$D\tooltip.obj \

diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp
index 2e55df4d409ff6efa687e3e668b1c073e822c4da..5737b15039cae213a1355ef37d1e6aa230df0f98 100644 (file)
--- a/src/msw/statline.cpp
+++ b/src/msw/statline.cpp
@@ -55,12 +55,16 @@ bool wxStaticLine::Create( wxWindow *parent,
 
     wxSize sizeReal = AdjustSize(size);
 
+#ifndef WIN32
+#define SS_SUNKEN 0
+#endif
+
     m_hWnd = (WXHWND)::CreateWindow
                        (
                         _T("STATIC"),
                         "",
                         WS_VISIBLE | WS_CHILD |
-                        SS_GRAYRECT | SS_SUNKEN,// | SS_ETCHEDFRAME,
+                        SS_GRAYRECT | SS_SUNKEN, // | SS_ETCHEDFRAME,
                         pos.x, pos.y, sizeReal.x, sizeReal.y,
                         GetWinHwnd(parent),
                         (HMENU)m_windowId,