Add some version checks to help compiling on OSX.

[wxWidgets.git] / src / msw / helpchm.cpp

diff --git a/src/msw/helpchm.cpp b/src/msw/helpchm.cpp
index e88789a0427ece18b7934795e3337e1a8770fe93..cdb46e21af4f1c7f97d7439eaa40f2ec8673ad08 100644 (file)
--- a/src/msw/helpchm.cpp
+++ b/src/msw/helpchm.cpp
@@ -50,7 +50,7 @@ HTMLHELP GetHtmlHelpFunction()
 
     if ( !s_htmlHelp )
     {
 
     if ( !s_htmlHelp )
     {

-        static wxDynamicLibrary s_dllHtmlHelp(_T("HHCTRL.OCX"), wxDL_VERBATIM);
+        static wxDynamicLibrary s_dllHtmlHelp(wxT("HHCTRL.OCX"), wxDL_VERBATIM);

 
         if ( !s_dllHtmlHelp.IsLoaded() )
         {
 
         if ( !s_dllHtmlHelp.IsLoaded() )
         {


@@ -156,8 +156,8 @@ wxCHMHelpController::DoDisplayTextPopup(const wxChar *text,
     popup.pszText = text;
     popup.pt.x = pos.x;
     popup.pt.y = pos.y;
     popup.pszText = text;
     popup.pt.x = pos.x;
     popup.pt.y = pos.y;

-    popup.clrForeground =
-    popup.clrBackground = (COLORREF)-1;
+    popup.clrForeground = ::GetSysColor(COLOR_INFOTEXT);
+    popup.clrBackground = ::GetSysColor(COLOR_INFOBK);

     popup.rcMargins.top =
     popup.rcMargins.left =
     popup.rcMargins.right =
     popup.rcMargins.top =
     popup.rcMargins.left =
     popup.rcMargins.right =