mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-18 03:59:14 +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.
103 lines
3.0 KiB
C++
103 lines
3.0 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/osx/carbon/region.h
|
|
// Purpose: wxRegion class
|
|
// Author: Stefan Csomor
|
|
// Modified by:
|
|
// Created: 1998-01-01
|
|
// Copyright: (c) Stefan Csomor
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MAC_CARBON_REGION_H_
|
|
#define _WX_MAC_CARBON_REGION_H_
|
|
|
|
#include "wx/list.h"
|
|
|
|
class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine
|
|
{
|
|
public:
|
|
wxRegion() { }
|
|
wxRegion(long x, long y, long w, long h);
|
|
wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
|
|
wxRegion(const wxRect& rect);
|
|
wxRegion( WXHRGN hRegion );
|
|
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
|
|
|
|
virtual ~wxRegion();
|
|
|
|
// wxRegionBase methods
|
|
virtual void Clear();
|
|
virtual bool IsEmpty() const;
|
|
|
|
// Internal
|
|
WXHRGN GetWXHRGN() const ;
|
|
|
|
protected:
|
|
virtual wxGDIRefData *CreateGDIRefData() const;
|
|
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
|
|
|
|
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 DoCombine(const wxRegion& region, wxRegionOp op);
|
|
virtual bool DoUnionWithRect(const wxRect& rect);
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxRegion);
|
|
friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator;
|
|
};
|
|
|
|
class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject
|
|
{
|
|
public:
|
|
wxRegionIterator();
|
|
wxRegionIterator(const wxRegion& region);
|
|
wxRegionIterator(const wxRegionIterator& iterator);
|
|
virtual ~wxRegionIterator();
|
|
|
|
wxRegionIterator& operator=(const wxRegionIterator& iterator);
|
|
|
|
void Reset() { m_current = 0; }
|
|
void Reset(const wxRegion& region);
|
|
|
|
operator bool () const { return m_current < m_numRects; }
|
|
bool HaveRects() const { return m_current < m_numRects; }
|
|
|
|
wxRegionIterator& operator++();
|
|
wxRegionIterator operator++(int);
|
|
|
|
long GetX() const;
|
|
long GetY() const;
|
|
long GetW() const;
|
|
long GetWidth() const { return GetW(); }
|
|
long GetH() const;
|
|
long GetHeight() const { return GetH(); }
|
|
wxRect GetRect() const { return wxRect((int)GetX(), (int)GetY(), (int)GetWidth(), (int)GetHeight()); }
|
|
|
|
private:
|
|
void SetRects(long numRects, wxRect *rects);
|
|
|
|
long m_current;
|
|
long m_numRects;
|
|
wxRegion m_region;
|
|
wxRect* m_rects;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxRegionIterator);
|
|
};
|
|
|
|
#endif // _WX_MAC_CARBON_REGION_H_
|