X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22328fa444e2fc9a1b762ab1b3950c3c49b502db..ca6911c361b04290fe1f0e64b616249b3b3d71ba:/include/wx/generic/dirctrlg.h?ds=sidebyside diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h index 977b5396a7..7c0640be7d 100644 --- a/include/wx/generic/dirctrlg.h +++ b/include/wx/generic/dirctrlg.h @@ -15,8 +15,8 @@ #ifndef _WX_DIRCTRL_H_ #define _WX_DIRCTRL_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "dirctrlg.h" +#if wxUSE_DIRDLG || wxUSE_FILEDLG + #include "wx/imaglist.h" #endif #if wxUSE_DIRDLG @@ -30,9 +30,9 @@ // classes //----------------------------------------------------------------------------- -class WXDLLEXPORT wxTextCtrl; -class WXDLLEXPORT wxImageList; -class WXDLLEXPORT wxHashTable; +class WXDLLIMPEXP_FWD_CORE wxTextCtrl; +class WXDLLIMPEXP_FWD_CORE wxImageList; +class WXDLLIMPEXP_FWD_BASE wxHashTable; //----------------------------------------------------------------------------- // Extra styles for wxGenericDirCtrl @@ -44,8 +44,10 @@ 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 @@ -56,11 +58,11 @@ enum // 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; @@ -76,17 +78,17 @@ public: // wxDirCtrl //----------------------------------------------------------------------------- -class WXDLLEXPORT wxDirFilterListCtrl; +class WXDLLIMPEXP_FWD_CORE wxDirFilterListCtrl; -class WXDLLEXPORT wxGenericDirCtrl: public wxControl +class WXDLLIMPEXP_CORE wxGenericDirCtrl: public wxControl { 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, - long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, + long style = wxDIRCTRL_3D_INTERNAL, const wxString& filter = wxEmptyString, int defaultFilter = 0, const wxString& name = wxTreeCtrlNameStr ) @@ -94,12 +96,12 @@ public: 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, - long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, + long style = wxDIRCTRL_3D_INTERNAL, const wxString& filter = wxEmptyString, int defaultFilter = 0, const wxString& name = wxTreeCtrlNameStr ); @@ -116,6 +118,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 @@ -124,12 +128,12 @@ public: // 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); - + virtual void ShowHidden( bool show ); virtual bool GetShowHidden() { return m_showHidden; } @@ -146,23 +150,28 @@ public: // Helper virtual void SetupSections(); - - // Parse the filter into an array of filters and an array of descriptions - virtual 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. - // 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); - + // Resize the components of the control virtual void DoResize(); - + // Collapse & expand the tree, thus re-creating it from scratch: virtual void ReCreateTree(); - + + // Collapse the entire tree + virtual void CollapseTree(); + + + // overridden base class methods + virtual void SetFocus(); + protected: + virtual void ExpandRoot(); virtual void ExpandDir(wxTreeItemId parentId); virtual void CollapseDir(wxTreeItemId parentId); virtual const wxTreeItemId AddSection(const wxString& path, const wxString& name, int imageId = 0); @@ -171,6 +180,7 @@ protected: 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); @@ -189,18 +199,18 @@ 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(); } - 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) @@ -208,15 +218,15 @@ public: 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(); - ~wxDirFilterListCtrl() {}; + virtual ~wxDirFilterListCtrl() {} //// Operations void FillFilterList(const wxString& filter, int defaultFilter); @@ -229,7 +239,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__) @@ -240,11 +250,15 @@ protected: #define wxID_TREECTRL 7000 #define wxID_FILTERLISTCTRL 7001 +#endif // wxUSE_DIRDLG + //------------------------------------------------------------------------- // wxFileIconsTable - use wxTheFileIconsTable which is created as necessary //------------------------------------------------------------------------- -class WXDLLEXPORT wxFileIconsTable +#if wxUSE_DIRDLG || wxUSE_FILEDLG + +class WXDLLIMPEXP_CORE wxFileIconsTable { public: wxFileIconsTable(); @@ -274,9 +288,9 @@ protected: }; // The global fileicons table -WXDLLEXPORT_DATA(extern wxFileIconsTable *) wxTheFileIconsTable; +extern WXDLLIMPEXP_DATA_CORE(wxFileIconsTable *) wxTheFileIconsTable; -#endif // wxUSE_DIRDLG +#endif // wxUSE_DIRDLG || wxUSE_FILEDLG #endif // _WX_DIRCTRLG_H_