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

modified wxHtmlHelpFrame to use AssignImageList

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-09-28 22:18:47 +00:00
parent da599db240
commit 8fd2b35cbe
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/html/helpfrm.h
View File

@@ -206,7 +206,6 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
wxSplitterWindow *m_Splitter; wxSplitterWindow *m_Splitter;
wxNotebook *m_NavigPan; wxNotebook *m_NavigPan;
wxTreeCtrl *m_ContentsBox; wxTreeCtrl *m_ContentsBox;
wxImageList *m_ContentsImageList;
wxTextCtrl *m_IndexText; wxTextCtrl *m_IndexText;
wxButton *m_IndexButton; wxButton *m_IndexButton;
wxButton *m_IndexButtonAll; wxButton *m_IndexButtonAll;

17
src/html/helpfrm.cpp
View File

@@ -143,12 +143,6 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
m_DataCreated = TRUE; m_DataCreated = TRUE;
} }
m_ContentsImageList = new wxImageList(16, 16);
m_ContentsImageList -> Add(wxICON(wbook));
m_ContentsImageList -> Add(wxICON(wfolder));
m_ContentsImageList -> Add(wxICON(wpage));
m_ContentsImageList -> Add(wxICON(whlproot));
m_ContentsBox = NULL; m_ContentsBox = NULL;
m_IndexList = NULL; m_IndexList = NULL;
m_IndexButton = NULL; m_IndexButton = NULL;
@@ -200,6 +194,12 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& title, bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& title,
int style) int style)
{ {
wxImageList *ContentsImageList = new wxImageList(16, 16);
ContentsImageList->Add(wxICON(wbook));
ContentsImageList->Add(wxICON(wfolder));
ContentsImageList->Add(wxICON(wpage));
ContentsImageList->Add(wxICON(whlproot));
// Do the config in two steps. We read the HtmlWindow customization after we // Do the config in two steps. We read the HtmlWindow customization after we
// create the window. // create the window.
if (m_Config) if (m_Config)
@@ -289,7 +289,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
m_ContentsBox = new wxTreeCtrl(dummy, wxID_HTML_TREECTRL, m_ContentsBox = new wxTreeCtrl(dummy, wxID_HTML_TREECTRL,
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
wxTR_HAS_BUTTONS | wxSUNKEN_BORDER); wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
m_ContentsBox -> SetImageList(m_ContentsImageList); m_ContentsBox -> AssignImageList(ContentsImageList);
b4 -> top.Below (m_Bookmarks, 10); b4 -> top.Below (m_Bookmarks, 10);
b4 -> left.SameAs (dummy, wxLeft, 0); b4 -> left.SameAs (dummy, wxLeft, 0);
@@ -308,7 +308,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
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_HAS_BUTTONS | wxSUNKEN_BORDER);
m_ContentsBox -> SetImageList(m_ContentsImageList); m_ContentsBox -> AssignImageList(ContentsImageList);
m_NavigPan -> AddPage(m_ContentsBox, _("Contents")); m_NavigPan -> AddPage(m_ContentsBox, _("Contents"));
} }
@@ -462,7 +462,6 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
wxHtmlHelpFrame::~wxHtmlHelpFrame() wxHtmlHelpFrame::~wxHtmlHelpFrame()
{ {
// PopEventHandler(); // wxhtmlhelpcontroller (not any more!) // PopEventHandler(); // wxhtmlhelpcontroller (not any more!)
delete m_ContentsImageList;
if (m_DataCreated) if (m_DataCreated)
delete m_Data; delete m_Data;
if (m_NormalFonts) delete m_NormalFonts; if (m_NormalFonts) delete m_NormalFonts;