Fixup Blit so it can be used with a source that is a wxBufferedDC,

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

diff --git a/src/mac/carbon/dirdlg.cpp b/src/mac/carbon/dirdlg.cpp
index a17768a61b251fa591e50888e64a135f9a1f1cbf..fedf03ccaeb4f0421b7744d984c16f0b547c8217 100644 (file)
--- a/src/mac/carbon/dirdlg.cpp
+++ b/src/mac/carbon/dirdlg.cpp
@@ -1,31 +1,34 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dirdlg.cpp
+// Name:        src/mac/carbon/dirdlg.cpp

 // Purpose:     wxDirDialog
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxDirDialog
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #if wxUSE_DIRDLG
 
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #if wxUSE_DIRDLG
 

-#include "wx/utils.h"
-#include "wx/dialog.h"

 #include "wx/dirdlg.h"
 
 #include "wx/dirdlg.h"
 

-#include "wx/cmndata.h"
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/cmndata.h"
+#endif // WX_PRECOMP
+

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

-  #include <Carbon/Carbon.h>
+    #include <Carbon/Carbon.h>

 #else
 #else

-  #include <Navigation.h>
+    #include <Navigation.h>

 #endif
 
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 #endif
 
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)


@@ -45,7 +48,7 @@ static pascal void NavEventProc(
     wxDirDialog * data = ( wxDirDialog *) ioUserData ;
     if ( inSelector == kNavCBStart )
     {
     wxDirDialog * data = ( wxDirDialog *) ioUserData ;
     if ( inSelector == kNavCBStart )
     {

-        if (data && !data->GetPath().IsEmpty() )
+        if (data && !data->GetPath().empty() )

         {
             // Set default location for the modern Navigation APIs
             // Apple Technical Q&A 1151
         {
             // Set default location for the modern Navigation APIs
             // Apple Technical Q&A 1151


@@ -68,7 +71,6 @@ wxDirDialog::wxDirDialog(wxWindow *parent,
 {
     wxASSERT_MSG( NavServicesAvailable() , wxT("Navigation Services are not running") ) ;
     m_message = message;
 {
     wxASSERT_MSG( NavServicesAvailable() , wxT("Navigation Services are not running") ) ;
     m_message = message;

-    m_dialogStyle = style;

     m_parent = parent;
     m_path = defaultPath;
 }
     m_parent = parent;
     m_path = defaultPath;
 }


@@ -80,15 +82,15 @@ int wxDirDialog::ShowModal()
     NavReplyRecord reply ;
     bool disposeReply = false ;
     OSStatus err = noErr;
     NavReplyRecord reply ;
     bool disposeReply = false ;
     OSStatus err = noErr;

-    
+

     err = NavGetDefaultDialogCreationOptions(&options);
     err = NavGetDefaultDialogCreationOptions(&options);

-    if (err == noErr) 
+    if (err == noErr)

     {
         wxMacCFStringHolder message(m_message, m_font.GetEncoding());
         options.message = message;
         err = NavCreateChooseFolderDialog(&options, sStandardNavEventFilter , NULL,  this , &dialog);
     {
         wxMacCFStringHolder message(m_message, m_font.GetEncoding());
         options.message = message;
         err = NavCreateChooseFolderDialog(&options, sStandardNavEventFilter , NULL,  this , &dialog);

-        if (err == noErr) 
-        {        
+        if (err == noErr)
+        {

             err = NavDialogRun(dialog);
             if ( err == noErr )
             {
             err = NavDialogRun(dialog);
             if ( err == noErr )
             {


@@ -97,16 +99,16 @@ int wxDirDialog::ShowModal()
             }
         }
     }
             }
         }
     }

-    
-    if ( err == noErr ) 
-    { 
+
+    if ( err == noErr )
+    {

         if ( reply.validRecord )
         {
             FSRef folderInfo;
             AEDesc specDesc ;
         if ( reply.validRecord )
         {
             FSRef folderInfo;
             AEDesc specDesc ;

-            
+

             OSErr err = ::AECoerceDesc( &reply.selection , typeFSRef, &specDesc);
             OSErr err = ::AECoerceDesc( &reply.selection , typeFSRef, &specDesc);

-            if ( err != noErr ) 
+            if ( err != noErr )

             {
                 m_path = wxEmptyString ;
             }
             {
                 m_path = wxEmptyString ;
             }


@@ -114,10 +116,10 @@ int wxDirDialog::ShowModal()
             {
                 folderInfo = **(FSRef**) specDesc.dataHandle;
                 m_path = wxMacFSRefToPath( &folderInfo ) ;
             {
                 folderInfo = **(FSRef**) specDesc.dataHandle;
                 m_path = wxMacFSRefToPath( &folderInfo ) ;

-                if (specDesc.dataHandle != nil) 
+                if (specDesc.dataHandle != nil)

                 {
                     ::AEDisposeDesc(&specDesc);
                 {
                     ::AEDisposeDesc(&specDesc);

-                }            
+                }

             }
         }
         else
             }
         }
         else


@@ -125,14 +127,14 @@ int wxDirDialog::ShowModal()
             err = paramErr ; // could be any error, only used for giving back wxID_CANCEL
         }
     }
             err = paramErr ; // could be any error, only used for giving back wxID_CANCEL
         }
     }

-    
+

     if ( disposeReply )
         ::NavDisposeReply(&reply);
     if ( disposeReply )
         ::NavDisposeReply(&reply);

-    
+

     // apparently cancelling shouldn't change m_path
     if ( err != noErr && err != userCanceledErr )
         m_path = wxEmptyString ;
     // apparently cancelling shouldn't change m_path
     if ( err != noErr && err != userCanceledErr )
         m_path = wxEmptyString ;

-    
+

     return (err == noErr) ? wxID_OK : wxID_CANCEL ;
 }
 
     return (err == noErr) ? wxID_OK : wxID_CANCEL ;
 }