mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-17 19:49: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.
92 lines
2.9 KiB
C++
92 lines
2.9 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/x11/dataobj2.h
|
|
// Purpose: declaration of standard wxDataObjectSimple-derived classes
|
|
// Author: Robert Roebling
|
|
// Created: 19.10.99 (extracted from gtk/dataobj.h)
|
|
// Copyright: (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_X11_DATAOBJ2_H_
|
|
#define _WX_X11_DATAOBJ2_H_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxBitmapDataObject is a specialization of wxDataObject for bitmaps
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase
|
|
{
|
|
public:
|
|
// ctors
|
|
wxBitmapDataObject();
|
|
wxBitmapDataObject(const wxBitmap& bitmap);
|
|
|
|
// destr
|
|
virtual ~wxBitmapDataObject();
|
|
|
|
// override base class virtual to update PNG data too
|
|
virtual void SetBitmap(const wxBitmap& bitmap);
|
|
|
|
// implement base class pure virtuals
|
|
// ----------------------------------
|
|
|
|
virtual size_t GetDataSize() const { return m_pngSize; }
|
|
virtual bool GetDataHere(void *buf) const;
|
|
virtual bool SetData(size_t len, const void *buf);
|
|
// Must provide overloads to avoid hiding them (and warnings about it)
|
|
virtual size_t GetDataSize(const wxDataFormat&) const
|
|
{
|
|
return GetDataSize();
|
|
}
|
|
virtual bool GetDataHere(const wxDataFormat&, void *buf) const
|
|
{
|
|
return GetDataHere(buf);
|
|
}
|
|
virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
|
|
{
|
|
return SetData(len, buf);
|
|
}
|
|
|
|
protected:
|
|
void Init() { m_pngData = NULL; m_pngSize = 0; }
|
|
void Clear() { free(m_pngData); }
|
|
void ClearAll() { Clear(); Init(); }
|
|
|
|
size_t m_pngSize;
|
|
void *m_pngData;
|
|
|
|
void DoConvertToPng();
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxFileDataObject is a specialization of wxDataObject for file names
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase
|
|
{
|
|
public:
|
|
// implement base class pure virtuals
|
|
// ----------------------------------
|
|
|
|
void AddFile( const wxString &filename );
|
|
|
|
virtual size_t GetDataSize() const;
|
|
virtual bool GetDataHere(void *buf) const;
|
|
virtual bool SetData(size_t len, const void *buf);
|
|
// Must provide overloads to avoid hiding them (and warnings about it)
|
|
virtual size_t GetDataSize(const wxDataFormat&) const
|
|
{
|
|
return GetDataSize();
|
|
}
|
|
virtual bool GetDataHere(const wxDataFormat&, void *buf) const
|
|
{
|
|
return GetDataHere(buf);
|
|
}
|
|
virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
|
|
{
|
|
return SetData(len, buf);
|
|
}
|
|
};
|
|
|
|
#endif // _WX_X11_DATAOBJ2_H_
|