#if wxUSE_HELP && wxUSE_MS_HTML_HELP
-#include "wx/filefn.h"
+#include "wx/filename.h"
#include "wx/msw/helpchm.h"
#include "wx/dynload.h"
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() )
{
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 =