Unicode compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -251,8 +251,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
|||||||
_T("Allow changing the year in the calendar"),
|
_T("Allow changing the year in the calendar"),
|
||||||
TRUE);
|
TRUE);
|
||||||
menuCal->AppendSeparator();
|
menuCal->AppendSeparator();
|
||||||
menuCal->Append(Calendar_Cal_SetDate, "SetDate()", "Set date to 2005-12-24.");
|
menuCal->Append(Calendar_Cal_SetDate, _T("SetDate()"), _T("Set date to 2005-12-24."));
|
||||||
menuCal->Append(Calendar_Cal_Today, "Today()", "Set the current date.");
|
menuCal->Append(Calendar_Cal_Today, _T("Today()"), _T("Set the current date."));
|
||||||
|
|
||||||
// now append the freshly created menu to the menu bar...
|
// now append the freshly created menu to the menu bar...
|
||||||
wxMenuBar *menuBar = new wxMenuBar;
|
wxMenuBar *menuBar = new wxMenuBar;
|
||||||
|
@@ -158,7 +158,7 @@ ShapedFrame::ShapedFrame()
|
|||||||
)
|
)
|
||||||
{
|
{
|
||||||
m_hasShape = FALSE;
|
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()));
|
SetSize(wxSize(m_bmp.GetWidth(), m_bmp.GetHeight()));
|
||||||
#ifndef __WXMAC__
|
#ifndef __WXMAC__
|
||||||
// On wxMac the tooltip gets clipped by the window shape, YUCK!!
|
// On wxMac the tooltip gets clipped by the window shape, YUCK!!
|
||||||
|
Reference in New Issue
Block a user