class wxHtmlHelpHtmlWindow : public wxHtmlWindow
{
public:
- wxHtmlHelpHtmlWindow(wxHtmlHelpWindow *win, wxWindow *parent)
- : wxHtmlWindow(parent), m_Window(win)
+ wxHtmlHelpHtmlWindow(wxHtmlHelpWindow *win, wxWindow *parent, wxWindowID id = wxID_ANY,
+ const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, long style = wxHW_DEFAULT_STYLE)
+ : wxHtmlWindow(parent, id, pos, sz, style), m_Window(win)
{
SetStandardFonts();
}
private:
wxHtmlHelpWindow *m_Window;
- DECLARE_NO_COPY_CLASS(wxHtmlHelpHtmlWindow)
+ wxDECLARE_NO_COPY_CLASS(wxHtmlHelpHtmlWindow);
DECLARE_EVENT_TABLE()
};
for (size_t i = 0; i < len; i++)
{
const wxHtmlHelpDataItem& item = items[i];
- wxASSERT_MSG( item.level < 128, _T("nested index entries too deep") );
+ wxASSERT_MSG( item.level < 128, wxT("nested index entries too deep") );
if (history[item.level] &&
history[item.level]->items[0]->name == item.name)
m_PagesHash = NULL;
m_UpdateContents = true;
m_toolBar = NULL;
- m_helpController = (wxHtmlHelpController*) NULL;
+ m_helpController = NULL;
}
// Create: builds the GUI components.
{
m_hfStyle = helpStyle;
- wxImageList *ContentsImageList = new wxImageList(16, 16);
- ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_BOOK,
- wxART_HELP_BROWSER,
- wxSize(16, 16)));
- ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_FOLDER,
- wxART_HELP_BROWSER,
- wxSize(16, 16)));
- ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_PAGE,
- wxART_HELP_BROWSER,
- wxSize(16, 16)));
-
// Do the config in two steps. We read the HtmlWindow customization after we
// create the window.
if (m_Config)
wxTB_DOCKABLE | wxTB_NODIVIDER |
(helpStyle & wxHF_FLAT_TOOLBAR ? wxTB_FLAT : 0));
toolBar->SetMargins( 2, 2 );
+ toolBar->SetToolBitmapSize( wxSize(22,22) );
AddToolbarButtons(toolBar, helpStyle);
toolBar->Realize();
topWindowSizer->Add(toolBar, 0, wxEXPAND);
wxSizer *navigSizer = NULL;
+#ifdef __WXMSW__
+ wxBorder htmlWindowBorder = GetDefaultBorder();
+ if (htmlWindowBorder == wxBORDER_SUNKEN)
+ htmlWindowBorder = wxBORDER_SIMPLE;
+#else
+ wxBorder htmlWindowBorder = wxBORDER_SIMPLE;
+#endif
+
if (helpStyle & (wxHF_CONTENTS | wxHF_INDEX | wxHF_SEARCH))
{
// traditional help controller; splitter window with html page on the
// right and a notebook containing various pages on the left
- m_Splitter = new wxSplitterWindow(this);
+ long splitterStyle = wxSP_3D;
+ // Drawing moving sash can cause problems on wxMac
+#ifdef __WXMAC__
+ splitterStyle |= wxSP_LIVE_UPDATE;
+#endif
+ m_Splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, splitterStyle);
topWindowSizer->Add(m_Splitter, 1, wxEXPAND);
- m_HtmlWin = new wxHtmlHelpHtmlWindow(this, m_Splitter);
+ m_HtmlWin = new wxHtmlHelpHtmlWindow(this, m_Splitter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_DEFAULT_STYLE|htmlWindowBorder);
m_NavigPan = new wxPanel(m_Splitter, wxID_ANY);
m_NavigNotebook = new wxNotebook(m_NavigPan, wxID_HTML_NOTEBOOK,
wxDefaultPosition, wxDefaultSize);
+#ifdef __WXMAC__
+ m_NavigNotebook->SetWindowVariant(wxWINDOW_VARIANT_SMALL);
+#endif
navigSizer = new wxBoxSizer(wxVERTICAL);
navigSizer->Add(m_NavigNotebook, 1, wxEXPAND);
else
{
// only html window, no notebook with index,contents etc
- m_HtmlWin = new wxHtmlWindow(this);
+ m_HtmlWin = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_DEFAULT_STYLE|htmlWindowBorder);
topWindowSizer->Add(m_HtmlWin, 1, wxEXPAND);
}
if ( helpStyle & wxHF_CONTENTS )
{
wxWindow *dummy = new wxPanel(m_NavigNotebook, wxID_HTML_INDEXPAGE);
+#ifdef __WXMAC__
+ dummy->SetWindowVariant(wxWINDOW_VARIANT_NORMAL);
+#endif
wxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
topsizer->Add(0, 10);
m_ContentsBox = new wxTreeCtrl(dummy, wxID_HTML_TREECTRL,
wxDefaultPosition, wxDefaultSize,
-#ifdef __WXGTK20__
+#if defined(__WXGTK20__) || defined(__WXMAC__)
wxSUNKEN_BORDER |
wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT |
wxTR_NO_LINES
#endif
);
+ wxImageList *ContentsImageList = new wxImageList(16, 16);
+ ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_BOOK,
+ wxART_HELP_BROWSER,
+ wxSize(16, 16)));
+ ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_FOLDER,
+ wxART_HELP_BROWSER,
+ wxSize(16, 16)));
+ ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_PAGE,
+ wxART_HELP_BROWSER,
+ wxSize(16, 16)));
+
m_ContentsBox->AssignImageList(ContentsImageList);
topsizer->Add(m_ContentsBox, 1,
if ( helpStyle & wxHF_INDEX )
{
wxWindow *dummy = new wxPanel(m_NavigNotebook, wxID_HTML_INDEXPAGE);
+#ifdef __WXMAC__
+ dummy->SetWindowVariant(wxWINDOW_VARIANT_NORMAL);
+#endif
wxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
dummy->SetSizer(topsizer);
if ( helpStyle & wxHF_SEARCH )
{
wxWindow *dummy = new wxPanel(m_NavigNotebook, wxID_HTML_INDEXPAGE);
+#ifdef __WXMAC__
+ dummy->SetWindowVariant(wxWINDOW_VARIANT_NORMAL);
+#endif
wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
dummy->SetSizer(sizer);
m_SearchWholeWords = new wxCheckBox(dummy, wxID_ANY, _("Whole words only"));
m_SearchButton = new wxButton(dummy, wxID_HTML_SEARCHBUTTON, _("Search"));
#if wxUSE_TOOLTIPS
- m_SearchButton->SetToolTip(_("Search contents of help book(s) for all occurences of the text you typed above"));
+ m_SearchButton->SetToolTip(_("Search contents of help book(s) for all occurrences of the text you typed above"));
#endif //wxUSE_TOOLTIPS
m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST,
wxDefaultPosition, wxDefaultSize,
// showtime
if ( m_NavigPan && m_Splitter )
{
+ // The panel will have its own min size which the splitter
+ // should respect
+ //if (m_NavigPan)
+ // m_Splitter->SetMinimumPaneSize(m_NavigPan->GetBestSize().x);
+ //else
m_Splitter->SetMinimumPaneSize(20);
- if ( m_Cfg.navig_on )
- m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
if ( m_Cfg.navig_on )
{
// Reduce flicker by updating the splitter pane sizes before the
// frame is shown
wxSizeEvent sizeEvent(GetSize(), GetId());
- ProcessEvent(sizeEvent);
+ GetEventHandler()->ProcessEvent(sizeEvent);
if (m_Splitter)
m_Splitter->UpdateSize();
wxHtmlHelpWindow::~wxHtmlHelpWindow()
{
+ if ( m_helpController )
+ m_helpController->SetHelpWindow(NULL);
+
delete m_mergedIndex;
// PopEventHandler(); // wxhtmlhelpcontroller (not any more!)
wxT("One or more HTML help frame toolbar bitmap could not be loaded.")) ;
- toolBar->AddTool(wxID_HTML_PANEL, wpanelBitmap, wxNullBitmap,
- false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,
- _("Show/hide navigation panel"));
-
+ toolBar->AddTool(wxID_HTML_PANEL, wxEmptyString, wpanelBitmap, _("Show/hide navigation panel"));
toolBar->AddSeparator();
- toolBar->AddTool(wxID_HTML_BACK, wbackBitmap, wxNullBitmap,
- false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,
- _("Go back"));
- toolBar->AddTool(wxID_HTML_FORWARD, wforwardBitmap, wxNullBitmap,
- false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,
- _("Go forward"));
+ toolBar->AddTool(wxID_HTML_BACK, wxEmptyString, wbackBitmap, _("Go back"));
+ toolBar->AddTool(wxID_HTML_FORWARD, wxEmptyString, wforwardBitmap, _("Go forward"));
toolBar->AddSeparator();
-
- toolBar->AddTool(wxID_HTML_UPNODE, wupnodeBitmap, wxNullBitmap,
- false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,
- _("Go one level up in document hierarchy"));
- toolBar->AddTool(wxID_HTML_UP, wupBitmap, wxNullBitmap,
- false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,
- _("Previous page"));
- toolBar->AddTool(wxID_HTML_DOWN, wdownBitmap, wxNullBitmap,
- false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,
- _("Next page"));
+ toolBar->AddTool(wxID_HTML_UPNODE, wxEmptyString, wupnodeBitmap, _("Go one level up in document hierarchy"));
+ toolBar->AddTool(wxID_HTML_UP, wxEmptyString, wupBitmap, _("Previous page"));
+ toolBar->AddTool(wxID_HTML_DOWN, wxEmptyString, wdownBitmap, _("Next page"));
if ((style & wxHF_PRINT) || (style & wxHF_OPEN_FILES))
toolBar->AddSeparator();
if (style & wxHF_OPEN_FILES)
- toolBar->AddTool(wxID_HTML_OPENFILE, wopenBitmap, wxNullBitmap,
- false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,
- _("Open HTML document"));
+ toolBar->AddTool(wxID_HTML_OPENFILE, wxEmptyString, wopenBitmap, _("Open HTML document"));
#if wxUSE_PRINTING_ARCHITECTURE
if (style & wxHF_PRINT)
- toolBar->AddTool(wxID_HTML_PRINT, wprintBitmap, wxNullBitmap,
- false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,
- _("Print this page"));
+ toolBar->AddTool(wxID_HTML_PRINT, wxEmptyString, wprintBitmap, _("Print this page"));
#endif
toolBar->AddSeparator();
- toolBar->AddTool(wxID_HTML_OPTIONS, woptionsBitmap, wxNullBitmap,
- false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,
- _("Display options dialog"));
+ toolBar->AddTool(wxID_HTML_OPTIONS, wxEmptyString, woptionsBitmap, _("Display options dialog"));
// Allow application to add custom buttons
wxHtmlHelpFrame* parentFrame = wxDynamicCast(GetParent(), wxHtmlHelpFrame);
bool wxHtmlHelpWindow::KeywordSearch(const wxString& keyword,
wxHelpSearchMode mode)
{
+ wxCHECK_MSG( !keyword.empty(), false, "must have a non empty keyword" );
+
if (mode == wxHELP_SEARCH_ALL)
{
if ( !(m_SearchList &&
switch ( mode )
{
default:
- wxFAIL_MSG( _T("unknown help search mode") );
+ wxFAIL_MSG( wxT("unknown help search mode") );
// fall back
case wxHELP_SEARCH_ALL:
if (path != wxEmptyString)
{
oldpath = cfg->GetPath();
- cfg->SetPath(_T("/") + path);
+ cfg->SetPath(wxT("/") + path);
}
m_Cfg.navig_on = cfg->Read(wxT("hcNavigPanel"), m_Cfg.navig_on) != 0;
if (path != wxEmptyString)
{
oldpath = cfg->GetPath();
- cfg->SetPath(_T("/") + path);
+ cfg->SetPath(wxT("/") + path);
}
cfg->Write(wxT("hcNavigPanel"), m_Cfg.navig_on);
0, NULL, wxCB_DROPDOWN | wxCB_READONLY));
sizer->Add(FontSize = new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition,
- wxDefaultSize, wxSP_ARROW_KEYS, 2, 100, 2, _T("wxSpinCtrl")));
+ wxDefaultSize, wxSP_ARROW_KEYS, 2, 100, 2, wxT("wxSpinCtrl")));
topsizer->Add(sizer, 0, wxLEFT|wxRIGHT|wxTOP, 10);
topsizer->Add(new wxStaticText(this, wxID_ANY, _("Preview:")),
0, wxLEFT | wxTOP, 10);
+
+ topsizer->AddSpacer(5);
+
topsizer->Add(TestWin = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxSize(20, 150),
- wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER),
- 1, wxEXPAND | wxLEFT|wxTOP|wxRIGHT, 10);
+ wxHW_SCROLLBAR_AUTO|wxBORDER_THEME),
+ 1, wxEXPAND | wxLEFT | wxRIGHT, 10);
wxBoxSizer *sizer2 = new wxBoxSizer(wxHORIZONTAL);
wxButton *ok;
wxString content(_("font size"));
- content = _T("<font size=-2>") + content + _T(" -2</font><br>")
- _T("<font size=-1>") + content + _T(" -1</font><br>")
- _T("<font size=+0>") + content + _T(" +0</font><br>")
- _T("<font size=+1>") + content + _T(" +1</font><br>")
- _T("<font size=+2>") + content + _T(" +2</font><br>")
- _T("<font size=+3>") + content + _T(" +3</font><br>")
- _T("<font size=+4>") + content + _T(" +4</font><br>") ;
+ content = wxT("<font size=-2>") + content + wxT(" -2</font><br>")
+ wxT("<font size=-1>") + content + wxT(" -1</font><br>")
+ wxT("<font size=+0>") + content + wxT(" +0</font><br>")
+ wxT("<font size=+1>") + content + wxT(" +1</font><br>")
+ wxT("<font size=+2>") + content + wxT(" +2</font><br>")
+ wxT("<font size=+3>") + content + wxT(" +3</font><br>")
+ wxT("<font size=+4>") + content + wxT(" +4</font><br>") ;
- content = wxString(
_T("<html><body><table><tr><td>") ) +
+ content = wxString(
wxT("<html><body><table><tr><td>") ) +
_("Normal face<br>and <u>underlined</u>. ") +
_("<i>Italic face.</i> ") +
_("<b>Bold face.</b> ") +
_("<b><i>Bold italic face.</i></b><br>") +
content +
- wxString( _T("</td><td><tt>") ) +
+ wxString( wxT("</td><td><tt>") ) +
_("Fixed size face.<br> <b>bold</b> <i>italic</i> ") +
_("<b><i>bold italic <u>underlined</u></i></b><br>") +
content +
- _T("</tt></td></tr></table></body></html>");
+ wxT("</tt></td></tr></table></body></html>");
TestWin->SetPage( content );
}
}
DECLARE_EVENT_TABLE()
- DECLARE_NO_COPY_CLASS(wxHtmlHelpWindowOptionsDialog)
+ wxDECLARE_NO_COPY_CLASS(wxHtmlHelpWindowOptionsDialog);
};
BEGIN_EVENT_TABLE(wxHtmlHelpWindowOptionsDialog, wxDialog)
if (m_Printer == NULL)
m_Printer = new wxHtmlEasyPrinting(_("Help Printing"), this);
if (!m_HtmlWin->GetOpenedPage())
+ {
wxLogWarning(_("Cannot print empty page."));
+ }
else
+ {
m_Printer->PrintFile(m_HtmlWin->GetOpenedPage());
+ }
}
break;
#endif
if (!s.empty())
{
wxString ext = s.Right(4).Lower();
- if (ext == _T(".zip") || ext == _T(".htb") ||
+ if (ext == wxT(".zip") || ext == wxT(".htb") ||
#if wxUSE_LIBMSPACK
- ext == _T(".chm") ||
+ ext == wxT(".chm") ||
#endif
- ext == _T(".hhp"))
+ ext == wxT(".hhp"))
{
wxBusyCursor bcur;
m_Data->AddBook(s);
projects / wxWidgets.git / blobdiff