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.
95 lines
2.4 KiB
C++
95 lines
2.4 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/overlay.h
|
|
// Purpose: wxOverlay class
|
|
// Author: Stefan Csomor
|
|
// Modified by:
|
|
// Created: 2006-10-20
|
|
// Copyright: (c) wxWidgets team
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_OVERLAY_H_
|
|
#define _WX_OVERLAY_H_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if defined(__WXDFB__)
|
|
#define wxHAS_NATIVE_OVERLAY 1
|
|
#else
|
|
// don't define wxHAS_NATIVE_OVERLAY
|
|
#endif
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// creates an overlay over an existing window, allowing for manipulations like
|
|
// rubberbanding etc. This API is not stable yet, not to be used outside wx
|
|
// internal code
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxOverlayImpl;
|
|
class WXDLLIMPEXP_FWD_CORE wxDC;
|
|
|
|
class WXDLLIMPEXP_CORE wxOverlay
|
|
{
|
|
public:
|
|
wxOverlay();
|
|
~wxOverlay();
|
|
|
|
// clears the overlay without restoring the former state
|
|
// to be done eg when the window content has been changed and repainted
|
|
void Reset();
|
|
|
|
// returns (port-specific) implementation of the overlay
|
|
wxOverlayImpl *GetImpl() { return m_impl; }
|
|
|
|
private:
|
|
friend class WXDLLIMPEXP_FWD_CORE wxDCOverlay;
|
|
|
|
// returns true if it has been setup
|
|
bool IsOk();
|
|
|
|
void Init(wxDC* dc, int x , int y , int width , int height);
|
|
|
|
void BeginDrawing(wxDC* dc);
|
|
|
|
void EndDrawing(wxDC* dc);
|
|
|
|
void Clear(wxDC* dc);
|
|
|
|
wxOverlayImpl* m_impl;
|
|
|
|
bool m_inDrawing;
|
|
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxOverlay);
|
|
};
|
|
|
|
|
|
class WXDLLIMPEXP_CORE wxDCOverlay
|
|
{
|
|
public:
|
|
// connects this overlay to the corresponding drawing dc, if the overlay is
|
|
// not initialized yet this call will do so
|
|
wxDCOverlay(wxOverlay &overlay, wxDC *dc, int x , int y , int width , int height);
|
|
|
|
// convenience wrapper that behaves the same using the entire area of the dc
|
|
wxDCOverlay(wxOverlay &overlay, wxDC *dc);
|
|
|
|
// removes the connection between the overlay and the dc
|
|
virtual ~wxDCOverlay();
|
|
|
|
// clears the layer, restoring the state at the last init
|
|
void Clear();
|
|
|
|
private:
|
|
void Init(wxDC *dc, int x , int y , int width , int height);
|
|
|
|
wxOverlay& m_overlay;
|
|
|
|
wxDC* m_dc;
|
|
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxDCOverlay);
|
|
};
|
|
|
|
#endif // _WX_OVERLAY_H_
|