X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2461cfa0d9b786a26a783237bca38c920efecb51..e2813725c9c8d409b3b99768abc2dcf9ee1fa76f:/src/os2/toolbar.cpp diff --git a/src/os2/toolbar.cpp b/src/os2/toolbar.cpp index 56ab552677..def07d2192 100644 --- a/src/os2/toolbar.cpp +++ b/src/os2/toolbar.cpp @@ -366,7 +366,7 @@ bool wxToolBar::Create( wxClientDC vDC(this); vDC.SetFont(GetFont()); - vDC.GetTextExtent( "XXXX" + vDC.GetTextExtent( wxT("XXXX") ,&m_vTextX ,&m_vTextY ); @@ -858,7 +858,7 @@ void wxToolBar::DrawTool( LowerTool(pTool, FALSE); if (!pTool->IsEnabled()) { - wxColour vColor("GREY"); + wxColour vColor(wxT("GREY")); rDc.SetTextForeground(vColor); if (!pTool->GetDisabledBitmap().Ok()) @@ -873,7 +873,7 @@ void wxToolBar::DrawTool( } else { - wxColour vColor("BLACK"); + wxColour vColor(wxT("BLACK")); rDc.SetTextForeground(vColor); rDc.DrawBitmap( vBitmap @@ -918,7 +918,7 @@ void wxToolBar::DrawTool( } else { - wxColour vColor("GREY"); + wxColour vColor(wxT("GREY")); LowerTool(pTool); rDc.SetTextForeground(vColor); @@ -1072,7 +1072,7 @@ void wxToolBar::LowerTool ( ,1 ,wxSOLID ); - wxPen vWhitePen( "WHITE" + wxPen vWhitePen( wxT("WHITE") ,1 ,wxSOLID ); @@ -1149,7 +1149,7 @@ void wxToolBar::RaiseTool ( ,1 ,wxSOLID ); - wxPen vWhitePen( "WHITE" + wxPen vWhitePen( wxT("WHITE") ,1 ,wxSOLID );