Little tweaks and fixes.

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

diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index 05d354d1d0720f23a681eb3fc6581c8598103bc8..467c04f7a4e056a8fb1e620febb6fe89f4e58b7f 100644 (file)
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -4,12 +4,12 @@
 //              Builds on wxDirCtrl class written by Robert Roebling for the
 //              wxFile application, modified by Harm van der Heijden.
 //              Further modified for Windows.
 //              Builds on wxDirCtrl class written by Robert Roebling for the
 //              wxFile application, modified by Harm van der Heijden.
 //              Further modified for Windows.

-// Author:      Julian Smart et al
+// Author:      Robert Roebling, Harm van der Heijden, Julian Smart et al

 // Modified by:
 // Created:     21/3/2000
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     21/3/2000
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Copyright:   (c) Robert Roebling, Harm van der Heijden, Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIRCTRL_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIRCTRL_H_


@@ -19,44 +19,53 @@
 #pragma interface "dirctrlg.h"
 #endif
 
 #pragma interface "dirctrlg.h"
 #endif
 

+#if wxUSE_DIRDLG
+

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

+#include "wx/dialog.h"
+#include "wx/dirdlg.h"
+#include "wx/choice.h"

 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class wxDirItemData;
-class wxDirCtrl;
+class WXDLLEXPORT wxTextCtrl;

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

-// Only allow directory viewing/selection, no files
-#define wxDIRCTRL_DIR_ONLY       0x0010
-// When setting the default path, select the first file in the directory
-#define wxDIRCTRL_SELECT_FIRST   0x0020
-// Show the filter list
-#define wxDIRCTRL_SHOW_FILTERS   0x0040
-// Use 3D borders on internal controls
-#define wxDIRCTRL_3D_INTERNAL    0x0080
+enum
+{
+    // Only allow directory viewing/selection, no files
+    wxDIRCTRL_DIR_ONLY       = 0x0010,
+    // When setting the default path, select the first file in the directory
+    wxDIRCTRL_SELECT_FIRST   = 0x0020,
+    // Show the filter list
+    wxDIRCTRL_SHOW_FILTERS   = 0x0040,
+    // Use 3D borders on internal controls
+    wxDIRCTRL_3D_INTERNAL    = 0x0080
+};

 
 //-----------------------------------------------------------------------------
 // wxDirItemData
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxDirItemData
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDirItemDataEx : public wxTreeItemData
+class WXDLLEXPORT wxDirItemData : public wxTreeItemData

 {
 public:
 {
 public:

-  wxDirItemDataEx(const wxString& path, const wxString& name, bool isDir);
-  ~wxDirItemDataEx();
-  bool HasSubDirs();
-  void SetNewDirName( wxString path );
-  wxString m_path, m_name;
-  bool m_isHidden;
-  bool m_hasSubDirs;
-  bool m_isExpanded;
-  bool m_isDir;
+    wxDirItemData(const wxString& path, const wxString& name, bool isDir);
+    ~wxDirItemData();
+    void SetNewDirName(const wxString& path);
+
+    bool HasSubDirs() const;
+    bool HasFiles(const wxString& spec = wxEmptyString) const;
+
+    wxString m_path, m_name;
+    bool m_isHidden;
+    bool m_isExpanded;
+    bool m_isDir;

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


@@ -73,7 +82,7 @@ public:
               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,

-              long style = wxDIRCTRL_3D_INTERNAL,
+              long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,

               const wxString& filter = wxEmptyString,
               int defaultFilter = 0,
               const wxString& name = wxTreeCtrlNameStr )
               const wxString& filter = wxEmptyString,
               int defaultFilter = 0,
               const wxString& name = wxTreeCtrlNameStr )


@@ -86,7 +95,7 @@ public:
               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,

-              long style = wxDIRCTRL_3D_INTERNAL,
+              long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,

               const wxString& filter = wxEmptyString,
               int defaultFilter = 0,
               const wxString& name = wxTreeCtrlNameStr );
               const wxString& filter = wxEmptyString,
               int defaultFilter = 0,
               const wxString& name = wxTreeCtrlNameStr );


@@ -109,31 +118,34 @@ public:
     inline wxString GetDefaultPath() const { return m_defaultPath; }
     void SetDefaultPath(const wxString& path) { m_defaultPath = path; }
 
     inline wxString GetDefaultPath() const { return m_defaultPath; }
     void SetDefaultPath(const wxString& path) { m_defaultPath = path; }
 

