X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/08887820a9eae40c5720ed3e374fcb42f60dab09..cd3c2375e6fddd3d478a6776900c21aaeb2d0f08:/src/generic/dirctrlg.cpp?ds=sidebyside

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 94e2f41024..0572945ee1 100644
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -57,8 +57,8 @@
 // FIXME - Mingw32 1.0 has both _getdrive() and _chdrive(). For now, let's assume
 //         older releases don't, but it should be verified and the checks modified
 //         accordingly.
-#if !defined(__GNUWIN32__) || \
-    (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
+#if !defined(__WXWINE__) && (!defined(__GNUWIN32__) || \
+    (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1))
   #include <direct.h>
   #include <stdlib.h>
   #include <ctype.h>
@@ -375,8 +375,8 @@ bool wxIsDriveAvailable(const wxString& dirName)
     if (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':'))
     {
         wxString dirNameLower(dirName.Lower());
-#if defined(__GNUWIN32__) && \
-    !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
+#if defined(__WXWINE__) || (defined(__GNUWIN32__) && \
+    !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1))
         success = wxPathExists(dirNameLower);
 #else
         int currentDrive = _getdrive();
@@ -504,10 +504,8 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
 
     long treeStyle = wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT;
 
-#ifdef __WXMSW__
-    if (style & wxDIRCTRL_EDITABLE)
+    if (style & wxDIRCTRL_EDIT_LABELS)
         treeStyle |= wxTR_EDIT_LABELS;
-#endif
 
     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
         treeStyle |= wxNO_BORDER;