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 16c1473d6a1b4363faca502800127064f27df454..4ed240007ce5cbb5e45fa9581e478c58cb9d1b74 100644 (file)
--- 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.usCodePage,
                 fa.lMatch,
                 fn.usWeightClass,

-                fa.szFacename);
+                (char *)fa.szFacename);

     return sStr;
 } // end of wxNativeFontInfo::ToString
 
     return sStr;
 } // end of wxNativeFontInfo::ToString
 

diff --git a/src/os2/ownerdrw.cpp b/src/os2/ownerdrw.cpp
index d5d0db57c3c65a008f10754800aed9dfbe6c0c51..12790b51ceb709c55bece245e4f9b07bcc1d2e0c 100644 (file)
--- 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()
     ::GpiCharStringAt( rDC.GetHPS()
                       ,&vPntStart
                       ,sFullString.length()

-                      ,sFullString.wx_str()
+                      ,sFullString.char_str()

                      );
     if (bFoundMnemonic)
     {
                      );
     if (bFoundMnemonic)
     {


@@ -389,7 +389,7 @@ bool wxOwnerDrawn::OnDrawItem( wxDC& rDC,
         ::GpiCharStringAt( rDC.GetHPS()
                           ,&vPntStart
                           ,sAccel.length()
         ::GpiCharStringAt( rDC.GetHPS()
                           ,&vPntStart
                           ,sAccel.length()

-                          ,sAccel.wx_str()
+                          ,sAccel.char_str()

                          );
     }
 
                          );
     }