Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / msdos / dir.cpp

diff --git a/src/msdos/dir.cpp b/src/msdos/dir.cpp
index 7ae2827cfd6dc41e2b1dbf752266c0afcc29c093..7693fb10b4e588b96b5099a76ac6d26450cf9257 100644 (file)
--- a/src/msdos/dir.cpp
+++ b/src/msdos/dir.cpp
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/palmos/dir.cpp
-// Purpose:     wxDir implementation for PalmOS
-// Author:      William Osborne - minimal working wxPalmOS port
+// Name:        src/msdos/dir.cpp
+// Purpose:     wxDir implementation for DOS
+// Author:      derived from wxPalmOS code

 // Modified by:
 // Created:     10.13.04
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     10.13.04
 // RCS-ID:      $Id$


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dir.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -34,7 +30,6 @@
 #endif // PCH
 
 #include "wx/dir.h"
 #endif // PCH
 
 #include "wx/dir.h"

-#include "wx/filefn.h"          // for wxDirExists()

 
 // ----------------------------------------------------------------------------
 // define the types and functions used for file searching
 
 // ----------------------------------------------------------------------------
 // define the types and functions used for file searching


@@ -62,25 +57,15 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-// ----------------------------------------------------------------------------
-// wxDir helpers
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxDir::Exists(const wxString& dir)
-{
-    return false;
-}
-

 // ----------------------------------------------------------------------------
 // wxDir construction/destruction
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxDir construction/destruction
 // ----------------------------------------------------------------------------
 

-wxDir::wxDir(const wxString& dirname)
+wxDir::wxDir(const wxString& WXUNUSED(dirname))

 {
 }
 
 {
 }
 

-bool wxDir::Open(const wxString& dirname)
+bool wxDir::Open(const wxString& WXUNUSED(dirname))

 {
     return false;
 }
 {
     return false;
 }


@@ -92,9 +77,7 @@ bool wxDir::IsOpened() const
 
 wxString wxDir::GetName() const
 {
 
 wxString wxDir::GetName() const
 {

-    wxString name;
-
-    return name;
+    return wxEmptyString;

 }
 
 wxDir::~wxDir()
 }
 
 wxDir::~wxDir()


@@ -105,15 +88,14 @@ wxDir::~wxDir()
 // wxDir enumerating
 // ----------------------------------------------------------------------------
 
 // wxDir enumerating
 // ----------------------------------------------------------------------------
 

-bool wxDir::GetFirst(wxString *filename,
-                     const wxString& filespec,
-                     int flags) const
+bool wxDir::GetFirst(wxString *WXUNUSED(filename),
+                     const wxString& WXUNUSED(filespec),
+                     int WXUNUSED(flags)) const

 {
     return false;
 }
 
 {
     return false;
 }
 

-bool wxDir::GetNext(wxString *filename) const
+bool wxDir::GetNext(wxString *WXUNUSED(filename)) const

 {
     return false;
 }
 {
     return false;
 }

-