Add wxActivateEvent::GetActivationReason().

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

diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp
index 1a4b60cc7e3317466599bcf61cfb72c17eee7da7..c208c756d6c3bf040bc0118694b2adcbf6b941ba 100644 (file)
--- a/src/html/helpwnd.cpp
+++ b/src/html/helpwnd.cpp
@@ -4,7 +4,6 @@
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik
 // Author:      Harm van der Heijden and Vaclav Slavik
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik
 // Author:      Harm van der Heijden and Vaclav Slavik

-// RCS-ID:      $Id$

 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -60,6 +59,11 @@
 // what is considered "small index"?
 #define INDEX_IS_SMALL 1000
 
 // what is considered "small index"?
 #define INDEX_IS_SMALL 1000
 

+// minimum width for content tree and index
+// (we cannot let minimum size be determined from content, else long titles
+//  make the help frame unusable)
+const wxCoord CONTENT_TREE_INDEX_MIN_WIDTH = 150;
+

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


@@ -115,15 +119,13 @@ public:
         SetStandardFonts();
     }
 
         SetStandardFonts();
     }
 

-    void OnLink(wxHtmlLinkEvent& ev)
+    virtual bool LoadPage(const wxString& location)

     {
     {

-        const wxMouseEvent *e = ev.GetLinkInfo().GetEvent();
-        if (e == NULL || e->LeftUp())
-            m_Window->NotifyPageChanged();
+        if ( !wxHtmlWindow::LoadPage(location) )
+            return false;

 
 

-        // skip the event so that normal processing (i.e. following the link)
-        // is done:
-        ev.Skip();
+        m_Window->NotifyPageChanged();
+        return true;

     }
 
     // Returns full location with anchor (helper)
     }
 
     // Returns full location with anchor (helper)


@@ -145,13 +147,8 @@ private:
     wxHtmlHelpWindow *m_Window;
 
     wxDECLARE_NO_COPY_CLASS(wxHtmlHelpHtmlWindow);
     wxHtmlHelpWindow *m_Window;
 
     wxDECLARE_NO_COPY_CLASS(wxHtmlHelpHtmlWindow);

-    DECLARE_EVENT_TABLE()

 };
 
 };
 

-BEGIN_EVENT_TABLE(wxHtmlHelpHtmlWindow, wxHtmlWindow)
-    EVT_HTML_LINK_CLICKED(wxID_ANY, wxHtmlHelpHtmlWindow::OnLink)
-END_EVENT_TABLE()
-

 
 //---------------------------------------------------------------------------
 // wxHtmlHelpWindow::m_mergedIndex
 
 //---------------------------------------------------------------------------
 // wxHtmlHelpWindow::m_mergedIndex


@@ -357,8 +354,7 @@ bool wxHtmlHelpWindow::Create(wxWindow* parent, wxWindowID id,
     wxSizer *navigSizer = NULL;
 
 #ifdef __WXMSW__
     wxSizer *navigSizer = NULL;
 
 #ifdef __WXMSW__

-    wxBorder htmlWindowBorder = GetDefaultBorder();
-    htmlWindowBorder = wxBORDER_THEME;
+    wxBorder htmlWindowBorder = wxBORDER_THEME;

 #else
     wxBorder htmlWindowBorder = wxBORDER_SUNKEN;
 #endif
 #else
     wxBorder htmlWindowBorder = wxBORDER_SUNKEN;
 #endif


@@ -370,6 +366,7 @@ bool wxHtmlHelpWindow::Create(wxWindow* parent, wxWindowID id,
         long splitterStyle = wxSP_3D;
         // Drawing moving sash can cause problems on wxMac
 #ifdef __WXMAC__
         long splitterStyle = wxSP_3D;
         // Drawing moving sash can cause problems on wxMac
 #ifdef __WXMAC__

+        splitterStyle = 0; // 3D style looks poor on Mac

         splitterStyle |= wxSP_LIVE_UPDATE;
 #endif
         m_Splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, splitterStyle);
         splitterStyle |= wxSP_LIVE_UPDATE;
 #endif
         m_Splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, splitterStyle);


@@ -711,7 +708,6 @@ bool wxHtmlHelpWindow::Display(const wxString& x)
     if (!url.empty())
     {
         m_HtmlWin->LoadPage(url);
     if (!url.empty())
     {
         m_HtmlWin->LoadPage(url);

-        NotifyPageChanged();

         return true;
     }
 
         return true;
     }
 


@@ -724,7 +720,6 @@ bool wxHtmlHelpWindow::Display(const int id)
     if (!url.empty())
     {
         m_HtmlWin->LoadPage(url);
     if (!url.empty())
     {
         m_HtmlWin->LoadPage(url);

-        NotifyPageChanged();

         return true;
     }
 
         return true;
     }
 


@@ -787,7 +782,6 @@ void wxHtmlHelpWindow::DisplayIndexItem(const wxHtmlHelpMergedIndexItem *it)
         if (!it->items[0]->page.empty())
         {
             m_HtmlWin->LoadPage(it->items[0]->GetFullPath());
         if (!it->items[0]->page.empty())
         {
             m_HtmlWin->LoadPage(it->items[0]->GetFullPath());

-            NotifyPageChanged();

         }
     }
     else
         }
     }
     else


