forward ported changes in 2.8.7 from WX_2_8_BRNACH

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 5650f0df43b59924995d88353acc80185146a551..7aec57a7812823e0dfda87e6af9d789e1ab39a33 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -266,6 +266,20 @@ wxX11:
 - Make Enter key activate the default button (David Hart).
 
 
+2.8.7
+-----
+
+wxMSW:
+
+- Correct (harmless) warnings given for forward-declared DLL-exported classes
+  by mingw32 4.2 (Tim Stahlhut)
+
+wxGTK:
+
+- Added gtk.window.force-background-colour wxSystemOptions option to work around
+  a background colour bug in the gtk-qt theme under KDE.
+
+
 2.8.6
 -----
 

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 7c6ae670754eecc04e83d1179a6806e0c67f5888..b48d5dabe71b189f00f05f3912ea9a7aaa9a5d77 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -406,6 +406,8 @@ void wxURL::SetProxy(const wxString& url_proxy)
 class wxURLModule : public wxModule
 {
 public:
+    wxURLModule();
+
     virtual bool OnInit();
     virtual void OnExit();
 
@@ -415,6 +417,13 @@ private:
 
 IMPLEMENT_DYNAMIC_CLASS(wxURLModule, wxModule)
 
+wxURLModule::wxURLModule()
+{
+    // we must be cleaned up before wxSocketModule as otherwise deleting
+    // ms_proxyDefault from our OnExit() won't work (and can actually crash)
+    AddDependency(wxClassInfo::FindClass(_T("wxSocketModule")));
+}
+
 bool wxURLModule::OnInit()
 {
 #if wxUSE_PROTOCOL_HTTP