Update wxWidgets to 3.1.0
From wxWidgets master 81570ae070b35c9d52de47b1f14897f3ff1a66c7. include/wx/defs.h -- __w64 warning disable patch by comex brought forward. include/wx/msw/window.h -- added GetContentScaleFactor() which was not implemented on Windows but is necessary for wxBitmap scaling on Mac OS X so it needs to work to avoid #ifdef-ing the code. src/gtk/window.cpp -- Modified DoSetClientSize() to direct call wxWindowGTK::DoSetSize() instead of using public wxWindowBase::SetSize() which now prevents derived classes (like wxAuiToolbar) intercepting the call and breaking it. This matches Windows which does NOT need to call DoSetSize internally. End result is this fixes Dolphin's debug tools toolbars on Linux. src/osx/window_osx.cpp -- Same fix as for GTK since it has the same issue. src/msw/radiobox.cpp -- Hacked to fix display in HiDPI (was clipping off end of text). Updated CMakeLists for Linux and Mac OS X. Small code changes to Dolphin to fix debug error boxes, deprecation warnings, and retain previous UI behavior on Windows.
This commit is contained in:
EmptyChaos committed
1 parent
3a26167148
commit
822326eea9
1748 files changed
+58817
-84428
No files matched your search
+65
-188
@@ -13,22 +13,6 @@
|
||||
#include "wx/tracker.h"
|
||||
|
||||
|
||||
// Some compilers (VC6, Borland, g++ < 3.3) have problem with template specialization.
|
||||
// However, this is only used for optimization purposes (a smaller wxWeakRef pointer)
|
||||
// (and the corner case of wxWeakRef<wxObject>). So for those compilers, we can fall
|
||||
// back to the non-optimal case, where we use the same type of weak ref (static one)
|
||||
// in all cases. See defs.h for various setting these defines depending on compiler.
|
||||
|
||||
#if !defined(HAVE_PARTIAL_SPECIALIZATION) || \
|
||||
!defined(HAVE_TEMPLATE_OVERLOAD_RESOLUTION) || \
|
||||
(defined(__GNUC__) && !wxCHECK_GCC_VERSION(3, 3))
|
||||
#define USE_ONLY_STATIC_WEAKREF
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef USE_ONLY_STATIC_WEAKREF
|
||||
|
||||
// Avoid including this for simpler compilers
|
||||
#include "wx/meta/convertible.h"
|
||||
#include "wx/meta/int2type.h"
|
||||
|
||||
@@ -38,200 +22,35 @@ struct wxIsStaticTrackable
|
||||
enum { value = wxConvertibleTo<T, wxTrackable>::value };
|
||||
};
|
||||
|
||||
#endif // !USE_ONLY_STATIC_WEAKREF
|
||||
|
||||
|
||||
// Weak ref implementation when T has wxTrackable as a known base class
|
||||
// A weak reference to an object of type T (which must inherit from wxTrackable)
|
||||
template <class T>
|
||||
class wxWeakRefStatic : public wxTrackerNode
|
||||
{
|
||||
public:
|
||||
wxWeakRefStatic() : m_pobj(NULL) { }
|
||||
|
||||
void Release()
|
||||
{
|
||||
// Release old object if any
|
||||
if ( m_pobj )
|
||||
{
|
||||
// Remove ourselves from object tracker list
|
||||
wxTrackable *pt = static_cast<wxTrackable*>(m_pobj);
|
||||
pt->RemoveNode(this);
|
||||
m_pobj = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
virtual void OnObjectDestroy()
|
||||
{
|
||||
// Tracked object itself removes us from list of trackers
|
||||
wxASSERT(m_pobj != NULL);
|
||||
m_pobj = NULL;
|
||||
}
|
||||
|
||||
protected:
|
||||
void Assign(T* pobj)
|
||||
{
|
||||
if ( m_pobj == pobj )
|
||||
return;
|
||||
|
||||
Release();
|
||||
|
||||
// Now set new trackable object
|
||||
if ( pobj )
|
||||
{
|
||||
// Add ourselves to object tracker list
|
||||
wxTrackable *pt = static_cast<wxTrackable*>(pobj);
|
||||
pt->AddNode(this);
|
||||
m_pobj = pobj;
|
||||
}
|
||||
}
|
||||
|
||||
void AssignCopy(const wxWeakRefStatic& wr)
|
||||
{
|
||||
Assign( wr.m_pobj );
|
||||
}
|
||||
|
||||
T *m_pobj;
|
||||
};
|
||||
|
||||
|
||||
|
||||
#ifndef USE_ONLY_STATIC_WEAKREF
|
||||
|
||||
template<class T,bool use_static>
|
||||
struct wxWeakRefImpl;
|
||||
|
||||
// Intermediate class, to select the static case above.
|
||||
template <class T>
|
||||
struct wxWeakRefImpl<T, true> : public wxWeakRefStatic<T>
|
||||
{
|
||||
enum { value = 1 };
|
||||
};
|
||||
|
||||
// Weak ref implementation when T does not have wxTrackable as known base class
|
||||
template<class T>
|
||||
struct wxWeakRefImpl<T, false> : public wxTrackerNode
|
||||
{
|
||||
void Release()
|
||||
{
|
||||
// Release old object if any
|
||||
if ( m_pobj )
|
||||
{
|
||||
// Remove ourselves from object tracker list
|
||||
m_ptbase->RemoveNode(this);
|
||||
m_pobj = NULL;
|
||||
m_ptbase = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
virtual void OnObjectDestroy()
|
||||
{
|
||||
// Tracked object itself removes us from list of trackers
|
||||
wxASSERT(m_pobj != NULL);
|
||||
m_pobj = NULL;
|
||||
m_ptbase = NULL;
|
||||
}
|
||||
|
||||
protected:
|
||||
wxWeakRefImpl() : m_pobj(NULL), m_ptbase(NULL) { }
|
||||
|
||||
// Assign receives most derived class here and can use that
|
||||
template <class TDerived>
|
||||
void Assign( TDerived* pobj )
|
||||
{
|
||||
AssignHelper( pobj, wxInt2Type<wxIsStaticTrackable<TDerived>::value>() );
|
||||
}
|
||||
|
||||
template <class TDerived>
|
||||
void AssignHelper(TDerived* pobj, wxInt2Type<true>)
|
||||
{
|
||||
wxTrackable *ptbase = static_cast<wxTrackable*>(pobj);
|
||||
DoAssign( pobj, ptbase );
|
||||
}
|
||||
|
||||
#ifndef wxNO_RTTI
|
||||
void AssignHelper(T* pobj, wxInt2Type<false>)
|
||||
{
|
||||
// A last way to get a trackable pointer
|
||||
wxTrackable *ptbase = dynamic_cast<wxTrackable*>(pobj);
|
||||
if ( ptbase )
|
||||
{
|
||||
DoAssign( pobj, ptbase );
|
||||
}
|
||||
else
|
||||
{
|
||||
wxFAIL_MSG( "Tracked class should inherit from wxTrackable" );
|
||||
|
||||
Release();
|
||||
}
|
||||
}
|
||||
#endif // RTTI enabled
|
||||
|
||||
void AssignCopy(const wxWeakRefImpl& wr)
|
||||
{
|
||||
DoAssign(wr.m_pobj, wr.m_ptbase);
|
||||
}
|
||||
|
||||
void DoAssign( T* pobj, wxTrackable *ptbase ) {
|
||||
if( m_pobj==pobj ) return;
|
||||
Release();
|
||||
|
||||
// Now set new trackable object
|
||||
if( pobj )
|
||||
{
|
||||
// Add ourselves to object tracker list
|
||||
wxASSERT( ptbase );
|
||||
ptbase->AddNode( this );
|
||||
m_pobj = pobj;
|
||||
m_ptbase = ptbase;
|
||||
}
|
||||
}
|
||||
|
||||
T *m_pobj;
|
||||
wxTrackable *m_ptbase;
|
||||
};
|
||||
|
||||
#endif // #ifndef USE_ONLY_STATIC_WEAKREF
|
||||
|
||||
|
||||
|
||||
// A weak reference to an object of type T, where T has base wxTrackable
|
||||
// (usually statically but if not dynamic_cast<> is tried).
|
||||
template <class T>
|
||||
class wxWeakRef : public
|
||||
#ifdef USE_ONLY_STATIC_WEAKREF
|
||||
wxWeakRefStatic<T>
|
||||
#else
|
||||
wxWeakRefImpl<T, wxIsStaticTrackable<T>::value != 0>
|
||||
#endif
|
||||
class wxWeakRef : public wxTrackerNode
|
||||
{
|
||||
public:
|
||||
typedef T element_type;
|
||||
|
||||
// Default ctor
|
||||
wxWeakRef() { }
|
||||
wxWeakRef() : m_pobj(NULL), m_ptbase(NULL) { }
|
||||
|
||||
// Enabling this ctor for VC6 results in mysterious compilation failures in
|
||||
// wx/window.h when assigning wxWindow pointers (FIXME-VC6)
|
||||
#ifndef __VISUALC6__
|
||||
// Ctor from the object of this type: this is needed as the template ctor
|
||||
// below is not used by at least g++4 when a literal NULL is used
|
||||
wxWeakRef(T *pobj)
|
||||
wxWeakRef(T *pobj) : m_pobj(NULL), m_ptbase(NULL)
|
||||
{
|
||||
this->Assign(pobj);
|
||||
}
|
||||
#endif // !__VISUALC6__
|
||||
|
||||
// When we have the full type here, static_cast<> will always work
|
||||
// (or give a straight compiler error).
|
||||
template <class TDerived>
|
||||
wxWeakRef(TDerived* pobj)
|
||||
wxWeakRef(TDerived* pobj) : m_pobj(NULL), m_ptbase(NULL)
|
||||
{
|
||||
this->Assign(pobj);
|
||||
}
|
||||
|
||||
// We need this copy ctor, since otherwise a default compiler (binary) copy
|
||||
// happens (if embedded as an object member).
|
||||
wxWeakRef(const wxWeakRef<T>& wr)
|
||||
wxWeakRef(const wxWeakRef<T>& wr) : m_pobj(NULL), m_ptbase(NULL)
|
||||
{
|
||||
this->Assign(wr.get());
|
||||
}
|
||||
@@ -250,6 +69,64 @@ public:
|
||||
|
||||
T* get() const { return this->m_pobj; }
|
||||
operator T*() const { return this->m_pobj; }
|
||||
|
||||
public:
|
||||
void Release()
|
||||
{
|
||||
// Release old object if any
|
||||
if ( m_pobj )
|
||||
{
|
||||
// Remove ourselves from object tracker list
|
||||
m_ptbase->RemoveNode(this);
|
||||
m_pobj = NULL;
|
||||
m_ptbase = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
virtual void OnObjectDestroy() wxOVERRIDE
|
||||
{
|
||||
// Tracked object itself removes us from list of trackers
|
||||
wxASSERT(m_pobj != NULL);
|
||||
m_pobj = NULL;
|
||||
m_ptbase = NULL;
|
||||
}
|
||||
|
||||
protected:
|
||||
// Assign receives most derived class here and can use that
|
||||
template <class TDerived>
|
||||
void Assign( TDerived* pobj )
|
||||
{
|
||||
wxCOMPILE_TIME_ASSERT( wxIsStaticTrackable<TDerived>::value,
|
||||
Tracked_class_should_inherit_from_wxTrackable );
|
||||
wxTrackable *ptbase = static_cast<wxTrackable*>(pobj);
|
||||
DoAssign(pobj, ptbase);
|
||||
}
|
||||
|
||||
void AssignCopy(const wxWeakRef& wr)
|
||||
{
|
||||
DoAssign(wr.m_pobj, wr.m_ptbase);
|
||||
}
|
||||
|
||||
void DoAssign(T* pobj, wxTrackable *ptbase)
|
||||
{
|
||||
if ( m_pobj == pobj )
|
||||
return;
|
||||
|
||||
Release();
|
||||
|
||||
// Now set new trackable object
|
||||
if ( pobj )
|
||||
{
|
||||
// Add ourselves to object tracker list
|
||||
wxASSERT( ptbase );
|
||||
ptbase->AddNode( this );
|
||||
m_pobj = pobj;
|
||||
m_ptbase = ptbase;
|
||||
}
|
||||
}
|
||||
|
||||
T *m_pobj;
|
||||
wxTrackable *m_ptbase;
|
||||
};
|
||||
|
||||
|
||||
@@ -300,7 +177,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
virtual void OnObjectDestroy()
|
||||
virtual void OnObjectDestroy() wxOVERRIDE
|
||||
{
|
||||
wxASSERT_MSG(m_pobj, "tracked object should have removed us itself");
|
||||
|
||||
|
||||
Reference in new issue
Block a user