Added extra width for controls to avoid edge being clipped

[wxWidgets.git] / src / mac / carbon / dirmac.cpp

diff --git a/src/mac/carbon/dirmac.cpp b/src/mac/carbon/dirmac.cpp
index f029c2bd389f90c664ba5d565cdb6b3d051f0110..979f68a40e18da8724bf6df5e11fe4de796a4b43 100644 (file)
--- a/src/mac/carbon/dirmac.cpp
+++ b/src/mac/carbon/dirmac.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/dir.cpp
+// Name:        mac/dirmac.cpp

 // Purpose:     wxDir implementation for Mac
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxDir implementation for Mac
 // Author:      Stefan Csomor
 // Modified by:


@@ -24,37 +24,17 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/dir.h"
+

 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif // PCH
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif // PCH
 

-#include "wx/dir.h"

 #include "wx/filefn.h"          // for wxDirExists()
 #include "wx/filefn.h"          // for wxDirExists()

-
-#ifndef __DARWIN__
-  #include <windows.h>
-#endif
-

 #include "wx/filename.h"
 #include "wx/mac/private.h"
 
 #include "wx/filename.h"
 #include "wx/mac/private.h"
 

-#include "MoreFilesX.h"
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-#ifndef MAX_PATH
-    #define MAX_PATH 260        // from VC++ headers
-#endif
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-#define M_DIR       ((wxDirData *)m_data)
-

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -151,13 +131,16 @@ bool wxDirData::Read(wxString *filename)
         HFSUniStr255 uniname ;
         FSRef fileRef;
         FSCatalogInfo catalogInfo;
         HFSUniStr255 uniname ;
         FSRef fileRef;
         FSCatalogInfo catalogInfo;

-        UInt32 fetched = 0;
+        ItemCount fetched = 0;

 
         err = FSGetCatalogInfoBulk( m_iterator, 1, &fetched, NULL, kFSCatInfoNodeFlags | kFSCatInfoFinderInfo , &catalogInfo , &fileRef, NULL, &uniname );
 
         err = FSGetCatalogInfoBulk( m_iterator, 1, &fetched, NULL, kFSCatInfoNodeFlags | kFSCatInfoFinderInfo , &catalogInfo , &fileRef, NULL, &uniname );

+        
+        // expected error codes 
+        

         if ( errFSNoMoreItems == err )
             return false ;
         if ( errFSNoMoreItems == err )
             return false ;

-
-        wxASSERT( noErr == err ) ;
+        if ( afpAccessDenied == err )
+            return false ;

 
         if ( noErr != err )
             break ;
 
         if ( noErr != err )
             break ;


@@ -223,7 +206,7 @@ wxDir::wxDir(const wxString& dirname)
 
 bool wxDir::Open(const wxString& dirname)
 {
 
 bool wxDir::Open(const wxString& dirname)
 {

-    delete M_DIR;
+    delete m_data;

     m_data = new wxDirData(dirname);
 
     return true;
     m_data = new wxDirData(dirname);
 
     return true;


@@ -239,7 +222,7 @@ wxString wxDir::GetName() const
     wxString name;
     if ( m_data )
     {
     wxString name;
     if ( m_data )
     {

-        name = M_DIR->GetName();
+        name = m_data->GetName();

         if ( !name.empty() && (name.Last() == _T('/')) )
         {
             // chop off the last (back)slash
         if ( !name.empty() && (name.Last() == _T('/')) )
         {
             // chop off the last (back)slash


@@ -252,10 +235,8 @@ wxString wxDir::GetName() const
 
 wxDir::~wxDir()
 {
 
 wxDir::~wxDir()
 {

-    if (M_DIR != NULL) {
-        delete M_DIR;
-        m_data = NULL;
-    }
+    delete m_data;
+    m_data = NULL;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -268,10 +249,10 @@ bool wxDir::GetFirst(wxString *filename,
 {
     wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
 
 {
     wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
 

-    M_DIR->Rewind();
+    m_data->Rewind();

 
 

-    M_DIR->SetFileSpec(filespec);
-    M_DIR->SetFlags(flags);
+    m_data->SetFileSpec(filespec);
+    m_data->SetFlags(flags);

 
     return GetNext(filename);
 }
 
     return GetNext(filename);
 }


@@ -282,5 +263,5 @@ bool wxDir::GetNext(wxString *filename) const
 
     wxCHECK_MSG( filename, false, _T("bad pointer in wxDir::GetNext()") );
 
 
     wxCHECK_MSG( filename, false, _T("bad pointer in wxDir::GetNext()") );
 

-    return M_DIR->Read(filename);
+    return m_data->Read(filename);

 }
 }