Fix HTML help on Mac.

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

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 7cf0465e1e6f067ecdea3ee1be4bf6af548dc5ea..6ba01be7f7781e2e3a0a240c69b6009c1f7477b9 100644 (file)
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -569,8 +569,8 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
                  charset = wxEmptyString;
 
 #ifdef __WXMAC__
-        // wxIsAbsolutePath is broken
-        bookFull = wxGetCwd() + ":" + book;
+        if (wxIsAbsolutePath(book)) bookFull = book;
+        else bookFull = wxGetCwd() + book; // no slash or dot
         wxFileName fn( bookFull );
         bookFull = fn.GetFullPath( wxPATH_UNIX );
 #else

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index f5b05c3df37a76d3749b7f92c8fd9ca73564fe0d..78ca55abb0251f3c9aeb855391e015032e8d9836 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -347,7 +347,11 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
             wxLayoutConstraints *b4 = new wxLayoutConstraints;
             m_ContentsBox = new wxTreeCtrl(dummy, wxID_HTML_TREECTRL,
                                            wxDefaultPosition, wxDefaultSize,
-                                           wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
+#ifdef __WXMAC__
+       wxSUNKEN_BORDER|wxTR_MAC_BUTTONS|wxTR_NO_LINES|wxTR_ROW_LINES );
+#else
+       wxSUNKEN_BORDER|wxTR_HAS_BUTTONS );
+#endif
             m_ContentsBox->AssignImageList(ContentsImageList);
 
             b4->top.Below (m_Bookmarks, 10);