@@ -824,7 +818,6 @@ void wxHtmlHelpWindow::DisplayIndexItem(const wxHtmlHelpMergedIndexItem *it)
         if (dlg.ShowModal() == wxID_OK)
         {
             m_HtmlWin->LoadPage(it->items[dlg.GetSelection()]->GetFullPath());
         if (dlg.ShowModal() == wxID_OK)
         {
             m_HtmlWin->LoadPage(it->items[dlg.GetSelection()]->GetFullPath());

-            NotifyPageChanged();

         }
     }
 }
         }
     }
 }


@@ -933,7 +926,6 @@ bool wxHtmlHelpWindow::KeywordSearch(const wxString& keyword,
                 if (it)
                 {
                     m_HtmlWin->LoadPage(it->GetFullPath());
                 if (it)
                 {
                     m_HtmlWin->LoadPage(it->GetFullPath());

-                    NotifyPageChanged();

                 }
                 break;
             }
                 }
                 break;
             }


@@ -1033,6 +1025,9 @@ void wxHtmlHelpWindow::CreateContents()
             imaged[it->level] = true;
         }
     }
             imaged[it->level] = true;
         }
     }

+
+    m_ContentsBox->SetMinSize(wxSize(CONTENT_TREE_INDEX_MIN_WIDTH,
+                                     m_ContentsBox->GetMinHeight()));

 }
 
 void wxHtmlHelpWindow::CreateIndex()
 }
 
 void wxHtmlHelpWindow::CreateIndex()


@@ -1056,6 +1051,9 @@ void wxHtmlHelpWindow::CreateIndex()
     for (size_t i = 0; i < cnt; i++)
         m_IndexList->Append((*m_mergedIndex)[i].name,
                             (char*)(&(*m_mergedIndex)[i]));
     for (size_t i = 0; i < cnt; i++)
         m_IndexList->Append((*m_mergedIndex)[i].name,
                             (char*)(&(*m_mergedIndex)[i]));

+
+    m_IndexList->SetMinSize(wxSize(CONTENT_TREE_INDEX_MIN_WIDTH,
+                                   m_IndexList->GetMinHeight()));

 }
 
 void wxHtmlHelpWindow::CreateSearch()
 }
 
 void wxHtmlHelpWindow::CreateSearch()


@@ -1395,12 +1393,10 @@ void wxHtmlHelpWindow::OnToolbar(wxCommandEvent& event)
     {
         case wxID_HTML_BACK :
             m_HtmlWin->HistoryBack();
     {
         case wxID_HTML_BACK :
             m_HtmlWin->HistoryBack();

-            NotifyPageChanged();

             break;
 
         case wxID_HTML_FORWARD :
             m_HtmlWin->HistoryForward();
             break;
 
         case wxID_HTML_FORWARD :
             m_HtmlWin->HistoryForward();

-            NotifyPageChanged();

             break;
 
         case wxID_HTML_UP :
             break;
 
         case wxID_HTML_UP :


@@ -1416,7 +1412,6 @@ void wxHtmlHelpWindow::OnToolbar(wxCommandEvent& event)
                     if (!it.page.empty())
                     {
                         m_HtmlWin->LoadPage(it.GetFullPath());
                     if (!it.page.empty())
                     {
                         m_HtmlWin->LoadPage(it.GetFullPath());

-                        NotifyPageChanged();

                     }
                 }
             }
                     }
                 }
             }


@@ -1445,10 +1440,7 @@ void wxHtmlHelpWindow::OnToolbar(wxCommandEvent& event)
                     if (ind >= 0)
                     {
                         if (!it->page.empty())
                     if (ind >= 0)
                     {
                         if (!it->page.empty())

-                        {

                             m_HtmlWin->LoadPage(it->GetFullPath());
                             m_HtmlWin->LoadPage(it->GetFullPath());

-                            NotifyPageChanged();
-                        }

                     }
                 }
             }
                     }
                 }
             }


@@ -1470,10 +1462,7 @@ void wxHtmlHelpWindow::OnToolbar(wxCommandEvent& event)
                     while (contents[idx].GetFullPath() == page) idx++;
 
                     if (!contents[idx].page.empty())
                     while (contents[idx].GetFullPath() == page) idx++;
 
                     if (!contents[idx].page.empty())

-                    {

                         m_HtmlWin->LoadPage(contents[idx].GetFullPath());
                         m_HtmlWin->LoadPage(contents[idx].GetFullPath());

-                        NotifyPageChanged();
-                    }

                 }
             }
             break;
                 }
             }
             break;


@@ -1738,7 +1727,6 @@ void wxHtmlHelpWindow::OnSearchSel(wxCommandEvent& WXUNUSED(event))
     {
         if (!it->page.empty())
             m_HtmlWin->LoadPage(it->GetFullPath());
     {
         if (!it->page.empty())
             m_HtmlWin->LoadPage(it->GetFullPath());

-        NotifyPageChanged();

     }
 }
 
     }
 }
 


@@ -1757,7 +1745,6 @@ void wxHtmlHelpWindow::OnBookmarksSel(wxCommandEvent& WXUNUSED(event))
     if (!str.empty() && str != _("(bookmarks)") && idx != wxNOT_FOUND)
     {
        m_HtmlWin->LoadPage(m_BookmarksPages[(size_t)idx]);
     if (!str.empty() && str != _("(bookmarks)") && idx != wxNOT_FOUND)
     {
        m_HtmlWin->LoadPage(m_BookmarksPages[(size_t)idx]);

-       NotifyPageChanged();

     }
 }
 
     }
 }