wxColourData::operator=() should return wxColourData&, not void

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index b072f52667cab142bf281d2f0b44b321f1290dec..22f0636f92b39c3c6e3e66cae81a84df90217dd6 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -558,7 +558,7 @@ static CharType *wxDoExpandPath(CharType *buf, const wxString& name)
     buf[0] = wxT('\0');
     if (name.empty())
         return buf;
     buf[0] = wxT('\0');
     if (name.empty())
         return buf;

-    nm = MYcopystring((const CharType*)name.c_str()); // Make a scratch copy
+    nm = ::MYcopystring(static_cast<const CharType*>(name.c_str())); // Make a scratch copy

     CharType *nm_tmp = nm;
 
     /* Skip leading whitespace and cr */
     CharType *nm_tmp = nm;
 
     /* Skip leading whitespace and cr */


@@ -1915,7 +1915,7 @@ bool wxIsWritable(const wxString &path)
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links

-    return wxAccess(path.fn_str(), W_OK) == 0;
+    return wxAccess(path.c_str(), W_OK) == 0;

 #elif defined( __WINDOWS__ )
     return wxCheckWin32Permission(path, GENERIC_WRITE);
 #else
 #elif defined( __WINDOWS__ )
     return wxCheckWin32Permission(path, GENERIC_WRITE);
 #else


@@ -1929,7 +1929,7 @@ bool wxIsReadable(const wxString &path)
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links

-    return wxAccess(path.fn_str(), R_OK) == 0;
+    return wxAccess(path.c_str(), R_OK) == 0;

 #elif defined( __WINDOWS__ )
     return wxCheckWin32Permission(path, GENERIC_READ);
 #else
 #elif defined( __WINDOWS__ )
     return wxCheckWin32Permission(path, GENERIC_READ);
 #else


@@ -1943,7 +1943,7 @@ bool wxIsExecutable(const wxString &path)
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links

-    return wxAccess(path.fn_str(), X_OK) == 0;
+    return wxAccess(path.c_str(), X_OK) == 0;

 #elif defined( __WINDOWS__ )
    return wxCheckWin32Permission(path, GENERIC_EXECUTE);
 #else
 #elif defined( __WINDOWS__ )
    return wxCheckWin32Permission(path, GENERIC_EXECUTE);
 #else