Build fix after wxColourBase introduction.

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

diff --git a/src/mac/classic/filedlg.cpp b/src/mac/classic/filedlg.cpp
index 59807f398d9aba4bd8e2b450ee9bfee982ddf04d..7ebc988bcad39f9d65010bf0ab16596e266cfb41 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,11 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "filedlg.h"
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/defs.h"

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


@@ -26,9 +27,7 @@
   #include "PLStringFuncs.h"
 #endif
 
   #include "PLStringFuncs.h"
 #endif
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
 IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)

-#endif

 
 // begin wxmac
 
 
 // begin wxmac
 


@@ -189,7 +188,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() ) ;


@@ -206,21 +205,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
+            }

         }
     }
 }
         }
     }
 }


@@ -325,16 +324,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 ) ;
             }


@@ -621,7 +620,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;


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

-