piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade WX to r74856, mainly to support @2x.

Browse Source
This commit is contained in:
comex
2013-09-22 18:44:55 -04:00
parent 0bdef3932f
commit 66ed9a1804
1935 changed files with 45373 additions and 22739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Externals/wxWidgets3/include/wx/sharedptr.h vendored
View File

@ -3,7 +3,6 @@
// Purpose: Shared pointer based on the counted_ptr<> template, which
// is in the public domain
// Author: Robert Roebling, Yonat Sharon
// RCS-ID: $Id: sharedptr.h 67232 2011-03-18 15:10:15Z DS $
// Copyright: Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -31,6 +30,14 @@ public:
m_ref = new reftype(ptr);
}
template<typename Deleter>
wxEXPLICIT wxSharedPtr(T* ptr, Deleter d)
: m_ref(NULL)
{
if (ptr)
m_ref = new reftype_with_deleter<Deleter>(ptr, d);
}
~wxSharedPtr() { Release(); }
wxSharedPtr(const wxSharedPtr& tocopy) { Acquire(tocopy.m_ref); }
@ -92,6 +99,14 @@ public:
m_ref = new reftype(ptr);
}
template<typename Deleter>
void reset(T* ptr, Deleter d)
{
Release();
if (ptr)
m_ref = new reftype_with_deleter<Deleter>(ptr, d);
}
bool unique() const { return (m_ref ? m_ref->m_count == 1 : true); }
long use_count() const { return (m_ref ? (long)m_ref->m_count : 0); }
@ -99,10 +114,24 @@ private:
struct reftype
{
reftype( T* ptr = NULL, unsigned count = 1 ) : m_ptr(ptr), m_count(count) {}
reftype(T* ptr) : m_ptr(ptr), m_count(1) {}
virtual ~reftype() {}
virtual void delete_ptr() { delete m_ptr; }
T* m_ptr;
wxAtomicInt m_count;
}* m_ref;
};
template<typename Deleter>
struct reftype_with_deleter : public reftype
{
reftype_with_deleter(T* ptr, Deleter d) : reftype(ptr), m_deleter(d) {}
virtual void delete_ptr() { m_deleter(this->m_ptr); }
Deleter m_deleter;
};
reftype* m_ref;
void Acquire(reftype* ref)
{
@ -115,10 +144,9 @@ private:
{
if (m_ref)
{
wxAtomicDec( m_ref->m_count );
if (m_ref->m_count == 0)
if (!wxAtomicDec( m_ref->m_count ))
{
delete m_ref->m_ptr;
m_ref->delete_ptr();
delete m_ref;
}
m_ref = NULL;