[Audacity-cvs] lib-src/FileDialog/win FileDialogPrivate.cpp, 1.16, 1.17

[Vaughan Johnson]

Update of /cvsroot/audacity/lib-src/FileDialog/win
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31341/win

Modified Files:
        FileDialogPrivate.cpp 
Log Message:
Brian Cameron's patch for compatibility with latest Sun Studio compiler.

Index: FileDialogPrivate.cpp
===================================================================
RCS file: /cvsroot/audacity/lib-src/FileDialog/win/FileDialogPrivate.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- FileDialogPrivate.cpp       11 Apr 2009 05:53:09 -0000      1.16
+++ FileDialogPrivate.cpp       2 Jul 2009 22:11:19 -0000       1.17
@@ -489,8 +489,8 @@
    paths.Empty();
    
    wxString dir(m_dir);
-   if ( m_dir.Last() != _T('\\') )
-      dir += _T('\\');
+   if ( m_dir.Last() != wxT('\\') )
+      dir += wxT('\\');
    
    size_t count = m_fileNames.GetCount();
    for ( size_t n = 0; n < count; n++ )
@@ -512,7 +512,7 @@
    wxString ext;
    wxSplitPath(path, &m_dir, &m_fileName, &ext);
    if ( !ext.empty() )
-      m_fileName << _T('.') << ext;
+      m_fileName << wxT('.') << ext;
 }
 
 void FileDialog::DoGetPosition( int *x, int *y ) const
@@ -650,17 +650,17 @@
       wxChar ch = m_dir[i];
       switch ( ch )
       {
-         case _T('/'):
+         case wxT('/'):
             // convert to backslash
-            ch = _T('\\');
+            ch = wxT('\\');
             
             // fall through
             
-         case _T('\\'):
+         case wxT('\\'):
             while ( i < len - 1 )
             {
                wxChar chNext = m_dir[i + 1];
-               if ( chNext != _T('\\') && chNext != _T('/') )
+               if ( chNext != wxT('\\') && chNext != wxT('/') )
                   break;
                
                // ignore the next one, unless it is at the start of a UNC path
@@ -686,7 +686,7 @@
    
    size_t items = wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, 
m_FilterGroups);
    
-   wxASSERT_MSG( items > 0 , _T("empty wildcard list") );
+   wxASSERT_MSG( items > 0 , wxT("empty wildcard list") );
    
    wxString filterBuffer;
    
@@ -814,7 +814,7 @@
             i += wxStrlen(&fileNameBuffer[i]) + 1;
          }
 #else
-         wxStringTokenizer toke(fileNameBuffer, _T(" \t\r\n"));
+         wxStringTokenizer toke(fileNameBuffer, wxT(" \t\r\n"));
          m_dir = toke.GetNextToken();
          m_fileName = toke.GetNextToken();
          m_fileNames.Add(m_fileName);
@@ -824,8 +824,8 @@
 #endif // OFN_EXPLORER
          
          wxString dir(m_dir);
-         if ( m_dir.Last() != _T('\\') )
-            dir += _T('\\');
+         if ( m_dir.Last() != wxT('\\') )
+            dir += wxT('\\');
          
          m_path = dir + m_fileName;
          m_filterIndex = (int)of.nFilterIndex - 1;


------------------------------------------------------------------------------
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs