X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f50a1c3d667fb948bfbdcbd4b3021d896c6635cd..21bd196564d8483879a57c40ec1eea64114f9bd4:/src/generic/helpext.cpp diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp index 8a07d4648c..49dae623f0 100644 --- a/src/generic/helpext.cpp +++ b/src/generic/helpext.cpp @@ -19,7 +19,7 @@ #pragma hdrstop #endif -#if wxUSE_HELP && !defined(__WXWINCE__) +#if wxUSE_HELP && !defined(__WXWINCE__) && (!defined(__WXMAC__) || defined(__WXMAC_OSX__)) #ifndef WX_PRECOMP #include "wx/setup.h" @@ -45,6 +45,7 @@ #ifdef __WXMSW__ #include +#include "wx/msw/winundef.h" #endif // ---------------------------------------------------------------------------- @@ -287,7 +288,7 @@ bool wxExtHelpController::LoadFile(const wxString& ifile) m_MapList = new wxList; m_NumOfEntries = 0; - FILE *input = wxFopen(mapFile.fn_str(),wxT("rt")); + FILE *input = wxFopen(mapFile,wxT("rt")); if(! input) return false; do