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

html help : added '?' icon to root node of contents panel

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
1999-11-06 15:40:35 +00:00
parent 42d306a033
commit 5c172c1788
3 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,7 +151,8 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
enum { enum {
IMG_Book = 0, IMG_Book = 0,
IMG_Folder, IMG_Folder,
IMG_Page IMG_Page,
IMG_RootFolder
}; };
protected: protected:

27
src/html/bitmaps/helproot.xpm Normal file
View File

@@ -0,0 +1,27 @@
/* XPM */
static char *helproot_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 5 1",
" c Gray0",
". c #808000000000",
"X c #808080800000",
"o c Yellow",
"O c None",
/* pixels */
"OOOOOO OOOOOO",
"OOOO oooo .OOOO",
"OOO oooooooo OOO",
"OO oooXXooo OOO",
"OO oooXOOXooo OO",
"OO OOXooo OO",
"OOOOOOOO ooo OO",
"OOOOOOO ooo OOO",
"OOOOOO oooo OOOO",
"OOOOO oooo OOOOO",
"OOOOO OOOOO",
"OOOOOOOOOOOOOOOO",
"OOOOO OOOOO",
"OOOOO oooo OOOOO",
"OOOOO oooo OOOOO",
"OOOOO OOOOO"
};

15
src/html/helpfrm.cpp
View File

@@ -49,6 +49,7 @@
#include "bitmaps/folder.xpm" #include "bitmaps/folder.xpm"
#include "bitmaps/page.xpm" #include "bitmaps/page.xpm"
#include "bitmaps/help.xpm" #include "bitmaps/help.xpm"
#include "bitmaps/helproot.xpm"
#endif #endif
#include "wx/stream.h" #include "wx/stream.h"
@@ -101,6 +102,7 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
m_ContentsImageList -> Add(wxICON(book)); m_ContentsImageList -> Add(wxICON(book));
m_ContentsImageList -> Add(wxICON(folder)); m_ContentsImageList -> Add(wxICON(folder));
m_ContentsImageList -> Add(wxICON(page)); m_ContentsImageList -> Add(wxICON(page));
m_ContentsImageList -> Add(wxICON(helproot));
m_ContentsBox = NULL; m_ContentsBox = NULL;
m_IndexBox = NULL; m_IndexBox = NULL;
@@ -140,13 +142,9 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
wxFrame::Create(parent, id, _("Help"), wxPoint(m_Cfg.x, m_Cfg.y), wxSize(m_Cfg.w, m_Cfg.h)); wxFrame::Create(parent, id, _("Help"), wxPoint(m_Cfg.x, m_Cfg.y), wxSize(m_Cfg.w, m_Cfg.h));
#ifdef __WXMSW__ GetPosition(&m_Cfg.x, &m_Cfg.y);
wxIcon frameIcon("wxhelp", wxBITMAP_TYPE_ICO_RESOURCE, 32, 32);
#else SetIcon(wxICON(help));
wxIcon frameIcon(help_xpm);
#endif
if (frameIcon.Ok())
SetIcon(frameIcon);
int notebook_page = 0; int notebook_page = 0;
@@ -433,6 +431,8 @@ void wxHtmlHelpFrame::CreateContents(bool show_progress)
m_ContentsBox -> DeleteAllItems(); m_ContentsBox -> DeleteAllItems();
roots[0] = m_ContentsBox -> AddRoot(_("(Help)")); roots[0] = m_ContentsBox -> AddRoot(_("(Help)"));
m_ContentsBox -> SetItemImage(roots[0], IMG_RootFolder);
m_ContentsBox -> SetItemSelectedImage(roots[0], IMG_RootFolder);
imaged[0] = TRUE; imaged[0] = TRUE;
for (i = 0; i < cnt; i++, it++) { for (i = 0; i < cnt; i++, it++) {
@@ -637,6 +637,7 @@ void wxHtmlHelpFrame::OnCloseWindow(wxCloseEvent& evt)
{ {
GetSize(&m_Cfg.w, &m_Cfg.h); GetSize(&m_Cfg.w, &m_Cfg.h);
GetPosition(&m_Cfg.x, &m_Cfg.y); GetPosition(&m_Cfg.x, &m_Cfg.y);
if (m_Splitter && m_Cfg.navig_on) m_Cfg.sashpos = m_Splitter -> GetSashPosition(); if (m_Splitter && m_Cfg.navig_on) m_Cfg.sashpos = m_Splitter -> GetSashPosition();
if (m_Config) if (m_Config)