mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-12 09:09:12 +01:00
822326eea9
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.
294 lines
14 KiB
C++
294 lines
14 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/wxt2.h
|
|
// Purpose: runtime metadata information (extended class info)
|
|
// Author: Stefan Csomor
|
|
// Modified by: Francesco Montorsi
|
|
// Created: 27/07/03
|
|
// Copyright: (c) 1997 Julian Smart
|
|
// (c) 2003 Stefan Csomor
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_XTI2H__
|
|
#define _WX_XTI2H__
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// second part of xti headers, is included from object.h
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#if wxUSE_EXTENDED_RTTI
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxDynamicObject class, its instances connect to a 'super class instance'
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_BASE wxDynamicObject : public wxObject
|
|
{
|
|
friend class WXDLLIMPEXP_FWD_BASE wxDynamicClassInfo ;
|
|
public:
|
|
// instantiates this object with an instance of its superclass
|
|
wxDynamicObject(wxObject* superClassInstance, const wxDynamicClassInfo *info) ;
|
|
virtual ~wxDynamicObject();
|
|
|
|
void SetProperty (const wxChar *propertyName, const wxAny &value);
|
|
wxAny GetProperty (const wxChar *propertyName) const ;
|
|
|
|
// get the runtime identity of this object
|
|
wxClassInfo *GetClassInfo() const
|
|
{
|
|
#ifdef _MSC_VER
|
|
return (wxClassInfo*) m_classInfo;
|
|
#else
|
|
wxDynamicClassInfo *nonconst = const_cast<wxDynamicClassInfo *>(m_classInfo);
|
|
return static_cast<wxClassInfo *>(nonconst);
|
|
#endif
|
|
}
|
|
|
|
wxObject* GetSuperClassInstance() const
|
|
{
|
|
return m_superClassInstance ;
|
|
}
|
|
private :
|
|
// removes an existing runtime-property
|
|
void RemoveProperty( const wxChar *propertyName ) ;
|
|
|
|
// renames an existing runtime-property
|
|
void RenameProperty( const wxChar *oldPropertyName , const wxChar *newPropertyName ) ;
|
|
|
|
wxObject *m_superClassInstance ;
|
|
const wxDynamicClassInfo *m_classInfo;
|
|
struct wxDynamicObjectInternal;
|
|
wxDynamicObjectInternal *m_data;
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// String conversion templates supporting older compilers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#if wxUSE_FUNC_TEMPLATE_POINTER
|
|
# define wxTO_STRING(type) wxToStringConverter<type>
|
|
# define wxTO_STRING_IMP(type)
|
|
# define wxFROM_STRING(type) wxFromStringConverter<type>
|
|
# define wxFROM_STRING_IMP(type)
|
|
#else
|
|
# define wxTO_STRING(type) ToString##type
|
|
# define wxTO_STRING_IMP(type) \
|
|
inline void ToString##type( const wxAny& data, wxString &result ) \
|
|
{ wxToStringConverter<type>(data, result); }
|
|
|
|
# define wxFROM_STRING(type) FromString##type
|
|
# define wxFROM_STRING_IMP(type) \
|
|
inline void FromString##type( const wxString& data, wxAny &result ) \
|
|
{ wxFromStringConverter<type>(data, result); }
|
|
#endif
|
|
|
|
#include "wx/xtiprop.h"
|
|
#include "wx/xtictor.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxIMPLEMENT class macros for concrete classes
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// Single inheritance with one base class
|
|
|
|
#define _DEFAULT_CONSTRUCTOR(name) \
|
|
wxObject* wxConstructorFor##name() \
|
|
{ return new name; }
|
|
|
|
#define _DEFAULT_CONVERTERS(name) \
|
|
wxObject* wxVariantOfPtrToObjectConverter##name ( const wxAny &data ) \
|
|
{ return data.As( (name**)NULL ); } \
|
|
wxAny wxObjectToVariantConverter##name ( wxObject *data ) \
|
|
{ return wxAny( wx_dynamic_cast(name*, data) ); }
|
|
|
|
#define _TYPEINFO_CLASSES(n, toString, fromString ) \
|
|
wxClassTypeInfo s_typeInfo##n(wxT_OBJECT, &n::ms_classInfo, \
|
|
toString, fromString, typeid(n).name()); \
|
|
wxClassTypeInfo s_typeInfoPtr##n(wxT_OBJECT_PTR, &n::ms_classInfo, \
|
|
toString, fromString, typeid(n*).name());
|
|
|
|
#define _IMPLEMENT_DYNAMIC_CLASS(name, basename, unit, callback) \
|
|
_DEFAULT_CONSTRUCTOR(name) \
|
|
_DEFAULT_CONVERTERS(name) \
|
|
\
|
|
const wxClassInfo* name::ms_classParents[] = \
|
|
{ &basename::ms_classInfo, NULL }; \
|
|
wxClassInfo name::ms_classInfo(name::ms_classParents, wxT(unit), \
|
|
wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name, \
|
|
name::GetPropertiesStatic, name::GetHandlersStatic, name::ms_constructor, \
|
|
name::ms_constructorProperties, name::ms_constructorPropertiesCount, \
|
|
wxVariantOfPtrToObjectConverter##name, NULL, wxObjectToVariantConverter##name, \
|
|
callback);
|
|
|
|
#define _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY(name, basename, unit, callback ) \
|
|
_DEFAULT_CONSTRUCTOR(name) \
|
|
_DEFAULT_CONVERTERS(name) \
|
|
void wxVariantToObjectConverter##name ( const wxAny &data, wxObjectFunctor* fn ) \
|
|
{ name o = data.As<name>(); (*fn)( &o ); } \
|
|
\
|
|
const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo,NULL }; \
|
|
wxClassInfo name::ms_classInfo(name::ms_classParents, wxT(unit), \
|
|
wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name, \
|
|
name::GetPropertiesStatic,name::GetHandlersStatic,name::ms_constructor, \
|
|
name::ms_constructorProperties, name::ms_constructorPropertiesCount, \
|
|
wxVariantOfPtrToObjectConverter##name, wxVariantToObjectConverter##name, \
|
|
wxObjectToVariantConverter##name, callback);
|
|
|
|
#define wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name, basename ) \
|
|
_IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name, basename, "", NULL ) \
|
|
_TYPEINFO_CLASSES(name, NULL, NULL) \
|
|
const wxPropertyInfo *name::GetPropertiesStatic() \
|
|
{ return (wxPropertyInfo*) NULL; } \
|
|
const wxHandlerInfo *name::GetHandlersStatic() \
|
|
{ return (wxHandlerInfo*) NULL; } \
|
|
wxCONSTRUCTOR_DUMMY( name )
|
|
|
|
#define wxIMPLEMENT_DYNAMIC_CLASS( name, basename ) \
|
|
_IMPLEMENT_DYNAMIC_CLASS( name, basename, "", NULL ) \
|
|
_TYPEINFO_CLASSES(name, NULL, NULL) \
|
|
wxPropertyInfo *name::GetPropertiesStatic() \
|
|
{ return (wxPropertyInfo*) NULL; } \
|
|
wxHandlerInfo *name::GetHandlersStatic() \
|
|
{ return (wxHandlerInfo*) NULL; } \
|
|
wxCONSTRUCTOR_DUMMY( name )
|
|
|
|
#define wxIMPLEMENT_DYNAMIC_CLASS_XTI( name, basename, unit ) \
|
|
_IMPLEMENT_DYNAMIC_CLASS( name, basename, unit, NULL ) \
|
|
_TYPEINFO_CLASSES(name, NULL, NULL)
|
|
|
|
#define wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK( name, basename, unit, callback )\
|
|
_IMPLEMENT_DYNAMIC_CLASS( name, basename, unit, &callback ) \
|
|
_TYPEINFO_CLASSES(name, NULL, NULL)
|
|
|
|
#define wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( name, basename, unit ) \
|
|
_IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name, basename, unit, NULL ) \
|
|
_TYPEINFO_CLASSES(name, NULL, NULL)
|
|
|
|
#define wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( name, basename, \
|
|
unit, toString, \
|
|
fromString ) \
|
|
_IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name, basename, unit, NULL ) \
|
|
_TYPEINFO_CLASSES(name, toString, fromString)
|
|
|
|
// this is for classes that do not derive from wxObject, there are no creators for these
|
|
|
|
#define wxIMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_NO_BASE_XTI( name, unit ) \
|
|
const wxClassInfo* name::ms_classParents[] = { NULL }; \
|
|
wxClassInfo name::ms_classInfo(name::ms_classParents, wxEmptyString, \
|
|
wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) 0, \
|
|
name::GetPropertiesStatic,name::GetHandlersStatic, 0, 0, \
|
|
0, 0, 0 ); \
|
|
_TYPEINFO_CLASSES(name, NULL, NULL)
|
|
|
|
// this is for subclasses that still do not derive from wxObject
|
|
|
|
#define wxIMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_XTI( name, basename, unit ) \
|
|
const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo, NULL }; \
|
|
wxClassInfo name::ms_classInfo(name::ms_classParents, wxEmptyString, \
|
|
wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) 0, \
|
|
name::GetPropertiesStatic,name::GetHandlersStatic, 0, 0, \
|
|
0, 0, 0 ); \
|
|
_TYPEINFO_CLASSES(name, NULL, NULL)
|
|
|
|
|
|
// Multiple inheritance with two base classes
|
|
|
|
#define _IMPLEMENT_DYNAMIC_CLASS2(name, basename, basename2, unit, callback) \
|
|
_DEFAULT_CONSTRUCTOR(name) \
|
|
_DEFAULT_CONVERTERS(name) \
|
|
\
|
|
const wxClassInfo* name::ms_classParents[] = \
|
|
{ &basename::ms_classInfo,&basename2::ms_classInfo, NULL }; \
|
|
wxClassInfo name::ms_classInfo(name::ms_classParents, wxT(unit), \
|
|
wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name, \
|
|
name::GetPropertiesStatic,name::GetHandlersStatic,name::ms_constructor, \
|
|
name::ms_constructorProperties, name::ms_constructorPropertiesCount, \
|
|
wxVariantOfPtrToObjectConverter##name, NULL, wxObjectToVariantConverter##name, \
|
|
callback);
|
|
|
|
#define wxIMPLEMENT_DYNAMIC_CLASS2( name, basename, basename2) \
|
|
_IMPLEMENT_DYNAMIC_CLASS2( name, basename, basename2, "", NULL) \
|
|
_TYPEINFO_CLASSES(name, NULL, NULL) \
|
|
wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL; } \
|
|
wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL; } \
|
|
wxCONSTRUCTOR_DUMMY( name )
|
|
|
|
#define wxIMPLEMENT_DYNAMIC_CLASS2_XTI( name, basename, basename2, unit) \
|
|
_IMPLEMENT_DYNAMIC_CLASS2( name, basename, basename2, unit, NULL) \
|
|
_TYPEINFO_CLASSES(name, NULL, NULL)
|
|
|
|
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxIMPLEMENT class macros for abstract classes
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// Single inheritance with one base class
|
|
|
|
#define _IMPLEMENT_ABSTRACT_CLASS(name, basename) \
|
|
_DEFAULT_CONVERTERS(name) \
|
|
\
|
|
const wxClassInfo* name::ms_classParents[] = \
|
|
{ &basename::ms_classInfo,NULL }; \
|
|
wxClassInfo name::ms_classInfo(name::ms_classParents, wxEmptyString, \
|
|
wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) 0, \
|
|
name::GetPropertiesStatic,name::GetHandlersStatic, 0, 0, \
|
|
0, wxVariantOfPtrToObjectConverter##name,0, \
|
|
wxObjectToVariantConverter##name); \
|
|
_TYPEINFO_CLASSES(name, NULL, NULL)
|
|
|
|
#define wxIMPLEMENT_ABSTRACT_CLASS( name, basename ) \
|
|
_IMPLEMENT_ABSTRACT_CLASS( name, basename ) \
|
|
wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL; } \
|
|
wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL; }
|
|
|
|
// Multiple inheritance with two base classes
|
|
|
|
#define wxIMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) \
|
|
wxClassInfo name::ms_classInfo(wxT(#name), wxT(#basename1), \
|
|
wxT(#basename2), (int) sizeof(name), \
|
|
(wxObjectConstructorFn) 0);
|
|
|
|
// templated streaming, every type that can be converted to wxString
|
|
// must have their specialization for these methods
|
|
|
|
template<typename T>
|
|
void wxStringReadValue( const wxString &s, T &data );
|
|
|
|
template<typename T>
|
|
void wxStringWriteValue( wxString &s, const T &data);
|
|
|
|
template<typename T>
|
|
void wxToStringConverter( const wxAny &v, wxString &s )
|
|
{ wxStringWriteValue(s, v.As<T>()); }
|
|
|
|
template<typename T>
|
|
void wxFromStringConverter( const wxString &s, wxAny &v)
|
|
{ T d; wxStringReadValue(s, d); v = wxAny(d); }
|
|
|
|
// --------------------------------------------------------------------------
|
|
// Collection Support
|
|
// --------------------------------------------------------------------------
|
|
|
|
template<typename iter, typename collection_t > void wxListCollectionToAnyList(
|
|
const collection_t& coll, wxAnyList &value )
|
|
{
|
|
for ( iter current = coll.GetFirst(); current;
|
|
current = current->GetNext() )
|
|
{
|
|
value.Append( new wxAny(current->GetData()) );
|
|
}
|
|
}
|
|
|
|
template<typename collection_t> void wxArrayCollectionToVariantArray(
|
|
const collection_t& coll, wxAnyList &value )
|
|
{
|
|
for( size_t i = 0; i < coll.GetCount(); i++ )
|
|
{
|
|
value.Append( new wxAny(coll[i]) );
|
|
}
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif // _WX_XTIH2__
|