disable console targets for WinCE

[wxWidgets.git] / src / unix / stdpaths.cpp

diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index edbaef8fed99b4429730254420305a71a79f9aab..f445c2f3d2d8fce21bc217649ec9615ae7a39fa8 100644 (file)
--- a/src/unix/stdpaths.cpp
+++ b/src/unix/stdpaths.cpp
@@ -75,12 +75,12 @@ wxString wxStandardPaths::GetConfigDir() const
 
 wxString wxStandardPaths::GetDataDir() const
 {
 
 wxString wxStandardPaths::GetDataDir() const
 {

-   return AppendAppName(GetInstallPrefix() + _T("/sys$share"));
+   return AppendAppInfo(GetInstallPrefix() + _T("/sys$share"));

 }
 
 wxString wxStandardPaths::GetLocalDataDir() const
 {
 }
 
 wxString wxStandardPaths::GetLocalDataDir() const
 {

-   return AppendAppName(_T("/sys$manager"));
+   return AppendAppInfo(_T("/sys$manager"));

 }
 
 wxString wxStandardPaths::GetUserDataDir() const
 }
 
 wxString wxStandardPaths::GetUserDataDir() const


@@ -94,12 +94,17 @@ wxString wxStandardPaths::GetPluginsDir() const
 }
 
 wxString
 }
 
 wxString

-wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang,
+wxStandardPaths::GetLocalizedResourcesDir(const wxString& lang,

                                           ResourceCat category) const
 {
     return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category);
 }
 
                                           ResourceCat category) const
 {
     return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category);
 }
 

+wxString wxStandardPaths::GetExecutablePath() const
+{
+    return wxStandardPathsBase::GetExecutablePath();
+}
+

 #else // !__VMS
 
 // ============================================================================
 #else // !__VMS
 
 // ============================================================================


@@ -182,26 +187,26 @@ wxString wxStandardPaths::GetConfigDir() const
 
 wxString wxStandardPaths::GetDataDir() const
 {
 
 wxString wxStandardPaths::GetDataDir() const
 {

-   return AppendAppName(GetInstallPrefix() + _T("/share"));
+   return AppendAppInfo(GetInstallPrefix() + _T("/share"));

 }
 
 wxString wxStandardPaths::GetLocalDataDir() const
 {
 }
 
 wxString wxStandardPaths::GetLocalDataDir() const
 {

-   return AppendAppName(_T("/etc"));
+   return AppendAppInfo(_T("/etc"));

 }
 
 wxString wxStandardPaths::GetUserDataDir() const
 {
 }
 
 wxString wxStandardPaths::GetUserDataDir() const
 {

-   return AppendAppName(wxFileName::GetHomeDir() + _T("/."));
+   return AppendAppInfo(wxFileName::GetHomeDir() + _T("/."));

 }
 
 wxString wxStandardPaths::GetPluginsDir() const
 {
 }
 
 wxString wxStandardPaths::GetPluginsDir() const
 {

-    return AppendAppName(GetInstallPrefix() + _T("/lib"));
+    return AppendAppInfo(GetInstallPrefix() + _T("/lib"));

 }
 
 wxString
 }
 
 wxString

-wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang,
+wxStandardPaths::GetLocalizedResourcesDir(const wxString& lang,

                                           ResourceCat category) const
 {
     if ( category != ResourceCat_Messages )
                                           ResourceCat category) const
 {
     if ( category != ResourceCat_Messages )