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 cc6624c6fceae2be1cd440422b97e01f058e8085..66cd52bc6292b1008f71f5f3dde767c98d6fe36b 100644 (file)
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -19,6 +19,10 @@
 #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,9 +34,9 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

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

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


@@ -60,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;


@@ -82,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,


@@ -94,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,


@@ -124,12 +128,12 @@ public:
 
     // Get dir or filename
     virtual wxString GetPath() const;
 
     // Get dir or filename
     virtual wxString GetPath() const;

-    
+

     // Get selected filename path only (else empty string).
     // I.e. don't count a directory as a selection
     virtual wxString GetFilePath() const;
     virtual void SetPath(const wxString& path);
     // Get selected filename path only (else empty string).
     // I.e. don't count a directory as a selection
     virtual wxString GetFilePath() const;
     virtual void SetPath(const wxString& path);

-    
+

     virtual void ShowHidden( bool show );
     virtual bool GetShowHidden() { return m_showHidden; }
 
     virtual void ShowHidden( bool show );
     virtual bool GetShowHidden() { return m_showHidden; }
 


@@ -146,24 +150,24 @@ public:
 
     // Helper
     virtual void SetupSections();
 
     // 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
 #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"
     // 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
+    // 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);
     virtual wxTreeItemId FindChild(wxTreeItemId parentId, const wxString& path, bool& done);

-    
+

     // Resize the components of the control
     virtual void DoResize();
     // Resize the components of the control
     virtual void DoResize();

-    
+

     // Collapse & expand the tree, thus re-creating it from scratch:
     virtual void ReCreateTree();
     // Collapse & expand the tree, thus re-creating it from scratch:
     virtual void ReCreateTree();

-    
+

 protected:
     virtual void ExpandDir(wxTreeItemId parentId);
     virtual void CollapseDir(wxTreeItemId parentId);
 protected:
     virtual void ExpandDir(wxTreeItemId parentId);
     virtual void CollapseDir(wxTreeItemId parentId);


@@ -173,6 +177,7 @@ protected:
                 int image = -1, int selectedImage = -1,
                 wxTreeItemData * data = NULL);
     //void FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayString& filenames);
                 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);
 
     // Extract description and actual filter from overall filter string
     bool ExtractWildcard(const wxString& filterStr, int n, wxString& filter, wxString& description);


@@ -202,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)


@@ -210,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);


@@ -242,10 +247,14 @@ protected:
 #define wxID_TREECTRL          7000
 #define wxID_FILTERLISTCTRL    7001
 
 #define wxID_TREECTRL          7000
 #define wxID_FILTERLISTCTRL    7001
 

+#endif // wxUSE_DIRDLG
+

 //-------------------------------------------------------------------------
 // wxFileIconsTable - use wxTheFileIconsTable which is created as necessary
 //-------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------
 // wxFileIconsTable - use wxTheFileIconsTable which is created as necessary
 //-------------------------------------------------------------------------
 

+#if wxUSE_DIRDLG || wxUSE_FILEDLG
+

 class WXDLLEXPORT wxFileIconsTable
 {
 public:
 class WXDLLEXPORT wxFileIconsTable
 {
 public:


@@ -276,9 +285,9 @@ protected:
 };
 
 // The global fileicons table
 };
 
 // The global fileicons table

-WXDLLEXPORT_DATA(extern wxFileIconsTable *) wxTheFileIconsTable;
+extern WXDLLEXPORT_DATA(wxFileIconsTable *) wxTheFileIconsTable;

 
 

-#endif // wxUSE_DIRDLG
+#endif // wxUSE_DIRDLG || wxUSE_FILEDLG

 
 #endif
     // _WX_DIRCTRLG_H_
 
 #endif
     // _WX_DIRCTRLG_H_