merged MapBitmap() from 2.2 branch

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

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 504dd005bda50ed3301c77dd5b9991decd96466a..78ca55abb0251f3c9aeb855391e015032e8d9836 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -21,12 +21,20 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include "wx/defs.h"
+#if wxUSE_WXHTML_HELP

 
 

-#if wxUSE_HTML && wxUSE_STREAMS

 #ifndef WXPRECOMP
 #ifndef WXPRECOMP

-#include "wx/wx.h"
-#endif
+    #include "wx/intl.h"
+    #include "wx/log.h"
+
+    #include "wx/object.h"
+    #include "wx/layout.h"
+    #include "wx/sizer.h"
+
+    #include "wx/bmpbuttn.h"
+    #include "wx/statbox.h"
+    #include "wx/radiobox.h"
+#endif // WXPRECOMP

 
 #include "wx/html/helpfrm.h"
 #include "wx/html/helpctrl.h"
 
 #include "wx/html/helpfrm.h"
 #include "wx/html/helpctrl.h"


@@ -68,6 +76,10 @@
 // what is considered "small index"?
 #define INDEX_IS_SMALL 100
 
 // what is considered "small index"?
 #define INDEX_IS_SMALL 100
 

+/* Motif defines this as a macro */
+#ifdef Below
+#undef Below
+#endif

 
 //--------------------------------------------------------------------------
 // wxHtmlHelpTreeItemData (private)
 
 //--------------------------------------------------------------------------
 // wxHtmlHelpTreeItemData (private)


@@ -230,7 +242,7 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
 // moreover, if no contents, index or searchpage is needed, m_Splitter and
 // m_NavigPan will be NULL too (with m_HtmlWin directly connected to the frame)
 
 // moreover, if no contents, index or searchpage is needed, m_Splitter and
 // m_NavigPan will be NULL too (with m_HtmlWin directly connected to the frame)
 

-bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, 
+bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,

                              const wxString& WXUNUSED(title), int style)
 {
     m_hfStyle = style;
                              const wxString& WXUNUSED(title), int style)
 {
     m_hfStyle = style;


@@ -293,7 +305,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
         wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_INDEXPAGE);
 
         if (style & wxHF_BOOKMARKS)
         wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_INDEXPAGE);
 
         if (style & wxHF_BOOKMARKS)

-           {
+        {

             wxLayoutConstraints *b1 = new wxLayoutConstraints;
             wxBitmapButton *bmpbt = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSREMOVE, wxBITMAP(wbkdel), wxDefaultPosition, wxSize(20,20));
 
             wxLayoutConstraints *b1 = new wxLayoutConstraints;
             wxBitmapButton *bmpbt = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSREMOVE, wxBITMAP(wbkdel), wxDefaultPosition, wxSize(20,20));
 


@@ -335,7 +347,11 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
             wxLayoutConstraints *b4 = new wxLayoutConstraints;
             m_ContentsBox = new wxTreeCtrl(dummy, wxID_HTML_TREECTRL,
                                            wxDefaultPosition, wxDefaultSize,
             wxLayoutConstraints *b4 = new wxLayoutConstraints;
             m_ContentsBox = new wxTreeCtrl(dummy, wxID_HTML_TREECTRL,
                                            wxDefaultPosition, wxDefaultSize,

-                                           wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
+#ifdef __WXMAC__
+       wxSUNKEN_BORDER|wxTR_MAC_BUTTONS|wxTR_NO_LINES|wxTR_ROW_LINES );
+#else
+       wxSUNKEN_BORDER|wxTR_HAS_BUTTONS );
+#endif

             m_ContentsBox->AssignImageList(ContentsImageList);
 
             b4->top.Below (m_Bookmarks, 10);
             m_ContentsBox->AssignImageList(ContentsImageList);
 
             b4->top.Below (m_Bookmarks, 10);


@@ -494,18 +510,18 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
         if (m_Cfg.navig_on)
             m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
         else
         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_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
             m_Splitter->Unsplit();
         }
 

-           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(TRUE);
             m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
         }
         else

