X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29dfc56bf45e8ca73182fd1fee9d43c5dfedf6c1..75736a9c818f10e49b51506d967759fbecb4fa66:/src/html/helpfrm.cpp

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 488c31c45b..9e952b723a 100644
--- 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..."));
 
-    menuBar->Append(fileMenu,_("File"));
-    menuBar->Append(helpMenu,_("Help"));
+    menuBar->Append(fileMenu,_("&File"));
+    menuBar->Append(helpMenu,_("&Help"));
     SetMenuBar(menuBar);
 #endif
 
@@ -376,7 +376,9 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
 
         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++;
@@ -465,11 +467,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
 
     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();
     }
 
@@ -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;
 }
 
@@ -1604,7 +1609,7 @@ void wxHtmlHelpFrame::OnClose(wxCommandEvent& event)
 
 void wxHtmlHelpFrame::OnAbout(wxCommandEvent& event)
 {
-    wxMessageBox(wxT("wxWindows HTML Help Viewer (c) 1998-2003, Vaclav Slavik et al"), wxT("HelpView"),
+    wxMessageBox(wxT("wxWidgets HTML Help Viewer (c) 1998-2003, Vaclav Slavik et al"), wxT("HelpView"),
         wxICON_INFORMATION|wxOK, this);
 }
 #endif