use correct scale when drawing

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

diff --git a/src/osx/carbon/dirmac.cpp b/src/osx/carbon/dirmac.cpp
index 1fabdec5cd80aa30800b812751b14b9f7d6cd39e..71e643662516834d3115b2e2e4da495d575a48e0 100644 (file)
--- a/src/osx/carbon/dirmac.cpp
+++ b/src/osx/carbon/dirmac.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mac/dirmac.cpp
+// Name:        src/osx/carbon/dirmac.cpp
 // Purpose:     wxDir implementation for Mac
 // Author:      Stefan Csomor
 // Modified by:
@@ -31,7 +31,6 @@
     #include "wx/log.h"
 #endif // PCH
 
-#include "wx/filefn.h"          // for wxDirExists()
 #include "wx/filename.h"
 #include "wx/osx/private.h"
 
@@ -135,9 +134,9 @@ bool wxDirData::Read(wxString *filename)
         ItemCount fetched = 0;
 
         err = FSGetCatalogInfoBulk( m_iterator, 1, &fetched, NULL, kFSCatInfoNodeFlags | kFSCatInfoFinderInfo , &catalogInfo , &fileRef, NULL, &uniname );
-        
-        // expected error codes 
-        
+
+        // expected error codes
+
         if ( errFSNoMoreItems == err )
             return false ;
         if ( afpAccessDenied == err )
@@ -185,16 +184,6 @@ bool wxDirData::Read(wxString *filename)
     return true;
 }
 
-// ----------------------------------------------------------------------------
-// wxDir helpers
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxDir::Exists(const wxString& dir)
-{
-    return wxDirExists(dir);
-}
-
 // ----------------------------------------------------------------------------
 // wxDir construction/destruction
 // ----------------------------------------------------------------------------
@@ -237,8 +226,7 @@ wxString wxDir::GetName() const
 
 wxDir::~wxDir()
 {
-    delete m_data;
-    m_data = NULL;
+    wxDELETE(m_data);
 }
 
 // ----------------------------------------------------------------------------