X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..8f17876f2b49e831d817e0ce683ae4f4d1ee9fb1:/src/generic/dirctrlg.cpp

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index d00e4d958b..32e05b5adf 100644
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -27,6 +27,7 @@
 #include "wx/button.h"
 #include "wx/layout.h"
 #include "wx/msgdlg.h"
+#include "wx/textctrl.h"
 #include "wx/textdlg.h"
 #include "wx/filefn.h"
 #include "wx/cmndata.h"
@@ -67,8 +68,8 @@
 
 #endif // __WXPM__
 
-#if defined(__WXMAC__) && !defined(__UNIX__)
-#include "moreextr.h"
+#if defined(__WXMAC__)
+#  include "MoreFilesExtras.h"
 #endif
 
 #ifdef __BORLANDC__
@@ -597,7 +598,7 @@ void wxGenericDirCtrl::SetupSections()
         }
     }
 #endif
-#elif defined(__WXMAC__) && !defined(__UNIX__)
+#elif defined(__WXMAC__)
     FSSpec volume ;
     short index = 1 ;
     while(1) {
@@ -1074,8 +1075,8 @@ bool wxGenericDirCtrl::ExtractWildcard(const wxString& filterStr, int n, wxStrin
         description = descriptions[n];
         return TRUE;
     }
-    else
-        return FALSE;
+
+    return FALSE;
 }
 
 // Parses the global filter, returning the number of filters.