Applied patch #421073 (making setup options work)

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

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 3424745eafa1e9eefb0daeeac4afd21b526ccfce..80165004e02f42feb13be81aa3a964632acf9689 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -601,7 +601,9 @@ void wxApp::CleanUp()
 #if wxUSE_THREADS
     delete wxPendingEventsLocker;
     // If we don't do the following, we get an apparent memory leak.
+#if wxUSE_VALIDATORS
     ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
+#endif
 #endif
 
     wxClassInfo::CleanUpClasses();