merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/help/doc.hhp

@@ -0,0 +1,27 @@
+[OPTIONS]
+Compatibility=1.1
+Full-text search=Yes
+Contents file=doc.hhc
+Compiled file=doc.chm
+Default Window=docHelp
+Default topic=doc.htm
+Index file=doc.hhk
+Title=Help Demo
+
+[WINDOWS]
+docHelp=,"doc.hhc","doc.hhk","doc.htm",,,,,,0x2420,,0x380e,,,,,0,,,
+
+[FILES]
+doc.htm
+doc1.htm
+doc2.htm
+doc3.htm
+doc4.htm
+doc5.htm
+
+[MAP]
+#define doc1       100
+#define doc3       1
+#define doc2       2
+#define doc4       3
+