more wxHtmlHelpFrame fixes (didn't store customization correctly, still needs some fixing, will do asap)

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

include/wx/html/helpfrm.h

@@ -61,7 +61,7 @@ enum
 
 typedef struct
 {
-    long x, y, w, h;
+    int x, y, w, h;
     long sashpos;
     bool navig_on;
 }

src/html/helpdata.cpp

@@ -350,7 +350,7 @@ bool wxHtmlHelpData::AddBookParam(const wxString& title, const wxString& contfil
     if (! path.IsEmpty())
         fsys.ChangePathTo(path, TRUE);
 
-    bookr = new wxHtmlBookRecord(path + '/', title, deftopic);
+    bookr = new wxHtmlBookRecord(fsys.GetPath(), title, deftopic);
 
     if (m_ContentsCnt % wxHTML_REALLOC_STEP == 0)
         m_Contents = (wxHtmlContentsItem*) realloc(m_Contents, (m_ContentsCnt + wxHTML_REALLOC_STEP) * sizeof(wxHtmlContentsItem));
@@ -367,12 +367,12 @@ bool wxHtmlHelpData::AddBookParam(const wxString& title, const wxString& contfil
 
     // Try to find cached binary versions:
     safetitle = SafeFileName(title);
-    fi = fsys.OpenFile(safetitle + ".cached");
+    fi = fsys.OpenFile(safetitle + wxT(".cached"));
-    if (fi == NULL) fi = fsys.OpenFile(m_TempPath + safetitle + ".cached");
+    if (fi == NULL) fi = fsys.OpenFile(m_TempPath + safetitle + wxT(".cached"));
     if ((fi == NULL) || (m_TempPath == wxEmptyString)) {
         LoadMSProject(bookr, fsys, indexfile, contfile);
         if (m_TempPath != wxEmptyString) {
-            wxFileOutputStream *outs = new wxFileOutputStream(m_TempPath + safetitle + ".cached");
+            wxFileOutputStream *outs = new wxFileOutputStream(m_TempPath + safetitle + wxT(".cached"));
             SaveCachedBook(bookr, outs);
             delete outs;
         }
@@ -393,6 +393,27 @@ bool wxHtmlHelpData::AddBookParam(const wxString& title, const wxString& contfil
 
 
 bool wxHtmlHelpData::AddBook(const wxString& book)
+{
+    if (book.Right(4).Lower() == wxT(".zip") ||
+        book.Right(4).Lower() == wxT(".htb") /*html book*/) 
+
+    {
+        wxFileSystem fsys;
+        wxString s;
+        bool rt = FALSE;
+
+        s = fsys.FindFirst(book + wxT("#zip:") + wxT("*.hhp"), wxFILE);
+        while (!s.IsEmpty()) 
+        {
+            if (AddBook(s)) rt = TRUE;
+            s = fsys.FindNext();
+        }
+        
+        return rt;
+    }
+
+
+    else 
     {       
         wxFSFile *fi;
         wxFileSystem fsys;
@@ -438,6 +459,7 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
 
         return AddBookParam(title, contents, index, start, fsys.GetPath());
     }
+}
 
 wxString wxHtmlHelpData::FindPageByName(const wxString& x)
 {

src/html/helpfrm.cpp

@@ -96,7 +96,7 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
         m_DataCreated = TRUE;
     }
 
-    m_ContentsImageList = new wxImageList(12, 12);
+    m_ContentsImageList = new wxImageList(16, 16);
     m_ContentsImageList -> Add(wxICON(book));
     m_ContentsImageList -> Add(wxICON(folder));
     m_ContentsImageList -> Add(wxICON(page));
@@ -137,7 +137,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
     if (m_Config)
         ReadCustomization(m_Config, m_ConfigRoot);
 
-    wxFrame::Create(parent, id, "", wxPoint(m_Cfg.x, m_Cfg.y), wxSize(m_Cfg.w, m_Cfg.h));
+    wxFrame::Create(parent, id, _("Help"), wxPoint(m_Cfg.x, m_Cfg.y), wxSize(m_Cfg.w, m_Cfg.h));
 
     int notebook_page = 0;
 
@@ -279,6 +279,10 @@ toolBarBitmaps[0] = new wxBitmap(panel_xpm);
         m_Splitter -> SetMinimumPaneSize(20);
         if (m_Cfg.navig_on)
             m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
+        else {
+            m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
+            m_Splitter -> Unsplit();
+        }
     }
     m_HtmlWin -> Show(TRUE);
     return TRUE;
@@ -574,10 +578,12 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
             if (m_Splitter -> IsSplit()) {
                 m_Cfg.sashpos = m_Splitter -> GetSashPosition();
                 m_Splitter -> Unsplit(m_NavigPan);
+                m_Cfg.navig_on = FALSE;
             } else {
                 m_NavigPan -> Show(TRUE);
                 m_HtmlWin -> Show(TRUE);
                 m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
+                m_Cfg.navig_on = TRUE;
             }
             break;
     }
@@ -618,8 +624,13 @@ void wxHtmlHelpFrame::OnSearch(wxCommandEvent& WXUNUSED(event))
 
 void wxHtmlHelpFrame::OnCloseWindow(wxCloseEvent& evt)
 {
+    GetSize(&m_Cfg.w, &m_Cfg.h);
+    GetPosition(&m_Cfg.x, &m_Cfg.y);
+    if (m_Splitter && m_Cfg.navig_on) m_Cfg.sashpos = m_Splitter -> GetSashPosition();
+
     if (m_Config)
         WriteCustomization(m_Config, m_ConfigRoot);
+
     evt.Skip();
 }