Fixed bug #1022383: 'several ComboBoxes appear selected'

[wxWidgets.git] / include / wx / filefn.h

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 80cc1db89c0fc04ca7774d1d9c8305bf5e2d7657..1d0b0bac66b16d93980fe1b7fd0dc1c95eec69dc 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -122,12 +122,12 @@ enum wxSeekMode
   wxFromEnd
 };
 
   wxFromEnd
 };
 

-enum wxFileTypeEnum
+enum wxFileKind

 {
 {

-  wxFILE_TYPE_UNKNOWN,
-  wxFILE_TYPE_DISK,     // a file supporting seeking to arbitrary offsets
-  wxFILE_TYPE_TERMINAL, // a tty
-  wxFILE_TYPE_PIPE      // a pipe
+  wxFILE_KIND_UNKNOWN,
+  wxFILE_KIND_DISK,     // a file supporting seeking to arbitrary offsets
+  wxFILE_KIND_TERMINAL, // a tty
+  wxFILE_KIND_PIPE      // a pipe

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -148,10 +148,9 @@ enum wxFileTypeEnum
     int wxWrite(int fd, const void *buf, unsigned int count);
     int wxEof(int fd);
     wxFileOffset wxSeek(int fd, wxFileOffset offset, int origin);
     int wxWrite(int fd, const void *buf, unsigned int count);
     int wxEof(int fd);
     wxFileOffset wxSeek(int fd, wxFileOffset offset, int origin);

-    inline HANDLE wxGetOSFHandle(int fd) { return (HANDLE)fd; }

     #define wxLSeek wxSeek
     wxFileOffset wxTell(int fd);
     #define wxLSeek wxSeek
     wxFileOffset wxTell(int fd);

-    
+

     // always Unicode under WinCE
     #define   wxMkDir      _wmkdir
     #define   wxRmDir      _wrmdir
     // always Unicode under WinCE
     #define   wxMkDir      _wmkdir
     #define   wxRmDir      _wrmdir


@@ -352,11 +351,6 @@ enum wxFileTypeEnum
     #endif
 #endif // platforms
 
     #endif
 #endif // platforms
 

-#if defined __WXMSW__ && !defined __WXWINCE__ 
-    // get the HANDLE associated with a file descriptor
-    inline HANDLE wxGetOSFHandle(int fd) { return (HANDLE)_get_osfhandle(fd); }
-#endif
-

 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
 //
 // VisualAge C++ V4.0 cannot have any external linkage const decs
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
 //
 // VisualAge C++ V4.0 cannot have any external linkage const decs


@@ -464,11 +458,13 @@ WXDLLIMPEXP_BASE bool wxMkdir(const wxString& dir, int perm = 0777);
 WXDLLIMPEXP_BASE bool wxRmdir(const wxString& dir, int flags = 0);
 
 // Return the type of an open file
 WXDLLIMPEXP_BASE bool wxRmdir(const wxString& dir, int flags = 0);
 
 // Return the type of an open file

-WXDLLIMPEXP_BASE wxFileTypeEnum wxGetFileType(int fd);
-inline wxFileTypeEnum wxGetFileType(FILE *fp) { return wxGetFileType(fileno(fp)); }
+WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(int fd);
+WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(FILE *fp);

 
 // compatibility defines, don't use in new code
 
 // compatibility defines, don't use in new code

-#define wxDirExists wxPathExists
+#if WXWIN_COMPATIBILITY_2_4
+    #define wxDirExists wxPathExists
+#endif

 
 // ----------------------------------------------------------------------------
 // separators in file names
 
 // ----------------------------------------------------------------------------
 // separators in file names