mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-19 12:31:17 +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.
64 lines
2.0 KiB
C++
64 lines
2.0 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/x11/dataform.h
|
|
// Purpose: declaration of the wxDataFormat class
|
|
// Author: Robert Roebling
|
|
// Modified by:
|
|
// Created: 19.10.99 (extracted from motif/dataobj.h)
|
|
// Copyright: (c) 1999 Robert Roebling
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_X11_DATAFORM_H
|
|
#define _WX_X11_DATAFORM_H
|
|
|
|
class WXDLLIMPEXP_CORE wxDataFormat
|
|
{
|
|
public:
|
|
// the clipboard formats under Xt are Atoms
|
|
typedef Atom NativeFormat;
|
|
|
|
wxDataFormat();
|
|
wxDataFormat( wxDataFormatId type );
|
|
wxDataFormat( const wxString &id );
|
|
wxDataFormat( NativeFormat format );
|
|
|
|
wxDataFormat& operator=(NativeFormat format)
|
|
{ SetId(format); return *this; }
|
|
|
|
// comparison (must have both versions)
|
|
bool operator==(NativeFormat format) const
|
|
{ return m_format == (NativeFormat)format; }
|
|
bool operator!=(NativeFormat format) const
|
|
{ return m_format != (NativeFormat)format; }
|
|
bool operator==(wxDataFormatId format) const
|
|
{ return m_type == (wxDataFormatId)format; }
|
|
bool operator!=(wxDataFormatId format) const
|
|
{ return m_type != (wxDataFormatId)format; }
|
|
|
|
// explicit and implicit conversions to NativeFormat which is one of
|
|
// standard data types (implicit conversion is useful for preserving the
|
|
// compatibility with old code)
|
|
NativeFormat GetFormatId() const { return m_format; }
|
|
operator NativeFormat() const { return m_format; }
|
|
|
|
void SetId( NativeFormat format );
|
|
|
|
// string ids are used for custom types - this SetId() must be used for
|
|
// application-specific formats
|
|
wxString GetId() const;
|
|
void SetId( const wxString& id );
|
|
|
|
// implementation
|
|
wxDataFormatId GetType() const;
|
|
|
|
private:
|
|
wxDataFormatId m_type;
|
|
NativeFormat m_format;
|
|
|
|
void PrepareFormats();
|
|
void SetType( wxDataFormatId type );
|
|
};
|
|
|
|
|
|
#endif // _WX_X11_DATAFORM_H
|