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

make it possible to open files from XRC in wxHtmlWindow

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-08-28 22:12:44 +00:00
parent 150e58d8ae
commit 135ace6d7b
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/src/xrc/xh_html.cpp
View File

@@ -24,6 +24,7 @@
#if wxUSE_HTML #if wxUSE_HTML
#include "wx/html/htmlwin.h" #include "wx/html/htmlwin.h"
#include "wx/filesys.h"
wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler() wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler()
@@ -50,8 +51,19 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
if( HasParam( wxT("url") )) if( HasParam( wxT("url") ))
{ {
control->LoadPage( GetParamValue( wxT("url" ))); wxString url = GetParamValue(wxT("url" ));
wxFileSystem& fsys = GetCurFileSystem();
wxFSFile *f = fsys.OpenFile(url);
if (f)
{
control->LoadPage(f->GetLocation());
delete f;
}
else
control->LoadPage(url);
} }
else if( HasParam( wxT("htmlcode") )) else if( HasParam( wxT("htmlcode") ))
{ {
control->SetPage( GetText(wxT("htmlcode")) ); control->SetPage( GetText(wxT("htmlcode")) );

14
src/xrc/xh_html.cpp
View File

@@ -24,6 +24,7 @@
#if wxUSE_HTML #if wxUSE_HTML
#include "wx/html/htmlwin.h" #include "wx/html/htmlwin.h"
#include "wx/filesys.h"
wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler() wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler()
@@ -50,8 +51,19 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
if( HasParam( wxT("url") )) if( HasParam( wxT("url") ))
{ {
control->LoadPage( GetParamValue( wxT("url" ))); wxString url = GetParamValue(wxT("url" ));
wxFileSystem& fsys = GetCurFileSystem();
wxFSFile *f = fsys.OpenFile(url);
if (f)
{
control->LoadPage(f->GetLocation());
delete f;
}
else
control->LoadPage(url);
} }
else if( HasParam( wxT("htmlcode") )) else if( HasParam( wxT("htmlcode") ))
{ {
control->SetPage( GetText(wxT("htmlcode")) ); control->SetPage( GetText(wxT("htmlcode")) );