X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6fb99eb3b7063388672255335abf7a34405f51bf..8ea30e360315c0a50d3049013a95471f7d941daf:/include/wx/generic/dirctrlg.h?ds=sidebyside

diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index 4edf3f18cc..586d026f27 100644
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -15,10 +15,6 @@
 #ifndef _WX_DIRCTRL_H_
 #define _WX_DIRCTRL_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dirctrlg.h"
-#endif
-
 #if wxUSE_DIRDLG || wxUSE_FILEDLG
     #include "wx/imaglist.h"
 #endif
@@ -64,7 +60,7 @@ class WXDLLEXPORT wxDirItemData : public wxTreeItemData
 {
 public:
     wxDirItemData(const wxString& path, const wxString& name, bool isDir);
-    ~wxDirItemData();
+    ~wxDirItemData(){}
     void SetNewDirName(const wxString& path);
 
     bool HasSubDirs() const;
@@ -120,6 +116,8 @@ public:
 
     // Try to expand as much of the given path as possible.
     virtual bool ExpandPath(const wxString& path);
+    // collapse the path
+    virtual bool CollapsePath(const wxString& path);
 
     // Accessors
 
@@ -168,7 +166,11 @@ public:
     // Collapse & expand the tree, thus re-creating it from scratch:
     virtual void ReCreateTree();
 
+    // Collapse the entire tree
+    virtual void CollapseTree();
+
 protected:
+    virtual void ExpandRoot();
     virtual void ExpandDir(wxTreeItemId parentId);
     virtual void CollapseDir(wxTreeItemId parentId);
     virtual const wxTreeItemId AddSection(const wxString& path, const wxString& name, int imageId = 0);
@@ -177,6 +179,7 @@ protected:
                 int image = -1, int selectedImage = -1,
                 wxTreeItemData * data = NULL);
     //void FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayString& filenames);
+    virtual wxTreeCtrl* CreateTreeCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long treeStyle);
 
     // Extract description and actual filter from overall filter string
     bool ExtractWildcard(const wxString& filterStr, int n, wxString& filter, wxString& description);
@@ -284,7 +287,7 @@ protected:
 };
 
 // The global fileicons table
-WXDLLEXPORT_DATA(extern wxFileIconsTable *) wxTheFileIconsTable;
+extern WXDLLEXPORT_DATA(wxFileIconsTable *) wxTheFileIconsTable;
 
 #endif // wxUSE_DIRDLG || wxUSE_FILEDLG