X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99d800190a04a2deaf769017a5fae04a4ae50378..6968a3b87cee46f5c5af9b46e1ef97f17133cef7:/include/wx/dirdlg.h diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h index 0752c5e972..d02325f8f1 100644 --- a/include/wx/dirdlg.h +++ b/include/wx/dirdlg.h @@ -20,87 +20,113 @@ // constants // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogNameStr; -extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogDefaultFolderStr; -extern WXDLLEXPORT_DATA(const wxChar*) wxDirSelectorPromptStr; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogDefaultFolderStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[]; + +#define wxDD_CHANGE_DIR 0x0100 +#define wxDD_DIR_MUST_EXIST 0x0200 + +// deprecated, on by default now, use wxDD_DIR_MUST_EXIST to disable it +#define wxDD_NEW_DIR_BUTTON 0 #ifdef __WXWINCE__ - #define wxDD_DEFAULT_STYLE \ - (wxDEFAULT_DIALOG_STYLE | wxDD_NEW_DIR_BUTTON) + #define wxDD_DEFAULT_STYLE wxDEFAULT_DIALOG_STYLE #else - #define wxDD_DEFAULT_STYLE \ - (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON) + #define wxDD_DEFAULT_STYLE (wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER) #endif -/* - The interface (TODO: make the other classes really derive from it!) is - something like this: +//------------------------------------------------------------------------- +// wxDirDialogBase +//------------------------------------------------------------------------- -class WXDLLEXPORT wxDirDialogBase : public wxDialog +class WXDLLIMPEXP_CORE wxDirDialogBase : public wxDialog { public: + wxDirDialogBase() {} wxDirDialogBase(wxWindow *parent, - const wxString& title = wxFileSelectorPromptStr, + const wxString& title = wxDirSelectorPromptStr, const wxString& defaultPath = wxEmptyString, long style = wxDD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, - const wxString& name = _T("dirdialog")); + const wxString& name = wxDirDialogNameStr) + { + Create(parent, title, defaultPath, style, pos, sz, name); + } + + virtual ~wxDirDialogBase() {} + + + 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, + const wxString& name = wxDirDialogNameStr) + { + if (!wxDialog::Create(parent, wxID_ANY, title, pos, sz, style, name)) + return false; + m_path = defaultPath; + m_message = title; + return true; + } + +#if WXWIN_COMPATIBILITY_2_6 + + wxDEPRECATED( long GetStyle() const ); + wxDEPRECATED( void SetStyle(long style) ); - void SetMessage(const wxString& message); - void SetPath(const wxString& path); - void SetStyle(long style); +#endif // WXWIN_COMPATIBILITY_2_6 - wxString GetMessage() const; - wxString GetPath() const; - long GetStyle() const; + virtual void SetMessage(const wxString& message) { m_message = message; } + virtual void SetPath(const wxString& path) { m_path = path; } + + virtual wxString GetMessage() const { return m_message; } + virtual wxString GetPath() const { return m_path; } + +protected: + wxString m_message; + wxString m_path; }; -*/ // Universal and non-port related switches with need for generic implementation -#if defined(__WXMSW__) && (defined(__WXUNIVERSAL__) || \ - defined(__SALFORDC__) || \ - !wxUSE_OLE || \ - (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)) - +#if defined(__WXUNIVERSAL__) #include "wx/generic/dirdlgg.h" #define wxDirDialog wxGenericDirDialog - -// MS PocketPC or MS Smartphone -#elif defined(__WXMSW__) && defined(__WXWINCE__) && !defined(__HANDHELDPC__) - +#elif defined(__WXMSW__) && (!wxUSE_OLE || \ + (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)) #include "wx/generic/dirdlgg.h" #define wxDirDialog wxGenericDirDialog - -// Native MSW +#elif defined(__WXMSW__) && defined(__WXWINCE__) && !defined(__HANDHELDPC__) + #include "wx/generic/dirdlgg.h" // MS PocketPC or MS Smartphone + #define wxDirDialog wxGenericDirDialog #elif defined(__WXMSW__) - - #include "wx/msw/dirdlg.h" - -// Native Mac + #include "wx/msw/dirdlg.h" // Native MSW +#elif defined(__WXGTK20__) + #include "wx/gtk/dirdlg.h" // Native GTK for gtk2.4 +#elif defined(__WXGTK__) + #include "wx/generic/dirdlgg.h" + #define wxDirDialog wxGenericDirDialog #elif defined(__WXMAC__) - - #include "wx/mac/dirdlg.h" - -// Other ports use generic implementation + #include "wx/osx/dirdlg.h" // Native Mac +#elif defined(__WXCOCOA__) + #include "wx/cocoa/dirdlg.h" // Native Cocoa #elif defined(__WXMOTIF__) || \ - defined(__WXGTK__) || \ defined(__WXX11__) || \ - defined(__WXMGL__) || \ defined(__WXCOCOA__) || \ defined(__WXPM__) - - #include "wx/generic/dirdlgg.h" + #include "wx/generic/dirdlgg.h" // Other ports use generic implementation #define wxDirDialog wxGenericDirDialog - #endif // ---------------------------------------------------------------------------- // common ::wxDirSelector() function // ---------------------------------------------------------------------------- -WXDLLEXPORT wxString +WXDLLIMPEXP_CORE wxString wxDirSelector(const wxString& message = wxDirSelectorPromptStr, const wxString& defaultPath = wxEmptyString, long style = wxDD_DEFAULT_STYLE,