Unicode compilation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/mmedia/sndaiff.cpp b/contrib/src/mmedia/sndaiff.cpp
index f86a81e34603c3547319e32a506e015729852e28..cca0b66adda61e4ac19c12d1dec4bdcd9257563d 100644 (file)
--- a/contrib/src/mmedia/sndaiff.cpp
+++ b/contrib/src/mmedia/sndaiff.cpp
@@ -55,7 +55,7 @@ wxSoundAiff::~wxSoundAiff()
 
 wxString wxSoundAiff::GetCodecName() const
 {
 
 wxString wxSoundAiff::GetCodecName() const
 {

-    return "wxSoundAiff codec";
+    return wxT("wxSoundAiff codec");

 }
 
 bool wxSoundAiff::CanRead()
 }
 
 bool wxSoundAiff::CanRead()

diff --git a/contrib/src/mmedia/sndmsad.cpp b/contrib/src/mmedia/sndmsad.cpp
index dbc6505d5bf409262a2b6dd247b91468bba73d2c..e120f4a22358ef00f4d6e6f25af64a19c97642d7 100644 (file)
--- a/contrib/src/mmedia/sndmsad.cpp
+++ b/contrib/src/mmedia/sndmsad.cpp
@@ -368,8 +368,7 @@ bool wxSoundStreamMSAdpcm::SetSoundFormat(const wxSoundFormatBase& format)
     adpcm->GetCoefs(m_coefs, ncoefs, coefs_len);
 
     if (!ncoefs) {
     adpcm->GetCoefs(m_coefs, ncoefs, coefs_len);
 
     if (!ncoefs) {

-        wxLogError(__FILE__ ":%d: Number of ADPCM coefficients"
-                   " must be non null", __LINE__);
+        wxLogError(wxT("Number of ADPCM coefficients must be non null"));

         return FALSE;
     }
     
         return FALSE;
     }
     

diff --git a/contrib/src/mmedia/vidbase.cpp b/contrib/src/mmedia/vidbase.cpp
index b3c8ac9195e946092204d7c9fcc482b903b49c7a..dde026ab7dfb1b8eac8f04730775863a9d402940 100644 (file)
--- a/contrib/src/mmedia/vidbase.cpp
+++ b/contrib/src/mmedia/vidbase.cpp
@@ -16,6 +16,7 @@
 #ifndef WX_PRECOMP
 #include <wx/stream.h>
 #include <wx/wfstream.h>
 #ifndef WX_PRECOMP
 #include <wx/stream.h>
 #include <wx/wfstream.h>

+#include <wx/intl.h>

 #endif
 
 #include "wx/mmedia/vidbase.h"
 #endif
 
 #include "wx/mmedia/vidbase.h"


@@ -61,7 +62,7 @@ void wxVideoBaseDriver::DetachOutput()
 
 wxFrame *wxVideoCreateFrame(wxVideoBaseDriver *vid_drv)
 {
 
 wxFrame *wxVideoCreateFrame(wxVideoBaseDriver *vid_drv)
 {

-  wxFrame *frame = new wxFrame(NULL, -1, "Video Output", wxDefaultPosition, wxSize(100, 100));
+  wxFrame *frame = new wxFrame(NULL, -1, _("Video Output"), wxDefaultPosition, wxSize(100, 100));

   wxWindow *vid_out = new wxWindow(frame, -1, wxPoint(0, 0), wxSize(300, 300));
 
   frame->Layout();
   wxWindow *vid_out = new wxWindow(frame, -1, wxPoint(0, 0), wxSize(300, 300));
 
   frame->Layout();