Add wxLOCALE_DONT_LOAD_DEFAULT (=0) for clarity.

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

diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index 486233ad7ce582f0eb08d3e0a138e669de20a2c7..6a1a838e18c82cbb84804a697687cd641176429e 100644 (file)
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -120,6 +120,7 @@ public:
         return m_current;
     }
     virtual size_t GetSelections(wxArrayTreeItemIds&) const;
         return m_current;
     }
     virtual size_t GetSelections(wxArrayTreeItemIds&) const;

+    virtual wxTreeItemId GetFocusedItem() const { return m_current; }

 
     virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const;
     virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item,
 
     virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const;
     virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item,


@@ -154,6 +155,7 @@ public:
     virtual void Unselect();
     virtual void UnselectAll();
     virtual void SelectItem(const wxTreeItemId& item, bool select = true);
     virtual void Unselect();
     virtual void UnselectAll();
     virtual void SelectItem(const wxTreeItemId& item, bool select = true);

+    virtual void SelectChildren(const wxTreeItemId& parent);

 
     virtual void EnsureVisible(const wxTreeItemId& item);
     virtual void ScrollTo(const wxTreeItemId& item);
 
     virtual void EnsureVisible(const wxTreeItemId& item);
     virtual void ScrollTo(const wxTreeItemId& item);


@@ -257,12 +259,12 @@ protected:
     wxCursor             m_oldCursor;  // cursor is changed while dragging
     wxGenericTreeItem   *m_oldSelection;
     wxGenericTreeItem   *m_underMouse; // for visual effects
     wxCursor             m_oldCursor;  // cursor is changed while dragging
     wxGenericTreeItem   *m_oldSelection;
     wxGenericTreeItem   *m_underMouse; // for visual effects

-    
+

     enum { NoEffect, BorderEffect, AboveEffect, BelowEffect } m_dndEffect;
     enum { NoEffect, BorderEffect, AboveEffect, BelowEffect } m_dndEffect;

-    wxGenericTreeItem   *m_dndEffectItem; 
-    
+    wxGenericTreeItem   *m_dndEffectItem;
+

     wxTreeTextCtrl      *m_textCtrl;
     wxTreeTextCtrl      *m_textCtrl;

-    
+

 
     wxTimer             *m_renameTimer;
 
 
     wxTimer             *m_renameTimer;
 


@@ -275,7 +277,7 @@ protected:
     // the common part of all ctors
     void Init();
 
     // the common part of all ctors
     void Init();
 

-    // overridden wxWindow methods 
+    // overridden wxWindow methods

     virtual void DoThaw();
 
     // misc helpers
     virtual void DoThaw();
 
     // misc helpers


@@ -348,7 +350,7 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGenericTreeCtrl)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGenericTreeCtrl)

-    DECLARE_NO_COPY_CLASS(wxGenericTreeCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxGenericTreeCtrl);

 };
 
 #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
 };
 
 #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)