corrected CodeWarrior project target names and generated application names

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

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 801384fdfa5be90d445651ab2d85605cc88b8379..ed745c827f1f28c55daf7d37f6d383ace3dc6997 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -25,9 +25,11 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_TREECTRL
+

 #include "wx/generic/treectlg.h"
 #include "wx/imaglist.h"
 #include "wx/settings.h"
 #include "wx/generic/treectlg.h"
 #include "wx/imaglist.h"
 #include "wx/settings.h"


@@ -663,9 +665,7 @@ 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 );


@@ -1485,6 +1485,17 @@ void wxGenericTreeCtrl::SelectItem(const wxTreeItemId& itemId,
     if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )
       return;
 
     if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )
       return;
 

+    wxTreeItemId parent = GetParent( itemId );
+    while (parent.IsOk())
+    {
+        if (!IsExpanded(parent))
+            Expand( parent );
+
+        parent = GetParent( parent );
+    }
+
+    EnsureVisible( itemId );
+

     // ctrl press
     if (unselect_others)
     {
     // ctrl press
     if (unselect_others)
     {


@@ -1584,7 +1595,7 @@ void wxGenericTreeCtrl::ScrollTo(const wxTreeItemId &item)
 
     int start_x = 0;
     int start_y = 0;
 
     int start_x = 0;
     int start_y = 0;

-    ViewStart( &start_x, &start_y );
+    GetViewStart( &start_x, &start_y );

     start_y *= PIXELS_PER_UNIT;
 
     int client_h = 0;
     start_y *= PIXELS_PER_UNIT;
 
     int client_h = 0;


@@ -1776,8 +1787,11 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
 
     int total_h = GetLineHeight(item);
 
 
     int total_h = GetLineHeight(item);
 

-    if (item->IsSelected())
+    bool paintBg = item->IsSelected() && m_hasFocus;
+    if ( paintBg )
+    {

         dc.SetBrush(*m_hilightBrush);
         dc.SetBrush(*m_hilightBrush);

+    }

     else
     {
         wxColour colBg;
     else
     {
         wxColour colBg;


@@ -1788,15 +1802,21 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
         dc.SetBrush(wxBrush(colBg, wxSOLID));
     }
 
         dc.SetBrush(wxBrush(colBg, wxSOLID));
     }
 

-    if (item->IsSelected() && image != NO_IMAGE)
+    int offset = HasFlag(wxTR_ROW_LINES) ? 1 : 0;
+
+    if ( item->IsSelected() && image != NO_IMAGE)

     {
         // If it's selected, and there's an image, then we should
         // take care to leave the area under the image painted in the
         // background colour.
     {
         // If it's selected, and there's an image, then we should
         // take care to leave the area under the image painted in the
         // background colour.

-        dc.DrawRectangle( item->GetX() + image_w - 2, item->GetY(), item->GetWidth() - image_w + 2, total_h );
+        dc.DrawRectangle( item->GetX() + image_w - 2, item->GetY()+offset,
+                          item->GetWidth() - image_w + 2, total_h-offset );

     }
     else
     }
     else

-        dc.DrawRectangle( item->GetX()-2, item->GetY(), item->GetWidth()+2, total_h );
+    {
+        dc.DrawRectangle( item->GetX()-2, item->GetY()+offset,
+                          item->GetWidth()+2, total_h-offset );
+    }

 
     if ( image != NO_IMAGE )
     {
 
     if ( image != NO_IMAGE )
     {


@@ -1821,39 +1841,37 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
 // Now y stands for the top of the item, whereas it used to stand for middle !
 void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y )
 {
 // Now y stands for the top of the item, whereas it used to stand for middle !
 void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y )
 {

-    int horizX = level*m_indent;
+    int x = (level+1)*m_indent;

 
 

-    item->SetX( horizX+m_indent+m_spacing );
+    item->SetX( x+m_spacing );

     item->SetY( y );
 
     int oldY = y;
     y+=GetLineHeight(item)/2;
 
     item->SetY( y );
 
     int oldY = y;
     y+=GetLineHeight(item)/2;
 

-    item->SetCross( horizX+m_indent, y );
+    item->SetCross( x, y );

 
     int exposed_x = dc.LogicalToDeviceX( 0 );
     int exposed_y = dc.LogicalToDeviceY( item->GetY() );
 
 
     int exposed_x = dc.LogicalToDeviceX( 0 );
     int exposed_y = dc.LogicalToDeviceY( item->GetY() );
 

-    bool drawLines = ((GetWindowStyle() & wxTR_NO_LINES) == 0);
+    bool drawLines = (!HasFlag(wxTR_NO_LINES) && !HasFlag(wxTR_MAC_BUTTONS));

 
     if (IsExposed( exposed_x, exposed_y, 10000, GetLineHeight(item) ))  // 10000 = very much
     {
 
     if (IsExposed( exposed_x, exposed_y, 10000, GetLineHeight(item) ))  // 10000 = very much
     {

-        int startX = horizX;
-        int endX = horizX + (m_indent-5);
+        int startX = x - m_indent;
+        int endX = x-5;

 
 

-//        if (!item->HasChildren()) endX += (m_indent+5);

         if (!item->HasChildren()) endX += 20;
         if (!item->HasChildren()) endX += 20;

-        
+

         if (HasFlag( wxTR_MAC_BUTTONS ))
         {
             if (item->HasPlus())
             {
                 dc.SetPen( *wxBLACK_PEN );
                 dc.SetBrush( *m_hilightBrush );
         if (HasFlag( wxTR_MAC_BUTTONS ))
         {
             if (item->HasPlus())
             {
                 dc.SetPen( *wxBLACK_PEN );
                 dc.SetBrush( *m_hilightBrush );

-                
+

                 wxPoint button[3];
                 wxPoint button[3];

-                int x = horizX + m_indent;
-                
+

                 if (item->IsExpanded())
                 {
                     button[0].x = x-5;
                 if (item->IsExpanded())
                 {
                     button[0].x = x-5;


@@ -1873,7 +1891,7 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
                     button[2].x = x+3;
                 }
                 dc.DrawPolygon( 3, button );
                     button[2].x = x+3;
                 }
                 dc.DrawPolygon( 3, button );

-                
+

                 dc.SetPen( m_dottedPen );
             }
         }
                 dc.SetPen( m_dottedPen );
             }
         }


@@ -1885,29 +1903,33 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
             if (item->HasPlus())
             {
                 if (drawLines)
             if (item->HasPlus())
             {
                 if (drawLines)

-                    dc.DrawLine( horizX+(m_indent+5), y, horizX+(m_indent+15), y );
+                    dc.DrawLine( x+5, y, x+15, y );

                 dc.SetPen( *wxGREY_PEN );
                 dc.SetBrush( *wxWHITE_BRUSH );
                 dc.SetPen( *wxGREY_PEN );
                 dc.SetBrush( *wxWHITE_BRUSH );

-                dc.DrawRectangle( horizX+(m_indent-5), y-4, 11, 9 );
+                dc.DrawRectangle( x-5, y-4, 11, 9 );

 
                 dc.SetPen( *wxBLACK_PEN );
 
                 dc.SetPen( *wxBLACK_PEN );

-                dc.DrawLine( horizX+(m_indent-2), y, horizX+(m_indent+3), y );
+                dc.DrawLine( x-2, y, x+3, y );

                 if (!item->IsExpanded())
                 if (!item->IsExpanded())

-                    dc.DrawLine( horizX+m_indent, y-2, horizX+m_indent, y+3 );
+                    dc.DrawLine( x, y-2, x, y+3 );

                 dc.SetPen( m_dottedPen );
             }
         }
 
                 dc.SetPen( m_dottedPen );
             }
         }
 

-        wxPen *pen = wxTRANSPARENT_PEN;
-        wxColour colText;
-
+        wxPen *pen;
+#ifndef __WXMAC__
+        // don't draw rect outline if we already have the background color
+        // under Max

         if ( item->IsSelected() )
         if ( item->IsSelected() )

+            pen = wxBLACK_PEN;
+        else
+#endif // !__WXMAC__
+            pen = wxTRANSPARENT_PEN;
+
+        wxColour colText;
+        if ( item->IsSelected() && m_hasFocus )

         {
             colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT );
         {
             colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT );

-
-            if ( m_hasFocus )
-               pen = wxBLACK_PEN;
-

         }
         else
         {
         }
         else
         {


@@ -1925,6 +1947,13 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
         // draw
         PaintItem(item, dc);
 
         // draw
         PaintItem(item, dc);
 

+        if (HasFlag( wxTR_ROW_LINES ))
+        {
+            dc.SetPen( *wxWHITE_PEN );
+            dc.DrawLine( 0, oldY, 10000, oldY );
+            dc.DrawLine( 0, oldY + GetLineHeight(item), 10000, oldY + GetLineHeight(item) );
+        }
+

         // restore DC objects
         dc.SetBrush( *wxWHITE_BRUSH );
         dc.SetPen( m_dottedPen );
         // restore DC objects
         dc.SetBrush( *wxWHITE_BRUSH );
         dc.SetPen( m_dottedPen );


@@ -1953,7 +1982,7 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
         {
             semiOldY+=GetLineHeight(children[--n])/2;
             if (drawLines)
         {
             semiOldY+=GetLineHeight(children[--n])/2;
             if (drawLines)

-                dc.DrawLine( horizX+m_indent, oldY+5, horizX+m_indent, semiOldY );
+                dc.DrawLine( x, oldY+5, x, semiOldY );

         }
     }
 }
         }
     }
 }


