fix for removal of dosyacc.c

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

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 10b2517c13c05f75c3a35d71aff5d3c2024695fc..e4d3c35fad07363eb081cee2a1b5a3dea562a6b8 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Modified:    22/10/98 - almost total rewrite, simpler interface (VZ)
 // Id:          $Id$
 // Created:     01/02/97
 // Modified:    22/10/98 - almost total rewrite, simpler interface (VZ)
 // Id:          $Id$

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling and Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -38,6 +38,10 @@
 #include "wx/settings.h"
 #include "wx/dcclient.h"
 
 #include "wx/settings.h"
 #include "wx/dcclient.h"
 

+#ifdef __WXMAC__
+    #include "wx/mac/private.h"
+#endif
+

 // -----------------------------------------------------------------------------
 // array types
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // array types
 // -----------------------------------------------------------------------------


@@ -120,6 +124,8 @@ public:
 
 private:
     wxGenericTreeCtrl *m_owner;
 
 private:
     wxGenericTreeCtrl *m_owner;

+
+    DECLARE_NO_COPY_CLASS(wxTreeRenameTimer)

 };
 
 // control used for in-place edit
 };
 
 // control used for in-place edit


@@ -143,6 +149,7 @@ private:
     bool                m_finished;
 
     DECLARE_EVENT_TABLE()
     bool                m_finished;
 
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxTreeTextCtrl)

 };
 
 // timer used to clear wxGenericTreeCtrl::m_findPrefix if no key was pressed
 };
 
 // timer used to clear wxGenericTreeCtrl::m_findPrefix if no key was pressed


@@ -159,6 +166,8 @@ public:
 
 private:
     wxGenericTreeCtrl *m_owner;
 
 private:
     wxGenericTreeCtrl *m_owner;

+
+    DECLARE_NO_COPY_CLASS(wxTreeFindTimer)

 };
 
 // a tree item
 };
 
 // a tree item


@@ -287,7 +296,7 @@ private:
     short               m_images[wxTreeItemIcon_Max];
 
     wxCoord             m_x;            // (virtual) offset from top
     short               m_images[wxTreeItemIcon_Max];
 
     wxCoord             m_x;            // (virtual) offset from top

-    short               m_y;            // (virtual) offset from left
+    wxCoord             m_y;            // (virtual) offset from left

     short               m_width;        // width of this item
     unsigned char       m_height;       // height of this item
 
     short               m_width;        // width of this item
     unsigned char       m_height;       // height of this item
 


@@ -298,6 +307,8 @@ private:
                                           // children but has a [+] button
     int                 m_isBold      :1; // render the label in bold font
     int                 m_ownsAttr    :1; // delete attribute when done
                                           // children but has a [+] button
     int                 m_isBold      :1; // render the label in bold font
     int                 m_ownsAttr    :1; // delete attribute when done

+
+    DECLARE_NO_COPY_CLASS(wxGenericTreeItem)

 };
 
 // =============================================================================
 };
 
 // =============================================================================


