X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/generic/dirdlgg.h?ds=sidebyside diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h index 3133ca5ab6..79c15b278d 100644 --- a/include/wx/generic/dirdlgg.h +++ b/include/wx/generic/dirdlgg.h @@ -15,20 +15,20 @@ #ifndef _WX_DIRDLGG_H_ #define _WX_DIRDLGG_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "dirdlgg.h" -#endif - -class WXDLLEXPORT wxGenericDirCtrl; -class WXDLLEXPORT wxTextCtrl; -class WXDLLEXPORT wxTreeEvent; +class WXDLLIMPEXP_FWD_CORE wxGenericDirCtrl; +class WXDLLIMPEXP_FWD_CORE wxTextCtrl; +class WXDLLIMPEXP_FWD_CORE wxTreeEvent; // we may be included directly as well as from wx/dirdlg.h (FIXME) -WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[]; + #ifndef wxDD_DEFAULT_STYLE - #define wxDD_DEFAULT_STYLE \ - (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON) +#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" @@ -37,30 +37,34 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr; // wxGenericDirDialog //----------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericDirDialog : public wxDialog +class WXDLLIMPEXP_CORE wxGenericDirDialog : public wxDirDialogBase { public: - wxGenericDirDialog() : wxDialog() { } + wxGenericDirDialog() : wxDirDialogBase() { } wxGenericDirDialog(wxWindow* parent, const wxString& title = wxDirSelectorPromptStr, const wxString& defaultPath = wxEmptyString, long style = wxDD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxSize(450, 550), + 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 - void SetMessage(const wxString& message) { m_message = message; } void SetPath(const wxString& path); - void SetStyle(long style) { m_dialogStyle = style; } - - wxString GetMessage() const { return m_message; } wxString GetPath() const; - long GetStyle() 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; } @@ -75,9 +79,6 @@ protected: void OnGoHome(wxCommandEvent& event); void OnShowHidden(wxCommandEvent& event); - wxString m_message; - long m_dialogStyle; - wxString m_path; wxGenericDirCtrl* m_dirCtrl; wxTextCtrl* m_input;