X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/748fcded3c795db266076aac381aa335cc4aa42d..903972f99993e6f31a31b66d1866f6fc982a1c43:/include/wx/generic/dirctrlg.h?ds=sidebyside

diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index e0e5c4c554..27b5fa36ef 100644
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -15,7 +15,7 @@
 #ifndef _WX_DIRCTRL_H_
 #define _WX_DIRCTRL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dirctrlg.h"
 #endif
 
@@ -45,7 +45,9 @@ enum
     // Show the filter list
     wxDIRCTRL_SHOW_FILTERS   = 0x0040,
     // Use 3D borders on internal controls
-    wxDIRCTRL_3D_INTERNAL    = 0x0080
+    wxDIRCTRL_3D_INTERNAL    = 0x0080,
+    // Editable labels
+    wxDIRCTRL_EDIT_LABELS    = 0x0100
 };
 
 //-----------------------------------------------------------------------------
@@ -100,9 +102,9 @@ public:
               int defaultFilter = 0,
               const wxString& name = wxTreeCtrlNameStr );
 
-    void Init();
+    virtual void Init();
 
-    ~wxGenericDirCtrl();
+    virtual ~wxGenericDirCtrl();
 
     void OnExpandItem(wxTreeEvent &event );
     void OnCollapseItem(wxTreeEvent &event );
@@ -111,45 +113,56 @@ public:
     void OnSize(wxSizeEvent &event );
 
     // Try to expand as much of the given path as possible.
-    bool ExpandPath(const wxString& path);
+    virtual bool ExpandPath(const wxString& path);
 
     // Accessors
 
-    inline wxString GetDefaultPath() const { return m_defaultPath; }
-    void SetDefaultPath(const wxString& path) { m_defaultPath = path; }
+    virtual inline wxString GetDefaultPath() const { return m_defaultPath; }
+    virtual void SetDefaultPath(const wxString& path) { m_defaultPath = path; }
 
     // Get dir or filename
-    wxString GetPath() const ;
+    virtual wxString GetPath() const;
+    
     // Get selected filename path only (else empty string).
     // I.e. don't count a directory as a selection
-    wxString GetFilePath() const ;
-    void SetPath(const wxString& path) ;
+    virtual wxString GetFilePath() const;
+    virtual void SetPath(const wxString& path);
+    
+    virtual void ShowHidden( bool show );
+    virtual bool GetShowHidden() { return m_showHidden; }
 
-    wxString GetFilter() const { return m_filter; }
-    void SetFilter(const wxString& filter);
+    virtual wxString GetFilter() const { return m_filter; }
+    virtual void SetFilter(const wxString& filter);
 
-    int GetFilterIndex() const { return m_currentFilter; }
-    void SetFilterIndex(int n) ;
+    virtual int GetFilterIndex() const { return m_currentFilter; }
+    virtual void SetFilterIndex(int n);
 
-    wxTreeItemId GetRootId() { return m_rootId; }
+    virtual wxTreeItemId GetRootId() { return m_rootId; }
 
-    wxTreeCtrl* GetTreeCtrl() const { return m_treeCtrl; }
-    wxDirFilterListCtrl* GetFilterListCtrl() const { return m_filterListCtrl; }
+    virtual wxTreeCtrl* GetTreeCtrl() const { return m_treeCtrl; }
+    virtual wxDirFilterListCtrl* GetFilterListCtrl() const { return m_filterListCtrl; }
 
-    //// Helpers
-    void SetupSections();
+    // Helper
+    virtual void SetupSections();
+    
     // Parse the filter into an array of filters and an array of descriptions
-    int ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions);
+    virtual int ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions);
+    
     // Find the child that matches the first part of 'path'.
     // E.g. if a child path is "/usr" and 'path' is "/usr/include"
     // then the child for /usr is returned.
     // If the path string has been used (we're at the leaf), done is set to TRUE
-    wxTreeItemId FindChild(wxTreeItemId parentId, const wxString& path, bool& done);
+    virtual wxTreeItemId FindChild(wxTreeItemId parentId, const wxString& path, bool& done);
     
     // Resize the components of the control
-    void DoResize();
+    virtual void DoResize();
+    
+    // Collapse & expand the tree, thus re-creating it from scratch:
+    virtual void ReCreateTree();
+    
 protected:
     void ExpandDir(wxTreeItemId parentId);
+    void CollapseDir(wxTreeItemId parentId);
     void AddSection(const wxString& path, const wxString& name, int imageId = 0);
     //void FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayString& filenames);
 
@@ -171,6 +184,7 @@ private:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGenericDirCtrl)
+    DECLARE_NO_COPY_CLASS(wxGenericDirCtrl)
 };
 
 //-----------------------------------------------------------------------------
@@ -210,12 +224,17 @@ protected:
 
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxDirFilterListCtrl)
+    DECLARE_NO_COPY_CLASS(wxDirFilterListCtrl)
 };
 
 #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXPM__)
     #define wxDirCtrl wxGenericDirCtrl
 #endif
 
+// Symbols for accessing individual controls
+#define wxID_TREECTRL          7000
+#define wxID_FILTERLISTCTRL    7001
+
 #endif // wxUSE_DIRDLG
 
 #endif