Splashscreen works better on GTK

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

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 614eea26417d8b78fbbf4b00414e6c4641bc9e39..8f61ef0ffc86aee301993eb602b229c3b1a4b6b8 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -263,14 +263,6 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
         b2 -> height.AsIs();
         m_SearchButton -> SetConstraints(b2);
 
-        wxLayoutConstraints *b3 = new wxLayoutConstraints;
-        m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0);
-        b3 -> top.Below (m_SearchButton, 10);
-        b3 -> left.SameAs (dummy, wxLeft, 0);
-        b3 -> right.SameAs (dummy, wxRight, 0);
-        b3 -> bottom.SameAs (dummy, wxBottom, 0);
-        m_SearchList -> SetConstraints(b3);
-
         wxLayoutConstraints *b4 = new wxLayoutConstraints;
         m_SearchChoice = new wxChoice(dummy, wxID_HTML_SEARCHCHOICE, wxDefaultPosition,
                                       wxDefaultSize);
@@ -280,6 +272,14 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
         b4 -> height.AsIs();
         m_SearchChoice -> SetConstraints(b4);
 
+        wxLayoutConstraints *b3 = new wxLayoutConstraints;
+        m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0);
+        b3 -> top.Below (m_SearchButton, 10);
+        b3 -> left.SameAs (dummy, wxLeft, 0);
+        b3 -> right.SameAs (dummy, wxRight, 0);
+        b3 -> bottom.SameAs (dummy, wxBottom, 0);
+        m_SearchList -> SetConstraints(b3);
+
         dummy -> SetAutoLayout(TRUE);
         dummy -> Layout();
         m_NavigPan -> AddPage(dummy, _("Search"));
@@ -292,6 +292,12 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
     // showtime
     if (m_NavigPan && m_Splitter) {
         m_Splitter -> SetMinimumPaneSize(20);
+        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();
+        }
         if (m_Cfg.navig_on) {
             m_NavigPan -> Show(TRUE);
             m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);