Include wx/cursor.h according to precompiled headers of wx/wx.h (with other minor...

[wxWidgets.git] / src / mac / classic / filedlg.cpp

diff --git a/src/mac/classic/filedlg.cpp b/src/mac/classic/filedlg.cpp
index 920f82b3b363f8c0f4ffa6acbcf4e4fdfe72f63b..f80b88378e030b7e07133395478d2d1fe50e5b88 100644 (file)
--- a/src/mac/classic/filedlg.cpp
+++ b/src/mac/classic/filedlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filedlg.cpp
+// Name:        src/mac/classic/filedlg.cpp

 // Purpose:     wxFileDialog
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxFileDialog
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,17 +9,26 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/defs.h"
-#include "wx/app.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+

 #include "wx/filedlg.h"
 #include "wx/filedlg.h"

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

 #include "wx/tokenzr.h"
 #include "wx/filename.h"
 
 #ifndef __DARWIN__
 #include "wx/tokenzr.h"
 #include "wx/filename.h"
 
 #ifndef __DARWIN__

-  #include "PLStringFuncs.h"
+    #include "PLStringFuncs.h"

 #endif
 
 IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
 #endif
 
 IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)


@@ -89,7 +98,7 @@ NavEventProc(
     else if ( inSelector == kNavCBStart )
     {
 #if TARGET_CARBON
     else if ( inSelector == kNavCBStart )
     {
 #if TARGET_CARBON

-        if (data && !(data->defaultLocation).IsEmpty())
+        if (data && !(data->defaultLocation).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


@@ -183,7 +192,7 @@ void MakeUserDataRec(OpenUserDataRec    *myData , const wxString& filter )
         // an explanatory text, in that case the first part is name and extension at the same time
 
         wxASSERT_MSG( filterIndex == 0 || !isName , wxT("incorrect format of format string") ) ;
         // an explanatory text, in that case the first part is name and extension at the same time
 
         wxASSERT_MSG( filterIndex == 0 || !isName , wxT("incorrect format of format string") ) ;

-        if ( current.IsEmpty() )
+        if ( current.empty() )

             myData->extensions.Add( myData->name[filterIndex] ) ;
         else
             myData->extensions.Add( current.MakeUpper() ) ;
             myData->extensions.Add( myData->name[filterIndex] ) ;
         else
             myData->extensions.Add( current.MakeUpper() ) ;


@@ -200,21 +209,21 @@ void MakeUserDataRec(OpenUserDataRec    *myData , const wxString& filter )
             wxString extension = myData->extensions[i];
 
             if (extension.GetChar(0) == '*')
             wxString extension = myData->extensions[i];
 
             if (extension.GetChar(0) == '*')

-                extension = extension.Mid(1);  // Remove leading *
+                extension = extension.Mid(1);  // Remove leading *

 
             if (extension.GetChar(0) == '.')
             {
 
             if (extension.GetChar(0) == '.')
             {

-                extension = extension.Mid(1);  // Remove leading .
+                extension = extension.Mid(1);  // Remove leading .

             }
             }

-       
+

             if (wxFileName::MacFindDefaultTypeAndCreator( extension, &fileType, &creator ))
             {
                 myData->filtermactypes.Add( (OSType)fileType );
             }
             else
             {
             if (wxFileName::MacFindDefaultTypeAndCreator( extension, &fileType, &creator ))
             {
                 myData->filtermactypes.Add( (OSType)fileType );
             }
             else
             {

-                myData->filtermactypes.Add( '****' ) ;         // We'll fail safe if it's not recognized
-               }
+                myData->filtermactypes.Add( '****' ) ;   // We'll fail safe if it's not recognized
+            }

         }
     }
 }
         }
     }
 }


@@ -311,7 +320,7 @@ pascal Boolean CrossPlatformFilterCallback (
                 wxString file = wxMacMakeStringFromPascal( spec.name ) ;
                 display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
             }
                 wxString file = wxMacMakeStringFromPascal( spec.name ) ;
                 display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
             }

- #if TARGET_CARBON
+#if TARGET_CARBON

             else if ( theItem->descriptorType == typeFSRef )
             {
                 FSRef fsref ;
             else if ( theItem->descriptorType == typeFSRef )
             {
                 FSRef fsref ;


@@ -319,16 +328,16 @@ pascal Boolean CrossPlatformFilterCallback (
 
 
 
 
 
 

-               CFURLRef fullURLRef;
+                CFURLRef fullURLRef;

                 fullURLRef = ::CFURLCreateFromFSRef(NULL, &fsref);
 #ifdef __UNIX__
                 fullURLRef = ::CFURLCreateFromFSRef(NULL, &fsref);
 #ifdef __UNIX__

-               CFURLPathStyle pathstyle = kCFURLPOSIXPathStyle;
+                CFURLPathStyle pathstyle = kCFURLPOSIXPathStyle;

 #else
 #else

-               CFURLPathStyle pathstyle = kCFURLHFSPathStyle;
+                CFURLPathStyle pathstyle = kCFURLHFSPathStyle;

 #endif
 #endif

-               CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, pathstyle);
-               ::CFRelease( fullURLRef ) ;
-               wxString file = wxMacCFStringHolder(cfString).AsString(wxFont::GetDefaultEncoding());
+                CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, pathstyle);
+                ::CFRelease( fullURLRef ) ;
+                wxString file = wxMacCFStringHolder(cfString).AsString(wxFont::GetDefaultEncoding());

 
                 display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
             }
 
                 display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
             }


@@ -615,7 +624,7 @@ int wxFileDialog::ShowModal()
             OSErr err = ::AEGetNthDesc( &mNavReply.selection , i , typeFSS, &keyWord , &specDesc);
             if ( err != noErr )
             {
             OSErr err = ::AEGetNthDesc( &mNavReply.selection , i , typeFSS, &keyWord , &specDesc);
             if ( err != noErr )
             {

-                m_path = wxT("") ;
+                m_path = wxEmptyString ;

                 return wxID_CANCEL ;
             }
             outFileSpec = **(FSSpec**) specDesc.dataHandle;
                 return wxID_CANCEL ;
             }
             outFileSpec = **(FSSpec**) specDesc.dataHandle;


@@ -638,4 +647,3 @@ int wxFileDialog::ShowModal()
     return wxID_CANCEL;
 #endif // TARGET_CARBON
 }
     return wxID_CANCEL;
 #endif // TARGET_CARBON
 }

-