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.
90 lines
2.2 KiB
C++
90 lines
2.2 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/aui/tabartmsw.h
|
|
// Purpose: wxAuiMSWTabArt declaration
|
|
// Author: Tobias Taschner
|
|
// Created: 2015-09-26
|
|
// Copyright: (c) 2015 wxWidgets development team
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_AUI_TABARTMSW_H_
|
|
#define _WX_AUI_TABARTMSW_H_
|
|
|
|
class WXDLLIMPEXP_AUI wxAuiMSWTabArt : public wxAuiGenericTabArt
|
|
{
|
|
|
|
public:
|
|
|
|
wxAuiMSWTabArt();
|
|
virtual ~wxAuiMSWTabArt();
|
|
|
|
wxAuiTabArt* Clone() wxOVERRIDE;
|
|
void SetSizingInfo(const wxSize& tabCtrlSize,
|
|
size_t tabCount) wxOVERRIDE;
|
|
|
|
void DrawBorder(
|
|
wxDC& dc,
|
|
wxWindow* wnd,
|
|
const wxRect& rect) wxOVERRIDE;
|
|
|
|
void DrawBackground(
|
|
wxDC& dc,
|
|
wxWindow* wnd,
|
|
const wxRect& rect) wxOVERRIDE;
|
|
|
|
void DrawTab(wxDC& dc,
|
|
wxWindow* wnd,
|
|
const wxAuiNotebookPage& pane,
|
|
const wxRect& inRect,
|
|
int closeButtonState,
|
|
wxRect* outTabRect,
|
|
wxRect* outButtonRect,
|
|
int* xExtent) wxOVERRIDE;
|
|
|
|
void DrawButton(
|
|
wxDC& dc,
|
|
wxWindow* wnd,
|
|
const wxRect& inRect,
|
|
int bitmapId,
|
|
int buttonState,
|
|
int orientation,
|
|
wxRect* outRect) wxOVERRIDE;
|
|
|
|
int GetIndentSize() wxOVERRIDE;
|
|
|
|
int GetBorderWidth(
|
|
wxWindow* wnd) wxOVERRIDE;
|
|
|
|
int GetAdditionalBorderSpace(
|
|
wxWindow* wnd) wxOVERRIDE;
|
|
|
|
wxSize GetTabSize(
|
|
wxDC& dc,
|
|
wxWindow* wnd,
|
|
const wxString& caption,
|
|
const wxBitmap& bitmap,
|
|
bool active,
|
|
int closeButtonState,
|
|
int* xExtent) wxOVERRIDE;
|
|
|
|
int ShowDropDown(
|
|
wxWindow* wnd,
|
|
const wxAuiNotebookPageArray& items,
|
|
int activeIdx) wxOVERRIDE;
|
|
|
|
int GetBestTabCtrlSize(wxWindow* wnd,
|
|
const wxAuiNotebookPageArray& pages,
|
|
const wxSize& requiredBmpSize) wxOVERRIDE;
|
|
|
|
private:
|
|
bool m_themed;
|
|
wxSize m_closeBtnSize;
|
|
wxSize m_tabSize;
|
|
int m_maxTabHeight;
|
|
|
|
void InitSizes(wxWindow* wnd, wxDC& dc);
|
|
|
|
bool IsThemed() const;
|
|
};
|
|
|
|
#endif // _WX_AUI_TABARTMSW_H_
|