mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-22 12:21:41 +02: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.
122 lines
3.4 KiB
C++
122 lines
3.4 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/x11/region.h
|
|
// Purpose: wxRegion class
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 17/09/98
|
|
// Copyright: (c) Julian Smart, Robert Roebling
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_REGION_H_
|
|
#define _WX_REGION_H_
|
|
|
|
#include "wx/list.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxRegion
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxRegion : public wxRegionBase
|
|
{
|
|
public:
|
|
wxRegion() { }
|
|
|
|
wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
|
|
{
|
|
InitRect(x, y, w, h);
|
|
}
|
|
|
|
wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight )
|
|
{
|
|
InitRect(topLeft.x, topLeft.y,
|
|
bottomRight.x - topLeft.x, bottomRight.y - topLeft.y);
|
|
}
|
|
|
|
wxRegion( const wxRect& rect )
|
|
{
|
|
InitRect(rect.x, rect.y, rect.width, rect.height);
|
|
}
|
|
|
|
wxRegion( size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
|
|
|
|
wxRegion( const wxBitmap& bmp)
|
|
{
|
|
Union(bmp);
|
|
}
|
|
wxRegion( const wxBitmap& bmp,
|
|
const wxColour& transColour, int tolerance = 0)
|
|
{
|
|
Union(bmp, transColour, tolerance);
|
|
}
|
|
|
|
virtual ~wxRegion();
|
|
|
|
// wxRegionBase methods
|
|
virtual void Clear();
|
|
virtual bool IsEmpty() const;
|
|
|
|
public:
|
|
WXRegion *GetX11Region() const;
|
|
|
|
protected:
|
|
virtual wxGDIRefData *CreateGDIRefData() const;
|
|
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
|
|
|
|
// wxRegionBase pure virtuals
|
|
virtual bool DoIsEqual(const wxRegion& region) const;
|
|
virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const;
|
|
virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const;
|
|
virtual wxRegionContain DoContainsRect(const wxRect& rect) const;
|
|
|
|
virtual bool DoOffset(wxCoord x, wxCoord y);
|
|
virtual bool DoUnionWithRect(const wxRect& rect);
|
|
virtual bool DoUnionWithRegion(const wxRegion& region);
|
|
virtual bool DoIntersect(const wxRegion& region);
|
|
virtual bool DoSubtract(const wxRegion& region);
|
|
virtual bool DoXor(const wxRegion& region);
|
|
|
|
// common part of ctors for a rectangle region
|
|
void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxRegion);
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxRegionIterator: decomposes a region into rectangles
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxRegionIterator: public wxObject
|
|
{
|
|
public:
|
|
wxRegionIterator();
|
|
wxRegionIterator(const wxRegion& region);
|
|
|
|
void Reset() { m_current = 0u; }
|
|
void Reset(const wxRegion& region);
|
|
|
|
operator bool () const;
|
|
bool HaveRects() const;
|
|
|
|
void operator ++ ();
|
|
void operator ++ (int);
|
|
|
|
wxCoord GetX() const;
|
|
wxCoord GetY() const;
|
|
wxCoord GetW() const;
|
|
wxCoord GetWidth() const { return GetW(); }
|
|
wxCoord GetH() const;
|
|
wxCoord GetHeight() const { return GetH(); }
|
|
wxRect GetRect() const;
|
|
|
|
private:
|
|
size_t m_current;
|
|
wxRegion m_region;
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxRegionIterator);
|
|
};
|
|
|
|
#endif
|
|
// _WX_REGION_H_
|