-           {
+        {

             m_NavigPan->Show(FALSE);
             m_Splitter->Initialize(m_HtmlWin);
         }
             m_NavigPan->Show(FALSE);
             m_Splitter->Initialize(m_HtmlWin);
         }


@@ -705,7 +721,7 @@ bool wxHtmlHelpFrame::KeywordSearch(const wxString& keyword)
         if (curi % 32 == 0 && progress.Update(curi) == FALSE)
             break;
         if (status.Search())
         if (curi % 32 == 0 && progress.Update(curi) == FALSE)
             break;
         if (status.Search())

-           {
+        {

             foundstr.Printf(_("Found %i matches"), ++foundcnt);
             progress.Update(status.GetCurIndex(), foundstr);
             m_SearchList->Append(status.GetName(), status.GetContentsItem());
             foundstr.Printf(_("Found %i matches"), ++foundcnt);
             progress.Update(status.GetCurIndex(), foundstr);
             m_SearchList->Append(status.GetName(), status.GetContentsItem());


@@ -752,9 +768,9 @@ void wxHtmlHelpFrame::CreateContents()
     //     We set the icon later: when we find an item with level=n, we know
     //     that the last item with level=n-1 was folder with subitems, so we
     //     set its icon accordingly
     //     We set the icon later: when we find an item with level=n, we know
     //     that the last item with level=n-1 was folder with subitems, so we
     //     set its icon accordingly

-    bool imaged[MAX_ROOTS]; 
+    bool imaged[MAX_ROOTS];

     m_ContentsBox->DeleteAllItems();
     m_ContentsBox->DeleteAllItems();

-    
+

     // Don't show (Help) root if there's only one boook
     if (booksCnt > 1)
     {
     // Don't show (Help) root if there's only one boook
     if (booksCnt > 1)
     {


@@ -773,8 +789,10 @@ void wxHtmlHelpFrame::CreateContents()
             if (booksCnt == 1)
             {
                 roots[0] = roots[1] = m_ContentsBox->AddRoot(
             if (booksCnt == 1)
             {
                 roots[0] = roots[1] = m_ContentsBox->AddRoot(

-                                         it->m_Name, IMG_Page, -1,
+                                         it->m_Name, IMG_Book, -1,

                                          new wxHtmlHelpTreeItemData(i));
                                          new wxHtmlHelpTreeItemData(i));

+                imaged[0] = imaged[1] = TRUE;
+                m_ContentsBox->SetItemBold(roots[1], TRUE);

             }
             // multiple books:
             else
             }
             // multiple books:
             else


@@ -789,7 +807,7 @@ void wxHtmlHelpFrame::CreateContents()
                 else
                 {
                     roots[1] = m_ContentsBox->AppendItem(roots[0],
                 else
                 {
                     roots[1] = m_ContentsBox->AppendItem(roots[0],

-                                             it->m_Name, IMG_Book, -1, 
+                                             it->m_Name, IMG_Book, -1,

                                              new wxHtmlHelpTreeItemData(i));
                     m_ContentsBox->SetItemBold(roots[1], TRUE);
                 }
                                              new wxHtmlHelpTreeItemData(i));
                     m_ContentsBox->SetItemBold(roots[1], TRUE);
                 }


@@ -797,12 +815,12 @@ void wxHtmlHelpFrame::CreateContents()
             }
         }
         // ...and their contents:
             }
         }
         // ...and their contents:

