Unicode fixes for OS/2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -231,7 +231,7 @@ wxStatusBar* wxFrame::OnCreateStatusBar(
|
||||
// Set the height according to the font and the border size
|
||||
//
|
||||
vDC.SetFont(pStatusBar->GetFont()); // Screws up the menues for some reason
|
||||
vDC.GetTextExtent( "X"
|
||||
vDC.GetTextExtent( wxT("X")
|
||||
,NULL
|
||||
,&nY
|
||||
);
|
||||
@@ -304,7 +304,7 @@ void wxFrame::PositionStatusBar()
|
||||
{
|
||||
vError = ::WinGetLastError(vHabmain);
|
||||
sError = wxPMErrorToStr(vError);
|
||||
wxLogError("Error setting parent for StautsBar. Error: %s\n", sError.c_str());
|
||||
wxLogError(_T("Error setting parent for StautsBar. Error: %s\n"), sError.c_str());
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -437,14 +437,14 @@ void wxFrame::InternalSetMenuBar()
|
||||
{
|
||||
vError = ::WinGetLastError(vHabmain);
|
||||
sError = wxPMErrorToStr(vError);
|
||||
wxLogError("Error setting parent for submenu. Error: %s\n", sError.c_str());
|
||||
wxLogError(_T("Error setting parent for submenu. Error: %s\n"), sError.c_str());
|
||||
}
|
||||
|
||||
if (!::WinSetOwner(m_hMenu, m_hFrame))
|
||||
{
|
||||
vError = ::WinGetLastError(vHabmain);
|
||||
sError = wxPMErrorToStr(vError);
|
||||
wxLogError("Error setting parent for submenu. Error: %s\n", sError.c_str());
|
||||
wxLogError(_T("Error setting parent for submenu. Error: %s\n"), sError.c_str());
|
||||
}
|
||||
::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
|
||||
} // end of wxFrame::InternalSetMenuBar
|
||||
|
Reference in New Issue
Block a user