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

fixes to charset conversion when loading non-Latin1 helpbooks; use wxString instead of wxChar* in data structures

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-27 13:09:18 +00:00
parent 16327fd824
commit 3912b3f8f7
3 changed files with 121 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/html/helpfrm.cpp
View File

@@ -1276,7 +1276,7 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
if (ha && ha->m_Index > 0)
{
wxHtmlContentsItem *it = m_Data->GetContents() + (ha->m_Index - 1);
if (it->m_Page[0] != 0)
if (!it->m_Page.empty())
{
m_HtmlWin->LoadPage(it->GetFullPath());
NotifyPageChanged();
@@ -1304,7 +1304,7 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
while (ind >= 0 && it->m_Level != level) ind--, it--;
if (ind >= 0)
{
if (it->m_Page[0] != 0)
if (!it->m_Page.empty())
{
m_HtmlWin->LoadPage(it->GetFullPath());
NotifyPageChanged();
@@ -1332,7 +1332,7 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
while (it->GetFullPath() == adr) it++;
if (it->m_Page[0] != 0)
if (!it->m_Page.empty())
{
m_HtmlWin->LoadPage(it->GetFullPath());
NotifyPageChanged();
@@ -1463,7 +1463,7 @@ void wxHtmlHelpFrame::OnContentsSel(wxTreeEvent& event)
{
it = m_Data->GetContents() + (pg->m_Id);
m_UpdateContents = false;
if (it->m_Page[0] != 0)
if (!it->m_Page.empty())
m_HtmlWin->LoadPage(it->GetFullPath());
m_UpdateContents = true;
}
@@ -1474,7 +1474,7 @@ void wxHtmlHelpFrame::OnContentsSel(wxTreeEvent& event)
void wxHtmlHelpFrame::OnIndexSel(wxCommandEvent& WXUNUSED(event))
{
wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_IndexList->GetClientData(m_IndexList->GetSelection());
if (it->m_Page[0] != 0)
if (!it->m_Page.empty())
m_HtmlWin->LoadPage(it->GetFullPath());
NotifyPageChanged();
}
@@ -1514,7 +1514,7 @@ void wxHtmlHelpFrame::OnIndexFind(wxCommandEvent& event)
displ++;
if (first)
{
if (index[i].m_Page[0] != 0)
if (!index[i].m_Page.empty())
m_HtmlWin->LoadPage(index[i].GetFullPath());
NotifyPageChanged();
first = false;
@@ -1545,7 +1545,7 @@ void wxHtmlHelpFrame::OnIndexAll(wxCommandEvent& WXUNUSED(event))
m_IndexList->Append(index[i].m_Name, (char*)(index + i));
if (first)
{
if (index[i].m_Page[0] != 0)
if (!index[i].m_Page.empty())
m_HtmlWin->LoadPage(index[i].GetFullPath());
NotifyPageChanged();
first = false;
@@ -1563,7 +1563,7 @@ void wxHtmlHelpFrame::OnSearchSel(wxCommandEvent& WXUNUSED(event))
wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_SearchList->GetClientData(m_SearchList->GetSelection());
if (it)
{
if (it->m_Page[0] != 0)
if (!it->m_Page.empty())
m_HtmlWin->LoadPage(it->GetFullPath());
NotifyPageChanged();
}