Rich text lib separation.

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

diff --git a/src/mac/classic/filedlg.cpp b/src/mac/classic/filedlg.cpp
index 56f87a07357c358fd6ef7cbeed11490b4916ff44..7eca40ec7e900bd070e64da4948461828e929e93 100644 (file)
--- a/src/mac/classic/filedlg.cpp
+++ b/src/mac/classic/filedlg.cpp
@@ -19,16 +19,16 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/dialog.h"

 #endif
 
 #endif
 

-#include "wx/app.h"
-#include "wx/utils.h"
-#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)


@@ -98,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


@@ -169,7 +169,7 @@ void MakeUserDataRec(OpenUserDataRec    *myData , const wxString& filter )
         int filterIndex = 0;
         bool isName = true ;
         wxString current ;
         int filterIndex = 0;
         bool isName = true ;
         wxString current ;

-        for( unsigned int i = 0; i < filter2.Len() ; i++ )
+        for( unsigned int i = 0; i < filter2.length() ; i++ )

         {
             if( filter2.GetChar(i) == wxT('|') )
             {
         {
             if( filter2.GetChar(i) == wxT('|') )
             {


@@ -251,7 +251,7 @@ static Boolean CheckFile( const wxString &filename , OSType type , OpenUserDataR
                 if ( extension.GetChar(0) == '*' )
                     extension = extension.Mid(1) ;
 
                 if ( extension.GetChar(0) == '*' )
                     extension = extension.Mid(1) ;
 

-                if ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) )
+                if ( file.length() >= extension.length() && extension == file.Right(extension.length() ) )

                     return true ;
             }
         }
                     return true ;
             }
         }


@@ -292,8 +292,8 @@ static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dat
 
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
 
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,

-        long style, const wxPoint& pos)
-             :wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos)
+        long style, const wxPoint& pos, const wxSize& sz, const wxString& name)
+             :wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name)

 {
     wxASSERT_MSG( NavServicesAvailable() , wxT("Navigation Services are not running") ) ;
 }
 {
     wxASSERT_MSG( NavServicesAvailable() , wxT("Navigation Services are not running") ) ;
 }


@@ -320,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 ;


@@ -372,7 +372,7 @@ int wxFileDialog::ShowModal()
     OpenUserDataRec myData;
     myData.defaultLocation = m_dir;
 
     OpenUserDataRec myData;
     myData.defaultLocation = m_dir;
 

-    if (m_dialogStyle & wxSAVE)
+    if (HasFlag(wxFD_SAVE))

     {
         dialogCreateOptions.optionFlags |= kNavNoTypePopup;
         dialogCreateOptions.optionFlags |= kNavDontAutoTranslate;
     {
         dialogCreateOptions.optionFlags |= kNavNoTypePopup;
         dialogCreateOptions.optionFlags |= kNavDontAutoTranslate;


@@ -445,7 +445,7 @@ int wxFileDialog::ShowModal()
                 break;
 
             CFURLRef fullURLRef;
                 break;
 
             CFURLRef fullURLRef;

-            if (m_dialogStyle & wxSAVE)
+            if (HasFlag(wxFD_SAVE))

             {
                 CFURLRef parentURLRef = ::CFURLCreateFromFSRef(NULL, &theFSRef);
 
             {
                 CFURLRef parentURLRef = ::CFURLCreateFromFSRef(NULL, &theFSRef);
 


@@ -562,7 +562,7 @@ int wxFileDialog::ShowModal()
             wxMacStringToPascal( myData.name[i] , (StringPtr)(*mNavOptions.popupExtension)[i].menuItemName ) ;
         }
     }
             wxMacStringToPascal( myData.name[i] , (StringPtr)(*mNavOptions.popupExtension)[i].menuItemName ) ;
         }
     }

-    if ( m_dialogStyle & wxSAVE )
+    if ( HasFlag(wxFD_SAVE) )

     {
         myData.saveMode = true ;
 
     {
         myData.saveMode = true ;
 


@@ -584,7 +584,7 @@ int wxFileDialog::ShowModal()
         myData.saveMode = false ;
 
         mNavFilterUPP = NewNavObjectFilterUPP( CrossPlatformFilterCallback ) ;
         myData.saveMode = false ;
 
         mNavFilterUPP = NewNavObjectFilterUPP( CrossPlatformFilterCallback ) ;

-        if ( m_dialogStyle & wxMULTIPLE )
+        if ( m_windowStyle & wxFD_MULTIPLE )

             mNavOptions.dialogOptionFlags |= kNavAllowMultipleFiles ;
         else
             mNavOptions.dialogOptionFlags &= ~kNavAllowMultipleFiles ;
             mNavOptions.dialogOptionFlags |= kNavAllowMultipleFiles ;
         else
             mNavOptions.dialogOptionFlags &= ~kNavAllowMultipleFiles ;