Changed default cursor to be an arrow rather than the ugly X.

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

diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp
index 228b436b11c35fcb4a3842ff6b4bf5cd7b630602..b7885919ca6f21e9bf71cabf08ae0b2ecef90757 100644 (file)
--- a/src/generic/helphtml.cpp
+++ b/src/generic/helphtml.cpp
@@ -34,21 +34,21 @@ public:
 };
 
 IMPLEMENT_ABSTRACT_CLASS(wxHTMLHelpControllerBase, wxHelpControllerBase)
-   
+
 /**
    This class implements help via an external browser.
    It requires the name of a directory containing the documentation
    and a file mapping numerical Section numbers to relative URLS.
 */
 
-wxHTMLHelpControllerBase::wxHTMLHelpControllerBase(void)
+wxHTMLHelpControllerBase::wxHTMLHelpControllerBase()
 {
    m_MapList = (wxList*) NULL;
    m_NumOfEntries = 0;
 }
 
 void
-wxHTMLHelpControllerBase::DeleteList(void)
+wxHTMLHelpControllerBase::DeleteList()
 {
    if(m_MapList)
    {
@@ -64,7 +64,7 @@ wxHTMLHelpControllerBase::DeleteList(void)
    }
 }
 
-wxHTMLHelpControllerBase::~wxHTMLHelpControllerBase(void)
+wxHTMLHelpControllerBase::~wxHTMLHelpControllerBase()
 {
    DeleteList();
 }
@@ -88,7 +88,7 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile)
    wxString mapFile, file, url, doc;
    int id,i,len;
    char buffer[WXEXTHELP_BUFLEN];
-   
+
    wxBusyCursor b; // display a busy cursor
 
    if(! ifile.IsEmpty())
@@ -96,7 +96,7 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile)
       file = ifile;
       if(! wxIsAbsolutePath(file))
       {
-         char* f = wxGetWorkingDirectory();
+         wxChar* f = wxGetWorkingDirectory();
          file = f;
          delete[] f; // wxGetWorkingDirectory returns new memory
          file << WXEXTHELP_SEPARATOR << ifile;
@@ -104,6 +104,7 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile)
       else
          file = ifile;
 
+#if wxUSE_INTL
       // If a locale is set, look in file/localename, i.e.
       // If passed "/usr/local/myapp/help" and the current wxLocale is
       // set to be "de", then look in "/usr/local/myapp/help/de/"
@@ -115,11 +116,21 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile)
          newfile << WXEXTHELP_SEPARATOR << wxGetLocale()->GetName();
          if(wxDirExists(newfile))
             file = newfile;
+         else
+         {
+            newfile = WXEXTHELP_SEPARATOR;
+            const wxChar *cptr = wxGetLocale()->GetName().c_str();
+            while(*cptr && *cptr != _T('_'))
+               newfile << *(cptr++);
+            if(wxDirExists(newfile))
+               file = newfile;
+         }
       }
-      
+#endif
+
       if(! wxDirExists(file))
          return FALSE;
-      
+
       mapFile << file << WXEXTHELP_SEPARATOR << WXEXTHELP_MAPFILE;
    }
    else // try to reload old file
@@ -131,8 +142,8 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile)
    DeleteList();
    m_MapList = new wxList;
    m_NumOfEntries = 0;
-   
-   FILE *input = fopen(mapFile.c_str(),"rt");
+
+   FILE *input = fopen(mapFile.fn_str(),"rt");
    if(! input)
       return FALSE;
    do
@@ -160,21 +171,21 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile)
       }
    }while(! feof(input));
    fclose(input);
-   
+
    m_MapFile = file; // now it's valid
    return TRUE;
 }
 
 
 bool
-wxHTMLHelpControllerBase::DisplayContents(void)
+wxHTMLHelpControllerBase::DisplayContents()
 {
    if(! m_NumOfEntries)
       return FALSE;
    wxBusyCursor b; // display a busy cursor
    return KeywordSearch("");
 }
-      
+
 bool
 wxHTMLHelpControllerBase::DisplaySection(int sectionNo)
 {
@@ -210,19 +221,19 @@ wxHTMLHelpControllerBase::KeywordSearch(const wxString& k)
    wxString     *choices = new wxString[m_NumOfEntries];
    wxString     *urls = new wxString[m_NumOfEntries];
    wxString compA, compB;
-   
+
    int          idx = 0, j;
    bool         rc;
    bool         showAll = k.IsEmpty();
    wxNode       *node = m_MapList->First();
    wxExtHelpMapEntry *entry;
-   
+
    compA = k; compA.LowerCase(); // we compare case insensitive
    while(node)
    {
       entry = (wxExtHelpMapEntry *)node->Data();
       compB = entry->doc; compB.LowerCase();
-      if((showAll || compB.Contains(k)) && ! compB.IsEmpty()) 
+      if((showAll || compB.Contains(k)) && ! compB.IsEmpty())
       {
          urls[idx] = entry->url;
          // doesn't work:
@@ -257,19 +268,19 @@ wxHTMLHelpControllerBase::KeywordSearch(const wxString& k)
    }
    delete[] urls;
    delete[] choices;
-   
+
    return rc;
 }
 
 
 bool
-wxHTMLHelpControllerBase::Quit(void)
+wxHTMLHelpControllerBase::Quit()
 {
    return TRUE;
 }
 
 void
-wxHTMLHelpControllerBase::OnQuit(void)
+wxHTMLHelpControllerBase::OnQuit()
 {
 }