return wxStandardPaths, not wxStandardPathsBase, from wxStandardPathsBase::Get() to allow calling platform-specific methods on it if necessary
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -25,7 +25,7 @@ class WXDLLIMPEXP_FWD_BASE wxLog;
|
||||
class WXDLLIMPEXP_FWD_BASE wxMessageOutput;
|
||||
class WXDLLIMPEXP_FWD_BASE wxObject;
|
||||
class WXDLLIMPEXP_FWD_CORE wxRendererNative;
|
||||
class WXDLLIMPEXP_FWD_BASE wxStandardPathsBase;
|
||||
class WXDLLIMPEXP_FWD_BASE wxStandardPaths;
|
||||
class WXDLLIMPEXP_FWD_BASE wxString;
|
||||
class WXDLLIMPEXP_FWD_BASE wxTimer;
|
||||
class WXDLLIMPEXP_FWD_BASE wxTimerImpl;
|
||||
@@ -75,7 +75,7 @@ public:
|
||||
|
||||
// wxStandardPaths object is normally the same for wxBase and wxGUI
|
||||
// except in the case of wxMac and wxCocoa
|
||||
virtual wxStandardPathsBase& GetStandardPaths();
|
||||
virtual wxStandardPaths& GetStandardPaths();
|
||||
|
||||
#if wxUSE_INTL
|
||||
// called during wxApp initialization to set the locale to correspond to
|
||||
|
@@ -17,6 +17,8 @@
|
||||
#include "wx/string.h"
|
||||
#include "wx/filefn.h"
|
||||
|
||||
class WXDLLIMPEXP_FWD_BASE wxStandardPaths;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxStandardPaths returns the standard locations in the file system
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -50,7 +52,7 @@ public:
|
||||
|
||||
|
||||
// return the global standard paths object
|
||||
static wxStandardPathsBase& Get();
|
||||
static wxStandardPaths& Get();
|
||||
|
||||
// return the path (directory+filename) of the running executable or
|
||||
// wxEmptyString if it couldn't be determined.
|
||||
|
@@ -62,7 +62,7 @@ public:
|
||||
#endif
|
||||
|
||||
#if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS
|
||||
virtual wxStandardPathsBase& GetStandardPaths();
|
||||
virtual wxStandardPaths& GetStandardPaths();
|
||||
#endif
|
||||
virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
|
||||
|
||||
|
Reference in New Issue
Block a user