From d49520c31853edd1131772eb1e186ffb64cc70e5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 21 Mar 2004 09:31:29 +0000 Subject: [PATCH] a) navigation panel needs size hint, reverted previous revision; b) added wxADJUST_MINSIZE for tree and list controls git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/html/helpfrm.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp index 488c31c45b..f8d35f3a50 100644 --- a/src/html/helpfrm.cpp +++ b/src/html/helpfrm.cpp @@ -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 | wxADJUST_MINSIZE, + 2); m_NavigNotebook->AddPage(dummy, _("Contents")); m_ContentsPage = notebook_page++; @@ -417,7 +419,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, topsizer->Add(btsizer, 0, wxALIGN_RIGHT | wxLEFT | wxRIGHT | wxBOTTOM, 10); topsizer->Add(m_IndexCountInfo, 0, wxEXPAND | wxLEFT | wxRIGHT, 2); - topsizer->Add(m_IndexList, 1, wxEXPAND | wxALL, 2); + topsizer->Add(m_IndexList, 1, wxEXPAND | wxALL | wxADJUST_MINSIZE, 2); m_NavigNotebook->AddPage(dummy, _("Index")); m_IndexPage = notebook_page++; @@ -453,7 +455,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, sizer->Add(m_SearchCaseSensitive, 0, wxLEFT | wxRIGHT, 10); sizer->Add(m_SearchWholeWords, 0, wxLEFT | wxRIGHT, 10); sizer->Add(m_SearchButton, 0, wxALL | wxALIGN_RIGHT, 8); - sizer->Add(m_SearchList, 1, wxALL | wxEXPAND, 2); + sizer->Add(m_SearchList, 1, wxALL | wxEXPAND | wxADJUST_MINSIZE, 2); m_NavigNotebook->AddPage(dummy, _("Search")); m_SearchPage = 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(); } -- 2.45.2