Forbid creation of wxStandardPaths object directly.
This happens to work under MSW and Unix where there is only one wxStandardPaths class for both the console and the GUI applications but doesn't return the correct result under OS X where the Core Foundation version, returned by wxStandardPaths::Get(), has to be used for the GUI programs. And historically this confused a lot of people, so just ensure that they can't accidentally create an object of the wrong type any more. Closes #13537. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -19,10 +19,6 @@
|
||||
class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase
|
||||
{
|
||||
public:
|
||||
// ctor calls IgnoreAppBuildSubDirs() and also sets up the object to use
|
||||
// both vendor and application name by default
|
||||
wxStandardPaths();
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual wxString GetExecutablePath() const;
|
||||
virtual wxString GetConfigDir() const;
|
||||
@@ -67,6 +63,13 @@ public:
|
||||
static wxString MSWGetShellDir(int csidl);
|
||||
|
||||
protected:
|
||||
// Ctor is protected, use wxStandardPaths::Get() instead of instantiating
|
||||
// objects of this class directly.
|
||||
//
|
||||
// It calls IgnoreAppBuildSubDirs() and also sets up the object to use
|
||||
// both vendor and application name by default.
|
||||
wxStandardPaths();
|
||||
|
||||
// get the path corresponding to the given standard CSIDL_XXX constant
|
||||
static wxString DoGetDirectory(int csidl);
|
||||
|
||||
|
Reference in New Issue
Block a user