A couple more tests.

[wxWidgets.git] / src / generic / treectlg.cpp

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index e4d81b2b4cfa413a64bf11ddc473853dce865de7..71d424699992e6b4719dba84f30e250646507006 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -753,6 +753,13 @@ void wxGenericTreeCtrl::Init()
     m_indent = 15;
     m_spacing = 18;
 
     m_indent = 15;
     m_spacing = 18;
 

+#ifdef __WXMAC__
+    // OS X sel item highlight color differs from text highlight color, which is
+    // what wxSYS_COLOUR_HIGHLIGHT returns. 
+    RGBColor hilight;
+    GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &hilight);
+    m_hilightBrush = new wxBrush( wxColour(hilight.red, hilight.green, hilight.blue ), wxSOLID );
+#else

     m_hilightBrush = new wxBrush
                          (
                             wxSystemSettings::GetColour
     m_hilightBrush = new wxBrush
                          (
                             wxSystemSettings::GetColour


@@ -761,7 +768,14 @@ void wxGenericTreeCtrl::Init()
                             ),
                             wxSOLID
                          );
                             ),
                             wxSOLID
                          );

+#endif

 
 

+#ifdef __WXMAC__
+    // on Mac, this color also differs from the wxSYS_COLOUR_BTNSHADOW, enough to be noticable.
+    // I don't know if BTNSHADOW is appropriate in other contexts, so I'm just changing it here.
+    GetThemeBrushAsColor(kThemeBrushSecondaryHighlightColor, 32, true, &hilight);
+    m_hilightUnfocusedBrush = new wxBrush( wxColour(hilight.red, hilight.green, hilight.blue ), wxSOLID );
+#else

     m_hilightUnfocusedBrush = new wxBrush
                               (
                                  wxSystemSettings::GetColour
     m_hilightUnfocusedBrush = new wxBrush
                               (
                                  wxSystemSettings::GetColour


@@ -770,7 +784,7 @@ void wxGenericTreeCtrl::Init()
                                  ),
                                  wxSOLID
                               );
                                  ),
                                  wxSOLID
                               );

-
+#endif

     m_imageListButtons = NULL;
     m_ownsImageListButtons = false;
 
     m_imageListButtons = NULL;
     m_ownsImageListButtons = false;
 


@@ -819,7 +833,14 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent,
     style |= wxTR_NO_LINES;
     if (major < 10)
         style |= wxTR_ROW_LINES;
     style |= wxTR_NO_LINES;
     if (major < 10)
         style |= wxTR_ROW_LINES;

+        
+    if (style == 0 || style & wxTR_DEFAULT_STYLE)
+        style |= wxTR_FULL_ROW_HIGHLIGHT;
+        

 #endif // __WXMAC__
 #endif // __WXMAC__

+#ifdef __WXGTK20__
+    style |= wxTR_NO_LINES;
+#endif

 
     if ( !wxControl::Create( parent, id, pos, size,
                              style|wxHSCROLL|wxVSCROLL,
 
     if ( !wxControl::Create( parent, id, pos, size,
                              style|wxHSCROLL|wxVSCROLL,


@@ -844,7 +865,7 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent,
 
     m_dottedPen = wxPen( wxT("grey"), 0, 0 );
 
 
     m_dottedPen = wxPen( wxT("grey"), 0, 0 );
 

-    SetBestSize(size);
+    SetInitialSize(size);

 
     return true;
 }
 
     return true;
 }


@@ -2188,20 +2209,7 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
 
     if ( item->IsSelected() )
     {
 
     if ( item->IsSelected() )
     {

-// under mac selections are only a rectangle in case they don't have the focus
-#ifdef __WXMAC__
-        if ( !m_hasFocus )
-        {
-            dc.SetBrush( *wxTRANSPARENT_BRUSH ) ;
-            dc.SetPen( wxPen( wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHT ) , 1 , wxSOLID ) ) ;
-        }
-        else
-        {
-            dc.SetBrush( *m_hilightBrush ) ;
-        }
-#else

         dc.SetBrush(*(m_hasFocus ? m_hilightBrush : m_hilightUnfocusedBrush));
         dc.SetBrush(*(m_hasFocus ? m_hilightBrush : m_hilightUnfocusedBrush));

-#endif

         drawItemBackground = true;
     }
     else
         drawItemBackground = true;
     }
     else


@@ -2223,10 +2231,9 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
 
     if ( HasFlag(wxTR_FULL_ROW_HIGHLIGHT) )
     {
 
     if ( HasFlag(wxTR_FULL_ROW_HIGHLIGHT) )
     {

-        int x, y, w, h;
-
-        DoGetPosition(&x, &y);
-        DoGetSize(&w, &h);
+        int x, w, h;
+        x=0;
+        GetVirtualSize(&w, &h);

         dc.DrawRectangle(x, item->GetY()+offset, w, total_h-offset);
     }
     else
         dc.DrawRectangle(x, item->GetY()+offset, w, total_h-offset);
     }
     else


@@ -2334,7 +2341,11 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
 #endif
             )
         {
 #endif
             )
         {

+#ifdef __WXMAC__
+            colText = *wxWHITE;
+#else

             colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
             colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);

+#endif

         }
         else
         {
         }
         else
         {