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.
76 lines
2.3 KiB
C++
76 lines
2.3 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/x11/pen.h
|
|
// Purpose: wxPen class
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 17/09/98
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_PEN_H_
|
|
#define _WX_PEN_H_
|
|
|
|
#include "wx/gdicmn.h"
|
|
#include "wx/gdiobj.h"
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// classes
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxPen;
|
|
class WXDLLIMPEXP_FWD_CORE wxColour;
|
|
class WXDLLIMPEXP_FWD_CORE wxBitmap;
|
|
|
|
typedef char wxX11Dash;
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxPen
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxPen: public wxPenBase
|
|
{
|
|
public:
|
|
wxPen() { }
|
|
|
|
wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID );
|
|
|
|
wxPen( const wxBitmap &stipple, int width );
|
|
virtual ~wxPen();
|
|
|
|
bool operator == ( const wxPen& pen ) const;
|
|
bool operator != (const wxPen& pen) const { return !(*this == pen); }
|
|
|
|
void SetColour( const wxColour &colour );
|
|
void SetColour( unsigned char red, unsigned char green, unsigned char blue );
|
|
void SetCap( wxPenCap capStyle );
|
|
void SetJoin( wxPenJoin joinStyle );
|
|
void SetStyle( wxPenStyle style );
|
|
void SetWidth( int width );
|
|
void SetDashes( int number_of_dashes, const wxDash *dash );
|
|
void SetStipple( const wxBitmap& stipple );
|
|
|
|
wxColour GetColour() const;
|
|
wxPenCap GetCap() const;
|
|
wxPenJoin GetJoin() const;
|
|
wxPenStyle GetStyle() const;
|
|
int GetWidth() const;
|
|
int GetDashes(wxDash **ptr) const;
|
|
int GetDashCount() const;
|
|
wxDash* GetDash() const;
|
|
wxBitmap* GetStipple() const;
|
|
|
|
|
|
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
|
|
wxPen(const wxColour& col, int width, int style);
|
|
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
|
|
void SetStyle(int style) { SetStyle((wxPenStyle)style); }
|
|
|
|
protected:
|
|
virtual wxGDIRefData *CreateGDIRefData() const;
|
|
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxPen);
|
|
};
|
|
|
|
#endif // _WX_PEN_H_
|