Add markup support to wxMSW wxButton and show it in the sample.

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

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index 79d837f6319ccc8e87ee574410c795b78c29b8cc..91a86d5fb4b0e1ee6a856d87d30de9264a3ebd9d 100644 (file)
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -64,7 +64,7 @@ bool wxTextFile::OnOpen(const wxString &strBufferName, wxTextBufferOpenMode Open
     switch ( OpenMode )
     {
         default:
     switch ( OpenMode )
     {
         default:

-            wxFAIL_MSG( _T("unknown open mode in wxTextFile::Open") );
+            wxFAIL_MSG( wxT("unknown open mode in wxTextFile::Open") );

             // fall through
 
         case ReadAccess :
             // fall through
 
         case ReadAccess :


@@ -89,7 +89,7 @@ bool wxTextFile::OnClose()
 bool wxTextFile::OnRead(const wxMBConv& conv)
 {
     // file should be opened
 bool wxTextFile::OnRead(const wxMBConv& conv)
 {
     // file should be opened

-    wxASSERT_MSG( m_file.IsOpened(), _T("can't read closed file") );
+    wxASSERT_MSG( m_file.IsOpened(), wxT("can't read closed file") );

 
     // read the entire file in memory: this is not the most efficient thing to
     // do it but there is no good way to avoid it in Unicode build because if
 
     // read the entire file in memory: this is not the most efficient thing to
     // do it but there is no good way to avoid it in Unicode build because if


@@ -124,7 +124,7 @@ bool wxTextFile::OnRead(const wxMBConv& conv)
             return false;
 
         // if the file is seekable, also check that we're at its beginning
             return false;
 
         // if the file is seekable, also check that we're at its beginning

-        wxASSERT_MSG( m_file.Tell() == 0, _T("should be at start of file") );
+        wxASSERT_MSG( m_file.Tell() == 0, wxT("should be at start of file") );

 
         char *dst = buf.data();
         for ( size_t nRemaining = bufSize; nRemaining > 0; )
 
         char *dst = buf.data();
         for ( size_t nRemaining = bufSize; nRemaining > 0; )


@@ -156,7 +156,7 @@ bool wxTextFile::OnRead(const wxMBConv& conv)
         }
 
         wxASSERT_MSG( dst - buf.data() == (wxFileOffset)bufSize,
         }
 
         wxASSERT_MSG( dst - buf.data() == (wxFileOffset)bufSize,

-                      _T("logic error") );
+                      wxT("logic error") );

     }
     else // file is not seekable
     {
     }
     else // file is not seekable
     {