Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv25947/src/gui
Modified Files:
wxMApp.cpp
Log Message:
Patch from Robert Vazan:
First the sed script that generates wxhelp.map. Second,
wxExtHelpController is explicitly requested rather than
wxHelpController. Third, macro wxUSE_HTML has been renamed
to wxUSE_WXHTML_HELP between 2.2 and 2.4 wxWindows releases.
I have removed condition that checks it, because we are
using wxExtHelpController anyway.
Index: wxMApp.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMApp.cpp,v
retrieving revision 1.264
retrieving revision 1.265
diff -b -u -2 -r1.264 -r1.265
--- wxMApp.cpp 23 Jul 2003 00:39:33 -0000 1.264
+++ wxMApp.cpp 23 Jul 2003 13:10:44 -0000 1.265
@@ -61,4 +61,6 @@
#include <wx/snglinst.h>
+#include <wx/generic/helpext.h>
+
#if defined(OS_WIN) || defined(__CYGWIN__)
#define wxConnection wxDDEConnection
@@ -1291,7 +1293,7 @@
#ifdef OS_WIN
- helpdir += "help";
+ helpdir += _T("help");
#else // !Windows
- helpdir += "doc";
+ helpdir += _T("doc");
#endif // Windows/!Windows
@@ -1313,5 +1315,5 @@
// possible formats, just HTML and CHM
#ifdef OS_UNIX
- m_HelpController = new wxHelpController;
+ m_HelpController = new wxExtHelpController;
#else // Windows
m_HelpController = new wxBestHelpController;
@@ -1360,5 +1362,5 @@
// set help viewer options
-#if defined(OS_UNIX) && !wxUSE_HTML
+#if defined(OS_UNIX) // && !wxUSE_WXHTML_HELP
((wxExtHelpController *)m_HelpController)->SetBrowser(
READ_APPCONFIG(MP_HELPBROWSER),
-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines at the
same time. Free trial click here: http://www.vmware.com/wl/offer/345/0
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
