mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-26 15:49:50 -06:00
Upgrade WX to r74856, mainly to support @2x.
This commit is contained in:
14
Externals/wxWidgets3/include/wx/stdpaths.h
vendored
14
Externals/wxWidgets3/include/wx/stdpaths.h
vendored
@ -4,7 +4,6 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 2004-10-17
|
||||
// RCS-ID: $Id: stdpaths.h 70796 2012-03-04 00:29:31Z VZ $
|
||||
// Copyright: (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -142,9 +141,6 @@ public:
|
||||
virtual wxString GetTempDir() const;
|
||||
|
||||
|
||||
// ctor for the base class
|
||||
wxStandardPathsBase();
|
||||
|
||||
// virtual dtor for the base class
|
||||
virtual ~wxStandardPathsBase();
|
||||
|
||||
@ -158,6 +154,10 @@ public:
|
||||
|
||||
|
||||
protected:
|
||||
// Ctor is protected as this is a base class which should never be created
|
||||
// directly.
|
||||
wxStandardPathsBase();
|
||||
|
||||
// append the path component, with a leading path separator if a
|
||||
// path separator or dot (.) is not already at the end of dir
|
||||
static wxString AppendPathComponent(const wxString& dir, const wxString& component);
|
||||
@ -210,6 +210,12 @@ public:
|
||||
virtual wxString GetPluginsDir() const { return m_prefix; }
|
||||
virtual wxString GetDocumentsDir() const { return m_prefix; }
|
||||
|
||||
protected:
|
||||
// Ctor is protected because wxStandardPaths::Get() should always be used
|
||||
// to access the global wxStandardPaths object of the correct type instead
|
||||
// of creating one of a possibly wrong type yourself.
|
||||
wxStandardPaths() { }
|
||||
|
||||
private:
|
||||
wxString m_prefix;
|
||||
};
|
||||
|
Reference in New Issue
Block a user