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

use wxTR_HIDE_ROOT in wxHtmlHelpFrame

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-12-31 00:46:31 +00:00
parent c9ecda60f5
commit 96873b794c
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/html/helpfrm.cpp
View File

@@ -346,8 +346,10 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
wxLayoutConstraints *b4 = new wxLayoutConstraints; wxLayoutConstraints *b4 = new wxLayoutConstraints;
m_ContentsBox = new wxTreeCtrl( dummy, wxID_HTML_TREECTRL, m_ContentsBox = new wxTreeCtrl(dummy, wxID_HTML_TREECTRL,
wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTR_HAS_BUTTONS ); wxDefaultPosition, wxDefaultSize,
wxSUNKEN_BORDER |
wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT);
m_ContentsBox->AssignImageList(ContentsImageList); m_ContentsBox->AssignImageList(ContentsImageList);
b4->top.Below (m_Bookmarks, 10); b4->top.Below (m_Bookmarks, 10);
@@ -366,7 +368,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
{ {
m_ContentsBox = new wxTreeCtrl(m_NavigPan, wxID_HTML_TREECTRL, m_ContentsBox = new wxTreeCtrl(m_NavigPan, wxID_HTML_TREECTRL,
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
wxTR_HAS_BUTTONS | wxSUNKEN_BORDER); wxTR_HIDE_ROOT | wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
m_ContentsBox->AssignImageList(ContentsImageList); m_ContentsBox->AssignImageList(ContentsImageList);
m_NavigPan->AddPage(m_ContentsBox, _("Contents")); m_NavigPan->AddPage(m_ContentsBox, _("Contents"));
} }
@@ -766,9 +768,13 @@ void wxHtmlHelpFrame::CreateContents()
// set its icon accordingly // set its icon accordingly
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 // Don't show (Help) root if there's only one boook
if (booksCnt > 1) 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);
@@ -782,7 +788,7 @@ void wxHtmlHelpFrame::CreateContents()
if (it->m_Level == 0) if (it->m_Level == 0)
{ {
// special case, only one book, make it tree's root: // special case, only one book, make it tree's root:
if (booksCnt == 1) if (!hasSuperRoot)
{ {
roots[0] = roots[1] = m_ContentsBox->AddRoot( roots[0] = roots[1] = m_ContentsBox->AddRoot(
it->m_Name, IMG_Book, -1, it->m_Name, IMG_Book, -1,