Added machinery to Enable/Disable windows. When a window is disabled, it

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 3ccac13183f3116f5c8a6d57d8161943a225b963..80c870d8b8094adaf0b2b48edc73fa954b16cc70 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "filefn.h"
 #endif
 
@@ -128,7 +128,7 @@
 #endif
 
 #ifdef __WINDOWS__
-    #include <windows.h>
+    #include "wx/msw/wrapwin.h"
     #include "wx/msw/mslu.h"
 
     // for _getcwd
@@ -196,7 +196,7 @@ const off_t wxInvalidOffset = (off_t)-1;
 // implementation
 // ============================================================================
 
-#if defined(__WXMAC__) && !defined(__DARWIN__)
+#if defined(__WXMAC__) && !defined(__DARWIN__) && !defined(wxUSE_UNICODE)
 
 WXDLLEXPORT int wxStat( const wxChar *file_name, wxStructStat *buf )
 {
@@ -255,7 +255,7 @@ static inline wxChar* MYcopystring(const wxChar* s)
 
 void wxPathList::Add (const wxString& path)
 {
-    wxStringList::Append (WXSTRINGCAST path);
+    wxStringList::Add (WXSTRINGCAST path);
 }
 
 // Add paths e.g. from the PATH environment variable
@@ -977,7 +977,7 @@ wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
     }
 
     // create path string for return value
-    wxString result( thePath ) ;
+    wxString result( thePath , wxConvLocal) ;
 #else
     Handle    myPath ;
     short     length ;