X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1044a386f0521b9b805b142547783acb96d1a406..a42aa5d7be12e5bb24aa0488892574c01cae5a5b:/include/wx/dirdlg.h

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 3f23e13047..00a314639b 100644
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -1,6 +1,8 @@
 #ifndef _WX_DIRDLG_H_BASE_
 #define _WX_DIRDLG_H_BASE_
 
+#if wxUSE_DIRDLG
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -10,7 +12,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 #if defined(__WXMSW__)
-#if defined(__WIN16__) || defined(__GNUWIN32__) || defined(__SALFORDC__)
+#if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__)
 #include "wx/generic/dirdlgg.h"
 #else
 #include "wx/msw/dirdlg.h"
@@ -19,15 +21,19 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 #include "wx/generic/dirdlgg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/dirdlgg.h"
-#elif defined(__WXQT__)
-#include "wx/qt/dirdlg.h"
 #elif defined(__WXMAC__)
+#ifdef __DARWIN__
+#include "wx/generic/dirdlgg.h"
+#else
 #include "wx/mac/dirdlg.h"
+#endif
 #elif defined(__WXPM__)
 #include "wx/os2/dirdlg.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/dirdlg.h"
 #endif
 
+#endif // wxUSE_DIRDLG
+
 #endif
     // _WX_DIRDLG_H_BASE_