mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-14 10:09:13 +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.
68 lines
1.9 KiB
C++
68 lines
1.9 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/osx/clipbrd.h
|
|
// Purpose: Clipboard functionality.
|
|
// Author: Stefan Csomor
|
|
// Modified by:
|
|
// Created: 1998-01-01
|
|
// Copyright: (c) Stefan Csomor
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_CLIPBRD_H_
|
|
#define _WX_CLIPBRD_H_
|
|
|
|
#if wxUSE_CLIPBOARD
|
|
|
|
#include "wx/osx/core/cfref.h"
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxClipboard
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
|
|
{
|
|
public:
|
|
wxClipboard();
|
|
virtual ~wxClipboard();
|
|
|
|
// open the clipboard before SetData() and GetData()
|
|
virtual bool Open();
|
|
|
|
// close the clipboard after SetData() and GetData()
|
|
virtual void Close();
|
|
|
|
// query whether the clipboard is opened
|
|
virtual bool IsOpened() const;
|
|
|
|
// set the clipboard data. all other formats will be deleted.
|
|
virtual bool SetData( wxDataObject *data );
|
|
|
|
// add to the clipboard data.
|
|
virtual bool AddData( wxDataObject *data );
|
|
|
|
// ask if data in correct format is available
|
|
virtual bool IsSupported( const wxDataFormat& format );
|
|
|
|
// fill data with data on the clipboard (if available)
|
|
virtual bool GetData( wxDataObject& data );
|
|
|
|
// clears wxTheClipboard and the system's clipboard if possible
|
|
virtual void Clear();
|
|
|
|
// flushes the clipboard: this means that the data which is currently on
|
|
// clipboard will stay available even after the application exits (possibly
|
|
// eating memory), otherwise the clipboard will be emptied on exit
|
|
virtual bool Flush();
|
|
|
|
private:
|
|
wxDataObject *m_data;
|
|
bool m_open;
|
|
wxCFRef<PasteboardRef> m_pasteboard;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxClipboard);
|
|
};
|
|
|
|
#endif // wxUSE_CLIPBOARD
|
|
|
|
#endif // _WX_CLIPBRD_H_
|