X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12f5e1e78fe906050ff2fee9529476db332633f0..633e19307ce18ce24837db616feb9dda848056dd:/interface/wx/fs_mem.h diff --git a/interface/wx/fs_mem.h b/interface/wx/fs_mem.h index a7209c0ea9..421c0b2e41 100644 --- a/interface/wx/fs_mem.h +++ b/interface/wx/fs_mem.h @@ -3,7 +3,7 @@ // Purpose: interface of wxMemoryFSHandler // Author: wxWidgets team // RCS-ID: $Id$ -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /** @@ -13,7 +13,7 @@ them accessible via an URL. It is particularly suitable for storing bitmaps from resources or included XPM - files so that they can be used with wxHTML. + files so that they can be used with wxHTML or wxWebView. Filenames are prefixed with @c "memory:", e.g. @c "memory:myfile.html". @@ -26,24 +26,30 @@ void MyFrame::OnAbout(wxCommandEvent&) { - wxBusyCursor bcur; wxFileSystem::AddHandler(new wxMemoryFSHandler); - wxMemoryFSHandler::AddFile("logo.pcx", wxBITMAP(logo), wxBITMAP_TYPE_PCX); + wxMemoryFSHandler::AddFile("logo.png", wxBITMAP(logo), wxBITMAP_TYPE_PNG); wxMemoryFSHandler::AddFile("about.htm", "About: " - "

"); + "

"); wxDialog dlg(this, -1, wxString(_("About"))); wxBoxSizer *topsizer; - wxHtmlWindow *html; topsizer = new wxBoxSizer(wxVERTICAL); - html = new wxHtmlWindow(&dlg, -1, wxDefaultPosition, - wxSize(380, 160), wxHW_SCROLLBAR_NEVER); - html->SetBorders(0); - html->LoadPage("memory:about.htm"); - html->SetSize(html->GetInternalRepresentation()->GetWidth(), - html->GetInternalRepresentation()->GetHeight()); - topsizer->Add(html, 1, wxALL, 10); + #ifdef USE_WEBVIEW + wxWebView* browser = wxWebView::New(&dlg, wxID_ANY, wxWebViewDefaultURLStr, + wxDefaultPosition, wxSize(380, 160)); + browser->RegisterHandler(wxSharedPtr(new wxWebViewFSHandler("memory"))); + browser->LoadURL("memory:about.htm"); + #else // Use wxHtml + wxHtmlWindow *browser; + browser = new wxHtmlWindow(&dlg, -1, wxDefaultPosition, + wxSize(380, 160), wxHW_SCROLLBAR_NEVER); + browser->SetBorders(0); + browser->LoadPage("memory:about.htm"); + browser->SetSize(browser->GetInternalRepresentation()->GetWidth(), + browser->GetInternalRepresentation()->GetHeight()); + #endif + topsizer->Add(browser, 1, wxALL, 10); topsizer->Add(new wxStaticLine(&dlg, -1), 0, wxEXPAND | wxLEFT | wxRIGHT, 10); topsizer->Add(new wxButton(&dlg, wxID_OK, "Ok"), 0, wxALL | wxALIGN_RIGHT, 15); @@ -53,7 +59,7 @@ dlg.Centre(); dlg.ShowModal(); - wxMemoryFSHandler::RemoveFile("logo.pcx"); + wxMemoryFSHandler::RemoveFile("logo.png"); wxMemoryFSHandler::RemoveFile("about.htm"); } @endcode