mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-15 10:39:13 +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.
44 lines
1.6 KiB
C++
44 lines
1.6 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/osx/cocoa/stdpaths.h
|
|
// Purpose: wxStandardPaths for Cocoa
|
|
// Author: Tobias Taschner
|
|
// Created: 2015-09-09
|
|
// Copyright: (c) 2015 wxWidgets development team
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_COCOA_STDPATHS_H_
|
|
#define _WX_COCOA_STDPATHS_H_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxStandardPaths
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase
|
|
{
|
|
public:
|
|
virtual ~wxStandardPaths();
|
|
|
|
// implement base class pure virtuals
|
|
virtual wxString GetExecutablePath() const wxOVERRIDE;
|
|
virtual wxString GetConfigDir() const wxOVERRIDE;
|
|
virtual wxString GetUserConfigDir() const wxOVERRIDE;
|
|
virtual wxString GetDataDir() const wxOVERRIDE;
|
|
virtual wxString GetLocalDataDir() const wxOVERRIDE;
|
|
virtual wxString GetUserDataDir() const wxOVERRIDE;
|
|
virtual wxString GetPluginsDir() const wxOVERRIDE;
|
|
virtual wxString GetResourcesDir() const wxOVERRIDE;
|
|
virtual wxString
|
|
GetLocalizedResourcesDir(const wxString& lang,
|
|
ResourceCat category = ResourceCat_None) const wxOVERRIDE;
|
|
virtual wxString GetUserDir(Dir userDir) const wxOVERRIDE;
|
|
|
|
protected:
|
|
// Ctor is protected, use wxStandardPaths::Get() instead of instantiating
|
|
// objects of this class directly.
|
|
wxStandardPaths();
|
|
};
|
|
|
|
|
|
#endif // _WX_COCOA_STDPATHS_H_
|