correct bug with using uninitialized end variable (unused variable warnings are not...

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

diff --git a/src/os2/stdpaths.cpp b/src/os2/stdpaths.cpp
index 86a91d3e0cc60a31dbeec98263b8d1b0bebae66b..f7ba58488bb956b6a117a3908f8182f81738acda 100644 (file)
--- a/src/os2/stdpaths.cpp
+++ b/src/os2/stdpaths.cpp
@@ -20,6 +20,8 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_STDPATHS
+

 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif


@@ -52,9 +54,9 @@ wxString wxStandardPaths::GetInstallPrefix() const
 {
     if ( m_prefix.empty() )
     {
 {
     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 = _T("/usr/local");

     }
     return m_prefix;
 }
     }
     return m_prefix;
 }


@@ -80,10 +82,12 @@ wxString wxStandardPaths::GetDataDir() const
 
 wxString wxStandardPaths::GetUserDataDir() const
 {
 
 wxString wxStandardPaths::GetUserDataDir() const
 {

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

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

+
+#endif // wxUSE_STDPATHS