-    //inline long GetStyleEx() const { return m_styleEx; }
-    //void SetStyleEx(long styleEx) { m_styleEx = styleEx; }
-

     // Get dir or filename
     // Get dir or filename

-    wxString GetPath() const ;
+    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) ;
+    wxString GetFilePath() const;
+    void SetPath(const wxString& path);
+    
+    void ShowHidden( bool show );
+    bool GetShowHidden() { return m_showHidden; }

 
     wxString GetFilter() const { return m_filter; }
     void SetFilter(const wxString& filter);
 
     int GetFilterIndex() const { return m_currentFilter; }
 
     wxString GetFilter() const { return m_filter; }
     void SetFilter(const wxString& filter);
 
     int GetFilterIndex() const { return m_currentFilter; }

-    void SetFilterIndex(int n) ;
+    void SetFilterIndex(int n);

 
     wxTreeItemId GetRootId() { return m_rootId; }
 
     wxTreeCtrl* GetTreeCtrl() const { return m_treeCtrl; }
     wxDirFilterListCtrl* GetFilterListCtrl() const { return m_filterListCtrl; }
 
 
     wxTreeItemId GetRootId() { return m_rootId; }
 
     wxTreeCtrl* GetTreeCtrl() const { return m_treeCtrl; }
     wxDirFilterListCtrl* GetFilterListCtrl() const { return m_filterListCtrl; }
 

-//// Helpers
+    // Helper

     void SetupSections();
     void SetupSections();

+    

     // Parse the filter into an array of filters and an array of descriptions
     int ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions);
     // Parse the filter into an array of filters and an array of descriptions
     int ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions);

+    

     // 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.


@@ -142,6 +154,7 @@ public:
     
     // Resize the components of the control
     void DoResize();
     
     // Resize the components of the control
     void DoResize();

+    

 protected:
     void ExpandDir(wxTreeItemId parentId);
     void AddSection(const wxString& path, const wxString& name, int imageId = 0);
 protected:
     void ExpandDir(wxTreeItemId parentId);
     void AddSection(const wxString& path, const wxString& name, int imageId = 0);


@@ -193,10 +206,10 @@ public:
 
     ~wxDirFilterListCtrl() {};
 
 
     ~wxDirFilterListCtrl() {};
 

-//// Operations
+    //// Operations

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

-//// Events
+    //// Events

     void OnSelFilter(wxCommandEvent& event);
 
 protected:
     void OnSelFilter(wxCommandEvent& event);
 
 protected:


@@ -206,40 +219,11 @@ protected:
     DECLARE_CLASS(wxDirFilterListCtrl)
 };
 
     DECLARE_CLASS(wxDirFilterListCtrl)
 };
 

-#define wxID_TREECTRL          7000
-#define wxID_FILTERLISTCTRL    7001
-
-//-----------------------------------------------------------------------------
-// wxGenericDirDialog
-//
-//-----------------------------------------------------------------------------
-
-class wxGenericDirDialog: public wxDialog
-{
-DECLARE_EVENT_TABLE()
-public:
-    wxGenericDirDialog(): wxDialog() {}
-    wxGenericDirDialog(wxWindow* parent, const wxString& title,
-        const wxString& defaultPath = wxEmptyString, long style = wxDEFAULT_DIALOG_STYLE, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxSize(450, 550), const wxString& name = "dialog");
-
-    void OnCloseWindow(wxCloseEvent& event);
-    void OnOK(wxCommandEvent& event);
-
-    inline void SetMessage(const wxString& message) { m_message = message; }
-    void SetPath(const wxString& path) ;
-    inline void SetStyle(long style) { m_dialogStyle = style; }
-
-    inline wxString GetMessage(void) const { return m_message; }
-    wxString GetPath(void) const ;
-    inline long GetStyle(void) const { return m_dialogStyle; }
-
-protected:
-    wxString    m_message;
-    long        m_dialogStyle;
-    wxString    m_path;
-    wxGenericDirCtrl* m_dirCtrl;
+#if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXPM__)
+    #define wxDirCtrl wxGenericDirCtrl
+#endif

 
 

-};
+#endif // wxUSE_DIRDLG

 
 #endif
     // _WX_DIRCTRLG_H_
 
 #endif
     // _WX_DIRCTRLG_H_