From bf973818a376aea7edf29ec264982fcde7423c78 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 23 Feb 2012 16:33:13 +0000
Subject: [PATCH] Remove duplicate wxFileKind definition from documentation.

Also move wxSeekMode from interface/wx/ffile.h to filefn.h to be consistent
with the header in which this enum is really defined. And document it better.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 interface/wx/ffile.h  | 25 -------------------------
 interface/wx/filefn.h | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/interface/wx/ffile.h b/interface/wx/ffile.h
index 869aed9a22..43d94f1ed1 100644
--- a/interface/wx/ffile.h
+++ b/interface/wx/ffile.h
@@ -7,31 +7,6 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-
-/**
-    Values used for both wxFile and wxFFile.
-
-    @todo make the value names uppercase
-*/
-enum wxSeekMode
-{
-  wxFromStart,
-  wxFromCurrent,
-  wxFromEnd
-};
-
-/**
-    See wxFFile::GetKind().
-*/
-enum wxFileKind
-{
-  wxFILE_KIND_UNKNOWN,
-  wxFILE_KIND_DISK,     /**< A file supporting seeking to arbitrary offsets. */
-  wxFILE_KIND_TERMINAL, /**< A terminal. */
-  wxFILE_KIND_PIPE      /**< A pipe. */
-};
-
-
 /**
     @class wxFFile
 
diff --git a/interface/wx/filefn.h b/interface/wx/filefn.h
index 18fd7def0d..f2c9551b4f 100644
--- a/interface/wx/filefn.h
+++ b/interface/wx/filefn.h
@@ -479,9 +479,25 @@ wxString wxFindNextFile();
 */
 wxString wxFindFirstFile(const wxString& spec, int flags = 0);
 
+/**
+    Parameter indicating how file offset should be interpreted.
+
+    This is used by wxFFile::Seek() and wxFile::Seek().
+
+    @header{wx/filefn.h}
+*/
+enum wxSeekMode
+{
+    wxFromStart,        ///< Seek from the file beginning.
+    wxFromCurrent,      ///< Seek from the current position.
+    wxFromEnd           ///< Seek from end of the file.
+};
+
 /**
     File kind enumerations returned from wxGetFileKind().
 
+    Also used by wxFFile::GetKind() and wxFile::GetKind().
+
     @header{wx/filefn.h}
 */
 enum wxFileKind
-- 
2.45.2