1. added wfstream.cpp to wxBase (needed by filesys.cpp)

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

diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp
index c595157f3fdbd054954355e227630982a5a099ad..f8731d8d17e625b8289ef6aa2c25b59b1c4f209c 100644 (file)
--- a/src/generic/helphtml.cpp
+++ b/src/generic/helphtml.cpp
@@ -36,9 +36,11 @@
 
 #include <stdio.h>
 #include <ctype.h>
 
 #include <stdio.h>
 #include <ctype.h>

+#ifndef __MWERKS__

 #include <sys/stat.h>
 #include <sys/stat.h>

+#endif

 
 

-#ifndef __WINDOWS__
+#if !defined(__WINDOWS__) && !defined(__OS2__)

     #include   <unistd.h>
 #endif
 
     #include   <unistd.h>
 #endif
 


@@ -141,7 +143,7 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile)
          {
             newfile = WXEXTHELP_SEPARATOR;
             const wxChar *cptr = wxGetLocale()->GetName().c_str();
          {
             newfile = WXEXTHELP_SEPARATOR;
             const wxChar *cptr = wxGetLocale()->GetName().c_str();

-            while(*cptr && *cptr != _T('_'))
+            while(*cptr && *cptr != wxT('_'))

                newfile << *(cptr++);
             if(wxDirExists(newfile))
                file = newfile;
                newfile << *(cptr++);
             if(wxDirExists(newfile))
                file = newfile;


@@ -221,13 +223,13 @@ wxHTMLHelpControllerBase::DisplayContents()
    bool rc = FALSE;
    wxString file;
    file << m_MapFile << WXEXTHELP_SEPARATOR << contents;
    bool rc = FALSE;
    wxString file;
    file << m_MapFile << WXEXTHELP_SEPARATOR << contents;

-   if(file.Contains(_T('#')))
-      file = file.BeforeLast(_T('#'));
+   if(file.Contains(wxT('#')))
+      file = file.BeforeLast(wxT('#'));

    if(contents.Length() && wxFileExists(file))
       rc = DisplaySection(CONTENTS_ID);
    if(contents.Length() && wxFileExists(file))
       rc = DisplaySection(CONTENTS_ID);

-   
+

    // if not found, open homemade toc:
    // if not found, open homemade toc:

-   return rc ? TRUE : KeywordSearch(_T(""));
+   return rc ? TRUE : KeywordSearch(wxT(""));

 }
 
 bool
 }
 
 bool


@@ -294,7 +296,7 @@ wxHTMLHelpControllerBase::KeywordSearch(const wxString& k)
          node = node->Next();
       }
    }
          node = node->Next();
       }
    }

-   
+

    if(idx == 1)
       rc = DisplayHelp(urls[0]);
    else if(idx == 0)
    if(idx == 1)
       rc = DisplayHelp(urls[0]);
    else if(idx == 0)