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

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
samples/html/help/help.cpp
View File

@@ -111,11 +111,11 @@
#if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB
wxFileSystem::AddHandler(new wxZipFSHandler);
#endif
SetVendorName("wxWindows");
SetAppName("wxHTMLHelp");
SetVendorName(wxT("wxWindows"));
SetAppName(wxT("wxHTMLHelp"));
// Create the main application window
MyFrame *frame = new MyFrame("HTML Help Sample",
MyFrame *frame = new MyFrame(_("HTML Help Sample"),
wxPoint(50, 50), wxSize(150, 50));
// Show it and tell the application that it's our main window
@@ -143,12 +143,12 @@
// create a menu bar
wxMenu *menuFile = new wxMenu;
menuFile->Append(Minimal_Help, "&Help");
menuFile->Append(Minimal_Quit, "E&xit");
menuFile->Append(Minimal_Help, _("&Help"));
menuFile->Append(Minimal_Quit, _("E&xit"));
// now append the freshly created menu to the menu bar...
wxMenuBar *menuBar = new wxMenuBar;
menuBar->Append(menuFile, "&File");
menuBar->Append(menuFile, _("&File"));
// ... and attach this menu bar to the frame
SetMenuBar(menuBar);
@@ -156,20 +156,20 @@
help.UseConfig(wxConfig::Get());
bool ret;
#if defined(__WXMAC__) && !defined(__DARWIN__)
ret = help.AddBook(":helpfiles:testing.hhp");
ret = help.AddBook(wxT(":helpfiles:testing.hhp"));
#else
help.SetTempDir(".");
ret = help.AddBook("helpfiles/testing.hhp");
help.SetTempDir(wxT("."));
ret = help.AddBook(wxT("helpfiles/testing.hhp"));
#endif
if (! ret)
wxMessageBox("Failed adding book helpfiles/testing.hhp");
wxMessageBox(wxT("Failed adding book helpfiles/testing.hhp"));
#if defined(__WXMAC__) && !defined(__DARWIN__)
ret = help.AddBook(":helpfiles:another.hhp");
ret = help.AddBook(wxT(":helpfiles:another.hhp"));
#else
ret = help.AddBook("helpfiles/another.hhp");
ret = help.AddBook(wxT("helpfiles/another.hhp"));
#endif
if (! ret)
wxMessageBox("Failed adding book helpfiles/another.hhp");
wxMessageBox(_("Failed adding book helpfiles/another.hhp"));
}
@@ -183,7 +183,7 @@
void MyFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
{
help.Display("Test HELPFILE");
help.Display(wxT("Test HELPFILE"));
}
void MyFrame::OnClose(wxCloseEvent& event)

4
samples/html/help/help.dsp
View File

@@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw233.lib
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "htmlhelp - Win32 Debug DLL"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw233d.lib
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "htmlhelp - Win32 Release"