From c6afc57c82030dccc6674ad3b6e789bca6989743 Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Thu, 5 Jun 2003 18:07:55 +0000 Subject: [PATCH] Unicode compilation fixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/calendar/calendar.cpp | 4 ++-- samples/shaped/shaped.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp index 710a20b00b..a19364dc5c 100644 --- a/samples/calendar/calendar.cpp +++ b/samples/calendar/calendar.cpp @@ -251,8 +251,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) _T("Allow changing the year in the calendar"), TRUE); menuCal->AppendSeparator(); - menuCal->Append(Calendar_Cal_SetDate, "SetDate()", "Set date to 2005-12-24."); - menuCal->Append(Calendar_Cal_Today, "Today()", "Set the current date."); + menuCal->Append(Calendar_Cal_SetDate, _T("SetDate()"), _T("Set date to 2005-12-24.")); + menuCal->Append(Calendar_Cal_Today, _T("Today()"), _T("Set the current date.")); // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar; diff --git a/samples/shaped/shaped.cpp b/samples/shaped/shaped.cpp index c0f546cec3..6198bc181a 100644 --- a/samples/shaped/shaped.cpp +++ b/samples/shaped/shaped.cpp @@ -158,7 +158,7 @@ ShapedFrame::ShapedFrame() ) { m_hasShape = FALSE; - m_bmp = wxBitmap("star.png", wxBITMAP_TYPE_PNG); + m_bmp = wxBitmap(wxT("star.png"), wxBITMAP_TYPE_PNG); SetSize(wxSize(m_bmp.GetWidth(), m_bmp.GetHeight())); #ifndef __WXMAC__ // On wxMac the tooltip gets clipped by the window shape, YUCK!!