Make InheritAttributes and ShouldInheritColours public so they can be

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

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 488c31c45bdc44e1c443d5396e80f06a5f3c6cbf..4acfbb904378936457529522e454cdf8942f1519 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -273,8 +273,8 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
     wxMenu* helpMenu = new wxMenu;
     helpMenu->Append(wxID_ABOUT, _("&About..."));
 
     wxMenu* helpMenu = new wxMenu;
     helpMenu->Append(wxID_ABOUT, _("&About..."));
 

-    menuBar->Append(fileMenu,_("File"));
-    menuBar->Append(helpMenu,_("Help"));
+    menuBar->Append(fileMenu,_("&File"));
+    menuBar->Append(helpMenu,_("&Help"));

     SetMenuBar(menuBar);
 #endif
 
     SetMenuBar(menuBar);
 #endif
 


@@ -376,7 +376,9 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
 
         m_ContentsBox->AssignImageList(ContentsImageList);
         
 
         m_ContentsBox->AssignImageList(ContentsImageList);
         

-        topsizer->Add(m_ContentsBox, 1, wxEXPAND | wxLEFT | wxBOTTOM | wxRIGHT, 2);
+        topsizer->Add(m_ContentsBox, 1,
+                      wxEXPAND | wxLEFT | wxBOTTOM | wxRIGHT,
+                      2);

 
         m_NavigNotebook->AddPage(dummy, _("Contents"));
         m_ContentsPage = notebook_page++;
 
         m_NavigNotebook->AddPage(dummy, _("Contents"));
         m_ContentsPage = notebook_page++;


@@ -465,11 +467,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
 
     if ( navigSizer )
     {
 
     if ( navigSizer )
     {

-        // We don't really want to set the nav panel min size to
-        // the current overall window size (which may be large).
-        // But leaving this code commented in case there's
-        // some variation that makes sense.
-//        navigSizer->SetSizeHints(m_NavigPan);
+        navigSizer->SetSizeHints(m_NavigPan);

         m_NavigPan->Layout();
     }
 
         m_NavigPan->Layout();
     }
 


@@ -492,6 +490,13 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
         }
     }
     
         }
     }
     

+    // Reduce flicker by updating the splitter pane sizes before the
+    // frame is shown
+    wxSizeEvent sizeEvent(GetSize(), GetId());
+    ProcessEvent(sizeEvent);
+    
+    m_Splitter->UpdateSize();
+    

     return TRUE;
 }
 
     return TRUE;
 }