@@ -427,6 +438,8 @@ void wxTreeTextCtrl::Finish()
 {
     if ( !m_finished )
     {
 {
     if ( !m_finished )
     {

+        m_owner->ResetTextControl();
+

         wxPendingDelete.Append(this);
 
         m_finished = TRUE;
         wxPendingDelete.Append(this);
 
         m_finished = TRUE;


@@ -755,6 +768,7 @@ void wxGenericTreeCtrl::Init()
     m_dragCount = 0;
     m_isDragging = FALSE;
     m_dropTarget = m_oldSelection = (wxGenericTreeItem *)NULL;
     m_dragCount = 0;
     m_isDragging = FALSE;
     m_dropTarget = m_oldSelection = (wxGenericTreeItem *)NULL;

+    m_textCtrl = NULL;

 
     m_renameTimer = NULL;
     m_findTimer = NULL;
 
     m_renameTimer = NULL;
     m_findTimer = NULL;


@@ -1118,7 +1132,7 @@ bool wxGenericTreeCtrl::IsBold(const wxTreeItemId& item) const
 // navigation
 // -----------------------------------------------------------------------------
 
 // navigation
 // -----------------------------------------------------------------------------
 

-wxTreeItemId wxGenericTreeCtrl::GetParent(const wxTreeItemId& item) const
+wxTreeItemId wxGenericTreeCtrl::GetItemParent(const wxTreeItemId& item) const

 {
     wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
 
 {
     wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
 


@@ -1218,7 +1232,7 @@ wxTreeItemId wxGenericTreeCtrl::GetNext(const wxTreeItemId& item) const
          do
          {
               toFind = GetNextSibling(p);
          do
          {
               toFind = GetNextSibling(p);

-              p = GetParent(p);
+              p = GetItemParent(p);

          } while (p.IsOk() && !toFind.IsOk());
          return toFind;
     }
          } while (p.IsOk() && !toFind.IsOk());
          return toFind;
     }


@@ -1265,6 +1279,12 @@ wxTreeItemId wxGenericTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
     return wxTreeItemId();
 }
 
     return wxTreeItemId();
 }
 

+// called by wxTextTreeCtrl when it marks itself for deletion
+void wxGenericTreeCtrl::ResetTextControl()
+{
+  m_textCtrl = NULL;
+}
+

 // find the first item starting with the given prefix after the given item
 wxTreeItemId wxGenericTreeCtrl::FindItem(const wxTreeItemId& idParent,
                                          const wxString& prefixOrig) const
 // find the first item starting with the given prefix after the given item
 wxTreeItemId wxGenericTreeCtrl::FindItem(const wxTreeItemId& idParent,
                                          const wxString& prefixOrig) const


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

-    wxTreeItemId parent = GetParent( itemId );
+    wxTreeItemId parent = GetItemParent( itemId );

     while (parent.IsOk())
     {
         if (!IsExpanded(parent))
             Expand( parent );
 
     while (parent.IsOk())
     {
         if (!IsExpanded(parent))
             Expand( parent );
 

-        parent = GetParent( parent );
+        parent = GetItemParent( parent );

     }
 
     EnsureVisible( itemId );
     }
 
     EnsureVisible( itemId );


@@ -2112,7 +2132,20 @@ 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

     }
     else
     {
     }
     else
     {


@@ -2293,10 +2326,25 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
 
                 if (HasFlag(wxTR_AQUA_BUTTONS))
                 {
 
                 if (HasFlag(wxTR_AQUA_BUTTONS))
                 {

+#ifdef __WXMAC__
+                    wxMacPortSetter helper(&dc) ;
+                    wxMacWindowClipper clipper(this) ;
+                    wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
+
+                    int loc_x = x - 5 ;
+                    int loc_y = y_mid - 6 ;
+                    MacWindowToRootWindow( & loc_x , & loc_y ) ;
+                    Rect bounds = { loc_y , loc_x , loc_y + 18 , loc_x + 12 } ;
+                    ThemeButtonDrawInfo info = { kThemeStateActive , item->IsExpanded() ? kThemeDisclosureDown : kThemeDisclosureRight ,
+                        kThemeAdornmentNone }; 
+                    DrawThemeButton( &bounds, kThemeDisclosureButton , 
+                        &info , NULL , NULL , NULL , NULL ) ;
+#else

                     if (item->IsExpanded())
                         dc.DrawBitmap( *m_arrowDown, x-5, y_mid-6, TRUE );
                     else
                         dc.DrawBitmap( *m_arrowRight, x-5, y_mid-6, TRUE );
                     if (item->IsExpanded())
                         dc.DrawBitmap( *m_arrowDown, x-5, y_mid-6, TRUE );
                     else
                         dc.DrawBitmap( *m_arrowRight, x-5, y_mid-6, TRUE );

+#endif

                 }
                 else
                 {
                 }
                 else
                 {


@@ -2369,7 +2417,23 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
                 // draw line down to last child
                 oldY += GetLineHeight(children[n-1])>>1;
                 if (HasButtons()) y_mid += 5;
                 // draw line down to last child
                 oldY += GetLineHeight(children[n-1])>>1;
                 if (HasButtons()) y_mid += 5;

-                dc.DrawLine(x, y_mid, x, oldY);
+
+                // Only draw the portion of the line that is visible, in case it is huge
+                wxCoord        xOrigin=0, yOrigin=0, width, height;
+                dc.GetDeviceOrigin(&xOrigin, &yOrigin);
+                yOrigin = abs(yOrigin);
+                GetClientSize(&width, &height);
+
+                // Move end points to the begining/end of the view?
+                if (y_mid < yOrigin)
+                    y_mid = yOrigin;
+                if (oldY > yOrigin + height)
+                    oldY = yOrigin + height;
+
+                // after the adjustments if y_mid is larger than oldY then the line
+                // isn't visible at all so don't draw anything
+                if (y_mid < oldY)
+                    dc.DrawLine(x, y_mid, x, oldY);

             }
         }
     }
             }
         }
     }


