1) APPCONF_ constants renamed to wxCONFIG_

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

diff --git a/include/wx/generic/treectrl.h b/include/wx/generic/treectrl.h
index 42789bb8baf1654d84b278808035691e40adc96c..3ad6295af4bef0a86374ea0940e7313e2b38d1e9 100644 (file)
--- a/include/wx/generic/treectrl.h
+++ b/include/wx/generic/treectrl.h
@@ -123,41 +123,41 @@ enum {
 
 class WXDLLEXPORT wxTreeItem: public wxObject
 {
 
 class WXDLLEXPORT wxTreeItem: public wxObject
 {

+public:
+  long            m_mask;
+  long            m_itemId;
+  long            m_state;
+  long            m_stateMask;
+  wxString        m_text;
+  int             m_image;
+  int             m_selectedImage;
+  int             m_children;
+  long            m_data;
+
+  wxTreeItem();
+
+  // Accessors
+  inline long GetMask() const { return m_mask; }
+  inline long GetItemId() const { return m_itemId; }
+  inline long GetState() const { return m_state; }
+  inline long GetStateMask() const { return m_stateMask; }
+  inline wxString GetText() const { return m_text; }
+  inline int GetImage() const { return m_image; }
+  inline int GetSelectedImage() const { return m_selectedImage; }
+  inline int GetChildren() const { return m_children; }
+  inline long GetData() const { return m_data; }
+
+  inline void SetMask(long mask) { m_mask = mask; }
+  inline void SetItemId(long id) { m_itemId = m_itemId = id; }
+  inline void GetState(long state) { m_state = state; }
+  inline void SetStateMask(long stateMask) { m_stateMask = stateMask; }
+  inline void GetText(const wxString& text) { m_text = text; }
+  inline void SetImage(int image) { m_image = image; }
+  inline void SetSelectedImage(int selImage) { m_selectedImage = selImage; }
+  inline void SetChildren(int children) { m_children = children; }
+  inline void SetData(long data) { m_data = data; }
+

   DECLARE_DYNAMIC_CLASS(wxTreeItem)
   DECLARE_DYNAMIC_CLASS(wxTreeItem)

-  
-  public:
-    long            m_mask;
-    long            m_itemId;
-    long            m_state;
-    long            m_stateMask;
-    wxString        m_text;
-    int             m_image;
-    int             m_selectedImage;
-    int             m_children;
-    long            m_data;
-
-    wxTreeItem(void);
-
-// Accessors
-    inline long GetMask() const { return m_mask; }
-    inline long GetItemId() const { return m_itemId; }
-    inline long GetState() const { return m_state; }
-    inline long GetStateMask() const { return m_stateMask; }
-    inline wxString GetText() const { return m_text; }
-    inline int GetImage() const { return m_image; }
-    inline int GetSelectedImage() const { return m_selectedImage; }
-    inline int GetChildren() const { return m_children; }
-    inline long GetData() const { return m_data; }
-
-    inline void SetMask(long mask) { m_mask = mask; }
-    inline void SetItemId(long id) { m_itemId = m_itemId = id; }
-    inline void GetState(long state) { m_state = state; }
-    inline void SetStateMask(long stateMask) { m_stateMask = stateMask; }
-    inline void GetText(const wxString& text) { m_text = text; }
-    inline void SetImage(int image) { m_image = image; }
-    inline void SetSelectedImage(int selImage) { m_selectedImage = selImage; }
-    inline void SetChildren(int children) { m_children = children; }
-    inline void SetData(long data) { m_data = data; }

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -194,6 +194,8 @@ typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
 #define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },

+#define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },

 #define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },


@@ -218,18 +220,18 @@ class WXDLLEXPORT wxGenericTreeItem: public wxTreeItem
     wxGenericTreeItem  *m_parent;
     bool                m_hasHilight;
 
     wxGenericTreeItem  *m_parent;
     bool                m_hasHilight;
 

-    wxGenericTreeItem(void) {};
+    wxGenericTreeItem() {};

     wxGenericTreeItem( wxGenericTreeItem *parent );
     wxGenericTreeItem( wxGenericTreeItem *parent, const wxTreeItem& item, wxDC *dc );
     void SetItem( const wxTreeItem &item, wxDC *dc );
     void SetText( const wxString &text, wxDC *dc );
     wxGenericTreeItem( wxGenericTreeItem *parent );
     wxGenericTreeItem( wxGenericTreeItem *parent, const wxTreeItem& item, wxDC *dc );
     void SetItem( const wxTreeItem &item, wxDC *dc );
     void SetText( const wxString &text, wxDC *dc );

-    void Reset(void);
+    void Reset();

     void GetItem( wxTreeItem &item ) const;
     void AddChild( const wxTreeItem &item );
     void GetItem( wxTreeItem &item ) const;
     void AddChild( const wxTreeItem &item );

-    bool HasChildren(void);
-    bool HasPlus(void);
-    int NumberOfVisibleDescendents(void);
-    int NumberOfVisibleChildren(void);
+    bool HasChildren();
+    bool HasPlus();
+    int NumberOfVisibleDescendents();
+    int NumberOfVisibleChildren();

     wxGenericTreeItem *FindItem( long itemId ) const;
     void AddChild( wxGenericTreeItem *child );
     void SetCross( int x, int y );
     wxGenericTreeItem *FindItem( long itemId ) const;
     void AddChild( wxGenericTreeItem *child );
     void SetCross( int x, int y );


@@ -242,7 +244,7 @@ class WXDLLEXPORT wxGenericTreeItem: public wxTreeItem
     void SendExpand( wxWindow *target );
     void SendCollapse( wxWindow *target );
     void SetHilight( bool set = TRUE );
     void SendExpand( wxWindow *target );
     void SendCollapse( wxWindow *target );
     void SetHilight( bool set = TRUE );

-    bool HasHilight(void);
+    bool HasHilight();

     bool IsExpanded() const { return !m_isCollapsed; }
 };
 
     bool IsExpanded() const { return !m_isCollapsed; }
 };
 


@@ -252,78 +254,94 @@ class WXDLLEXPORT wxGenericTreeItem: public wxTreeItem
 
 class wxTreeCtrl: public wxScrolledWindow
 {
 
 class wxTreeCtrl: public wxScrolledWindow
 {

-  DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
-
-   public:
-
-    wxTreeCtrl(void);
-    wxTreeCtrl(wxWindow *parent, wxWindowID id = -1,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxTR_HAS_BUTTONS,
-            const wxString& name = "wxTreeCtrl" );
-    ~wxTreeCtrl(void);
-    bool Create(wxWindow *parent, wxWindowID id = -1,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxTR_HAS_BUTTONS,
-            const wxString& name = "wxTreeCtrl");
-
-    int GetCount(void) const;
-    long InsertItem( long parent, const wxString& label, int image = -1,
-      int selImage = -1, long insertAfter = wxTREE_INSERT_LAST );
-    long InsertItem( long parent, wxTreeItem &info, long insertAfter = wxTREE_INSERT_LAST );
-    bool DeleteAllItems(void);
-    bool ExpandItem( long item, int action );
-    bool GetItem( wxTreeItem &info ) const;
-    long GetItemData( long item ) const;
-    wxString GetItemText( long item ) const;
-    int  GetItemImage(long item) const;
-    long GetParent( long item ) const;
-    long GetRootItem(void) const;
-    long GetSelection(void) const;
-    bool SelectItem( long item ) const;
-    bool ItemHasChildren( long item ) const;
-    void SetIndent( int indent );
-    int GetIndent(void) const;
-    bool SetItem( wxTreeItem &info );
-    bool SetItemData( long item, long data );
-    bool SetItemText( long item, const wxString &text );
-    void SetItemImage(long item, int image, int imageSel) const;
-    long HitTest( const wxPoint& point, int &flags );
-
-    void AdjustMyScrollbars(void);
-    void PaintLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y );
-    void OnPaint( const wxPaintEvent &event );
-    void OnSetFocus( const wxFocusEvent &event );
-    void OnKillFocus( const wxFocusEvent &event );
-    void OnChar( wxKeyEvent &event );
-    void OnMouse( const wxMouseEvent &event );
-
-    void SetImageList(wxImageList *imageList) { m_imageList = imageList; }
-    wxImageList *GetImageList() const { return m_imageList; }
-
-  private:
-
-    wxGenericTreeItem   *m_anchor;
-    wxGenericTreeItem   *m_current;
-    bool                 m_hasFocus;
-    int                  m_xScroll,m_yScroll;
-    int                  m_indent;
-    long                 m_lastId;
-    int                  m_lineHeight;
-    wxPen                m_dottedPen;
-    bool                 m_isCreated;
-    wxPaintDC           *m_dc;
-    wxBrush             *m_hilightBrush;
-    wxImageList         *m_imageList;
-  
-    void CalculateLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y );
-    void CalculatePositions(void);
-    wxGenericTreeItem *FindItem( long itemId ) const;
-    void RefreshLine( wxGenericTreeItem *item );
+public:
+  wxTreeCtrl();
+  wxTreeCtrl(wxWindow *parent, const wxWindowID id = -1,
+      const wxPoint& pos = wxDefaultPosition,
+      const wxSize& size = wxDefaultSize,
+      long style = wxTR_HAS_BUTTONS,
+      const wxString& name = "wxTreeCtrl" );
+  ~wxTreeCtrl();
+  bool Create(wxWindow *parent, const wxWindowID id = -1,
+      const wxPoint& pos = wxDefaultPosition,
+      const wxSize& size = wxDefaultSize,
+      long style = wxTR_HAS_BUTTONS,
+      const wxString& name = "wxTreeCtrl");
+
+  int GetCount() const;
+  long InsertItem( long parent, const wxString& label, int image = -1,
+                   int selImage = -1, long insertAfter = wxTREE_INSERT_LAST );
+  long InsertItem( long parent, wxTreeItem &info,
+                   long insertAfter = wxTREE_INSERT_LAST );
+  void DeleteItem( long item );
+  void DeleteChildren( long item );
+  bool DeleteAllItems();
+  bool ExpandItem(long item)   { return ExpandItem(item, wxTREE_EXPAND_EXPAND);   }
+  bool CollapseItem(long item) { return ExpandItem(item, wxTREE_EXPAND_COLLAPSE); }
+  bool ToggleItem(long item)   { return ExpandItem(item, wxTREE_EXPAND_TOGGLE);   }
+  bool ExpandItem( long item, int action );
+
+    // is the item expanded now?
+  bool IsItemExpanded(long item)
+  {
+    wxGenericTreeItem *pItem = FindItem(item);
+    return pItem && (pItem->GetState() & wxTREE_STATE_EXPANDED);
+  }
+
+  bool GetItem( wxTreeItem &info ) const;
+  long GetItemData( long item ) const;
+  wxString GetItemText( long item ) const;
+  int  GetItemImage(long item) const;
+  long GetParent( long item ) const;
+  long GetRootItem() const;
+  long GetSelection() const;
+  bool SelectItem( long item );
+  bool ItemHasChildren( long item ) const;
+  void SetIndent( int indent );
+  int GetIndent() const;
+  bool SetItem( wxTreeItem &info );
+  bool SetItemData( long item, long data );
+  bool SetItemText( long item, const wxString &text );
+  void SetItemImage(long item, int image, int imageSel) const;
+  long HitTest( const wxPoint& point, int &flags );
+
+  void AdjustMyScrollbars();
+  void PaintLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y );
+  void OnPaint( const wxPaintEvent &event );
+  void OnSetFocus( const wxFocusEvent &event );
+  void OnKillFocus( const wxFocusEvent &event );
+  void OnChar( wxKeyEvent &event );
+  void OnMouse( const wxMouseEvent &event );
+
+  wxImageList *GetImageList(int which = wxIMAGE_LIST_NORMAL) const;
+  void SetImageList(wxImageList *imageList, int which = wxIMAGE_LIST_NORMAL);
+
+private:
+  // set the selection to the specified item generating appropriate event(s) if
+  // not disabled
+  void SelectItem(wxGenericTreeItem *item, bool bDoEvents = TRUE);
+
+  wxGenericTreeItem   *m_anchor;
+  wxGenericTreeItem   *m_current;
+  bool                 m_hasFocus;
+  int                  m_xScroll,m_yScroll;
+  int                  m_indent;
+  long                 m_lastId;
+  int                  m_lineHeight;
+  wxPen                m_dottedPen;
+  bool                 m_isCreated;
+  wxPaintDC           *m_dc;
+  wxBrush             *m_hilightBrush;
+  wxImageList         *m_imageList;
+  wxImageList         *m_smallImageList;
+
+  void CalculateLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y );
+  void CalculatePositions();
+  wxGenericTreeItem *FindItem( long itemId ) const;
+  void RefreshLine( wxGenericTreeItem *item );

 
   DECLARE_EVENT_TABLE()
 
   DECLARE_EVENT_TABLE()

+  DECLARE_DYNAMIC_CLASS(wxTreeCtrl)

 };
 
 #endif
 };
 
 #endif