made wxCommandEvent::GetInt() return int, not long (patch 1473771)

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

diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index 9b95c0f884adefb562df3fc8e88d95dc0002f648..cc425db3b43026bda55420a33f372d92164b6e80 100644 (file)
--- a/src/unix/stdpaths.cpp
+++ b/src/unix/stdpaths.cpp
@@ -52,11 +52,6 @@ wxString wxStandardPaths::GetUserConfigDir() const
     return wxFileName::GetHomeDir();
 }
 
-wxString wxStandardPaths::GetPluginsDir() const
-{
-    return wxString();
-}
-
 // ============================================================================
 // wxStandardPaths implementation for VMS
 // ============================================================================
@@ -69,6 +64,8 @@ wxString wxStandardPaths::GetInstallPrefix() const
     {
         wx_const_cast(wxStandardPaths *, this)->m_prefix = wxT("/sys$system");
     }
+
+    return m_prefix;
 }
 
 wxString wxStandardPaths::GetConfigDir() const
@@ -91,6 +88,18 @@ wxString wxStandardPaths::GetUserDataDir() const
    return wxFileName::GetHomeDir();
 }
 
+wxString wxStandardPaths::GetPluginsDir() const
+{
+    return wxString(); // TODO: this is wrong, it should return something
+}
+
+wxString
+wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang,
+                                          ResourceCat category) const
+{
+    return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category);
+}
+
 #else // !__VMS
 
 // ============================================================================
@@ -154,6 +163,21 @@ wxString wxStandardPaths::GetUserDataDir() const
    return AppendAppName(wxFileName::GetHomeDir() + _T("/."));
 }
 
+wxString wxStandardPaths::GetPluginsDir() const
+{
+    return AppendAppName(GetInstallPrefix() + _T("/lib"));
+}
+
+wxString
+wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang,
+                                          ResourceCat category) const
+{
+    if ( category != ResourceCat_Messages )
+        return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category);
+
+    return GetInstallPrefix() + _T("/share/locale/") + lang + _T("/LC_MESSAGES");
+}
+
 #endif // __VMS/!__VMS
 
 #endif // wxUSE_STDPATHS