usleep() prototype added for solaris

[wxWidgets.git] / src / html / helpfrm.cpp

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index d99173552de0c4646469ac9dc1bcd02d0c53574b..614eea26417d8b78fbbf4b00414e6c4641bc9e39 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -13,7 +13,8 @@
 #pragma implementation
 #endif
 
-// For compilers that support precompilation, includes "wx.h".
+// For compilers that support precompilation, includes "wx.h"
+
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
@@ -23,9 +24,8 @@
 #include "wx/defs.h"
 
 #if wxUSE_HTML
-
 #ifndef WXPRECOMP
-#include <wx/wx.h>
+#include "wx/wx.h"
 #endif
 
 #include "wx/html/helpfrm.h"
@@ -37,6 +37,7 @@
 #include "wx/html/htmlwin.h"
 #include "wx/busyinfo.h"
 #include "wx/progdlg.h"
+#include "wx/toolbar.h"
 
 // Bitmaps:
 
@@ -47,6 +48,8 @@
 #include "bitmaps/book.xpm"
 #include "bitmaps/folder.xpm"
 #include "bitmaps/page.xpm"
+#include "bitmaps/help.xpm"
+#include "bitmaps/helproot.xpm"
 #endif
 
 #include "wx/stream.h"
@@ -95,10 +98,11 @@ 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));
+    m_ContentsImageList -> Add(wxICON(helproot));
 
     m_ContentsBox = NULL;
     m_IndexBox = NULL;
@@ -136,7 +140,19 @@ 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));
+
+#if defined(__WXMSW__) || (__WXPM__)
+    wxIcon frameIcon("wxhelp", wxBITMAP_TYPE_ICO_RESOURCE, 32, 32);
+#else
+    wxIcon frameIcon(help_xpm);
+#endif
+    if (frameIcon.Ok())
+        SetIcon(frameIcon);
+
+    GetPosition(&m_Cfg.x, &m_Cfg.y);
+
+    SetIcon(wxICON(help));
 
     int notebook_page = 0;
 
@@ -149,13 +165,13 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
         toolBar -> SetMargins(2, 2);
         wxBitmap* toolBarBitmaps[3];
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || (__WXPM__)
         toolBarBitmaps[0] = new wxBitmap("panel");
         toolBarBitmaps[1] = new wxBitmap("back");
         toolBarBitmaps[2] = new wxBitmap("forward");
         int width = 24;
 #else
-toolBarBitmaps[0] = new wxBitmap(panel_xpm);
+        toolBarBitmaps[0] = new wxBitmap(panel_xpm);
         toolBarBitmaps[1] = new wxBitmap(back_xpm);
         toolBarBitmaps[2] = new wxBitmap(forward_xpm);
         int width = 16;
@@ -269,17 +285,22 @@ toolBarBitmaps[0] = new wxBitmap(panel_xpm);
         m_NavigPan -> AddPage(dummy, _("Search"));
         m_SearchPage = notebook_page++;
     }
+    m_HtmlWin -> Show(TRUE);
 
     //RefreshLists();
 
     // showtime
     if (m_NavigPan && m_Splitter) {
-        m_NavigPan -> Show(TRUE);
         m_Splitter -> SetMinimumPaneSize(20);
-        if (m_Cfg.navig_on)
+        if (m_Cfg.navig_on) {
+            m_NavigPan -> Show(TRUE);
             m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
+        }
+        else {
+            m_NavigPan -> Show(FALSE);
+            m_Splitter -> Initialize(m_HtmlWin);
+        }
     }
-    m_HtmlWin -> Show(TRUE);
     return TRUE;
 }
 
@@ -320,6 +341,7 @@ bool wxHtmlHelpFrame::DisplayContents()
         m_NavigPan -> Show(TRUE);
         m_HtmlWin -> Show(TRUE);
         m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
+        m_Cfg.navig_on = TRUE;
     }
     m_NavigPan -> SetSelection(0);
     return TRUE;
@@ -417,6 +439,8 @@ void wxHtmlHelpFrame::CreateContents(bool show_progress)
 
     m_ContentsBox -> DeleteAllItems();
     roots[0] = m_ContentsBox -> AddRoot(_("(Help)"));
+    m_ContentsBox -> SetItemImage(roots[0], IMG_RootFolder);
+    m_ContentsBox -> SetItemSelectedImage(roots[0], IMG_RootFolder);
     imaged[0] = TRUE;
 
     for (i = 0; i < cnt; i++, it++) {
@@ -573,10 +597,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;
     }
@@ -597,7 +623,7 @@ void wxHtmlHelpFrame::OnContentsSel(wxTreeEvent& event)
 void wxHtmlHelpFrame::OnIndexSel(wxCommandEvent& WXUNUSED(event))
 {
     wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_IndexBox -> GetClientData(m_IndexBox -> GetSelection());
-    if (it) m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
+    m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
 }
 
 
@@ -617,8 +643,14 @@ 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();
 }