Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/fs_inet.cpp
View File

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

2
src/common/zstream.cpp
View File

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

2
src/generic/tipdlg.cpp
View File

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

2
src/msw/Makefile.am
View File

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