@@ -2513,7 +2577,7 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
     // home  : go to root
     // end   : go to last item without opening parents
     // alnum : start or continue searching for the item with this prefix
     // home  : go to root
     // end   : go to last item without opening parents
     // alnum : start or continue searching for the item with this prefix

-    int keyCode = event.KeyCode();
+    int keyCode = event.GetKeyCode();

     switch ( keyCode )
     {
         case '+':
     switch ( keyCode )
     {
         case '+':


@@ -2567,7 +2631,7 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
                 wxTreeItemId prev = GetPrevSibling( m_key_current );
                 if (!prev)
                 {
                 wxTreeItemId prev = GetPrevSibling( m_key_current );
                 if (!prev)
                 {

-                    prev = GetParent( m_key_current );
+                    prev = GetItemParent( m_key_current );

                     if ((prev == GetRootItem()) && HasFlag(wxTR_HIDE_ROOT))
                     {
                         break;  // don't go to root if it is hidden
                     if ((prev == GetRootItem()) && HasFlag(wxTR_HIDE_ROOT))
                     {
                         break;  // don't go to root if it is hidden


@@ -2606,7 +2670,7 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
             // left arrow goes to the parent
         case WXK_LEFT:
             {
             // left arrow goes to the parent
         case WXK_LEFT:
             {

-                wxTreeItemId prev = GetParent( m_current );
+                wxTreeItemId prev = GetItemParent( m_current );

                 if ((prev == GetRootItem()) && HasFlag(wxTR_HIDE_ROOT))
                 {
                     // don't go to root if it is hidden
                 if ((prev == GetRootItem()) && HasFlag(wxTR_HIDE_ROOT))
                 {
                     // don't go to root if it is hidden


@@ -2642,7 +2706,7 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
                         wxTreeItemId current = m_key_current;
                         while (current && !next)
                         {
                         wxTreeItemId current = m_key_current;
                         while (current && !next)
                         {

-                            current = GetParent( current );
+                            current = GetItemParent( current );

                             if (current) next = GetNextSibling( current );
                         }
                     }
                             if (current) next = GetNextSibling( current );
                         }
                     }


@@ -2809,9 +2873,17 @@ void wxGenericTreeCtrl::Edit( const wxTreeItemId& item )
     if ( m_dirty )
         wxYieldIfNeeded();
 
     if ( m_dirty )
         wxYieldIfNeeded();
 

-    wxTreeTextCtrl *text = new wxTreeTextCtrl(this, itemEdit);
+    m_textCtrl = new wxTreeTextCtrl(this, itemEdit);

 
 

-    text->SetFocus();
+    m_textCtrl->SetFocus();
+}
+
+// returns a pointer to the text edit control if the item is being
+// edited, NULL otherwise (it's assumed that no more than one item may
+// be edited simultaneously)
+wxTextCtrl* wxGenericTreeCtrl::GetEditControl() const
+{
+    return m_textCtrl;

 }
 
 bool wxGenericTreeCtrl::OnRenameAccept(wxGenericTreeItem *item,
 }
 
 bool wxGenericTreeCtrl::OnRenameAccept(wxGenericTreeItem *item,