From: Václav Slavík <vslavik@fastmail.fm>
Date: Sun, 17 Aug 2003 15:00:46 +0000 (+0000)
Subject: Unicode compilation fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f815011ffb2a69481a91a20b2010fa0181a8fca5

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 f86a81e346..cca0b66add 100644
--- a/contrib/src/mmedia/sndaiff.cpp
+++ b/contrib/src/mmedia/sndaiff.cpp
@@ -55,7 +55,7 @@ wxSoundAiff::~wxSoundAiff()
 
 wxString wxSoundAiff::GetCodecName() const
 {
-    return "wxSoundAiff codec";
+    return wxT("wxSoundAiff codec");
 }
 
 bool wxSoundAiff::CanRead()
diff --git a/contrib/src/mmedia/sndmsad.cpp b/contrib/src/mmedia/sndmsad.cpp
index dbc6505d5b..e120f4a223 100644
--- 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) {
-        wxLogError(__FILE__ ":%d: Number of ADPCM coefficients"
-                   " must be non null", __LINE__);
+        wxLogError(wxT("Number of ADPCM coefficients must be non null"));
         return FALSE;
     }
     
diff --git a/contrib/src/mmedia/vidbase.cpp b/contrib/src/mmedia/vidbase.cpp
index b3c8ac9195..dde026ab7d 100644
--- 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>
+#include <wx/intl.h>
 #endif
 
 #include "wx/mmedia/vidbase.h"
@@ -61,7 +62,7 @@ void wxVideoBaseDriver::DetachOutput()
 
 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();