merged MapBitmap() from 2.2 branch

[wxWidgets.git] / src / html / helpfrm.cpp

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 7fba6120afb2ba07e6f605e622b2754e54a20249..78ca55abb0251f3c9aeb855391e015032e8d9836 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -76,6 +76,10 @@
 // what is considered "small index"?
 #define INDEX_IS_SMALL 100
 
 // what is considered "small index"?
 #define INDEX_IS_SMALL 100
 

+/* Motif defines this as a macro */
+#ifdef Below
+#undef Below
+#endif

 
 //--------------------------------------------------------------------------
 // wxHtmlHelpTreeItemData (private)
 
 //--------------------------------------------------------------------------
 // wxHtmlHelpTreeItemData (private)


@@ -343,7 +347,11 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
             wxLayoutConstraints *b4 = new wxLayoutConstraints;
             m_ContentsBox = new wxTreeCtrl(dummy, wxID_HTML_TREECTRL,
                                            wxDefaultPosition, wxDefaultSize,
             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);
             m_ContentsBox->AssignImageList(ContentsImageList);
 
             b4->top.Below (m_Bookmarks, 10);