fix for root behavior under MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -305,6 +305,11 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
|
|||||||
{
|
{
|
||||||
wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_INDEXPAGE);
|
wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_INDEXPAGE);
|
||||||
|
|
||||||
|
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)
|
||||||
{
|
{
|
||||||
wxLayoutConstraints *b1 = new wxLayoutConstraints;
|
wxLayoutConstraints *b1 = new wxLayoutConstraints;
|
||||||
@@ -348,8 +353,7 @@ 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,
|
wxDefaultPosition, wxDefaultSize,
|
||||||
wxSUNKEN_BORDER |
|
treeStyle);
|
||||||
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);
|
||||||
@@ -368,7 +372,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_HIDE_ROOT | wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
|
treeStyle);
|
||||||
m_ContentsBox->AssignImageList(ContentsImageList);
|
m_ContentsBox->AssignImageList(ContentsImageList);
|
||||||
m_NavigPan->AddPage(m_ContentsBox, _("Contents"));
|
m_NavigPan->AddPage(m_ContentsBox, _("Contents"));
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user