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:
@@ -575,4 +575,5 @@ void wxTempFile::Discard()
|
||||
wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
@@ -177,3 +177,4 @@ wxFileStream::wxFileStream(const wxString& fileName)
|
||||
|
||||
#endif
|
||||
// wxUSE_STREAMS && wxUSE_FILE
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user