X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/06cc1fb991aa0b6ec8966627d3c6d6bd0ade04be..6c3afc422403767a0e8c0310c0bee436f096193a:/include/wx/generic/dirctrlg.h

diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index 518749de47..cc6624c6fc 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_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "dirctrlg.h"
 #endif
 
@@ -147,8 +147,10 @@ public:
     // Helper
     virtual void SetupSections();
     
+#if WXWIN_COMPATIBILITY_2_4
     // Parse the filter into an array of filters and an array of descriptions
     virtual int ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions);
+#endif // WXWIN_COMPATIBILITY_2_4
     
     // Find the child that matches the first part of 'path'.
     // E.g. if a child path is "/usr" and 'path' is "/usr/include"
@@ -163,9 +165,13 @@ public:
     virtual void ReCreateTree();
     
 protected:
-    void ExpandDir(wxTreeItemId parentId);
-    void CollapseDir(wxTreeItemId parentId);
-    void AddSection(const wxString& path, const wxString& name, int imageId = 0);
+    virtual void ExpandDir(wxTreeItemId parentId);
+    virtual void CollapseDir(wxTreeItemId parentId);
+    virtual const wxTreeItemId AddSection(const wxString& path, const wxString& name, int imageId = 0);
+    virtual wxTreeItemId AppendItem (const wxTreeItemId & parent,
+                const wxString & text,
+                int image = -1, int selectedImage = -1,
+                wxTreeItemData * data = NULL);
     //void FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayString& filenames);
 
     // Extract description and actual filter from overall filter string