The alignment controls are now left-aligned if the floating controls are not shown.

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

diff --git a/src/os2/stdpaths.cpp b/src/os2/stdpaths.cpp
index 98cf196f241f3a38be6c21fb88bd75aefe24cb92..d66be925809d16ba7da48a3f0c262f2a826756ce 100644 (file)
--- a/src/os2/stdpaths.cpp
+++ b/src/os2/stdpaths.cpp
@@ -1,12 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        unix/stdpaths.cpp
+// Name:        src/os2/stdpaths.cpp

 // Purpose:     wxStandardPaths implementation for OS/2 systems
 // Author:      Stefan Neis
 // Modified by:
 // Created:     2004-11-06
 // Purpose:     wxStandardPaths implementation for OS/2 systems
 // Author:      Stefan Neis
 // Modified by:
 // Created:     2004-11-06

-// RCS-ID:      $Id$

 // Copyright:   (c) 2004 Stefan Neis <Stefan.Neis@t-online.de>
 // Copyright:   (c) 2004 Stefan Neis <Stefan.Neis@t-online.de>

-// License:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -54,9 +53,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 = wxT("/usr/local");

     }
     return m_prefix;
 }
     }
     return m_prefix;
 }


@@ -77,12 +76,12 @@ wxString wxStandardPaths::GetUserConfigDir() const
 
 wxString wxStandardPaths::GetDataDir() const
 {
 
 wxString wxStandardPaths::GetDataDir() const
 {

-    return GetInstallPrefix() + _T("\\data");
+    return GetInstallPrefix() + wxT("\\data");

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

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

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