X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a70a30b2e52f5f2e0e8c41e495be9a43161fc8a..1a6a6043f79b8b12958e6cb09d443213a969507d:/include/wx/dirdlg.h diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h index 7d8682927a..5b0dacfef8 100644 --- a/include/wx/dirdlg.h +++ b/include/wx/dirdlg.h @@ -12,8 +12,9 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr; WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; #if defined(__WXMSW__) - #if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__) + #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,14 +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" -#elif defined(__WXSTUBS__) - #include "wx/stubs/dirdlg.h" + #include "wx/generic/dirdlgg.h" #endif // ----------------------------------------------------------------------------