From f80eabe5a2a9922c2c73d44b4037a2de8fffdf87 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 16 May 2001 11:22:01 +0000
Subject: [PATCH] Applied patch #421073 (making setup options work)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/url.cpp | 5 +++--
 src/msw/app.cpp    | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/common/url.cpp b/src/common/url.cpp
index eae17c35ca..c2e863f0b4 100644
--- 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 3424745eaf..80165004e0 100644
--- 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();
-- 
2.45.2