Tried to make wxTreeCtrl on Mac look more Maccy. Part I.

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 96eac208142a9617afdeb78185bb953590a2aead..b77826636d2473faccc5863c19761ca83ec41b28 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1146,6 +1146,8 @@ enum wxStretch
 #define wxTR_EXTENDED        0x0040
 #define wxTR_HAS_VARIABLE_ROW_HEIGHT 0x0080
 #define wxTR_NO_LINES        0x0100
 #define wxTR_EXTENDED        0x0040
 #define wxTR_HAS_VARIABLE_ROW_HEIGHT 0x0080
 #define wxTR_NO_LINES        0x0100

+#define wxTR_MAC_BUTTONS     0x0200
+#define wxTR_ROW_LINES       0x0400

 
 /*
  * wxListCtrl flags
 
 /*
  * wxListCtrl flags

diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index 2165e9c18ed30e2915ec780c9e948f12547747be..a6bff0878f1ae89462b282c98840a852177519da 100644 (file)
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -53,7 +53,11 @@ public:
     wxGenericTreeCtrl(wxWindow *parent, wxWindowID id = -1,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
     wxGenericTreeCtrl(wxWindow *parent, wxWindowID id = -1,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,

+#ifdef __WXMAC__
+               long style = wxTR_MAC_BUTTONS | wxTR_NO_LINES,
+#else

                long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
                long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,

+#endif

                const wxValidator &validator = wxDefaultValidator,
                const wxString& name = wxTreeCtrlNameStr)
     {
                const wxValidator &validator = wxDefaultValidator,
                const wxString& name = wxTreeCtrlNameStr)
     {


@@ -66,7 +70,11 @@ public:
     bool Create(wxWindow *parent, wxWindowID id = -1,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
     bool Create(wxWindow *parent, wxWindowID id = -1,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
+#ifdef __WXMAC__
+               long style = wxTR_MAC_BUTTONS | wxTR_NO_LINES,
+#else
+               long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
+#endif

                 const wxValidator &validator = wxDefaultValidator,
                 const wxString& name = wxTreeCtrlNameStr);
 
                 const wxValidator &validator = wxDefaultValidator,
                 const wxString& name = wxTreeCtrlNameStr);
 

diff --git a/samples/treectrl/treectrl.cpp b/samples/treectrl/treectrl.cpp
index 2bb7c13e98f6b6b545f2f0783592d030fbc7edcb..9fc8b16228dc58d8aa0693485f00359f204ddc1d 100644 (file)
--- a/samples/treectrl/treectrl.cpp
+++ b/samples/treectrl/treectrl.cpp
@@ -218,14 +218,14 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
 
     m_treeCtrl = new MyTreeCtrl(this, TreeTest_Ctrl,
                                 wxDefaultPosition, wxDefaultSize,
 
     m_treeCtrl = new MyTreeCtrl(this, TreeTest_Ctrl,
                                 wxDefaultPosition, wxDefaultSize,

-                                wxTR_HAS_BUTTONS | // wxTR_NO_LINES |
+                                wxTR_MAC_BUTTONS | wxTR_NO_LINES |

                                 wxTR_EDIT_LABELS |
 #ifndef NO_VARIABLE_HEIGHT
                                 wxTR_HAS_VARIABLE_ROW_HEIGHT |
 #endif
                                 wxSUNKEN_BORDER);
 
                                 wxTR_EDIT_LABELS |
 #ifndef NO_VARIABLE_HEIGHT
                                 wxTR_HAS_VARIABLE_ROW_HEIGHT |
 #endif
                                 wxSUNKEN_BORDER);
 

-    m_treeCtrl->SetBackgroundColour(wxColour(204, 205, 79));
+//    m_treeCtrl->SetBackgroundColour( *wxLIGHT_GREY );

 
     m_textCtrl = new wxTextCtrl(this, -1, "",
                                 wxDefaultPosition, wxDefaultSize,
 
     m_textCtrl = new wxTextCtrl(this, -1, "",
                                 wxDefaultPosition, wxDefaultSize,

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 4669cdca4485d4b1f92b9efe162130d4837f42c3..801384fdfa5be90d445651ab2d85605cc88b8379 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -663,7 +663,10 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent, wxWindowID id,
     SetValidator( validator );
 #endif
 
     SetValidator( validator );
 #endif
 

+#ifndef __WXMAC__

     SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );
     SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );

+#endif
+

 //  m_dottedPen = wxPen( "grey", 0, wxDOT );  too slow under XFree86
     m_dottedPen = wxPen( "grey", 0, 0 );
 
 //  m_dottedPen = wxPen( "grey", 0, wxDOT );  too slow under XFree86
     m_dottedPen = wxPen( "grey", 0, 0 );
 


@@ -841,15 +844,15 @@ bool wxGenericTreeCtrl::IsVisible(const wxTreeItemId& item) const
 {
     wxCHECK_MSG( item.IsOk(), FALSE, wxT("invalid tree item") );
 
 {
     wxCHECK_MSG( item.IsOk(), FALSE, wxT("invalid tree item") );
 

-       // An item is only visible if it's not a descendant of a collapsed item
+    // An item is only visible if it's not a descendant of a collapsed item

     wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem;
     wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem;

-       wxGenericTreeItem* parent = pItem->GetParent();
-       while (parent)
-       {
-               if (!parent->IsExpanded())
-                       return FALSE;
-               parent = parent->GetParent();
-       }
+    wxGenericTreeItem* parent = pItem->GetParent();
+    while (parent)
+    {
+        if (!parent->IsExpanded())
+            return FALSE;
+        parent = parent->GetParent();
+    }

 
     int startX, startY;
     GetViewStart(& startX, & startY);
 
     int startX, startY;
     GetViewStart(& startX, & startY);


@@ -859,8 +862,8 @@ bool wxGenericTreeCtrl::IsVisible(const wxTreeItemId& item) const
     wxRect rect;
     if (!GetBoundingRect(item, rect))
         return FALSE;
     wxRect rect;
     if (!GetBoundingRect(item, rect))
         return FALSE;

-       if (rect.GetWidth() == 0 || rect.GetHeight() == 0)
-               return FALSE;
+    if (rect.GetWidth() == 0 || rect.GetHeight() == 0)
+        return FALSE;

     if (rect.GetBottom() < 0 || rect.GetTop() > clientSize.y)
         return FALSE;
     if (rect.GetRight() < 0 || rect.GetLeft() > clientSize.x)
     if (rect.GetBottom() < 0 || rect.GetTop() > clientSize.y)
         return FALSE;
     if (rect.GetRight() < 0 || rect.GetLeft() > clientSize.x)


@@ -1039,10 +1042,10 @@ wxTreeItemId wxGenericTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
   wxTreeItemId id = item;
   while (id.IsOk())
   {
   wxTreeItemId id = item;
   while (id.IsOk())
   {

-         id = GetNext(id);
+      id = GetNext(id);

 
 

-         if (id.IsOk() && IsVisible(id))
-                 return id;
+      if (id.IsOk() && IsVisible(id))
+          return id;

   }
   return wxTreeItemId();
 }
   }
   return wxTreeItemId();
 }


@@ -1840,24 +1843,59 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
 
 //        if (!item->HasChildren()) endX += (m_indent+5);
         if (!item->HasChildren()) endX += 20;
 
 //        if (!item->HasChildren()) endX += (m_indent+5);
         if (!item->HasChildren()) endX += 20;

-
-        if (drawLines)
-            dc.DrawLine( startX, y, endX, y );
-
-        if (item->HasPlus())
+        
+        if (HasFlag( wxTR_MAC_BUTTONS ))
+        {
+            if (item->HasPlus())
+            {
+                dc.SetPen( *wxBLACK_PEN );
+                dc.SetBrush( *m_hilightBrush );
+                
+                wxPoint button[3];
+                int x = horizX + m_indent;
+                
+                if (item->IsExpanded())
+                {
+                    button[0].x = x-5;
+                    button[0].y = y-2;
+                    button[1].x = x+5;
+                    button[1].y = y-2;
+                    button[2].x = x;
+                    button[2].y = y+3;
+                }
+                else
+                {
+                    button[0].y = y-5;
+                    button[0].x = x-2;
+                    button[1].y = y+5;
+                    button[1].x = x-2;
+                    button[2].y = y;
+                    button[2].x = x+3;
+                }
+                dc.DrawPolygon( 3, button );
+                
+                dc.SetPen( m_dottedPen );
+            }
+        }
+        else

         {
             if (drawLines)
         {
             if (drawLines)

-                dc.DrawLine( horizX+(m_indent+5), y, horizX+(m_indent+15), y );
-            dc.SetPen( *wxGREY_PEN );
-            dc.SetBrush( *wxWHITE_BRUSH );
-            dc.DrawRectangle( horizX+(m_indent-5), y-4, 11, 9 );
-
-            dc.SetPen( *wxBLACK_PEN );
-            dc.DrawLine( horizX+(m_indent-2), y, horizX+(m_indent+3), y );
-            if (!item->IsExpanded())
-                dc.DrawLine( horizX+m_indent, y-2, horizX+m_indent, y+3 );
+                dc.DrawLine( startX, y, endX, y );

 
 

-            dc.SetPen( m_dottedPen );
+            if (item->HasPlus())
+            {
+                if (drawLines)
+                    dc.DrawLine( horizX+(m_indent+5), y, horizX+(m_indent+15), y );
+                dc.SetPen( *wxGREY_PEN );
+                dc.SetBrush( *wxWHITE_BRUSH );
+                dc.DrawRectangle( horizX+(m_indent-5), y-4, 11, 9 );
+
+                dc.SetPen( *wxBLACK_PEN );
+                dc.DrawLine( horizX+(m_indent-2), y, horizX+(m_indent+3), y );
+                if (!item->IsExpanded())
+                    dc.DrawLine( horizX+m_indent, y-2, horizX+m_indent, y+3 );
+                dc.SetPen( m_dottedPen );
+            }

         }
 
         wxPen *pen = wxTRANSPARENT_PEN;
         }
 
         wxPen *pen = wxTRANSPARENT_PEN;


@@ -2262,10 +2300,10 @@ bool wxGenericTreeCtrl::GetBoundingRect(const wxTreeItemId& item,
     GetViewStart(& startX, & startY);
 
     rect.x = i->GetX() - startX*PIXELS_PER_UNIT;
     GetViewStart(& startX, & startY);
 
     rect.x = i->GetX() - startX*PIXELS_PER_UNIT;

-       rect.y = i->GetY() - startY*PIXELS_PER_UNIT;
+    rect.y = i->GetY() - startY*PIXELS_PER_UNIT;

     rect.width = i->GetWidth();
     rect.width = i->GetWidth();

-       //rect.height = i->GetHeight();
-       rect.height = GetLineHeight(i);
+    //rect.height = i->GetHeight();
+    rect.height = GetLineHeight(i);

 
     return TRUE;
 }
 
     return TRUE;
 }