mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 09:39: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.
128 lines
4.1 KiB
C++
128 lines
4.1 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/brush.h
|
|
// Purpose: Includes platform-specific wxBrush file
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created:
|
|
// Copyright: Julian Smart
|
|
// Licence: wxWindows Licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_BRUSH_H_BASE_
|
|
#define _WX_BRUSH_H_BASE_
|
|
|
|
#include "wx/defs.h"
|
|
#include "wx/object.h"
|
|
#include "wx/gdiobj.h"
|
|
#include "wx/gdicmn.h" // for wxGDIObjListBase
|
|
|
|
// NOTE: these values cannot be combined together!
|
|
enum wxBrushStyle
|
|
{
|
|
wxBRUSHSTYLE_INVALID = -1,
|
|
|
|
wxBRUSHSTYLE_SOLID = wxSOLID,
|
|
wxBRUSHSTYLE_TRANSPARENT = wxTRANSPARENT,
|
|
wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE = wxSTIPPLE_MASK_OPAQUE,
|
|
wxBRUSHSTYLE_STIPPLE_MASK = wxSTIPPLE_MASK,
|
|
wxBRUSHSTYLE_STIPPLE = wxSTIPPLE,
|
|
wxBRUSHSTYLE_BDIAGONAL_HATCH = wxHATCHSTYLE_BDIAGONAL,
|
|
wxBRUSHSTYLE_CROSSDIAG_HATCH = wxHATCHSTYLE_CROSSDIAG,
|
|
wxBRUSHSTYLE_FDIAGONAL_HATCH = wxHATCHSTYLE_FDIAGONAL,
|
|
wxBRUSHSTYLE_CROSS_HATCH = wxHATCHSTYLE_CROSS,
|
|
wxBRUSHSTYLE_HORIZONTAL_HATCH = wxHATCHSTYLE_HORIZONTAL,
|
|
wxBRUSHSTYLE_VERTICAL_HATCH = wxHATCHSTYLE_VERTICAL,
|
|
wxBRUSHSTYLE_FIRST_HATCH = wxHATCHSTYLE_FIRST,
|
|
wxBRUSHSTYLE_LAST_HATCH = wxHATCHSTYLE_LAST
|
|
};
|
|
|
|
|
|
// wxBrushBase
|
|
class WXDLLIMPEXP_CORE wxBrushBase: public wxGDIObject
|
|
{
|
|
public:
|
|
virtual ~wxBrushBase() { }
|
|
|
|
virtual void SetColour(const wxColour& col) = 0;
|
|
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) = 0;
|
|
virtual void SetStyle(wxBrushStyle style) = 0;
|
|
virtual void SetStipple(const wxBitmap& stipple) = 0;
|
|
|
|
virtual wxColour GetColour() const = 0;
|
|
virtual wxBrushStyle GetStyle() const = 0;
|
|
virtual wxBitmap *GetStipple() const = 0;
|
|
|
|
virtual bool IsHatch() const
|
|
{ return (GetStyle()>=wxBRUSHSTYLE_FIRST_HATCH) && (GetStyle()<=wxBRUSHSTYLE_LAST_HATCH); }
|
|
|
|
// Convenient helpers for testing whether the brush is a transparent one:
|
|
// unlike GetStyle() == wxBRUSHSTYLE_TRANSPARENT, they work correctly even
|
|
// if the brush is invalid (they both return false in this case).
|
|
bool IsTransparent() const
|
|
{
|
|
return IsOk() && GetStyle() == wxBRUSHSTYLE_TRANSPARENT;
|
|
}
|
|
|
|
bool IsNonTransparent() const
|
|
{
|
|
return IsOk() && GetStyle() != wxBRUSHSTYLE_TRANSPARENT;
|
|
}
|
|
};
|
|
|
|
#if defined(__WXMSW__)
|
|
#include "wx/msw/brush.h"
|
|
#elif defined(__WXMOTIF__) || defined(__WXX11__)
|
|
#include "wx/x11/brush.h"
|
|
#elif defined(__WXGTK20__)
|
|
#include "wx/gtk/brush.h"
|
|
#elif defined(__WXGTK__)
|
|
#include "wx/gtk1/brush.h"
|
|
#elif defined(__WXDFB__)
|
|
#include "wx/dfb/brush.h"
|
|
#elif defined(__WXMAC__)
|
|
#include "wx/osx/brush.h"
|
|
#elif defined(__WXQT__)
|
|
#include "wx/qt/brush.h"
|
|
#endif
|
|
|
|
class WXDLLIMPEXP_CORE wxBrushList: public wxGDIObjListBase
|
|
{
|
|
public:
|
|
wxBrush *FindOrCreateBrush(const wxColour& colour,
|
|
wxBrushStyle style = wxBRUSHSTYLE_SOLID);
|
|
|
|
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
|
|
wxBrush *FindOrCreateBrush(const wxColour& colour, int style)
|
|
{ return FindOrCreateBrush(colour, (wxBrushStyle)style); }
|
|
};
|
|
|
|
extern WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
|
|
|
|
// provide comparison operators to allow code such as
|
|
//
|
|
// if ( brush.GetStyle() == wxTRANSPARENT )
|
|
//
|
|
// to compile without warnings which it would otherwise provoke from some
|
|
// compilers as it compares elements of different enums
|
|
|
|
// Unfortunately some compilers have ambiguity issues when enum comparisons are
|
|
// overloaded so we have to disable the overloads in this case, see
|
|
// wxCOMPILER_NO_OVERLOAD_ON_ENUM definition in wx/platform.h for more details.
|
|
#ifndef wxCOMPILER_NO_OVERLOAD_ON_ENUM
|
|
|
|
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants only")
|
|
inline bool operator==(wxBrushStyle s, wxDeprecatedGUIConstants t)
|
|
{
|
|
return static_cast<int>(s) == static_cast<int>(t);
|
|
}
|
|
|
|
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants only")
|
|
inline bool operator!=(wxBrushStyle s, wxDeprecatedGUIConstants t)
|
|
{
|
|
return static_cast<int>(s) != static_cast<int>(t);
|
|
}
|
|
|
|
#endif // wxCOMPILER_NO_OVERLOAD_ON_ENUM
|
|
|
|
#endif // _WX_BRUSH_H_BASE_
|