projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added wxPropertySheetDialog for implementing settings dialogs
[wxWidgets.git]
/
src
/
common
/
stdpbase.cpp
diff --git
a/src/common/stdpbase.cpp
b/src/common/stdpbase.cpp
index 58e9e4ebbaa5e813bb346818f2738d0976f611e9..7543b42155f041b4d444e0fbee64330bb960ccfb 100644
(file)
--- a/
src/common/stdpbase.cpp
+++ b/
src/common/stdpbase.cpp
@@
-24,9
+24,12
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
+#if wxUSE_STDPATHS
+
#ifndef WX_PRECOMP
#include "wx/app.h"
#endif //WX_PRECOMP
#ifndef WX_PRECOMP
#include "wx/app.h"
#endif //WX_PRECOMP
+#include "wx/apptrait.h"
#include "wx/filename.h"
#include "wx/stdpaths.h"
#include "wx/filename.h"
#include "wx/stdpaths.h"
@@
-42,7
+45,12
@@
static wxStandardPaths gs_stdPaths;
// ============================================================================
/* static */
// ============================================================================
/* static */
-wxStandardPaths& wxStandardPathsBase::Get()
+wxStandardPathsBase& wxStandardPathsBase::Get()
+{
+ return wxTheApp->GetTraits()->GetStandardPaths();
+}
+
+wxStandardPathsBase& wxAppTraitsBase::GetStandardPaths()
{
return gs_stdPaths;
}
{
return gs_stdPaths;
}
@@
-84,3
+92,4
@@
wxString wxStandardPathsBase::AppendAppName(const wxString& dir)
return subdir;
}
return subdir;
}
+#endif // wxUSE_STDPATHS