return wxStandardPaths, not wxStandardPathsBase, from wxStandardPathsBase::Get()...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 4775f4b9de7750cd25995b922707d6b3eb8843fd..52c815bf13475194da464f1fbdc331e28b8e1f35 100644 (file)
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -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

diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h
index 517e7de31d7a79d091ef1e2e48ae1c69eb88ffaf..0b6f8479d41d477c11be87e81c823179f84073be 100644 (file)
--- a/include/wx/stdpaths.h
+++ b/include/wx/stdpaths.h
@@ -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.

diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h
index b8dd8e4abfc12dcdf65e34cae6b62f333feb98fd..cd46c08eb5c69f0a394c3565a7f7215ceed19a96 100644 (file)
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -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;
 

diff --git a/interface/wx/stdpaths.h b/interface/wx/stdpaths.h
index af4dac1d2900045c87b09d15b47db1095f8f0e55..d082af4b97976c92eb2366a851f4ec95df2c91bb 100644 (file)
--- a/interface/wx/stdpaths.h
+++ b/interface/wx/stdpaths.h
@@ -51,7 +51,7 @@ public:
     /**
         Returns reference to the unique global standard paths object.
     */
-    static wxStandardPathsBase& Get();
+    static wxStandardPaths& Get();
 
     /**
         Return the directory for the document files used by this application.

diff --git a/src/common/stdpbase.cpp b/src/common/stdpbase.cpp
index 6eaaeb29ec3fb54c7bace71c82814729e15301b8..6cf9b8a32a59f0befd736b910d6e404201f17b9f 100644 (file)
--- a/src/common/stdpbase.cpp
+++ b/src/common/stdpbase.cpp
@@ -43,7 +43,7 @@ static wxStandardPaths gs_stdPaths;
 // ============================================================================
 
 /* static */
-wxStandardPathsBase& wxStandardPathsBase::Get()
+wxStandardPaths& wxStandardPathsBase::Get()
 {
     wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
     wxCHECK_MSG( traits, gs_stdPaths, _T("create wxApp before calling this") );
@@ -72,7 +72,7 @@ wxString wxStandardPathsBase::GetExecutablePath() const
     return filename.GetFullPath();
 }
 
-wxStandardPathsBase& wxAppTraitsBase::GetStandardPaths()
+wxStandardPaths& wxAppTraitsBase::GetStandardPaths()
 {
     return gs_stdPaths;
 }

diff --git a/src/osx/core/utilsexc_cf.cpp b/src/osx/core/utilsexc_cf.cpp
index be96bcfb36c5e51b29d22588f9637c811d5c2431..d503bd59754062d6402559eea007931380c43e9e 100644 (file)
--- a/src/osx/core/utilsexc_cf.cpp
+++ b/src/osx/core/utilsexc_cf.cpp
@@ -110,7 +110,7 @@ int wxGUIAppTraits::AddProcessCallback(wxEndProcessData *proc_data, int fd)
 // put it in because it's already compiled for wxCocoa and wxMac GUI lib.
 #if wxUSE_STDPATHS
 static wxStandardPathsCF gs_stdPaths;
-wxStandardPathsBase& wxGUIAppTraits::GetStandardPaths()
+wxStandardPaths& wxGUIAppTraits::GetStandardPaths()
 {
     return gs_stdPaths;
 }