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

hide tree root on wxMSW in wxHtmlHelpController

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-03-16 19:35:47 +00:00
parent f6ed38239c
commit e095264892
1 changed files with 20 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/html/helpfrm.cpp
View File

@@ -327,11 +327,6 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
dummy->SetAutoLayout(TRUE); dummy->SetAutoLayout(TRUE);
dummy->SetSizer(topsizer); dummy->SetSizer(topsizer);
long treeStyle = wxSUNKEN_BORDER | wxTR_HAS_BUTTONS;
#ifndef __WXMSW__ // FIXME - temporary, till MSW supports wxTR_HIDE_ROOT
treeStyle |= wxTR_HIDE_ROOT;
#endif
if ( style & wxHF_BOOKMARKS ) if ( style & wxHF_BOOKMARKS )
{ {
m_Bookmarks = new wxComboBox(dummy, wxID_HTML_BOOKMARKSLIST, m_Bookmarks = new wxComboBox(dummy, wxID_HTML_BOOKMARKSLIST,
@@ -366,7 +361,10 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
m_ContentsBox = new wxTreeCtrl(dummy, wxID_HTML_TREECTRL, m_ContentsBox = new wxTreeCtrl(dummy, wxID_HTML_TREECTRL,
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
treeStyle); wxSUNKEN_BORDER |
wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT |
wxTR_LINES_AT_ROOT);
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);
@@ -711,7 +709,6 @@ void wxHtmlHelpFrame::CreateContents()
int cnt = m_Data->GetContentsCnt(); int cnt = m_Data->GetContentsCnt();
int i; int i;
size_t booksCnt = m_Data->GetBookRecArray().GetCount();
wxHtmlContentsItem *it; wxHtmlContentsItem *it;
@@ -726,35 +723,15 @@ void wxHtmlHelpFrame::CreateContents()
bool imaged[MAX_ROOTS]; bool imaged[MAX_ROOTS];
m_ContentsBox->DeleteAllItems(); m_ContentsBox->DeleteAllItems();
// FIXME - will go away when wxMSW's wxTreeCtrl supports wxTR_HIDE_ROOT!
bool hasSuperRoot = (booksCnt > 1) ||
(m_ContentsBox->GetWindowStyle() & wxTR_HIDE_ROOT);
// Don't show (Help) root if there's only one boook
if (hasSuperRoot)
{
roots[0] = m_ContentsBox->AddRoot(_("(Help)")); roots[0] = m_ContentsBox->AddRoot(_("(Help)"));
m_ContentsBox->SetItemImage(roots[0], IMG_RootFolder); m_ContentsBox->SetItemImage(roots[0], IMG_RootFolder);
m_ContentsBox->SetItemSelectedImage(roots[0], IMG_RootFolder); m_ContentsBox->SetItemSelectedImage(roots[0], IMG_RootFolder);
imaged[0] = TRUE; imaged[0] = TRUE;
}
for (it = m_Data->GetContents(), i = 0; i < cnt; i++, it++) for (it = m_Data->GetContents(), i = 0; i < cnt; i++, it++)
{ {
// Handle books: // Handle books:
if (it->m_Level == 0) if (it->m_Level == 0)
{
// special case, only one book, make it tree's root:
if (!hasSuperRoot)
{
roots[0] = roots[1] = m_ContentsBox->AddRoot(
it->m_Name, IMG_Book, -1,
new wxHtmlHelpTreeItemData(i));
imaged[0] = imaged[1] = TRUE;
m_ContentsBox->SetItemBold(roots[1], TRUE);
}
// multiple books:
else
{ {
if (m_hfStyle & wxHF_MERGE_BOOKS) if (m_hfStyle & wxHF_MERGE_BOOKS)
// VS: we don't want book nodes, books' content should // VS: we don't want book nodes, books' content should
@@ -772,7 +749,6 @@ void wxHtmlHelpFrame::CreateContents()
} }
imaged[1] = TRUE; imaged[1] = TRUE;
} }
}
// ...and their contents: // ...and their contents:
else else
{ {