Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch #421073 (making setup options work)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-05-16 11:22:01 +00:00
parent b07664068b
commit f80eabe5a2
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/url.cpp
View File

@@ -36,11 +36,12 @@ IMPLEMENT_CLASS(wxURL, wxObject)
wxProtoInfo *wxURL::ms_protocols = NULL; wxProtoInfo *wxURL::ms_protocols = NULL;
// Enforce linking of protocol classes: // Enforce linking of protocol classes:
USE_PROTOCOL(wxHTTP)
USE_PROTOCOL(wxFTP)
USE_PROTOCOL(wxFileProto) USE_PROTOCOL(wxFileProto)
#if wxUSE_SOCKETS #if wxUSE_SOCKETS
USE_PROTOCOL(wxHTTP)
USE_PROTOCOL(wxFTP)
wxHTTP *wxURL::ms_proxyDefault = NULL; wxHTTP *wxURL::ms_proxyDefault = NULL;
bool wxURL::ms_useDefaultProxy = FALSE; bool wxURL::ms_useDefaultProxy = FALSE;
#endif #endif

2
src/msw/app.cpp
View File

@@ -601,7 +601,9 @@ void wxApp::CleanUp()
#if wxUSE_THREADS #if wxUSE_THREADS
delete wxPendingEventsLocker; delete wxPendingEventsLocker;
// If we don't do the following, we get an apparent memory leak. // If we don't do the following, we get an apparent memory leak.
#if wxUSE_VALIDATORS
((wxEvtHandler&) wxDefaultValidator).ClearEventLocker(); ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
#endif
#endif #endif
wxClassInfo::CleanUpClasses(); wxClassInfo::CleanUpClasses();