Some minors changes, like adding empty lines at end of files, to be able to compile with VC++1.52c.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -108,6 +108,14 @@
|
|||||||
# pragma suppress 571 // Virtual function hiding
|
# pragma suppress 571 // Virtual function hiding
|
||||||
#endif // __SALFORDC__
|
#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,
|
// Digital Unix C++ compiler only defines this symbol for .cxx and .hxx files,
|
||||||
// so define it ourselves
|
// so define it ourselves
|
||||||
#ifdef __DECCXX
|
#ifdef __DECCXX
|
||||||
|
@@ -38,3 +38,4 @@ class wxMemoryOutputStream: public wxOutputStream {
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
// _WX_WXMMSTREAM_H__
|
// _WX_WXMMSTREAM_H__
|
||||||
|
|
||||||
|
@@ -87,3 +87,4 @@ class wxFileStream: public wxFileInputStream, public wxFileOutputStream {
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
// _WX_WXFSTREAM_H__
|
// _WX_WXFSTREAM_H__
|
||||||
|
|
||||||
|
@@ -56,3 +56,4 @@ class WXDLLEXPORT wxZlibOutputStream: public wxFilterOutputStream {
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
// _WX_WXZSTREAM_H__
|
// _WX_WXZSTREAM_H__
|
||||||
|
|
||||||
|
@@ -576,3 +576,4 @@ void wxTempFile::Discard()
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -177,3 +177,4 @@ wxFileStream::wxFileStream(const wxString& fileName)
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
// wxUSE_STREAMS && wxUSE_FILE
|
// wxUSE_STREAMS && wxUSE_FILE
|
||||||
|
|
||||||
|
@@ -30,7 +30,7 @@
|
|||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
#include "wx/intl.h"
|
#include "wx/intl.h"
|
||||||
#include "wx/log.h"
|
#include "wx/log.h"
|
||||||
#include "zlib.h"
|
#include "..\zlib\zlib.h"
|
||||||
|
|
||||||
#define ZSTREAM_BUFFER_SIZE 1024
|
#define ZSTREAM_BUFFER_SIZE 1024
|
||||||
|
|
||||||
|
@@ -168,6 +168,7 @@ COMMONOBJS = \
|
|||||||
..\common\$D\variant.obj \
|
..\common\$D\variant.obj \
|
||||||
..\common\$D\dlgcmn.obj \
|
..\common\$D\dlgcmn.obj \
|
||||||
..\common\$D\wincmn.obj \
|
..\common\$D\wincmn.obj \
|
||||||
|
..\common\$D\txtstrm.obj \
|
||||||
..\common\$D\wxchar.obj
|
..\common\$D\wxchar.obj
|
||||||
|
|
||||||
MSWOBJS = \
|
MSWOBJS = \
|
||||||
@@ -250,7 +251,6 @@ MSWOBJS = \
|
|||||||
..\msw\$D\tbar95.obj \
|
..\msw\$D\tbar95.obj \
|
||||||
..\msw\$D\tbarmsw.obj \
|
..\msw\$D\tbarmsw.obj \
|
||||||
..\msw\$D\textctrl.obj \
|
..\msw\$D\textctrl.obj \
|
||||||
..\msw\$D\txtstrm.obj \
|
|
||||||
..\msw\$D\thread.obj \
|
..\msw\$D\thread.obj \
|
||||||
..\msw\$D\timer.obj \
|
..\msw\$D\timer.obj \
|
||||||
..\msw\$D\tooltip.obj \
|
..\msw\$D\tooltip.obj \
|
||||||
|
@@ -55,6 +55,10 @@ bool wxStaticLine::Create( wxWindow *parent,
|
|||||||
|
|
||||||
wxSize sizeReal = AdjustSize(size);
|
wxSize sizeReal = AdjustSize(size);
|
||||||
|
|
||||||
|
#ifndef WIN32
|
||||||
|
#define SS_SUNKEN 0
|
||||||
|
#endif
|
||||||
|
|
||||||
m_hWnd = (WXHWND)::CreateWindow
|
m_hWnd = (WXHWND)::CreateWindow
|
||||||
(
|
(
|
||||||
_T("STATIC"),
|
_T("STATIC"),
|
||||||
|
Reference in New Issue
Block a user