wxControl::SetLabel no longer strips out codes so do it here

[wxWidgets.git] / src / common / stdpbase.cpp

diff --git a/src/common/stdpbase.cpp b/src/common/stdpbase.cpp
index 57a729623e55c012e13a5c0db6c74e2d33c3bd74..6f9bba7c978ced79ea4c8fcc073a77c3534bbe58 100644 (file)
--- a/src/common/stdpbase.cpp
+++ b/src/common/stdpbase.cpp
@@ -24,12 +24,12 @@
     #pragma hdrstop
 #endif
 
-// FIXME: there is no Mac implementation yet
-#ifndef __WXMAC__
+#if wxUSE_STDPATHS
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #endif //WX_PRECOMP
+#include "wx/apptrait.h"
 
 #include "wx/filename.h"
 #include "wx/stdpaths.h"
@@ -45,7 +45,15 @@ static wxStandardPaths gs_stdPaths;
 // ============================================================================
 
 /* static */
-wxStandardPaths& wxStandardPathsBase::Get()
+wxStandardPathsBase& wxStandardPathsBase::Get()
+{
+    wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+    wxCHECK_MSG( traits, gs_stdPaths, _T("create wxApp before calling this") );
+
+    return traits->GetStandardPaths();
+}
+
+wxStandardPathsBase& wxAppTraitsBase::GetStandardPaths()
 {
     return gs_stdPaths;
 }
@@ -70,7 +78,7 @@ wxString wxStandardPathsBase::AppendAppName(const wxString& dir)
 {
     wxString subdir(dir);
 
-    // empty string indicates that an error has occured, don't touch it then
+    // empty string indicates that an error has occurred, don't touch it then
     if ( !subdir.empty() )
     {
         const wxString appname = wxTheApp->GetAppName();
@@ -87,5 +95,4 @@ wxString wxStandardPathsBase::AppendAppName(const wxString& dir)
     return subdir;
 }
 
-#endif // !__WXMAC__
-
+#endif // wxUSE_STDPATHS