mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-15 18:49:11 +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.
60 lines
1.9 KiB
C++
60 lines
1.9 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gtk/dcmemory.h
|
|
// Purpose:
|
|
// Author: Robert Roebling
|
|
// Copyright: (c) 1998 Robert Roebling
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GTK_DCMEMORY_H_
|
|
#define _WX_GTK_DCMEMORY_H_
|
|
|
|
#include "wx/dcmemory.h"
|
|
#include "wx/gtk/dcclient.h"
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxMemoryDCImpl
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxWindowDCImpl
|
|
{
|
|
public:
|
|
wxMemoryDCImpl( wxMemoryDC *owner );
|
|
wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
|
|
wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );
|
|
|
|
virtual ~wxMemoryDCImpl();
|
|
|
|
// these get reimplemented for mono-bitmaps to behave
|
|
// more like their Win32 couterparts. They now interpret
|
|
// wxWHITE, wxWHITE_BRUSH and wxWHITE_PEN as drawing 0
|
|
// and everything else as drawing 1.
|
|
virtual void SetPen( const wxPen &pen ) wxOVERRIDE;
|
|
virtual void SetBrush( const wxBrush &brush ) wxOVERRIDE;
|
|
virtual void SetBackground( const wxBrush &brush ) wxOVERRIDE;
|
|
virtual void SetTextForeground( const wxColour &col ) wxOVERRIDE;
|
|
virtual void SetTextBackground( const wxColour &col ) wxOVERRIDE;
|
|
|
|
// overridden from wxDCImpl
|
|
virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE;
|
|
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE;
|
|
virtual void* GetHandle() const wxOVERRIDE;
|
|
|
|
// overridden for wxMemoryDC Impl
|
|
virtual void DoSelect(const wxBitmap& bitmap) wxOVERRIDE;
|
|
|
|
virtual const wxBitmap& GetSelectedBitmap() const wxOVERRIDE;
|
|
virtual wxBitmap& GetSelectedBitmap() wxOVERRIDE;
|
|
|
|
private:
|
|
wxBitmap m_selected;
|
|
|
|
void Init();
|
|
|
|
wxDECLARE_ABSTRACT_CLASS(wxMemoryDCImpl);
|
|
};
|
|
|
|
#endif
|
|
// _WX_GTK_DCMEMORY_H_
|
|
|