merged MapBitmap() from 2.2 branch

[wxWidgets.git] / src / common / url.cpp

diff --git a/src/common/url.cpp b/src/common/url.cpp
index b6c54cca4579c174cd71abb6b690051979826118..c2e863f0b432495bef337d2f7cd6ba3455db6eb7 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -35,7 +35,13 @@ IMPLEMENT_CLASS(wxURL, wxObject)
 // Protocols list
 wxProtoInfo *wxURL::ms_protocols = NULL;
 
+// Enforce linking of protocol classes:
+USE_PROTOCOL(wxFileProto)
+
 #if wxUSE_SOCKETS
+USE_PROTOCOL(wxHTTP)
+USE_PROTOCOL(wxFTP)
+
     wxHTTP *wxURL::ms_proxyDefault = NULL;
     bool wxURL::ms_useDefaultProxy = FALSE;
 #endif