Unicode compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -23,21 +23,21 @@ LINK_DEBUG_FLAGS="/RELEASE"
|
||||
|
||||
all:
|
||||
cd $(WXDIR)\samples\html\about
|
||||
nmake -f makefile.vc FINAL=$(FINAL)
|
||||
nmake -f makefile.vc FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
|
||||
cd $(WXDIR)\samples\html\help
|
||||
nmake -f makefile.vc FINAL=$(FINAL)
|
||||
nmake -f makefile.vc FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
|
||||
cd $(WXDIR)\samples\html\helpview
|
||||
nmake -f makefile.vc FINAL=$(FINAL)
|
||||
nmake -f makefile.vc FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
|
||||
cd $(WXDIR)\samples\html\printing
|
||||
nmake -f makefile.vc FINAL=$(FINAL)
|
||||
nmake -f makefile.vc FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
|
||||
cd $(WXDIR)\samples\html\test
|
||||
nmake -f makefile.vc FINAL=$(FINAL)
|
||||
nmake -f makefile.vc FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
|
||||
cd $(WXDIR)\samples\html\virtual
|
||||
nmake -f makefile.vc FINAL=$(FINAL)
|
||||
nmake -f makefile.vc FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
|
||||
cd $(WXDIR)\samples\html\widget
|
||||
nmake -f makefile.vc FINAL=$(FINAL)
|
||||
nmake -f makefile.vc FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
|
||||
cd $(WXDIR)\samples\html\zip
|
||||
nmake -f makefile.vc FINAL=$(FINAL)
|
||||
nmake -f makefile.vc FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
|
||||
|
||||
clean:
|
||||
cd $(WXDIR)\samples\html\about
|
||||
|
@@ -70,8 +70,8 @@ bool MyApp::OnInit()
|
||||
help = new wxHtmlHelpController;
|
||||
|
||||
if (argc < 2) {
|
||||
wxLogError("Usage : helpview <helpfile> [<more helpfiles>]");
|
||||
wxLogError(" helpfile may be .hhp, .zip or .htb");
|
||||
wxLogError(wxT("Usage : helpview <helpfile> [<more helpfiles>]"));
|
||||
wxLogError(wxT(" helpfile may be .hhp, .zip or .htb"));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
@@ -212,7 +212,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
|
||||
|
||||
void MyFrame::OnPageOpen(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
wxString p = wxFileSelector("Open HTML document", "", "", "", "HTML files|*.htm");
|
||||
wxString p = wxFileSelector(wxT("Open HTML document"), wxT(""), wxT(""), wxT(""), wxT("HTML files|*.htm"));
|
||||
if (p != wxEmptyString)
|
||||
m_Html -> LoadPage(p);
|
||||
}
|
||||
|
@@ -47,8 +47,8 @@ TAG_HANDLER_BEGIN(MYBIND, "MYBIND")
|
||||
int ax, ay;
|
||||
int fl = 0;
|
||||
|
||||
tag.ScanParam("X", "%i", &ax);
|
||||
tag.ScanParam("Y", "%i", &ay);
|
||||
tag.ScanParam(wxT("X"), wxT("%i"), &ax);
|
||||
tag.ScanParam(wxT("Y"), wxT("%i"), &ay);
|
||||
if (tag.HasParam("FLOAT")) fl = ax;
|
||||
|
||||
wnd = new wxTextCtrl( m_WParser -> GetWindow(), -1, tag.GetParam("NAME"),
|
||||
|
Reference in New Issue
Block a user