Try to better revert to the original string value in wxBitmapComboBox::RecreateControl()

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

diff --git a/src/os2/stdpaths.cpp b/src/os2/stdpaths.cpp
index 86a91d3e0cc60a31dbeec98263b8d1b0bebae66b..593b70ae6ecdc0a538801ded19db0f2be8078080 100644 (file)
--- a/src/os2/stdpaths.cpp
+++ b/src/os2/stdpaths.cpp
@@ -6,7 +6,7 @@
 // Created:     2004-11-06
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Stefan Neis <Stefan.Neis@t-online.de>
-// License:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -20,6 +20,8 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_STDPATHS
+
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
@@ -52,9 +54,9 @@ wxString wxStandardPaths::GetInstallPrefix() const
 {
     if ( m_prefix.empty() )
     {
-        wxStandardPaths *self = wx_const_cast(wxStandardPaths *, this);
+        wxStandardPaths *self = const_cast<wxStandardPaths *>(this);
 
-       self->m_prefix = _T("/usr/local");
+        self->m_prefix = wxT("/usr/local");
     }
     return m_prefix;
 }
@@ -75,15 +77,17 @@ wxString wxStandardPaths::GetUserConfigDir() const
 
 wxString wxStandardPaths::GetDataDir() const
 {
-    return GetInstallPrefix() + _T("\\data");
+    return GetInstallPrefix() + wxT("\\data");
 }
 
 wxString wxStandardPaths::GetUserDataDir() const
 {
-    return AppendAppName(wxFileName::GetHomeDir() + _T("\\."));
+    return AppendAppInfo(wxFileName::GetHomeDir() + wxT("\\."));
 }
 
 wxString wxStandardPaths::GetPluginsDir() const
 {
     return wxString();
 }
+
+#endif // wxUSE_STDPATHS