added wxUSE_PROTOCOL[_XXX] and wxUSE_URL settings

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

include/wx/protocol/file.h

@@ -8,6 +8,7 @@
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
+
 #ifndef __WX_PROTO_FILE_H__
 #define __WX_PROTO_FILE_H__
 
@@ -15,6 +16,10 @@
 #pragma interface "sckfile.h"
 #endif
 
+#include "wx/defs.h"
+
+#if wxUSE_PROTOCOL_FILE
+
 #include "wx/protocol/protocol.h"
 #include "wx/url.h"
 
@@ -32,4 +37,6 @@ public:
   wxInputStream *GetInputStream(const wxString& path);
 };
 
-#endif
+#endif // wxUSE_PROTOCOL_FILE
+
+#endif // __WX_PROTO_FILE_H__

include/wx/protocol/ftp.h

@@ -17,7 +17,10 @@
     #pragma interface "ftp.h"
 #endif
 
-#include "wx/object.h"
+#include "wx/defs.h"
+
+#if wxUSE_PROTOCOL_FTP
+
 #include "wx/sckaddr.h"
 #include "wx/protocol/protocol.h"
 #include "wx/url.h"
@@ -161,4 +164,6 @@ protected:
 // wxLog::AddTraceMask(FTP_TRACE_MASK) to see them in output
 #define FTP_TRACE_MASK _T("ftp")
 
+#endif // wxUSE_PROTOCOL_FTP
+
 #endif // __WX_FTP_H__

include/wx/protocol/http.h

@@ -11,6 +11,10 @@
 #ifndef _WX_HTTP_H
 #define _WX_HTTP_H
 
+#include "wx/defs.h"
+
+#if wxUSE_PROTOCOL_HTTP
+
 #include "wx/list.h"
 #include "wx/protocol/protocol.h"
 
@@ -48,4 +52,7 @@ protected:
   bool ParseHeaders();
 };
 
-#endif
+#endif // wxUSE_PROTOCOL_HTTP
+
+#endif // _WX_HTTP_H
+

include/wx/protocol/protocol.h

@@ -18,6 +18,8 @@
 
 #include "wx/defs.h"
 
+#if wxUSE_PROTOCOL
+
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/stream.h"
@@ -127,4 +129,6 @@ protected:
     DECLARE_DYNAMIC_CLASS(wxProtoInfo)
 };
 
+#endif // wxUSE_PROTOCOL
+
 #endif // _WX_PROTOCOL_PROTOCOL_H