Removed redundant makefiles and AIAI icons. Changed dynamic sample source name from

[wxWidgets.git] / src / common / filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 90b49c111d04b1ac6dd5cf708f972a910db11f56..66f56e999e84048afe884eb548e05a1f46896a48 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -46,7 +46,7 @@
 #include <dirent.h>
 #endif
 
 #include <dirent.h>
 #endif
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 #ifndef __GNUWIN32__
 #include <direct.h>
 #include <dos.h>
 #ifndef __GNUWIN32__
 #include <direct.h>
 #include <dos.h>


@@ -70,7 +70,7 @@
 #include <dir.h>
 #endif
 
 #include <dir.h>
 #endif
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 #include "windows.h"
 #endif
 
 #include "windows.h"
 #endif
 


@@ -91,7 +91,7 @@ void wxPathList::Add (const wxString& path)
 void wxPathList::AddEnvList (const wxString& envVariable)
 {
   static const char PATH_TOKS[] =
 void wxPathList::AddEnvList (const wxString& envVariable)
 {
   static const char PATH_TOKS[] =

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

        " ;"; // Don't seperate with colon in DOS (used for drive)
 #else
        " :;";
        " ;"; // Don't seperate with colon in DOS (used for drive)
 #else
        " :;";


@@ -136,7 +136,7 @@ bool wxPathList::Member (const wxString& path)
   {
       wxString path2((char *) node->Data ());
       if (
   {
       wxString path2((char *) node->Data ());
       if (

-#if defined(__WXMSW__) || defined(__VMS__)
+#if defined(__WINDOWS__) || defined(__VMS__)

       // Case INDEPENDENT
          path.CompareTo (path2, wxString::ignoreCase) == 0
 #else
       // Case INDEPENDENT
          path.CompareTo (path2, wxString::ignoreCase) == 0
 #else


@@ -167,7 +167,7 @@ wxString wxPathList::FindValidPath (const wxString& file)
       if (ch != '\\' && ch != '/')
         strcat (wxBuffer, "/");
       strcat (wxBuffer, filename);
       if (ch != '\\' && ch != '/')
         strcat (wxBuffer, "/");
       strcat (wxBuffer, filename);

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

       Unix2DosFilename (wxBuffer);
 #endif
       if (wxFileExists (wxBuffer))
       Unix2DosFilename (wxBuffer);
 #endif
       if (wxFileExists (wxBuffer))


@@ -194,7 +194,7 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
       lastCh = buf[len-1];
     if (lastCh != '/' && lastCh != '\\')
     {
       lastCh = buf[len-1];
     if (lastCh != '/' && lastCh != '\\')
     {

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

       strcat(buf, "\\");
 #else
       strcat(buf, "/");
       strcat(buf, "\\");
 #else
       strcat(buf, "/");


@@ -237,7 +237,7 @@ wxIsAbsolutePath (const wxString& filename)
 #ifdef __VMS__
       || (filename[0] == '[' && filename[1] != '.')
 #endif
 #ifdef __VMS__
       || (filename[0] == '[' && filename[1] != '.')
 #endif

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

       /* MSDOS */
       || filename[0] == '\\' || (isalpha (filename[0]) && filename[1] == ':')
 #endif
       /* MSDOS */
       || filename[0] == '\\' || (isalpha (filename[0]) && filename[1] == ':')
 #endif


@@ -844,7 +844,9 @@ bool wxRemoveFile(const wxString& file)
 
 bool wxMkdir(const wxString& dir)
 {
 
 bool wxMkdir(const wxString& dir)
 {

-#ifdef __VMS__
+#if defined(__WXSTUBS__)
+  return FALSE;
+#elif defined(__VMS__)

        return FALSE;
 #elif (defined(__GNUWIN32__) && !defined(__MINGW32__)) || !defined(__WXMSW__)
   return (mkdir (WXSTRINGCAST dir, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0);
        return FALSE;
 #elif (defined(__GNUWIN32__) && !defined(__MINGW32__)) || !defined(__WXMSW__)
   return (mkdir (WXSTRINGCAST dir, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0);


@@ -924,7 +926,7 @@ bool wxPathExists(const char *pszPathName)
 // Get a temporary filename, opening and closing the file.
 char *wxGetTempFileName(const wxString& prefix, char *buf)
 {
 // Get a temporary filename, opening and closing the file.
 char *wxGetTempFileName(const wxString& prefix, char *buf)
 {

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 
 #ifndef        __WIN32__
   char tmp[144];
 
 #ifndef        __WIN32__
   char tmp[144];


@@ -1260,7 +1262,7 @@ bool wxSetWorkingDirectory(const wxString& d)
 {
 #ifdef __UNIX__
   return (chdir(d) == 0);
 {
 #ifdef __UNIX__
   return (chdir(d) == 0);

-#elif defined(__WXMSW__)
+#elif defined(__WINDOWS__)

 
 #ifdef __WIN32__
   return (bool)(SetCurrentDirectory(d) != 0);
 
 #ifdef __WIN32__
   return (bool)(SetCurrentDirectory(d) != 0);


@@ -1347,16 +1349,16 @@ void WXDLLEXPORT wxSplitPath(const char *pszFileName,
   const char *pSepDos = strrchr(pszFileName, FILE_SEP_PATH_DOS);
 
   // take the last of the two
   const char *pSepDos = strrchr(pszFileName, FILE_SEP_PATH_DOS);
 
   // take the last of the two

-  uint nPosUnix = pSepUnix ? pSepUnix - pszFileName : 0;
-  uint nPosDos = pSepDos ? pSepDos - pszFileName : 0;
+  size_t nPosUnix = pSepUnix ? pSepUnix - pszFileName : 0;
+  size_t nPosDos = pSepDos ? pSepDos - pszFileName : 0;

   if ( nPosDos > nPosUnix )
     nPosUnix = nPosDos;
   if ( nPosDos > nPosUnix )
     nPosUnix = nPosDos;

-//  uint nLen = Strlen(pszFileName);
+//  size_t nLen = Strlen(pszFileName);

 
   if ( pstrPath )
     *pstrPath = wxString(pszFileName, nPosUnix);
   if ( pDot ) {
 
   if ( pstrPath )
     *pstrPath = wxString(pszFileName, nPosUnix);
   if ( pDot ) {

-    uint nPosDot = pDot - pszFileName;
+    size_t nPosDot = pDot - pszFileName;

     if ( pstrName )
       *pstrName = wxString(pszFileName + nPosUnix + 1, nPosDot - nPosUnix);
     if ( pstrExt )
     if ( pstrName )
       *pstrName = wxString(pszFileName + nPosUnix + 1, nPosDot - nPosUnix);
     if ( pstrExt )