mirror of
https://github.com/Retropex/dolphin.git
synced 2025-08-05 06:24:48 +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.
158 lines
3.6 KiB
C++
158 lines
3.6 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: src/gtk/brush.cpp
|
|
// Purpose:
|
|
// Author: Robert Roebling
|
|
// Copyright: (c) 1998 Robert Roebling
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
// For compilers that support precompilation, includes "wx.h".
|
|
#include "wx/wxprec.h"
|
|
|
|
#include "wx/brush.h"
|
|
|
|
#ifndef WX_PRECOMP
|
|
#include "wx/bitmap.h"
|
|
#include "wx/colour.h"
|
|
#endif
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxBrush
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class wxBrushRefData: public wxGDIRefData
|
|
{
|
|
public:
|
|
wxBrushRefData(const wxColour& colour = wxNullColour, wxBrushStyle style = wxBRUSHSTYLE_SOLID)
|
|
{
|
|
m_style = style;
|
|
m_colour = colour;
|
|
}
|
|
|
|
wxBrushRefData( const wxBrushRefData& data )
|
|
: wxGDIRefData()
|
|
{
|
|
m_style = data.m_style;
|
|
m_stipple = data.m_stipple;
|
|
m_colour = data.m_colour;
|
|
}
|
|
|
|
bool operator == (const wxBrushRefData& data) const
|
|
{
|
|
return (m_style == data.m_style &&
|
|
m_stipple.IsSameAs(data.m_stipple) &&
|
|
m_colour == data.m_colour);
|
|
}
|
|
|
|
wxBrushStyle m_style;
|
|
wxColour m_colour;
|
|
wxBitmap m_stipple;
|
|
};
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
#define M_BRUSHDATA ((wxBrushRefData *)m_refData)
|
|
|
|
wxIMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject);
|
|
|
|
wxBrush::wxBrush( const wxColour &colour, wxBrushStyle style )
|
|
{
|
|
m_refData = new wxBrushRefData(colour, style);
|
|
}
|
|
|
|
wxBrush::wxBrush(const wxColour& col, int style)
|
|
{
|
|
m_refData = new wxBrushRefData(col, (wxBrushStyle)style);
|
|
}
|
|
|
|
wxBrush::wxBrush( const wxBitmap &stippleBitmap )
|
|
{
|
|
wxBrushStyle style = wxBRUSHSTYLE_STIPPLE;
|
|
if (stippleBitmap.GetMask())
|
|
style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;
|
|
|
|
m_refData = new wxBrushRefData(*wxBLACK, style);
|
|
M_BRUSHDATA->m_stipple = stippleBitmap;
|
|
}
|
|
|
|
wxBrush::~wxBrush()
|
|
{
|
|
// m_refData unrefed in ~wxObject
|
|
}
|
|
|
|
wxGDIRefData *wxBrush::CreateGDIRefData() const
|
|
{
|
|
return new wxBrushRefData;
|
|
}
|
|
|
|
wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
|
|
{
|
|
return new wxBrushRefData(*(wxBrushRefData *)data);
|
|
}
|
|
|
|
bool wxBrush::operator==(const wxBrush& brush) const
|
|
{
|
|
if (m_refData == brush.m_refData) return true;
|
|
|
|
if (!m_refData || !brush.m_refData) return false;
|
|
|
|
return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );
|
|
}
|
|
|
|
wxBrushStyle wxBrush::GetStyle() const
|
|
{
|
|
wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") );
|
|
|
|
return M_BRUSHDATA->m_style;
|
|
}
|
|
|
|
wxColour wxBrush::GetColour() const
|
|
{
|
|
wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") );
|
|
|
|
return M_BRUSHDATA->m_colour;
|
|
}
|
|
|
|
wxBitmap *wxBrush::GetStipple() const
|
|
{
|
|
wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") );
|
|
|
|
return &M_BRUSHDATA->m_stipple;
|
|
}
|
|
|
|
void wxBrush::SetColour( const wxColour& col )
|
|
{
|
|
AllocExclusive();
|
|
|
|
M_BRUSHDATA->m_colour = col;
|
|
}
|
|
|
|
void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
|
|
{
|
|
AllocExclusive();
|
|
|
|
M_BRUSHDATA->m_colour.Set( r, g, b );
|
|
}
|
|
|
|
void wxBrush::SetStyle( wxBrushStyle style )
|
|
{
|
|
AllocExclusive();
|
|
|
|
M_BRUSHDATA->m_style = style;
|
|
}
|
|
|
|
void wxBrush::SetStipple( const wxBitmap& stipple )
|
|
{
|
|
AllocExclusive();
|
|
|
|
M_BRUSHDATA->m_stipple = stipple;
|
|
if (M_BRUSHDATA->m_stipple.GetMask())
|
|
{
|
|
M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;
|
|
}
|
|
else
|
|
{
|
|
M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE;
|
|
}
|
|
}
|