Window management and sizer layout corrections

[wxWidgets.git] / include / wx / generic / treectlg.h

diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index a330263f1db71a23fba7a8660b46590abc349230..df8adb4c6e5be2d13e9bbcdaa9e91467360e2d77 100644 (file)
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -81,10 +81,10 @@ public:
     void SetSpacing(unsigned int spacing);
 
         // image list: these functions allow to associate an image list with
     void SetSpacing(unsigned int spacing);
 
         // image list: these functions allow to associate an image list with

-        // the control and retrieve it. Note that when assigned with 
+        // the control and retrieve it. Note that when assigned with

         // SetImageList, the control does _not_ delete
         // the associated image list when it's deleted in order to allow image
         // SetImageList, the control does _not_ delete
         // the associated image list when it's deleted in order to allow image

-        // lists to be shared between different controls. If you use 
+        // lists to be shared between different controls. If you use

         // AssignImageList, the control _does_ delete the image list.
         //
         // The normal image list is for the icons which correspond to the
         // AssignImageList, the control _does_ delete the image list.
         //
         // The normal image list is for the icons which correspond to the


@@ -222,7 +222,6 @@ public:
 
         // Only for internal use right now, but should probably be public
     wxTreeItemId GetNext(const wxTreeItemId& item) const;
 
         // Only for internal use right now, but should probably be public
     wxTreeItemId GetNext(const wxTreeItemId& item) const;

-    wxTreeItemId GetPrev(const wxTreeItemId& item) const;

 
     // operations
     // ----------
 
     // operations
     // ----------


@@ -329,6 +328,10 @@ public:
 
     // implementation only from now on
 
 
     // implementation only from now on
 

+    // overridden base class virtuals
+    virtual bool SetBackgroundColour(const wxColour& colour);
+    virtual bool SetForegroundColour(const wxColour& colour);
+

     // callbacks
     void OnPaint( wxPaintEvent &event );
     void OnSetFocus( wxFocusEvent &event );
     // callbacks
     void OnPaint( wxPaintEvent &event );
     void OnSetFocus( wxFocusEvent &event );


@@ -357,10 +360,11 @@ protected:
     unsigned short       m_spacing;
     int                  m_lineHeight;
     wxPen                m_dottedPen;
     unsigned short       m_spacing;
     int                  m_lineHeight;
     wxPen                m_dottedPen;

-    wxBrush             *m_hilightBrush;
+    wxBrush             *m_hilightBrush,
+                        *m_hilightUnfocusedBrush;

     bool                 m_hasFocus;
     bool                 m_dirty;
     bool                 m_hasFocus;
     bool                 m_dirty;

-    bool                 m_ownsImageListNormal, 
+    bool                 m_ownsImageListNormal,

                          m_ownsImageListState,
                          m_ownsImageListButtons;
     bool                 m_isDragging; // true between BEGIN/END drag events
                          m_ownsImageListState,
                          m_ownsImageListButtons;
     bool                 m_isDragging; // true between BEGIN/END drag events


@@ -378,6 +382,8 @@ protected:
 
     wxTimer             *m_renameTimer;
     wxString             m_renameRes;
 
     wxTimer             *m_renameTimer;
     wxString             m_renameRes;

+    
+    wxBitmap            *m_arrowRight,*m_arrowDown;

 
     // the common part of all ctors
     void Init();
 
     // the common part of all ctors
     void Init();


@@ -405,6 +411,12 @@ protected:
     void RefreshSubtree( wxGenericTreeItem *item );
     void RefreshLine( wxGenericTreeItem *item );
 
     void RefreshSubtree( wxGenericTreeItem *item );
     void RefreshLine( wxGenericTreeItem *item );
 

+    // redraw all selected items
+    void RefreshSelected();
+
+    // RefreshSelected() recursive helper
+    void RefreshSelectedUnder(wxGenericTreeItem *item);
+

     void OnRenameTimer();
     void OnRenameAccept();
 
     void OnRenameTimer();
     void OnRenameAccept();