@@ -2047,14 +2076,16 @@ void wxGenericTreeCtrl::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {
     m_hasFocus = TRUE;
 
 {
     m_hasFocus = TRUE;
 

-    if (m_current) RefreshLine( m_current );
+    if (m_current)
+        RefreshLine( m_current );

 }
 
 void wxGenericTreeCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
 {
     m_hasFocus = FALSE;
 
 }
 
 void wxGenericTreeCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
 {
     m_hasFocus = FALSE;
 

-    if (m_current) RefreshLine( m_current );
+    if (m_current)
+        RefreshLine( m_current );

 }
 
 void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
 }
 
 void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )


@@ -2482,6 +2513,13 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
         // erase the highlighting
         DrawDropEffect(m_dropTarget);
 
         // erase the highlighting
         DrawDropEffect(m_dropTarget);
 

+        if ( m_oldSelection )
+        {
+            m_oldSelection->SetHilight(TRUE);
+            RefreshLine(m_oldSelection);
+            m_oldSelection = (wxGenericTreeItem *)NULL;
+        }
+

         // generate the drag end event
         wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG, GetId());
 
         // generate the drag end event
         wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG, GetId());
 


@@ -2494,13 +2532,6 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
         m_isDragging = FALSE;
         m_dropTarget = (wxGenericTreeItem *)NULL;
 
         m_isDragging = FALSE;
         m_dropTarget = (wxGenericTreeItem *)NULL;
 

-        if ( m_oldSelection )
-        {
-            m_oldSelection->SetHilight(TRUE);
-            RefreshLine(m_oldSelection);
-            m_oldSelection = (wxGenericTreeItem *)NULL;
-        }
-

         ReleaseMouse();
 
         SetCursor(m_oldCursor);
         ReleaseMouse();
 
         SetCursor(m_oldCursor);


@@ -2731,3 +2762,4 @@ void wxGenericTreeCtrl::RefreshLine( wxGenericTreeItem *item )
     Refresh( TRUE, &rect );
 }
 
     Refresh( TRUE, &rect );
 }
 

+#endif // wxUSE_TREECTRL