-        else 
+        else

         {
             roots[it->m_Level + 1] = m_ContentsBox->AppendItem(
         {
             roots[it->m_Level + 1] = m_ContentsBox->AppendItem(

-                                     roots[it->m_Level], it->m_Name, IMG_Page, 
+                                     roots[it->m_Level], it->m_Name, IMG_Page,

                                      -1, new wxHtmlHelpTreeItemData(i));
                                      -1, new wxHtmlHelpTreeItemData(i));

-               imaged[it->m_Level + 1] = FALSE;
+            imaged[it->m_Level + 1] = FALSE;

         }
 
         m_PagesHash->Put(it->GetFullPath(),
         }
 
         m_PagesHash->Put(it->GetFullPath(),


@@ -811,7 +829,7 @@ void wxHtmlHelpFrame::CreateContents()
         // Set the icon for the node one level up in the hiearachy,
         // unless already done (see comment above imaged[] declaration)
         if (!imaged[it->m_Level])
         // Set the icon for the node one level up in the hiearachy,
         // unless already done (see comment above imaged[] declaration)
         if (!imaged[it->m_Level])

-           {
+        {

             int image = IMG_Folder;
             if (m_hfStyle & wxHF_ICONS_BOOK)
                 image = IMG_Book;
             int image = IMG_Folder;
             if (m_hfStyle & wxHF_ICONS_BOOK)
                 image = IMG_Book;


@@ -899,17 +917,17 @@ void wxHtmlHelpFrame::ReadCustomization(wxConfigBase *cfg, const wxString& path)
 
         cnt = cfg->Read(wxT("hcBookmarksCnt"), 0L);
         if (cnt != 0)
 
         cnt = cfg->Read(wxT("hcBookmarksCnt"), 0L);
         if (cnt != 0)

-           {
+        {

             m_BookmarksNames.Clear();
             m_BookmarksPages.Clear();
             if (m_Bookmarks)
             m_BookmarksNames.Clear();
             m_BookmarksPages.Clear();
             if (m_Bookmarks)

-               {
+            {

                 m_Bookmarks->Clear();
                 m_Bookmarks->Append(_("(bookmarks)"));
             }
 
             for (i = 0; i < cnt; i++)
                 m_Bookmarks->Clear();
                 m_Bookmarks->Append(_("(bookmarks)"));
             }
 
             for (i = 0; i < cnt; i++)

-               {
+            {

                 val.Printf(wxT("hcBookmark_%i"), i);
                 s = cfg->Read(val);
                 m_BookmarksNames.Add(s);
                 val.Printf(wxT("hcBookmark_%i"), i);
                 s = cfg->Read(val);
                 m_BookmarksNames.Add(s);


@@ -957,7 +975,7 @@ void wxHtmlHelpFrame::WriteCustomization(wxConfigBase *cfg, const wxString& path
 
         cfg->Write(wxT("hcBookmarksCnt"), (long)cnt);
         for (i = 0; i < cnt; i++)
 
         cfg->Write(wxT("hcBookmarksCnt"), (long)cnt);
         for (i = 0; i < cnt; i++)

-           {
+        {

             val.Printf(wxT("hcBookmark_%i"), i);
             cfg->Write(val, m_BookmarksNames[i]);
             val.Printf(wxT("hcBookmark_%i_url"), i);
             val.Printf(wxT("hcBookmark_%i"), i);
             cfg->Write(val, m_BookmarksNames[i]);
             val.Printf(wxT("hcBookmark_%i_url"), i);


@@ -1260,13 +1278,13 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
                 if (! (m_Splitter && m_NavigPan))
                     return ;
                 if (m_Splitter->IsSplit())
                 if (! (m_Splitter && m_NavigPan))
                     return ;
                 if (m_Splitter->IsSplit())

-                       {
+                {

                     m_Cfg.sashpos = m_Splitter->GetSashPosition();
                     m_Splitter->Unsplit(m_NavigPan);
                     m_Cfg.navig_on = FALSE;
                 }
                     m_Cfg.sashpos = m_Splitter->GetSashPosition();
                     m_Splitter->Unsplit(m_NavigPan);
                     m_Cfg.navig_on = FALSE;
                 }

-                       else
-                       {
+                else
+                {

                     m_NavigPan->Show(TRUE);
                     m_HtmlWin->Show(TRUE);
                     m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
                     m_NavigPan->Show(TRUE);
                     m_HtmlWin->Show(TRUE);
                     m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);


@@ -1287,9 +1305,9 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
                 item = m_HtmlWin->GetOpenedPageTitle();
                 url = m_HtmlWin->GetOpenedPage();
                 if (item == wxEmptyString)
                 item = m_HtmlWin->GetOpenedPageTitle();
                 url = m_HtmlWin->GetOpenedPage();
                 if (item == wxEmptyString)

-                           item = url.AfterLast(wxT('/'));
+                    item = url.AfterLast(wxT('/'));

                 if (m_BookmarksPages.Index(url) == wxNOT_FOUND)
                 if (m_BookmarksPages.Index(url) == wxNOT_FOUND)

-                       {
+                {

                     m_Bookmarks->Append(item);
                     m_BookmarksNames.Add(item);
                     m_BookmarksPages.Add(url);
                     m_Bookmarks->Append(item);
                     m_BookmarksNames.Add(item);
                     m_BookmarksPages.Add(url);


@@ -1305,7 +1323,7 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
                 item = m_Bookmarks->GetStringSelection();
                 pos = m_BookmarksNames.Index(item);
                 if (pos != wxNOT_FOUND)
                 item = m_Bookmarks->GetStringSelection();
                 pos = m_BookmarksNames.Index(item);
                 if (pos != wxNOT_FOUND)

-                       {
+                {

                     m_BookmarksNames.Remove(pos);
                     m_BookmarksPages.Remove(pos);
                     m_Bookmarks->Delete(m_Bookmarks->GetSelection());
                     m_BookmarksNames.Remove(pos);
                     m_BookmarksPages.Remove(pos);
                     m_Bookmarks->Delete(m_Bookmarks->GetSelection());


@@ -1400,7 +1418,7 @@ void wxHtmlHelpFrame::OnIndexFind(wxCommandEvent& event)
         wxBusyCursor bcur;
         const wxChar *cstr = sr.c_str();
         wxChar mybuff[512];
         wxBusyCursor bcur;
         const wxChar *cstr = sr.c_str();
         wxChar mybuff[512];

-               wxChar *ptr;
+        wxChar *ptr;

         bool first = TRUE;
 
         m_IndexList->Clear();
         bool first = TRUE;
 
         m_IndexList->Clear();


@@ -1416,11 +1434,11 @@ void wxHtmlHelpFrame::OnIndexFind(wxCommandEvent& event)
                 if (*ptr >= _T('A') && *ptr <= _T('Z'))
                     *ptr -= (wxChar)(_T('A') - _T('a'));
             if (wxStrstr(mybuff, cstr) != NULL)
                 if (*ptr >= _T('A') && *ptr <= _T('Z'))
                     *ptr -= (wxChar)(_T('A') - _T('a'));
             if (wxStrstr(mybuff, cstr) != NULL)

-               {
+            {

                 m_IndexList->Append(index[i].m_Name, (char*)(index + i));
                 displ++;
                 if (first)
                 m_IndexList->Append(index[i].m_Name, (char*)(index + i));
                 displ++;
                 if (first)

-                       {
+                {

                     if (index[i].m_Page[0] != 0)
                         m_HtmlWin->LoadPage(index[i].GetFullPath());
                     NotifyPageChanged();
                     if (index[i].m_Page[0] != 0)
                         m_HtmlWin->LoadPage(index[i].GetFullPath());
                     NotifyPageChanged();


@@ -1451,7 +1469,7 @@ void wxHtmlHelpFrame::OnIndexAll(wxCommandEvent& WXUNUSED(event))
     {
         m_IndexList->Append(index[i].m_Name, (char*)(index + i));
         if (first)
     {
         m_IndexList->Append(index[i].m_Name, (char*)(index + i));
         if (first)

-           {
+        {

             if (index[i].m_Page[0] != 0)
                 m_HtmlWin->LoadPage(index[i].GetFullPath());
             NotifyPageChanged();
             if (index[i].m_Page[0] != 0)
                 m_HtmlWin->LoadPage(index[i].GetFullPath());
             NotifyPageChanged();


@@ -1528,4 +1546,5 @@ BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
     EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
     EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow)
 END_EVENT_TABLE()
 

-#endif
+#endif // wxUSE_WXHTML_HELP
+