X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d0bc78e2bf750babe62ea4af7df1d0252293e7d8..38534f596974042130716a26276e9564b0b72295:/include/wx/generic/dirctrlg.h?ds=sidebyside diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h index 2a6c450824..73bf95d51c 100644 --- a/include/wx/generic/dirctrlg.h +++ b/include/wx/generic/dirctrlg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dirctrlg.h +// Name: wx/generic/dirctrlg.h // Purpose: wxGenericDirCtrl class // Builds on wxDirCtrl class written by Robert Roebling for the // wxFile application, modified by Harm van der Heijden. @@ -15,10 +15,6 @@ #ifndef _WX_DIRCTRL_H_ #define _WX_DIRCTRL_H_ -#if wxUSE_DIRDLG || wxUSE_FILEDLG - #include "wx/imaglist.h" -#endif - #if wxUSE_DIRDLG #include "wx/treectrl.h" @@ -30,9 +26,8 @@ // classes //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxTextCtrl; -class WXDLLIMPEXP_CORE wxImageList; -class WXDLLIMPEXP_BASE wxHashTable; +class WXDLLIMPEXP_FWD_CORE wxTextCtrl; +class WXDLLIMPEXP_FWD_BASE wxHashTable; //----------------------------------------------------------------------------- // Extra styles for wxGenericDirCtrl @@ -44,21 +39,21 @@ enum wxDIRCTRL_DIR_ONLY = 0x0010, // When setting the default path, select the first file in the directory wxDIRCTRL_SELECT_FIRST = 0x0020, -#if WXWIN_COMPATIBILITY_2_8 - // Unused, for compatibility only + // Show the filter list 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); @@ -78,9 +73,9 @@ public: // wxDirCtrl //----------------------------------------------------------------------------- -class WXDLLEXPORT wxDirFilterListCtrl; +class WXDLLIMPEXP_FWD_CORE wxDirFilterListCtrl; -class WXDLLEXPORT wxGenericDirCtrl: public wxControl +class WXDLLIMPEXP_CORE wxGenericDirCtrl: public wxControl { public: wxGenericDirCtrl(); @@ -88,7 +83,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 ) @@ -101,7 +96,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 ); @@ -114,6 +109,8 @@ public: void OnCollapseItem(wxTreeEvent &event ); void OnBeginEditItem(wxTreeEvent &event ); void OnEndEditItem(wxTreeEvent &event ); + void OnTreeSelChange(wxTreeEvent &event); + void OnItemActivated(wxTreeEvent &event); void OnSize(wxSizeEvent &event ); // Try to expand as much of the given path as possible. @@ -128,12 +125,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,6 +150,8 @@ public: virtual wxTreeCtrl* GetTreeCtrl() const { return m_treeCtrl; } virtual wxDirFilterListCtrl* GetFilterListCtrl() const { return m_filterListCtrl; } + virtual void UnselectAll(); + // Helper virtual void SetupSections(); @@ -157,6 +161,8 @@ public: // 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); + wxString GetPath(wxTreeItemId itemId) const; + // Resize the components of the control virtual void DoResize(); @@ -166,6 +172,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); @@ -182,6 +191,9 @@ protected: bool ExtractWildcard(const wxString& filterStr, int n, wxString& filter, wxString& description); private: + void PopulateNode(wxTreeItemId node); + wxDirItemData* GetItemData(wxTreeItemId itemId); + bool m_showHidden; wxTreeItemId m_rootId; wxString m_defaultPath; // Starting path @@ -195,14 +207,23 @@ private: private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxGenericDirCtrl) - DECLARE_NO_COPY_CLASS(wxGenericDirCtrl) + wxDECLARE_NO_COPY_CLASS(wxGenericDirCtrl); }; +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DIRCTRL_SELECTIONCHANGED, wxTreeEvent ); +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DIRCTRL_FILEACTIVATED, wxTreeEvent ); + +#define wx__DECLARE_DIRCTRL_EVT(evt, id, fn) \ + wx__DECLARE_EVT1(wxEVT_DIRCTRL_ ## evt, id, wxTreeEventHandler(fn)) + +#define EVT_DIRCTRL_SELECTIONCHANGED(id, fn) wx__DECLARE_DIRCTRL_EVT(SELECTIONCHANGED, id, fn) +#define EVT_DIRCTRL_FILEACTIVATED(id, fn) wx__DECLARE_DIRCTRL_EVT(FILEACTIVATED, id, fn) + //----------------------------------------------------------------------------- // wxDirFilterListCtrl //----------------------------------------------------------------------------- -class WXDLLEXPORT wxDirFilterListCtrl: public wxChoice +class WXDLLIMPEXP_CORE wxDirFilterListCtrl: public wxChoice { public: wxDirFilterListCtrl() { Init(); } @@ -235,7 +256,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__) @@ -252,9 +273,11 @@ protected: // wxFileIconsTable - use wxTheFileIconsTable which is created as necessary //------------------------------------------------------------------------- -#if wxUSE_DIRDLG || wxUSE_FILEDLG +#if wxUSE_DIRDLG || wxUSE_FILEDLG || wxUSE_FILECTRL + +class WXDLLIMPEXP_FWD_CORE wxImageList; -class WXDLLEXPORT wxFileIconsTable +class WXDLLIMPEXP_CORE wxFileIconsTable { public: wxFileIconsTable(); @@ -284,9 +307,13 @@ protected: }; // The global fileicons table -extern WXDLLEXPORT_DATA(wxFileIconsTable *) wxTheFileIconsTable; +extern WXDLLIMPEXP_DATA_CORE(wxFileIconsTable *) wxTheFileIconsTable; + +#endif // wxUSE_DIRDLG || wxUSE_FILEDLG || wxUSE_FILECTRL -#endif // wxUSE_DIRDLG || wxUSE_FILEDLG +// old wxEVT_COMMAND_* constants +#define wxEVT_COMMAND_DIRCTRL_SELECTIONCHANGED wxEVT_DIRCTRL_SELECTIONCHANGED +#define wxEVT_COMMAND_DIRCTRL_FILEACTIVATED wxEVT_DIRCTRL_FILEACTIVATED #endif // _WX_DIRCTRLG_H_