cleanup wxURLModule after wxSocketModule to avoid crash when destroying default proxy (patch 1828964)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@49798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -91,9 +91,13 @@ Major new features in 2.8 release
|
||||
2.8.7
|
||||
-----
|
||||
|
||||
All:
|
||||
|
||||
- Fixed bug with default proxy destruction in wxURL (Axel Gembe)
|
||||
|
||||
All (GUI):
|
||||
|
||||
- wxGraphicsContext implementations now all have the pixel's center at (0.5,0.5),
|
||||
- wxGraphicsContext implementations now all have the pixel's center at (0.5,0.5),
|
||||
avoiding differences in anti-aliasing between platforms.
|
||||
- wxChoicebook now vertically centres a left-aligned controller.
|
||||
|
||||
@@ -134,7 +138,7 @@ All (GUI):
|
||||
is shown.
|
||||
- Multiple centre panes in wxAUI can now be resized.
|
||||
- Add support for reading alpha data from TIFF images.
|
||||
|
||||
|
||||
wxMSW:
|
||||
|
||||
- Fixed a bug with a spurious border appearing on wxStatusBar under Windows XP/Vista.
|
||||
@@ -147,9 +151,9 @@ wxGTK:
|
||||
parent window. This also solves a problem with being able
|
||||
to change the selection of a wxListCtrl while editing a
|
||||
label.
|
||||
- Correct context menu event coming from wxListCtrl to
|
||||
- Correct context menu event coming from wxListCtrl to
|
||||
have the right ID (not that from the client window).
|
||||
|
||||
|
||||
wxMac:
|
||||
|
||||
- Fixed a crash in wxToolBar when adding tools with non-standard sizes.
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user