Blind bug fix to bug reported by Angel Kry.

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

diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index 467c04f7a4e056a8fb1e620febb6fe89f4e58b7f..66cd52bc6292b1008f71f5f3dde767c98d6fe36b 100644 (file)
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -15,10 +15,14 @@
 #ifndef _WX_DIRCTRL_H_
 #define _WX_DIRCTRL_H_
 
 #ifndef _WX_DIRCTRL_H_
 #define _WX_DIRCTRL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "dirctrlg.h"
 #endif
 
 #pragma interface "dirctrlg.h"
 #endif
 

+#if wxUSE_DIRDLG || wxUSE_FILEDLG
+    #include "wx/imaglist.h"
+#endif
+

 #if wxUSE_DIRDLG
 
 #include "wx/treectrl.h"
 #if wxUSE_DIRDLG
 
 #include "wx/treectrl.h"


@@ -30,7 +34,9 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTextCtrl;
+class WXDLLIMPEXP_CORE wxTextCtrl;
+class WXDLLIMPEXP_CORE wxImageList;
+class WXDLLIMPEXP_BASE wxHashTable;

 
 //-----------------------------------------------------------------------------
 // Extra styles for wxGenericDirCtrl
 
 //-----------------------------------------------------------------------------
 // Extra styles for wxGenericDirCtrl


@@ -45,7 +51,9 @@ enum
     // Show the filter list
     wxDIRCTRL_SHOW_FILTERS   = 0x0040,
     // Use 3D borders on internal controls
     // 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

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -56,7 +64,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();
+    ~wxDirItemData(){}

     void SetNewDirName(const wxString& path);
 
     bool HasSubDirs() const;
     void SetNewDirName(const wxString& path);
 
     bool HasSubDirs() const;


@@ -78,7 +86,7 @@ class WXDLLEXPORT wxGenericDirCtrl: public wxControl
 {
 public:
     wxGenericDirCtrl();
 {
 public:
     wxGenericDirCtrl();

-    wxGenericDirCtrl(wxWindow *parent, const wxWindowID id = -1,
+    wxGenericDirCtrl(wxWindow *parent, const wxWindowID id = wxID_ANY,

               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,


@@ -90,8 +98,8 @@ public:
         Init();
         Create(parent, id, dir, pos, size, style, filter, defaultFilter, name);
     }
         Init();
         Create(parent, id, dir, pos, size, style, filter, defaultFilter, name);
     }

-    
-    bool Create(wxWindow *parent, const wxWindowID id = -1,
+
+    bool Create(wxWindow *parent, const wxWindowID id = wxID_ANY,

               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,


@@ -100,9 +108,9 @@ public:
               int defaultFilter = 0,
               const wxString& name = wxTreeCtrlNameStr );
 
               int defaultFilter = 0,
               const wxString& name = wxTreeCtrlNameStr );
 

-    void Init();
+    virtual void Init();

 
 

-    ~wxGenericDirCtrl();
+    virtual ~wxGenericDirCtrl();

 
     void OnExpandItem(wxTreeEvent &event );
     void OnCollapseItem(wxTreeEvent &event );
 
     void OnExpandItem(wxTreeEvent &event );
     void OnCollapseItem(wxTreeEvent &event );


@@ -111,54 +119,65 @@ public:
     void OnSize(wxSizeEvent &event );
 
     // Try to expand as much of the given path as possible.
     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
 
 
     // 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
 
     // 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
     // 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);
-    
-    void ShowHidden( bool show );
-    bool GetShowHidden() { return m_showHidden; }
+    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; }

 
     // Helper
 
     // Helper

-    void SetupSections();
-    
+    virtual void SetupSections();
+
+#if WXWIN_COMPATIBILITY_2_4

     // Parse the filter into an array of filters and an array of descriptions
     // 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);
+#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"
     // then the child for /usr is returned.
     // 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);
-    
+    // If the path string has been used (we're at the leaf), done is set to true
+    virtual wxTreeItemId FindChild(wxTreeItemId parentId, const wxString& path, bool& done);
+

     // Resize the components of the control
     // 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:
 protected:

-    void ExpandDir(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);
     //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);
 
     // Extract description and actual filter from overall filter string
     bool ExtractWildcard(const wxString& filterStr, int n, wxString& filter, wxString& description);


@@ -166,7 +185,6 @@ protected:
 private:
     bool            m_showHidden;
     wxTreeItemId    m_rootId;
 private:
     bool            m_showHidden;
     wxTreeItemId    m_rootId;

-    wxImageList*    m_imageList;

     wxString        m_defaultPath; // Starting path
     long            m_styleEx; // Extended style
     wxString        m_filter;  // Wildcards in same format as per wxFileDialog
     wxString        m_defaultPath; // Starting path
     long            m_styleEx; // Extended style
     wxString        m_filter;  // Wildcards in same format as per wxFileDialog


@@ -178,6 +196,7 @@ private:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGenericDirCtrl)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGenericDirCtrl)

+    DECLARE_NO_COPY_CLASS(wxGenericDirCtrl)

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -188,7 +207,7 @@ class WXDLLEXPORT wxDirFilterListCtrl: public wxChoice
 {
 public:
     wxDirFilterListCtrl() { Init(); }
 {
 public:
     wxDirFilterListCtrl() { Init(); }

-    wxDirFilterListCtrl(wxGenericDirCtrl* parent, const wxWindowID id = -1,
+    wxDirFilterListCtrl(wxGenericDirCtrl* parent, const wxWindowID id = wxID_ANY,

               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0)
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0)


@@ -196,15 +215,15 @@ public:
         Init();
         Create(parent, id, pos, size, style);
     }
         Init();
         Create(parent, id, pos, size, style);
     }

-    
-    bool Create(wxGenericDirCtrl* parent, const wxWindowID id = -1,
+
+    bool Create(wxGenericDirCtrl* parent, const wxWindowID id = wxID_ANY,

               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0);
 
     void Init();
 
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0);
 
     void Init();
 

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

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


@@ -217,13 +236,58 @@ protected:
 
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxDirFilterListCtrl)
 
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxDirFilterListCtrl)

+    DECLARE_NO_COPY_CLASS(wxDirFilterListCtrl)

 };
 
 #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXPM__)
     #define wxDirCtrl wxGenericDirCtrl
 #endif
 
 };
 
 #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 // wxUSE_DIRDLG
 

+//-------------------------------------------------------------------------
+// wxFileIconsTable - use wxTheFileIconsTable which is created as necessary
+//-------------------------------------------------------------------------
+
+#if wxUSE_DIRDLG || wxUSE_FILEDLG
+
+class WXDLLEXPORT wxFileIconsTable
+{
+public:
+    wxFileIconsTable();
+    ~wxFileIconsTable();
+
+    enum iconId_Type
+    {
+        folder,
+        folder_open,
+        computer,
+        drive,
+        cdrom,
+        floppy,
+        removeable,
+        file,
+        executable
+    };
+
+    int GetIconID(const wxString& extension, const wxString& mime = wxEmptyString);
+    wxImageList *GetSmallImageList();
+
+protected:
+    void Create();  // create on first use
+
+    wxImageList *m_smallImageList;
+    wxHashTable *m_HashTable;
+};
+
+// The global fileicons table
+extern WXDLLEXPORT_DATA(wxFileIconsTable *) wxTheFileIconsTable;
+
+#endif // wxUSE_DIRDLG || wxUSE_FILEDLG
+

 #endif
     // _WX_DIRCTRLG_H_
 #endif
     // _WX_DIRCTRLG_H_