X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..6968a3b87cee46f5c5af9b46e1ef97f17133cef7:/include/wx/dirdlg.h?ds=sidebyside diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h index 738b1013cf..d02325f8f1 100644 --- a/include/wx/dirdlg.h +++ b/include/wx/dirdlg.h @@ -1,3 +1,14 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/dirdlg.h +// Purpose: wxDirDialog base class +// Author: Robert Roebling +// Modified by: +// Created: +// Copyright: (c) Robert Roebling +// RCS-ID: $Id$ +// Licence: wxWindows Licence +///////////////////////////////////////////////////////////////////////////// + #ifndef _WX_DIRDLG_H_BASE_ #define _WX_DIRDLG_H_BASE_ @@ -9,63 +20,105 @@ // constants // ---------------------------------------------------------------------------- -WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr; -WXDLLEXPORT_DATA(extern 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 -#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 -/* - 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) ); + +#endif // WXWIN_COMPATIBILITY_2_6 + + virtual void SetMessage(const wxString& message) { m_message = message; } + virtual void SetPath(const wxString& path) { m_path = path; } - void SetMessage(const wxString& message); - void SetPath(const wxString& path); - void SetStyle(long style); + virtual wxString GetMessage() const { return m_message; } + virtual wxString GetPath() const { return m_path; } - wxString GetMessage() const; - wxString GetPath() const; - long GetStyle() const; +protected: + wxString m_message; + wxString m_path; }; -*/ -#if defined(__WXMSW__) - #if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__) || !wxUSE_OLE - #include "wx/generic/dirdlgg.h" - #define wxDirDialog wxGenericDirDialog - #else - #include "wx/msw/dirdlg.h" - #endif -#elif defined(__WXMOTIF__) +// Universal and non-port related switches with need for generic implementation +#if defined(__WXUNIVERSAL__) #include "wx/generic/dirdlgg.h" -#elif defined(__WXGTK__) - #include "wx/generic/dirdlgg.h" -#elif defined(__WXX11__) + #define wxDirDialog wxGenericDirDialog +#elif defined(__WXMSW__) && (!wxUSE_OLE || \ + (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)) #include "wx/generic/dirdlgg.h" -#elif defined(__WXMGL__) + #define wxDirDialog wxGenericDirDialog +#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 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" + #include "wx/osx/dirdlg.h" // Native Mac #elif defined(__WXCOCOA__) - #include "wx/generic/dirdlgg.h" -#elif defined(__WXPM__) - #include "wx/generic/dirdlgg.h" -#endif - -#if !defined(__WXMSW__) && !defined(__WXMAC__) + #include "wx/cocoa/dirdlg.h" // Native Cocoa +#elif defined(__WXMOTIF__) || \ + defined(__WXX11__) || \ + defined(__WXCOCOA__) || \ + defined(__WXPM__) + #include "wx/generic/dirdlgg.h" // Other ports use generic implementation #define wxDirDialog wxGenericDirDialog #endif @@ -73,7 +126,7 @@ public: // common ::wxDirSelector() function // ---------------------------------------------------------------------------- -WXDLLEXPORT wxString +WXDLLIMPEXP_CORE wxString wxDirSelector(const wxString& message = wxDirSelectorPromptStr, const wxString& defaultPath = wxEmptyString, long style = wxDD_DEFAULT_STYLE,