From 34885a147bdca70749ac22737b55cbc6e0558b4a Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Tue, 8 Jan 2002 18:03:14 +0000
Subject: [PATCH] use UNIX wxDir if available

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/msw/tmake/filelist.txt  | 4 ++--
 src/mgl/{dir.cpp => dirmgl.cpp} | 6 ++++++
 src/mgl/files.lst               | 8 +++++---
 3 files changed, 13 insertions(+), 5 deletions(-)
 rename src/mgl/{dir.cpp => dirmgl.cpp} (99%)

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index bca3e3d319..689de96cab 100644
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -352,7 +352,7 @@ wave.cpp	MSW
 window.cpp	MSW	LowLevel
 
 dialup.cpp	Unix	NotMac
-dir.cpp	Unix	Base,NotMac,NotMGL
+dir.cpp	Unix	Base,NotMac
 fontenum.cpp	Unix	NotMac,NotMGL,NotMicro
 fontutil.cpp	Unix	NotMac,NotMGL,NotMicro
 gsocket.c	Unix	Base,NotMac
@@ -1448,7 +1448,7 @@ fontutil.cpp	MGL	LowLevel
 evtloop.cpp	MGL	LowLevel
 app.cpp	MGL	LowLevel
 bitmap.cpp	MGL	LowLevel
-dir.cpp	MGL	LowLevel
+dirmgl.cpp	MGL	LowLevel
 clipbrd.cpp	MGL	LowLevel
 cursor.cpp	MGL	LowLevel
 dcclient.cpp	MGL	LowLevel
diff --git a/src/mgl/dir.cpp b/src/mgl/dirmgl.cpp
similarity index 99%
rename from src/mgl/dir.cpp
rename to src/mgl/dirmgl.cpp
index c290d3f89a..b6ce6e5ca0 100644
--- a/src/mgl/dir.cpp
+++ b/src/mgl/dirmgl.cpp
@@ -29,6 +29,10 @@
     #pragma hdrstop
 #endif
 
+#include "wx/defs.h"
+
+#ifndef __UNIX__
+
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
@@ -261,3 +265,5 @@ bool wxDir::GetNext(wxString *filename) const
     return M_DIR->Read(filename);
 }
 
+#endif // !__UNIX__
+
diff --git a/src/mgl/files.lst b/src/mgl/files.lst
index 8b7852197b..8243d15d4e 100644
--- a/src/mgl/files.lst
+++ b/src/mgl/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 22:59, 2002/01/01
+# This file was automatically generated by tmake at 17:34, 2002/01/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MGL.T!
 ALL_SOURCES = \
 		generic/accel.cpp \
@@ -180,7 +180,7 @@ ALL_SOURCES = \
 		mgl/dcclient.cpp \
 		mgl/dcmemory.cpp \
 		mgl/dcscreen.cpp \
-		mgl/dir.cpp \
+		mgl/dirmgl.cpp \
 		mgl/evtloop.cpp \
 		mgl/font.cpp \
 		mgl/fontenum.cpp \
@@ -196,6 +196,7 @@ ALL_SOURCES = \
 		mgl/utils.cpp \
 		mgl/window.cpp \
 		unix/dialup.cpp \
+		unix/dir.cpp \
 		unix/gsocket.c \
 		unix/mimetype.cpp \
 		unix/snglinst.cpp \
@@ -694,7 +695,7 @@ GUI_LOWLEVEL_OBJS = \
 		dcclient.o \
 		dcmemory.o \
 		dcscreen.o \
-		dir.o \
+		dirmgl.o \
 		evtloop.o \
 		font.o \
 		fontenum.o \
@@ -712,6 +713,7 @@ GUI_LOWLEVEL_OBJS = \
 
 UNIXOBJS = \
 		dialup.o \
+		dir.o \
 		gsocket.o \
 		mimetype.o \
 		snglinst.o \
-- 
2.50.0