From: Václav Slavík Date: Wed, 2 May 2007 20:38:52 +0000 (+0000) Subject: more OS/2 compilation fixes X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fb2c90cab8a5a9214b2806ce93e36b377b215589?ds=inline more OS/2 compilation fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/os2/font.cpp b/src/os2/font.cpp index 16c1473d6a..4ed240007c 100644 --- a/src/os2/font.cpp +++ b/src/os2/font.cpp @@ -857,7 +857,7 @@ wxString wxNativeFontInfo::ToString() const fa.usCodePage, fa.lMatch, fn.usWeightClass, - fa.szFacename); + (char *)fa.szFacename); return sStr; } // end of wxNativeFontInfo::ToString diff --git a/src/os2/ownerdrw.cpp b/src/os2/ownerdrw.cpp index d5d0db57c3..12790b51ce 100644 --- a/src/os2/ownerdrw.cpp +++ b/src/os2/ownerdrw.cpp @@ -351,7 +351,7 @@ bool wxOwnerDrawn::OnDrawItem( wxDC& rDC, ::GpiCharStringAt( rDC.GetHPS() ,&vPntStart ,sFullString.length() - ,sFullString.wx_str() + ,sFullString.char_str() ); if (bFoundMnemonic) { @@ -389,7 +389,7 @@ bool wxOwnerDrawn::OnDrawItem( wxDC& rDC, ::GpiCharStringAt( rDC.GetHPS() ,&vPntStart ,sAccel.length() - ,sAccel.wx_str() + ,sAccel.char_str() ); }