Compilation fix for wxCStrData handling.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/os2/ownerdrw.cpp b/src/os2/ownerdrw.cpp
index 93742e8279239f9b59ea5c991926a8d4d381342d..12790b51ceb709c55bece245e4f9b07bcc1d2e0c 100644 (file)
--- a/src/os2/ownerdrw.cpp
+++ b/src/os2/ownerdrw.cpp
@@ -313,7 +313,7 @@ bool wxOwnerDrawn::OnDrawItem( wxDC& rDC,
     //
     // Deal with the tab, extracting the Accel text
     //
     //
     // Deal with the tab, extracting the Accel text
     //

-    nIndex = sFullString.Find(sTgt.c_str());
+    nIndex = sFullString.Find(sTgt);

     if (nIndex != -1)
     {
         bFoundAccel = true;
     if (nIndex != -1)
     {
         bFoundAccel = true;


@@ -325,7 +325,7 @@ bool wxOwnerDrawn::OnDrawItem( wxDC& rDC,
     // Deal with the mnemonic character
     //
     sTgt = wxT("~");
     // Deal with the mnemonic character
     //
     sTgt = wxT("~");

-    nIndex = sFullString.Find(sTgt.c_str());
+    nIndex = sFullString.Find(sTgt);

     if (nIndex != -1)
     {
         wxString sTmp = sFullString;
     if (nIndex != -1)
     {
         wxString sTmp = sFullString;


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

-                      ,(PCH)sFullString.c_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()

-                          ,(PCH)sAccel.c_str()
+                          ,sAccel.char_str()

                          );
     }
 
                          );
     }