Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index bad7a88aff42b9bbb7524e87059fe4d290835139..ad0333d6695de31013eed3de7fb44e61beac7b5c 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -22,22 +22,9 @@
     #include <time.h>
 #endif
 
     #include <time.h>
 #endif
 

-#ifdef __WXWINCE__
-// Nothing
-#elif !defined(__MWERKS__)
+#ifndef __WXWINCE__

     #include <sys/types.h>
     #include <sys/stat.h>
     #include <sys/types.h>
     #include <sys/stat.h>

-#else
-    #ifdef __MACH__
-        #include <sys/types.h>
-        #include <utime.h>
-        #include <sys/stat.h>
-        #include <unistd.h>
-    #else
-        #include <stat.h>
-        #include <unistd.h>
-        #include <unix.h>
-    #endif

 #endif
 
 #ifdef __OS2__
 #endif
 
 #ifdef __OS2__


@@ -58,7 +45,7 @@
 #endif
 
 #if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
 #endif
 
 #if defined(__WINDOWS__) && !defined(__WXMICROWIN__)

-#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__WXWINCE__) && !defined(__CYGWIN__)
+#if !defined( __GNUWIN32__ ) && !defined(__WXWINCE__) && !defined(__CYGWIN__)

     #include <direct.h>
     #include <dos.h>
     #include <io.h>
     #include <direct.h>
     #include <dos.h>
     #include <io.h>


@@ -106,12 +93,10 @@
     #endif
 #endif
 
     #endif
 #endif
 

-#if (defined(__VISUALC__) && !defined(__WXWINCE__)) || ( defined(__MWERKS__) && defined( __INTEL__) )
+#if defined(__VISUALC__) && !defined(__WXWINCE__)

     typedef _off_t off_t;
 #elif defined(__SYMANTEC__)
     typedef long off_t;
     typedef _off_t off_t;
 #elif defined(__SYMANTEC__)
     typedef long off_t;

-#elif defined(__MWERKS__) && !defined(__INTEL__) && !defined(__MACH__)
-    typedef long off_t;

 #endif
 
 enum wxSeekMode
 #endif
 
 enum wxSeekMode


@@ -200,13 +185,12 @@ enum wxPosixPermissions
     #define   wxCRT_RmDir      _wrmdir
     #define   wxCRT_Stat       _wstat
     #define   wxStructStat struct _stat
     #define   wxCRT_RmDir      _wrmdir
     #define   wxCRT_Stat       _wstat
     #define   wxStructStat struct _stat

-#elif (defined(__WXMSW__) || defined(__OS2__)) && \
+#elif (defined(__WINDOWS__) || defined(__OS2__)) && \

       ( \
         defined(__VISUALC__) || \
         defined(__MINGW64__) || \
         (defined(__MINGW32__) && !defined(__WINE__) && \
                                 wxCHECK_W32API_VERSION(0, 5)) || \
       ( \
         defined(__VISUALC__) || \
         defined(__MINGW64__) || \
         (defined(__MINGW32__) && !defined(__WINE__) && \
                                 wxCHECK_W32API_VERSION(0, 5)) || \

-        defined(__MWERKS__) || \

         defined(__DMC__) || \
         defined(__WATCOMC__) || \
         defined(__BORLANDC__) \
         defined(__DMC__) || \
         defined(__WATCOMC__) || \
         defined(__BORLANDC__) \


@@ -236,9 +220,8 @@ enum wxPosixPermissions
         #define wxFtell ftello64
     #endif
 
         #define wxFtell ftello64
     #endif
 

-    // other Windows compilers (DMC, Watcom, Metrowerks and Borland) don't have
-    // huge file support (or at least not all functions needed for it by wx)
-    // currently
+    // other Windows compilers (DMC, Watcom, and Borland) don't have huge file
+    // support (or at least not all functions needed for it by wx) currently

 
     // types
 
 
     // types
 


@@ -309,20 +292,8 @@ enum wxPosixPermissions
     // complications
     #define   wxClose      wxPOSIX_IDENT(close)
 
     // complications
     #define   wxClose      wxPOSIX_IDENT(close)
 

-    #if defined(__MWERKS__)
-        #if __MSL__ >= 0x6000
-            #define wxRead(fd, buf, nCount)  _read(fd, (void *)buf, nCount)
-            #define wxWrite(fd, buf, nCount) _write(fd, (void *)buf, nCount)
-        #else
-            #define wxRead(fd, buf, nCount)\
-                  _read(fd, (const char *)buf, nCount)
-            #define wxWrite(fd, buf, nCount)\
-                  _write(fd, (const char *)buf, nCount)
-        #endif
-    #else // __MWERKS__
-        #define wxRead         wxPOSIX_IDENT(read)
-        #define wxWrite        wxPOSIX_IDENT(write)
-    #endif
+    #define wxRead         wxPOSIX_IDENT(read)
+    #define wxWrite        wxPOSIX_IDENT(write)

 
     #ifdef wxHAS_HUGE_FILES
         #ifndef __MINGW64__
 
     #ifdef wxHAS_HUGE_FILES
         #ifndef __MINGW64__