Minor fixes mainly to get stuff compiled using the mingw32 (cross) compiler

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Harco de Hilster 1999-07-17 16:27:26 +00:00
parent 4d19d97916
commit 3bb0b01c29
4 changed files with 5 additions and 3 deletions

View File

@ -78,7 +78,7 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
info = (wxInetCacheNode*) m_Cache.Get(right);
// Add item into cache:
if (!info == NULL)
if (info != NULL)
{
wxURL url(right);
s = url.GetInputStream();

View File

@ -30,7 +30,7 @@
// When using configure, the path must be "zlib.h" I don't know
// what other ports (wxMac, wxMotif without configure) need here.
#ifdef __WXMSW__
#if defined(__WXMSW__) && !defined(USING_CONFIGURE)
#include "..\zlib\zlib.h"
#else
#include "zlib.h"

View File

@ -34,13 +34,13 @@
#include "wx/button.h"
#include "wx/checkbox.h"
#include "wx/statbox.h"
#include "wx/statbmp.h"
#include "wx/dialog.h"
#include "wx/icon.h"
#include "wx/intl.h"
#include "wx/layout.h"
#include "wx/settings.h"
#include "wx/textctrl.h"
#include "wx/statbmp.h"
#endif // WX_PRECOMP
#include "wx/statline.h"

View File

@ -56,6 +56,7 @@ libwx_msw_la_SOURCES = \
docview.cpp \
dynlib.cpp \
event.cpp \
ffile.cpp \
file.cpp \
fileconf.cpp \
framecmn.cpp \
@ -91,6 +92,7 @@ libwx_msw_la_SOURCES = \
stream.cpp \
tbarbase.cpp \
tbarsmpl.cpp \
textcmn.cpp \
textfile.cpp \
time.cpp \
url.cpp \