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.
139 lines
4.0 KiB
C++
139 lines
4.0 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gtk/region.h
|
|
// Purpose:
|
|
// Author: Robert Roebling
|
|
// Copyright: (c) 1998 Robert Roebling
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GTK_REGION_H_
|
|
#define _WX_GTK_REGION_H_
|
|
|
|
#ifdef __WXGTK3__
|
|
typedef struct _cairo_region cairo_region_t;
|
|
#endif
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// 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 );
|
|
|
|
#if wxUSE_IMAGE
|
|
wxRegion( const wxBitmap& bmp)
|
|
{
|
|
Union(bmp);
|
|
}
|
|
wxRegion( const wxBitmap& bmp,
|
|
const wxColour& transColour, int tolerance = 0)
|
|
{
|
|
Union(bmp, transColour, tolerance);
|
|
}
|
|
#endif // wxUSE_IMAGE
|
|
|
|
virtual ~wxRegion();
|
|
|
|
// wxRegionBase methods
|
|
virtual void Clear() wxOVERRIDE;
|
|
virtual bool IsEmpty() const wxOVERRIDE;
|
|
|
|
#ifdef __WXGTK3__
|
|
cairo_region_t* GetRegion() const;
|
|
#else
|
|
wxRegion(const GdkRegion* region);
|
|
GdkRegion *GetRegion() const;
|
|
#endif
|
|
|
|
protected:
|
|
virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
|
|
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
|
|
|
|
// wxRegionBase pure virtuals
|
|
virtual bool DoIsEqual(const wxRegion& region) const wxOVERRIDE;
|
|
virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const wxOVERRIDE;
|
|
virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const wxOVERRIDE;
|
|
virtual wxRegionContain DoContainsRect(const wxRect& rect) const wxOVERRIDE;
|
|
|
|
virtual bool DoOffset(wxCoord x, wxCoord y) wxOVERRIDE;
|
|
virtual bool DoUnionWithRect(const wxRect& rect) wxOVERRIDE;
|
|
virtual bool DoUnionWithRegion(const wxRegion& region) wxOVERRIDE;
|
|
virtual bool DoIntersect(const wxRegion& region) wxOVERRIDE;
|
|
virtual bool DoSubtract(const wxRegion& region) wxOVERRIDE;
|
|
virtual bool DoXor(const wxRegion& region) wxOVERRIDE;
|
|
|
|
// 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);
|
|
wxRegionIterator(const wxRegionIterator& ri) : wxObject(ri) { Init(); *this = ri; }
|
|
~wxRegionIterator();
|
|
|
|
wxRegionIterator& operator=(const wxRegionIterator& ri);
|
|
|
|
void Reset() { m_current = 0u; }
|
|
void Reset(const wxRegion& region);
|
|
|
|
bool HaveRects() const;
|
|
operator bool () const { return HaveRects(); }
|
|
|
|
wxRegionIterator& operator ++ ();
|
|
wxRegionIterator 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:
|
|
void Init();
|
|
void CreateRects( const wxRegion& r );
|
|
|
|
wxRegion m_region;
|
|
wxRect *m_rects;
|
|
int m_numRects;
|
|
int m_current;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxRegionIterator);
|
|
};
|
|
|
|
|
|
#endif
|
|
// _WX_GTK_REGION_H_
|