avoiding double define warnings on osx

[wxWidgets.git] / src / common / stdpbase.cpp

diff --git a/src/common/stdpbase.cpp b/src/common/stdpbase.cpp
index 6cf9b8a32a59f0befd736b910d6e404201f17b9f..8df8c13843ec03686e51fccdc5aef617d4be8b9b 100644 (file)
--- a/src/common/stdpbase.cpp
+++ b/src/common/stdpbase.cpp
@@ -46,7 +46,7 @@ static wxStandardPaths gs_stdPaths;
 wxStandardPaths& wxStandardPathsBase::Get()
 {
     wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
 wxStandardPaths& wxStandardPathsBase::Get()
 {
     wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;

-    wxCHECK_MSG( traits, gs_stdPaths, _T("create wxApp before calling this") );
+    wxCHECK_MSG( traits, gs_stdPaths, wxT("create wxApp before calling this") );

 
     return traits->GetStandardPaths();
 }
 
     return traits->GetStandardPaths();
 }


@@ -133,7 +133,7 @@ wxStandardPathsBase::AppendPathComponent(const wxString& dir,
         if ( !component.empty() )
         {
             const wxChar ch = *(subdir.end() - 1);
         if ( !component.empty() )
         {
             const wxChar ch = *(subdir.end() - 1);

-            if ( !wxFileName::IsPathSeparator(ch) && ch != _T('.') )
+            if ( !wxFileName::IsPathSeparator(ch) && ch != wxT('.') )

                 subdir += wxFileName::GetPathSeparator();
 
             subdir += component;
                 subdir += wxFileName::GetPathSeparator();
 
             subdir += component;