piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 18:19:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update wxWidgets to 3.1.0

Browse Source 
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.
This commit is contained in:
EmptyChaos
2016-06-26 05:25:29 +00:00
parent 3a26167148
commit 822326eea9
1748 changed files with 58822 additions and 84433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
Externals/wxWidgets3/include/wx/aui/tabart.h vendored
View File

@ -120,26 +120,26 @@ public:
wxAuiGenericTabArt();
virtual ~wxAuiGenericTabArt();
wxAuiTabArt* Clone();
void SetFlags(unsigned int flags);
wxAuiTabArt* Clone() wxOVERRIDE;
void SetFlags(unsigned int flags) wxOVERRIDE;
void SetSizingInfo(const wxSize& tabCtrlSize,
size_t tabCount);
size_t tabCount) wxOVERRIDE;
void SetNormalFont(const wxFont& font);
void SetSelectedFont(const wxFont& font);
void SetMeasuringFont(const wxFont& font);
void SetColour(const wxColour& colour);
void SetActiveColour(const wxColour& colour);
void SetNormalFont(const wxFont& font) wxOVERRIDE;
void SetSelectedFont(const wxFont& font) wxOVERRIDE;
void SetMeasuringFont(const wxFont& font) wxOVERRIDE;
void SetColour(const wxColour& colour) wxOVERRIDE;
void SetActiveColour(const wxColour& colour) wxOVERRIDE;
void DrawBorder(
wxDC& dc,
wxWindow* wnd,
const wxRect& rect);
const wxRect& rect) wxOVERRIDE;
void DrawBackground(
wxDC& dc,
wxWindow* wnd,
const wxRect& rect);
const wxRect& rect) wxOVERRIDE;
void DrawTab(wxDC& dc,
wxWindow* wnd,
@ -148,7 +148,7 @@ public:
int closeButtonState,
wxRect* outTabRect,
wxRect* outButtonRect,
int* xExtent);
int* xExtent) wxOVERRIDE;
void DrawButton(
wxDC& dc,
@ -157,15 +157,15 @@ public:
int bitmapId,
int buttonState,
int orientation,
wxRect* outRect);
wxRect* outRect) wxOVERRIDE;
int GetIndentSize();
int GetIndentSize() wxOVERRIDE;
int GetBorderWidth(
wxWindow* wnd);
wxWindow* wnd) wxOVERRIDE;
int GetAdditionalBorderSpace(
wxWindow* wnd);
wxWindow* wnd) wxOVERRIDE;
wxSize GetTabSize(
wxDC& dc,
@ -174,16 +174,16 @@ public:
const wxBitmap& bitmap,
bool active,
int closeButtonState,
int* xExtent);
int* xExtent) wxOVERRIDE;
int ShowDropDown(
wxWindow* wnd,
const wxAuiNotebookPageArray& items,
int activeIdx);
int activeIdx) wxOVERRIDE;
int GetBestTabCtrlSize(wxWindow* wnd,
const wxAuiNotebookPageArray& pages,
const wxSize& requiredBmpSize);
const wxSize& requiredBmpSize) wxOVERRIDE;
protected:
@ -218,27 +218,27 @@ public:
wxAuiSimpleTabArt();
virtual ~wxAuiSimpleTabArt();
wxAuiTabArt* Clone();
void SetFlags(unsigned int flags);
wxAuiTabArt* Clone() wxOVERRIDE;
void SetFlags(unsigned int flags) wxOVERRIDE;
void SetSizingInfo(const wxSize& tabCtrlSize,
size_t tabCount);
size_t tabCount) wxOVERRIDE;
void SetNormalFont(const wxFont& font);
void SetSelectedFont(const wxFont& font);
void SetMeasuringFont(const wxFont& font);
void SetColour(const wxColour& colour);
void SetActiveColour(const wxColour& colour);
void SetNormalFont(const wxFont& font) wxOVERRIDE;
void SetSelectedFont(const wxFont& font) wxOVERRIDE;
void SetMeasuringFont(const wxFont& font) wxOVERRIDE;
void SetColour(const wxColour& colour) wxOVERRIDE;
void SetActiveColour(const wxColour& colour) wxOVERRIDE;
void DrawBorder(
wxDC& dc,
wxWindow* wnd,
const wxRect& rect);
const wxRect& rect) wxOVERRIDE;
void DrawBackground(
wxDC& dc,
wxWindow* wnd,
const wxRect& rect);
const wxRect& rect) wxOVERRIDE;
void DrawTab(wxDC& dc,
wxWindow* wnd,
@ -247,7 +247,7 @@ public:
int closeButtonState,
wxRect* outTabRect,
wxRect* outButtonRect,
int* xExtent);
int* xExtent) wxOVERRIDE;
void DrawButton(
wxDC& dc,
@ -256,15 +256,15 @@ public:
int bitmapId,
int buttonState,
int orientation,
wxRect* outRect);
wxRect* outRect) wxOVERRIDE;
int GetIndentSize();
int GetIndentSize() wxOVERRIDE;
int GetBorderWidth(
wxWindow* wnd);
wxWindow* wnd) wxOVERRIDE;
int GetAdditionalBorderSpace(
wxWindow* wnd);
wxWindow* wnd) wxOVERRIDE;
wxSize GetTabSize(
wxDC& dc,
@ -273,22 +273,24 @@ public:
const wxBitmap& bitmap,
bool active,
int closeButtonState,
int* xExtent);
int* xExtent) wxOVERRIDE;
int ShowDropDown(
wxWindow* wnd,
const wxAuiNotebookPageArray& items,
int activeIdx);
int activeIdx) wxOVERRIDE;
int GetBestTabCtrlSize(wxWindow* wnd,
const wxAuiNotebookPageArray& pages,
const wxSize& requiredBmpSize);
const wxSize& requiredBmpSize) wxOVERRIDE;
protected:
wxFont m_normalFont;
wxFont m_selectedFont;
wxFont m_measuringFont;
wxColour m_normalTextColour;
wxColour m_selectedTextColour;
wxPen m_normalBkPen;
wxPen m_selectedBkPen;
wxBrush m_normalBkBrush;
@ -312,6 +314,10 @@ protected:
#define wxHAS_NATIVE_TABART
#include "wx/aui/tabartgtk.h"
#define wxAuiDefaultTabArt wxAuiGtkTabArt
#elif defined(__WXMSW__)
#define wxHAS_NATIVE_TABART
#include "wx/aui/tabartmsw.h"
#define wxAuiDefaultTabArt wxAuiMSWTabArt
#endif
#endif // !__WXUNIVERSAL__