Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a) navigation panel needs size hint, reverted previous revision; b) added wxADJUST_MINSIZE for tree and list controls

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-03-21 09:31:29 +00:00
parent d80f251586
commit d49520c318
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/html/helpfrm.cpp
View File

@@ -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 | wxADJUST_MINSIZE,
2);
m_NavigNotebook->AddPage(dummy, _("Contents")); m_NavigNotebook->AddPage(dummy, _("Contents"));
m_ContentsPage = notebook_page++; m_ContentsPage = notebook_page++;
@@ -417,7 +419,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
topsizer->Add(btsizer, 0, topsizer->Add(btsizer, 0,
wxALIGN_RIGHT | wxLEFT | wxRIGHT | wxBOTTOM, 10); wxALIGN_RIGHT | wxLEFT | wxRIGHT | wxBOTTOM, 10);
topsizer->Add(m_IndexCountInfo, 0, wxEXPAND | wxLEFT | wxRIGHT, 2); 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_NavigNotebook->AddPage(dummy, _("Index"));
m_IndexPage = notebook_page++; 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_SearchCaseSensitive, 0, wxLEFT | wxRIGHT, 10);
sizer->Add(m_SearchWholeWords, 0, wxLEFT | wxRIGHT, 10); sizer->Add(m_SearchWholeWords, 0, wxLEFT | wxRIGHT, 10);
sizer->Add(m_SearchButton, 0, wxALL | wxALIGN_RIGHT, 8); 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_NavigNotebook->AddPage(dummy, _("Search"));
m_SearchPage = notebook_page; m_SearchPage = 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 navigSizer->SetSizeHints(m_NavigPan);
// 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);
m_NavigPan->Layout(); m_NavigPan->Layout();
} }