X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c06dde42fe5dc8c97d0a6dbf1d6e590b198e8fbb..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/generic/dirctrlg.h diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h index e554f38182..b2ff47f63c 100644 --- a/include/wx/generic/dirctrlg.h +++ b/include/wx/generic/dirctrlg.h @@ -15,10 +15,6 @@ #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 @@ -34,9 +30,9 @@ // classes //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxTextCtrl; -class WXDLLIMPEXP_CORE wxImageList; -class WXDLLIMPEXP_BASE wxHashTable; +class WXDLLIMPEXP_FWD_CORE wxTextCtrl; +class WXDLLIMPEXP_FWD_CORE wxImageList; +class WXDLLIMPEXP_FWD_BASE wxHashTable; //----------------------------------------------------------------------------- // Extra styles for wxGenericDirCtrl @@ -48,23 +44,27 @@ enum wxDIRCTRL_DIR_ONLY = 0x0010, // When setting the default path, select the first file in the directory wxDIRCTRL_SELECT_FIRST = 0x0020, - // Show the filter list +#if WXWIN_COMPATIBILITY_2_8 + // Unused, for compatibility only wxDIRCTRL_SHOW_FILTERS = 0x0040, +#endif // WXWIN_COMPATIBILITY_2_8 // Use 3D borders on internal controls wxDIRCTRL_3D_INTERNAL = 0x0080, // Editable labels - wxDIRCTRL_EDIT_LABELS = 0x0100 + wxDIRCTRL_EDIT_LABELS = 0x0100, + // Allow multiple selection + wxDIRCTRL_MULTIPLE = 0x0200 }; //----------------------------------------------------------------------------- // wxDirItemData //----------------------------------------------------------------------------- -class WXDLLEXPORT wxDirItemData : public wxTreeItemData +class WXDLLIMPEXP_CORE wxDirItemData : public wxTreeItemData { public: wxDirItemData(const wxString& path, const wxString& name, bool isDir); - ~wxDirItemData(){} + virtual ~wxDirItemData(){} void SetNewDirName(const wxString& path); bool HasSubDirs() const; @@ -80,9 +80,9 @@ public: // wxDirCtrl //----------------------------------------------------------------------------- -class WXDLLEXPORT wxDirFilterListCtrl; +class WXDLLIMPEXP_FWD_CORE wxDirFilterListCtrl; -class WXDLLEXPORT wxGenericDirCtrl: public wxControl +class WXDLLIMPEXP_CORE wxGenericDirCtrl: public wxControl { public: wxGenericDirCtrl(); @@ -90,7 +90,7 @@ public: const wxString &dir = wxDirDialogDefaultFolderStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, + long style = wxDIRCTRL_3D_INTERNAL, const wxString& filter = wxEmptyString, int defaultFilter = 0, const wxString& name = wxTreeCtrlNameStr ) @@ -103,7 +103,7 @@ public: const wxString &dir = wxDirDialogDefaultFolderStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, + long style = wxDIRCTRL_3D_INTERNAL, const wxString& filter = wxEmptyString, int defaultFilter = 0, const wxString& name = wxTreeCtrlNameStr ); @@ -120,6 +120,8 @@ public: // 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 @@ -128,12 +130,17 @@ public: // Get dir or filename virtual wxString GetPath() const; + virtual void GetPaths(wxArrayString& paths) 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 GetFilePaths(wxArrayString& paths) const; virtual void SetPath(const wxString& path); + virtual void SelectPath(const wxString& path, bool select = true); + virtual void SelectPaths(const wxArrayString& paths); + virtual void ShowHidden( bool show ); virtual bool GetShowHidden() { return m_showHidden; } @@ -148,14 +155,11 @@ public: virtual wxTreeCtrl* GetTreeCtrl() const { return m_treeCtrl; } virtual wxDirFilterListCtrl* GetFilterListCtrl() const { return m_filterListCtrl; } + virtual void UnselectAll(); + // 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" // then the child for /usr is returned. @@ -171,6 +175,9 @@ public: // Collapse the entire tree virtual void CollapseTree(); + // overridden base class methods + virtual void SetFocus(); + protected: virtual void ExpandRoot(); virtual void ExpandDir(wxTreeItemId parentId); @@ -200,14 +207,14 @@ private: private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxGenericDirCtrl) - DECLARE_NO_COPY_CLASS(wxGenericDirCtrl) + wxDECLARE_NO_COPY_CLASS(wxGenericDirCtrl); }; //----------------------------------------------------------------------------- // wxDirFilterListCtrl //----------------------------------------------------------------------------- -class WXDLLEXPORT wxDirFilterListCtrl: public wxChoice +class WXDLLIMPEXP_CORE wxDirFilterListCtrl: public wxChoice { public: wxDirFilterListCtrl() { Init(); } @@ -227,7 +234,7 @@ public: void Init(); - ~wxDirFilterListCtrl() {} + virtual ~wxDirFilterListCtrl() {} //// Operations void FillFilterList(const wxString& filter, int defaultFilter); @@ -240,7 +247,7 @@ protected: DECLARE_EVENT_TABLE() DECLARE_CLASS(wxDirFilterListCtrl) - DECLARE_NO_COPY_CLASS(wxDirFilterListCtrl) + wxDECLARE_NO_COPY_CLASS(wxDirFilterListCtrl); }; #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXPM__) @@ -259,7 +266,7 @@ protected: #if wxUSE_DIRDLG || wxUSE_FILEDLG -class WXDLLEXPORT wxFileIconsTable +class WXDLLIMPEXP_CORE wxFileIconsTable { public: wxFileIconsTable(); @@ -289,7 +296,7 @@ protected: }; // The global fileicons table -extern WXDLLEXPORT_DATA(wxFileIconsTable *) wxTheFileIconsTable; +extern WXDLLIMPEXP_DATA_CORE(wxFileIconsTable *) wxTheFileIconsTable; #endif // wxUSE_DIRDLG || wxUSE_FILEDLG