default button on older systems was not shown with OK, but empty, resulting in wxID_C...

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

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index e6fda89c47960c7d96a10ef1156825ffca8e39c1..ec4c14e7f42a54c7532f15cd32811dd9b5f8844e 100644 (file)
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -11,11 +11,15 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#include "wx/filedlg.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+#endif
+

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

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

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


@@ -157,7 +161,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() ) ;


@@ -173,13 +177,13 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
             wxString extension = myData->extensions[i];
 
             // Remove leading '*'
             wxString extension = myData->extensions[i];
 
             // Remove leading '*'

-            if (extension.GetChar(0) == '*')
+            if (extension.length() && (extension.GetChar(0) == '*'))

                 extension = extension.Mid( 1 );
 
             // Remove leading '.'
                 extension = extension.Mid( 1 );
 
             // Remove leading '.'

-            if (extension.GetChar(0) == '.')
+            if (extension.length() && (extension.GetChar(0) == '.'))

                 extension = extension.Mid( 1 );
                 extension = extension.Mid( 1 );

-       
+

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


@@ -364,7 +368,7 @@ int wxFileDialog::ShowModal()
     {
         // let the user select bundles/programs in dialogs
         dialogCreateOptions.optionFlags |= kNavSupportPackages;
     {
         // let the user select bundles/programs in dialogs
         dialogCreateOptions.optionFlags |= kNavSupportPackages;

-    
+

         navFilterUPP = NewNavObjectFilterUPP(CrossPlatformFilterCallback);
         err = ::NavCreateGetFileDialog(
             &dialogCreateOptions,
         navFilterUPP = NewNavObjectFilterUPP(CrossPlatformFilterCallback);
         err = ::NavCreateGetFileDialog(
             &dialogCreateOptions,


@@ -413,7 +417,7 @@ int wxFileDialog::ShowModal()
                 thePath = wxMacFSRefToPath( &theFSRef, navReply.saveFileName );
             else
                 thePath = wxMacFSRefToPath( &theFSRef );
                 thePath = wxMacFSRefToPath( &theFSRef, navReply.saveFileName );
             else
                 thePath = wxMacFSRefToPath( &theFSRef );

-                
+

             if (!thePath)
             {
                 ::NavDisposeReply(&navReply);
             if (!thePath)
             {
                 ::NavDisposeReply(&navReply);


@@ -436,4 +440,3 @@ int wxFileDialog::ShowModal()
 
     return (err == noErr) ? wxID_OK : wxID_CANCEL;
 }
 
     return (err == noErr) ? wxID_OK : wxID_CANCEL;
 }

-