adding measuring contexts, streamlining printing code

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

diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index e554f381827bd8cab0d2a4a01547db682423df8f..169123db39763db934a2935d6142ce43b82c301d 100644 (file)
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -15,10 +15,6 @@
 #ifndef _WX_DIRCTRL_H_
 #define _WX_DIRCTRL_H_
 
 #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
 #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);
 {
 public:
     wxDirItemData(const wxString& path, const wxString& name, bool isDir);

-    ~wxDirItemData(){}
+    virtual ~wxDirItemData(){}

     void SetNewDirName(const wxString& path);
 
     bool HasSubDirs() const;
     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);
 
     // 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
 
 
     // Accessors
 


@@ -227,7 +225,7 @@ public:
 
     void Init();
 
 
     void Init();
 

-    ~wxDirFilterListCtrl() {}
+    virtual ~wxDirFilterListCtrl() {}

 
     //// Operations
     void FillFilterList(const wxString& filter, int defaultFilter);
 
     //// Operations
     void FillFilterList(const wxString& filter, int defaultFilter);