mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-17 19:49: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.
64 lines
2.3 KiB
C++
64 lines
2.3 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/unix/stdpaths.h
|
|
// Purpose: wxStandardPaths for Unix systems
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 2004-10-19
|
|
// Copyright: (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_UNIX_STDPATHS_H_
|
|
#define _WX_UNIX_STDPATHS_H_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxStandardPaths
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase
|
|
{
|
|
public:
|
|
// tries to determine the installation prefix automatically (Linux only right
|
|
// now) and returns /usr/local if it failed
|
|
void DetectPrefix();
|
|
|
|
// set the program installation directory which is /usr/local by default
|
|
//
|
|
// under some systems (currently only Linux) the program directory can be
|
|
// determined automatically but for portable programs you should always set
|
|
// it explicitly
|
|
void SetInstallPrefix(const wxString& prefix);
|
|
|
|
// get the program installation prefix
|
|
//
|
|
// if the prefix had been previously by SetInstallPrefix, returns that
|
|
// value, otherwise calls DetectPrefix()
|
|
wxString GetInstallPrefix() const;
|
|
|
|
|
|
// 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 GetLocalizedResourcesDir(const wxString& lang,
|
|
ResourceCat category) const wxOVERRIDE;
|
|
#ifndef __VMS
|
|
virtual wxString GetUserDir(Dir userDir) const wxOVERRIDE;
|
|
#endif
|
|
|
|
protected:
|
|
// Ctor is protected, use wxStandardPaths::Get() instead of instantiating
|
|
// objects of this class directly.
|
|
wxStandardPaths() { }
|
|
|
|
private:
|
|
wxString m_prefix;
|
|
};
|
|
|
|
#endif // _WX_UNIX_STDPATHS_H_
|
|
|