Remove (most) occurrences of wxT() macro from the samples
Also replace wxChar* with wxString. Closes https://github.com/wxWidgets/wxWidgets/pull/945
This commit is contained in:
committed by
Vadim Zeitlin
parent
e768046774
commit
f58ea62596
@@ -48,7 +48,7 @@ public:
|
||||
|
||||
bool MyVFS::CanOpen(const wxString& location)
|
||||
{
|
||||
return (GetProtocol(location) == wxT("myVFS"));
|
||||
return (GetProtocol(location) == "myVFS");
|
||||
}
|
||||
|
||||
wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
|
||||
@@ -73,7 +73,7 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
|
||||
// this won't happen because wxHTML keeps only one "page" file opened at the
|
||||
// time.
|
||||
str = new wxMemoryInputStream(buf, strlen(buf));
|
||||
f = new wxFSFile(str, location, wxT("text/html"), wxEmptyString, wxDateTime::Today());
|
||||
f = new wxFSFile(str, location, "text/html", wxEmptyString, wxDateTime::Today());
|
||||
|
||||
return f;
|
||||
}
|
||||
@@ -216,7 +216,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
||||
#if wxUSE_STATUSBAR
|
||||
html -> SetRelatedStatusBar(1);
|
||||
#endif // wxUSE_STATUSBAR
|
||||
html -> LoadPage(wxT("start.htm"));
|
||||
html -> LoadPage("start.htm");
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user