Remove my binary compatibility stuff from HEAD. Patch #1367014 used for reference.

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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 0b498470a0f0a5d45dc447af6d08664e7b07faaf..39c9f93735e304e525ca17ae2d0aaaa9b76f3188 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -39,6 +39,10 @@
     #include   <unistd.h>
 #endif
 
     #include   <unistd.h>
 #endif
 

+#ifdef __WINDOWS__
+#include "wx/msw/mslu.h"
+#endif
+

 #ifdef __WXMSW__
 #include <windows.h>
 #include "wx/msw/winundef.h"
 #ifdef __WXMSW__
 #include <windows.h>
 #include "wx/msw/winundef.h"


@@ -234,9 +238,7 @@ bool wxExtHelpController::LoadFile(const wxString& ifile)
       file = ifile;
       if(! wxIsAbsolutePath(file))
       {
       file = ifile;
       if(! wxIsAbsolutePath(file))
       {

-         wxChar* f = wxGetWorkingDirectory();
-         file = f;
-         delete[] f; // wxGetWorkingDirectory returns new memory
+         file = wxGetCwd();

 #ifdef __WXMAC__
          file << ifile;
 #else
 #ifdef __WXMAC__
          file << ifile;
 #else


@@ -344,7 +346,7 @@ wxExtHelpController::DisplayContents()
    file << m_MapFile << WXEXTHELP_SEPARATOR << contents;
    if(file.Contains(wxT('#')))
       file = file.BeforeLast(wxT('#'));
    file << m_MapFile << WXEXTHELP_SEPARATOR << contents;
    if(file.Contains(wxT('#')))
       file = file.BeforeLast(wxT('#'));

-   if(contents.Length() && wxFileExists(file))
+   if(contents.length() && wxFileExists(file))

       rc = DisplaySection(CONTENTS_ID);
 
    // if not found, open homemade toc:
       rc = DisplaySection(CONTENTS_ID);
 
    // if not found, open homemade toc:


@@ -462,4 +464,3 @@ void wxExtHelpController::OnQuit()
 
 
 #endif // wxUSE_HELP
 
 
 #endif // wxUSE_HELP

-