X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/748fcded3c795db266076aac381aa335cc4aa42d..b5b49e42939fd7ef098241733648b534f71b526c:/include/wx/dirdlg.h?ds=sidebyside diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h index 9f962768da..bb9a22f36d 100644 --- a/include/wx/dirdlg.h +++ b/include/wx/dirdlg.h @@ -14,6 +14,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; #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 @@ -21,12 +22,14 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; #include "wx/generic/dirdlgg.h" #elif defined(__WXGTK__) #include "wx/generic/dirdlgg.h" +#elif defined(__WXX11__) + #include "wx/generic/dirdlgg.h" #elif defined(__WXMGL__) #include "wx/generic/dirdlgg.h" #elif defined(__WXMAC__) #include "wx/mac/dirdlg.h" #elif defined(__WXPM__) - #include "wx/os2/dirdlg.h" + #include "wx/generic/dirdlgg.h" #endif // ---------------------------------------------------------------------------- @@ -38,7 +41,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr; WXDLLEXPORT wxString wxDirSelector(const wxString& message = wxDirSelectorPromptStr, const wxString& defaultPath = wxEmptyString, - long style = 0, + long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON, const wxPoint& pos = wxDefaultPosition, wxWindow *parent = NULL);