mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-22 20:31:50 +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.
86 lines
2.2 KiB
C++
86 lines
2.2 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/aui/barartmsw.h
|
|
// Purpose: Interface of wxAuiMSWToolBarArt
|
|
// Author: Tobias Taschner
|
|
// Created: 2015-09-22
|
|
// Copyright: (c) 2015 wxWidgets development team
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_AUI_BARART_MSW_H_
|
|
#define _WX_AUI_BARART_MSW_H_
|
|
|
|
class WXDLLIMPEXP_AUI wxAuiMSWToolBarArt : public wxAuiGenericToolBarArt
|
|
{
|
|
public:
|
|
wxAuiMSWToolBarArt();
|
|
|
|
virtual wxAuiToolBarArt* Clone() wxOVERRIDE;
|
|
|
|
virtual void DrawBackground(
|
|
wxDC& dc,
|
|
wxWindow* wnd,
|
|
const wxRect& rect) wxOVERRIDE;
|
|
|
|
virtual void DrawLabel(
|
|
wxDC& dc,
|
|
wxWindow* wnd,
|
|
const wxAuiToolBarItem& item,
|
|
const wxRect& rect) wxOVERRIDE;
|
|
|
|
virtual void DrawButton(
|
|
wxDC& dc,
|
|
wxWindow* wnd,
|
|
const wxAuiToolBarItem& item,
|
|
const wxRect& rect) wxOVERRIDE;
|
|
|
|
virtual void DrawDropDownButton(
|
|
wxDC& dc,
|
|
wxWindow* wnd,
|
|
const wxAuiToolBarItem& item,
|
|
const wxRect& rect) wxOVERRIDE;
|
|
|
|
virtual void DrawControlLabel(
|
|
wxDC& dc,
|
|
wxWindow* wnd,
|
|
const wxAuiToolBarItem& item,
|
|
const wxRect& rect) wxOVERRIDE;
|
|
|
|
virtual void DrawSeparator(
|
|
wxDC& dc,
|
|
wxWindow* wnd,
|
|
const wxRect& rect) wxOVERRIDE;
|
|
|
|
virtual void DrawGripper(
|
|
wxDC& dc,
|
|
wxWindow* wnd,
|
|
const wxRect& rect) wxOVERRIDE;
|
|
|
|
virtual void DrawOverflowButton(
|
|
wxDC& dc,
|
|
wxWindow* wnd,
|
|
const wxRect& rect,
|
|
int state) wxOVERRIDE;
|
|
|
|
virtual wxSize GetLabelSize(
|
|
wxDC& dc,
|
|
wxWindow* wnd,
|
|
const wxAuiToolBarItem& item) wxOVERRIDE;
|
|
|
|
virtual wxSize GetToolSize(
|
|
wxDC& dc,
|
|
wxWindow* wnd,
|
|
const wxAuiToolBarItem& item) wxOVERRIDE;
|
|
|
|
virtual int GetElementSize(int element) wxOVERRIDE;
|
|
virtual void SetElementSize(int elementId, int size) wxOVERRIDE;
|
|
|
|
virtual int ShowDropDown(wxWindow* wnd,
|
|
const wxAuiToolBarItemArray& items) wxOVERRIDE;
|
|
|
|
private:
|
|
bool m_themed;
|
|
wxSize m_buttonSize;
|
|
};
|
|
|
|
#endif // _WX_AUI_BARART_MSW_H_
|