we don't need to include wx/url.h from the header, we do need to include wx/uri.h...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/protocol/file.h b/include/wx/protocol/file.h
index 9a5af4b6f2a28c01ac653e941460cdade043660e..4be395dccf876bc010a83ac65cde15c558e2466c 100644 (file)
--- a/include/wx/protocol/file.h
+++ b/include/wx/protocol/file.h
@@ -17,7 +17,6 @@
 #if wxUSE_PROTOCOL_FILE
 
 #include "wx/protocol/protocol.h"
 #if wxUSE_PROTOCOL_FILE
 
 #include "wx/protocol/protocol.h"

-#include "wx/url.h"

 
 class WXDLLIMPEXP_NET wxFileProto: public wxProtocol {
   DECLARE_DYNAMIC_CLASS_NO_COPY(wxFileProto)
 
 class WXDLLIMPEXP_NET wxFileProto: public wxProtocol {
   DECLARE_DYNAMIC_CLASS_NO_COPY(wxFileProto)

diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp
index adf5a85c909310077a77d06ef661093b8a5822c1..152a91f89f2d921880948115acd071acc8f04be1 100644 (file)
--- a/src/common/sckfile.cpp
+++ b/src/common/sckfile.cpp
@@ -21,7 +21,7 @@
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 

-#include <stdio.h>
+#include "wx/uri.h"

 #include "wx/wfstream.h"
 #include "wx/protocol/file.h"
 
 #include "wx/wfstream.h"
 #include "wx/protocol/file.h"