Removed unnecessary casts

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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 30e80e68507ec626297abbf26b310ed06f3ec2b8..840ae94fa0492c76db07c1b2e60a0acf94787681 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
 
 // ----------------------------------------------------------------------------


@@ -258,7 +259,7 @@ bool wxExtHelpController::LoadFile(const wxString& ifile)
       {
          wxString newfile;
          newfile << WXEXTHELP_SEPARATOR << wxGetLocale()->GetName();
       {
          wxString newfile;
          newfile << WXEXTHELP_SEPARATOR << wxGetLocale()->GetName();

-         if(wxDirExists(newfile))
+         if(wxPathExists(newfile))

             file = newfile;
          else
          {
             file = newfile;
          else
          {


@@ -266,13 +267,13 @@ bool wxExtHelpController::LoadFile(const wxString& ifile)
             const wxChar *cptr = wxGetLocale()->GetName().c_str();
             while(*cptr && *cptr != wxT('_'))
                newfile << *(cptr++);
             const wxChar *cptr = wxGetLocale()->GetName().c_str();
             while(*cptr && *cptr != wxT('_'))
                newfile << *(cptr++);

-            if(wxDirExists(newfile))
+            if(wxPathExists(newfile))

                file = newfile;
          }
       }
 #endif
 
                file = newfile;
          }
       }
 #endif
 

-      if(! wxDirExists(file))
+      if(! wxPathExists(file))

          return false;
 
       mapFile << file << WXEXTHELP_SEPARATOR << WXEXTHELP_MAPFILE;
          return false;
 
       mapFile << file << WXEXTHELP_SEPARATOR << WXEXTHELP_MAPFILE;