Changed wxTreeCtrl to look Mac-like under Mac

     automatically.

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

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 71f27e271d417eeca16cff1d37e12100aabfbe78..edfa1116395a79129b1d5cdcd22331bcf60be5b0 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -665,6 +665,17 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent,
                                const wxValidator &validator,
                                const wxString& name )
 {
                                const wxValidator &validator,
                                const wxString& name )
 {

+#ifdef __WXMAC__
+    int major,minor;
+    wxGetOsVersion( &major, &minor );
+    
+    if (style & wxTR_HAS_BUTTONS) style |= wxTR_MAC_BUTTONS;
+    style &= ~wxTR_LINES_AT_ROOT;
+    style |= wxTR_NO_LINES;
+    if (major < 10)
+        style |= wxTR_ROW_LINES;
+#endif
+

     wxScrolledWindow::Create( parent, id, pos, size,
                               style|wxHSCROLL|wxVSCROLL, name );
 
     wxScrolledWindow::Create( parent, id, pos, size,
                               style|wxHSCROLL|wxVSCROLL, name );
 

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 2ca35f3f484e30f8a7be82bf6cb36b19196fb371..0f30f43339d117311137e4e49f77f247d1929f38 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -346,13 +346,8 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
 
 
             wxLayoutConstraints *b4 = new wxLayoutConstraints;
 
 
             wxLayoutConstraints *b4 = new wxLayoutConstraints;

-            m_ContentsBox = new wxTreeCtrl(dummy, wxID_HTML_TREECTRL,
-                                           wxDefaultPosition, wxDefaultSize,
-#ifdef __WXMAC__
-       wxSUNKEN_BORDER|wxTR_MAC_BUTTONS|wxTR_NO_LINES|wxTR_ROW_LINES );
-#else
-       wxSUNKEN_BORDER|wxTR_HAS_BUTTONS );
-#endif
+            m_ContentsBox = new wxTreeCtrl( dummy, wxID_HTML_TREECTRL,
+                wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTR_HAS_BUTTONS );

             m_ContentsBox->AssignImageList(ContentsImageList);
 
             b4->top.Below (m_Bookmarks, 10);
             m_ContentsBox->AssignImageList(ContentsImageList);
 
             b4->top.Below (m_Bookmarks, 10);