mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-12 09:09:12 +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.
79 lines
2.3 KiB
C++
79 lines
2.3 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/pen.h
|
|
// Purpose: wxPen class
|
|
// Author: Julian Smart
|
|
// Modified by: Vadim Zeitlin: fixed operator=(), ==(), !=()
|
|
// Created: 01/02/97
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_PEN_H_
|
|
#define _WX_PEN_H_
|
|
|
|
#include "wx/gdiobj.h"
|
|
#include "wx/gdicmn.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// Pen
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxPen : public wxPenBase
|
|
{
|
|
public:
|
|
wxPen() { }
|
|
wxPen(const wxColour& col, 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); }
|
|
|
|
// Override in order to recreate the pen
|
|
void SetColour(const wxColour& col);
|
|
void SetColour(unsigned char r, unsigned char g, unsigned char b);
|
|
|
|
void SetWidth(int width);
|
|
void SetStyle(wxPenStyle style);
|
|
void SetStipple(const wxBitmap& stipple);
|
|
void SetDashes(int nb_dashes, const wxDash *dash);
|
|
void SetJoin(wxPenJoin join);
|
|
void SetCap(wxPenCap cap);
|
|
|
|
wxColour GetColour() const;
|
|
int GetWidth() const;
|
|
wxPenStyle GetStyle() const;
|
|
wxPenJoin GetJoin() const;
|
|
wxPenCap GetCap() const;
|
|
int GetDashes(wxDash** ptr) const;
|
|
wxDash* GetDash() const;
|
|
int GetDashCount() 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); }
|
|
|
|
|
|
// internal: wxGDIObject methods
|
|
virtual bool RealizeResource();
|
|
virtual bool FreeResource(bool force = false);
|
|
virtual WXHANDLE GetResourceHandle() const;
|
|
virtual bool IsFree() const;
|
|
|
|
protected:
|
|
virtual wxGDIRefData* CreateGDIRefData() const;
|
|
virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
|
|
|
|
// same as FreeResource() + RealizeResource()
|
|
bool Recreate();
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxPen);
|
|
};
|
|
|
|
#endif // _WX_PEN_H_
|