Cured some small doc typos; some WIN16 fixes; transferred DLL WinMain to

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

diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp
index 0d909968b3b630336d69677fb74fc00d77cab33a..13ea6eeecf919a5f9acbd3c950789b16eb46ddf7 100644 (file)
--- a/src/generic/helphtml.cpp
+++ b/src/generic/helphtml.cpp
@@ -33,13 +33,6 @@ public:
       { id = iid; url = iurl; doc = idoc; }
 };
 
-
-struct wxBusyCursor
-{
-   wxBusyCursor() { wxBeginBusyCursor(); }
-   ~wxBusyCursor() { wxEndBusyCursor(); }
-};
-
 IMPLEMENT_ABSTRACT_CLASS(wxHTMLHelpControllerBase, wxHelpControllerBase)
    
 /**
@@ -122,6 +115,15 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile)
          newfile << WXEXTHELP_SEPARATOR << wxGetLocale()->GetName();
          if(wxDirExists(newfile))
             file = newfile;
+         else
+         {
+            newfile = WXEXTHELP_SEPARATOR;
+            const char *cptr = wxGetLocale()->GetName().c_str();
+            while(*cptr && *cptr != '_')
+               newfile << *(cptr++);
+            if(wxDirExists(newfile))
+               file = newfile;
+         }
       }
       
       if(! wxDirExists(file))