X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f38924e863cd44e2abd49d20d201d72aa773c51e..82c126e50158efee5a1f46e1200be380c5199f8d:/src/os2/ownerdrw.cpp

diff --git a/src/os2/ownerdrw.cpp b/src/os2/ownerdrw.cpp
index ee24483af6..12790b51ce 100644
--- a/src/os2/ownerdrw.cpp
+++ b/src/os2/ownerdrw.cpp
@@ -22,12 +22,11 @@
     #include "wx/dcmemory.h"
     #include "wx/menu.h"
     #include "wx/utils.h"
+    #include "wx/settings.h"
+    #include "wx/menuitem.h"
 #endif
 
-#include "wx/settings.h"
 #include "wx/ownerdrw.h"
-#include "wx/menuitem.h"
-
 
 // ============================================================================
 // implementation of wxOwnerDrawn class
@@ -43,7 +42,7 @@ wxOwnerDrawn::wxOwnerDrawn( const wxString& rsStr,
 : m_strName(rsStr)
 {
     m_bCheckable   = bCheckable;
-    m_bOwnerDrawn  = FALSE;
+    m_bOwnerDrawn  = false;
     m_nHeight      = 0;
     m_nMarginWidth = ms_nLastMarginWidth;
     if (wxNORMAL_FONT)
@@ -205,12 +204,22 @@ bool wxOwnerDrawn::OnDrawItem( wxDC& rDC,
     //
     if (eStatus & wxODSelected)
     {
-        wxColour                        vCol2(wxT("WHITE"));
-        vColBack.Set( (unsigned char)0
-                     ,(unsigned char)0
-                     ,(unsigned char)160
-                    ); // no dark blue in color table
-        vColText = vCol2;
+        vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP
+                                         ,SYSCLR_MENUHILITEBGND
+                                         ,0L
+                                        );
+        vColBack.Set( GetRValue(vRef)
+                     ,GetGValue(vRef)
+                     ,GetBValue(vRef)
+                    );
+        vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP
+                                         ,SYSCLR_MENUHILITE
+                                         ,0L
+                                        );
+        vColText.Set( GetRValue(vRef)
+                     ,GetGValue(vRef)
+                     ,GetBValue(vRef)
+                    );
     }
     else if (eStatus & wxODDisabled)
     {
@@ -304,7 +313,7 @@ bool wxOwnerDrawn::OnDrawItem( wxDC& rDC,
     //
     // Deal with the tab, extracting the Accel text
     //
-    nIndex = sFullString.Find(sTgt.c_str());
+    nIndex = sFullString.Find(sTgt);
     if (nIndex != -1)
     {
         bFoundAccel = true;
@@ -316,7 +325,7 @@ bool wxOwnerDrawn::OnDrawItem( wxDC& rDC,
     // Deal with the mnemonic character
     //
     sTgt = wxT("~");
-    nIndex = sFullString.Find(sTgt.c_str());
+    nIndex = sFullString.Find(sTgt);
     if (nIndex != -1)
     {
         wxString sTmp = sFullString;
@@ -342,7 +351,7 @@ bool wxOwnerDrawn::OnDrawItem( wxDC& rDC,
     ::GpiCharStringAt( rDC.GetHPS()
                       ,&vPntStart
                       ,sFullString.length()
-                      ,(PCH)sFullString.c_str()
+                      ,sFullString.char_str()
                      );
     if (bFoundMnemonic)
     {
@@ -380,7 +389,7 @@ bool wxOwnerDrawn::OnDrawItem( wxDC& rDC,
         ::GpiCharStringAt( rDC.GetHPS()
                           ,&vPntStart
                           ,sAccel.length()
-                          ,(PCH)sAccel.c_str()
+                          ,sAccel.char_str()
                          );
     }