Applied patch [ 1178610 ] datectlg.cpp: wxDropdownButton + bug fixes

[wxWidgets.git] / src / generic / helpext.cpp

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 8a07d4648c032c0617b07f706620fefdc9a45fad..49dae623f0f0c7e4d0c752f1dc7ffad14fa89b2e 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
     #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"
 
 #ifndef WX_PRECOMP
     #include "wx/setup.h"


@@ -45,6 +45,7 @@
 
 #ifdef __WXMSW__
 #include <windows.h>
 
 #ifdef __WXMSW__
 #include <windows.h>

+#include "wx/msw/winundef.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -287,7 +288,7 @@ bool wxExtHelpController::LoadFile(const wxString& ifile)
    m_MapList = new wxList;
    m_NumOfEntries = 0;
 
    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
    if(! input)
       return false;
    do