fixed handling of the accelerators of menu items added to already attached submenus

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

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 9f53a7fb625bfd0f4a6f34f7a920de38d0d2be2f..e1eac661fcd2bfb96d71409b71d96364db06d05a 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -281,7 +281,7 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
     m_Config = NULL;
     m_ConfigRoot = wxEmptyString;
 
     m_Config = NULL;
     m_ConfigRoot = wxEmptyString;
 

-    m_Cfg.x = m_Cfg.y = 0;
+    m_Cfg.x = m_Cfg.y = -1;

     m_Cfg.w = 700;
     m_Cfg.h = 480;
     m_Cfg.sashpos = 240;
     m_Cfg.w = 700;
     m_Cfg.h = 480;
     m_Cfg.sashpos = 240;


@@ -965,10 +965,10 @@ void wxHtmlHelpFrame::CreateContents()
     const int MAX_ROOTS = 64;
     wxTreeItemId roots[MAX_ROOTS];
     // VS: this array holds information about whether we've set item icon at
     const int MAX_ROOTS = 64;
     wxTreeItemId roots[MAX_ROOTS];
     // VS: this array holds information about whether we've set item icon at

-    //     given level. This is neccessary because m_Data has flat structure
+    //     given level. This is necessary because m_Data has a flat structure

     //     and there's no way of recognizing if some item has subitems or not.
     //     We set the icon later: when we find an item with level=n, we know
     //     and there's no way of recognizing if some item has subitems or not.
     //     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
+    //     that the last item with level=n-1 was afolder with subitems, so we

     //     set its icon accordingly
     bool imaged[MAX_ROOTS];
     m_ContentsBox->DeleteAllItems();
     //     set its icon accordingly
     bool imaged[MAX_ROOTS];
     m_ContentsBox->DeleteAllItems();


@@ -984,9 +984,9 @@ void wxHtmlHelpFrame::CreateContents()
         {
             if (m_hfStyle & wxHF_MERGE_BOOKS)
                 // VS: we don't want book nodes, books' content should
         {
             if (m_hfStyle & wxHF_MERGE_BOOKS)
                 // VS: we don't want book nodes, books' content should

-                //    appear under tree's root. This line will create "fake"
+                //    appear under tree's root. This line will create a "fake"

                 //    record about book node so that the rest of this look
                 //    record about book node so that the rest of this look

-                //    will believe there really _is_ book node and will
+                //    will believe there really _is_ a book node and will

                 //    behave correctly.
                 roots[1] = roots[0];
             else
                 //    behave correctly.
                 roots[1] = roots[0];
             else


@@ -1010,7 +1010,7 @@ void wxHtmlHelpFrame::CreateContents()
         m_PagesHash->Put(it->GetFullPath(),
                          new wxHtmlHelpHashData(i, roots[it->level + 1]));
 
         m_PagesHash->Put(it->GetFullPath(),
                          new wxHtmlHelpHashData(i, roots[it->level + 1]));
 

-        // Set the icon for the node one level up in the hiearachy,
+        // Set the icon for the node one level up in the hierarchy,

         // unless already done (see comment above imaged[] declaration)
         if (!imaged[it->level])
         {
         // unless already done (see comment above imaged[] declaration)
         if (!imaged[it->level])
         {