X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/957aea456c1a67fb57084e7e5895fc17d85f8a12..f1f5f16f780bb41aa2ea24ccbf728f14c86cc475:/include/wx/generic/dirdlgg.h?ds=sidebyside diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h index 908473efef..6346f476ec 100644 --- a/include/wx/generic/dirdlgg.h +++ b/include/wx/generic/dirdlgg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dirdlgg.h +// Name: wx/generic/dirdlgg.h // Purpose: wxGenericDirCtrl class // Builds on wxDirCtrl class written by Robert Roebling for the // wxFile application, modified by Harm van der Heijden. @@ -15,48 +15,60 @@ #ifndef _WX_DIRDLGG_H_ #define _WX_DIRDLGG_H_ -#ifdef __GNUG__ -#pragma interface "dirdlgg.h" -#endif +class WXDLLEXPORT wxGenericDirCtrl; +class WXDLLEXPORT wxTextCtrl; +class WXDLLEXPORT wxTreeEvent; -#include "wx/defs.h" +// we may be included directly as well as from wx/dirdlg.h (FIXME) +extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[]; +extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[]; -#if wxUSE_DIRDLG +#ifndef wxDD_DEFAULT_STYLE +#ifdef __WXWINCE__ + #define wxDD_DEFAULT_STYLE wxDEFAULT_DIALOG_STYLE +#else + #define wxDD_DEFAULT_STYLE (wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER) +#endif +#endif #include "wx/dialog.h" -class WXDLLEXPORT wxGenericDirCtrl; -class WXDLLEXPORT wxTextCtrl; -class WXDLLEXPORT wxTreeEvent; //----------------------------------------------------------------------------- // wxGenericDirDialog //----------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericDirDialog: public wxDialog +class WXDLLEXPORT wxGenericDirDialog : public wxDirDialogBase { public: - wxGenericDirDialog(): wxDialog() {} - wxGenericDirDialog(wxWindow* parent, const wxString& title, + wxGenericDirDialog() : wxDirDialogBase() { } + + wxGenericDirDialog(wxWindow* parent, + const wxString& title = wxDirSelectorPromptStr, const wxString& defaultPath = wxEmptyString, - long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER, + long style = wxDD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxSize(450, 550), - const wxString& name = _T("dialog")); + const wxSize& sz = wxDefaultSize,//Size(450, 550), + const wxString& name = wxDirDialogNameStr); + + bool Create(wxWindow* parent, + const wxString& title = wxDirSelectorPromptStr, + const wxString& defaultPath = wxEmptyString, + long style = wxDD_DEFAULT_STYLE, + const wxPoint& pos = wxDefaultPosition, + const wxSize& sz = wxDefaultSize,//Size(450, 550), + const wxString& name = wxDirDialogNameStr); //// Accessors - inline void SetMessage(const wxString& message) { m_message = message; } void SetPath(const wxString& path); - inline void SetStyle(long style) { m_dialogStyle = style; } + wxString GetPath() const; - inline wxString GetMessage(void) const { return m_message; } - wxString GetPath(void) const; - inline long GetStyle(void) const { return m_dialogStyle; } + //// Overrides + virtual int ShowModal(); + virtual void EndModal(int retCode); + // this one is specific to wxGenericDirDialog wxTextCtrl* GetInputCtrl() const { return m_input; } - //// Overrides - int ShowModal(); - protected: //// Event handlers void OnCloseWindow(wxCloseEvent& event); @@ -64,21 +76,14 @@ protected: void OnTreeSelected(wxTreeEvent &event); void OnTreeKeyDown(wxTreeEvent &event); void OnNew(wxCommandEvent& event); + void OnGoHome(wxCommandEvent& event); void OnShowHidden(wxCommandEvent& event); - wxString m_message; - long m_dialogStyle; - wxString m_path; wxGenericDirCtrl* m_dirCtrl; wxTextCtrl* m_input; DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS(wxGenericDirDialog) }; -#if !defined(__WXMSW__) && !defined(__WXMAC__) - #define wxDirDialog wxGenericDirDialog -#endif - -#endif // wxUSE_DIRDLG - #endif // _WX_DIRDLGG_H_