Enable graphics context by default

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index c23f02bf1c0416eeb467db1e4578212ad783ab63..7a8f627a555d2bd5e0724a64582c2376799b9a29 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -56,7 +56,7 @@
 #endif
 
 #if defined(__WXMAC__)
 #endif
 
 #if defined(__WXMAC__)

-    #include  "wx/mac/private.h"  // includes mac headers
+    #include  "wx/osx/private.h"  // includes mac headers

 #endif
 
 #ifdef __WINDOWS__
 #endif
 
 #ifdef __WINDOWS__


@@ -96,10 +96,6 @@
     #define _MAXPATHLEN 1024
 #endif
 
     #define _MAXPATHLEN 1024
 #endif
 

-#ifdef __WXMAC__
-// #    include "MoreFilesX.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // private globals
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private globals
 // ----------------------------------------------------------------------------


@@ -878,7 +874,7 @@ wxString wxPathOnly (const wxString& path)
 // and back again - or we get nasty problems with delimiters.
 // Also, convert to lower case, since case is significant in UNIX.
 
 // and back again - or we get nasty problems with delimiters.
 // Also, convert to lower case, since case is significant in UNIX.
 

-#if defined(__WXMAC__)
+#if defined(__WXMAC__) && !defined(__WXOSX_IPHONE__)

 
 #define kDefaultPathStyle kCFURLPOSIXPathStyle
 
 
 #define kDefaultPathStyle kCFURLPOSIXPathStyle
 


@@ -1373,7 +1369,12 @@ wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
         return NULL;
 
     if ( buf )
         return NULL;
 
     if ( buf )

+#ifdef _PACC_VER
+        // work around the PalmOS pacc compiler bug
+        wxStrcpy(buf, filename.data());
+#else

         wxStrcpy(buf, filename);
         wxStrcpy(buf, filename);

+#endif

     else
         buf = MYcopystring(filename);
 
     else
         buf = MYcopystring(filename);
 


@@ -1407,8 +1408,7 @@ wxString wxFindFirstFile(const wxString& spec, int flags)
     if ( !wxEndsWithPathSeparator(gs_dirPath ) )
         gs_dirPath << wxFILE_SEP_PATH;
 
     if ( !wxEndsWithPathSeparator(gs_dirPath ) )
         gs_dirPath << wxFILE_SEP_PATH;
 

-    if (gs_dir)
-        delete gs_dir;
+    delete gs_dir; // can be NULL, this is ok

     gs_dir = new wxDir(gs_dirPath);
 
     if ( !gs_dir->IsOpened() )
     gs_dir = new wxDir(gs_dirPath);
 
     if ( !gs_dir->IsOpened() )


@@ -1438,7 +1438,7 @@ wxString wxFindFirstFile(const wxString& spec, int flags)
 
 wxString wxFindNextFile()
 {
 
 wxString wxFindNextFile()
 {

-    wxASSERT_MSG( gs_dir, wxT("You must call wxFindFirstFile before!") );
+    wxCHECK_MSG( gs_dir, "", "You must call wxFindFirstFile before!" );

 
     wxString result;
     gs_dir->GetNext(&result);
 
     wxString result;
     gs_dir->GetNext(&result);


@@ -1656,7 +1656,7 @@ wxString wxGetOSDirectory()
     wxChar buf[256];
     GetWindowsDirectory(buf, 256);
     return wxString(buf);
     wxChar buf[256];
     GetWindowsDirectory(buf, 256);
     return wxString(buf);

-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && wxOSX_USE_CARBON

     return wxMacFindFolder(kOnSystemDisk, 'macs', false);
 #else
     return wxEmptyString;
     return wxMacFindFolder(kOnSystemDisk, 'macs', false);
 #else
     return wxEmptyString;


@@ -1850,7 +1850,7 @@ static bool wxCheckWin32Permission(const wxString& path, DWORD access)
 
     HANDLE h = ::CreateFile
                  (
 
     HANDLE h = ::CreateFile
                  (

-                    path.wx_str(),
+                    path.t_str(),

                     access,
                     FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
                     NULL,
                     access,
                     FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
                     NULL,