Added (untested) support for sub-locales.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp
index 228b436b11c35fcb4a3842ff6b4bf5cd7b630602..13ea6eeecf919a5f9acbd3c950789b16eb46ddf7 100644 (file)
--- a/src/generic/helphtml.cpp
+++ b/src/generic/helphtml.cpp
@@ -115,6 +115,15 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile)
          newfile << WXEXTHELP_SEPARATOR << wxGetLocale()->GetName();
          if(wxDirExists(newfile))
             file = newfile;
          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))
       }
       
       if(! wxDirExists(file))