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

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index b9f2bed17578089b421414855c7a09054d47fd50..37453002084b5aa4095c7c6e12af5c6fe1ed7b23 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -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();

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index 1ae27ad74c95cb78f00a19d88b6c2deed2e56391..8e444b4b5f6effe4c615249ac30b0b89f3634080 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -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"

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 1b04b10df8bf9278a128273a6a0ff2d16d43fd7c..3ae7cd8462f0f2d14d826a8f587495999bbb3920 100644 (file)
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -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"

diff --git a/src/msw/Makefile.am b/src/msw/Makefile.am
index 31294a69144624c1ff7e4bcbf8e2028976a19c0a..ef5ce9996e887ea4795534d9e1e779440b9e726c 100644 (file)
--- a/src/msw/Makefile.am
+++ b/src/msw/Makefile.am
@@ -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 \