target_carbon added

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index 41a37f0dd3bb4b66caeb96a2e18692c6373725be..0ff9c0e9dc59858bc9b315e686a4cc8e6ba04d80 100644 (file)
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -318,6 +318,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

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


@@ -328,6 +329,7 @@ pascal Boolean CrossPlatformFilterCallback (
                 file.UngetWriteBuf() ;
                 display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
             }
                 file.UngetWriteBuf() ;
                 display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
             }

+#endif

         }
     }
     
         }
     }
     


@@ -546,14 +548,16 @@ int wxFileDialog::ShowModal()
         m_fileName = wxFileNameFromPath(m_path);
         m_dir = wxPathOnly(m_path);
         NavDisposeReply( &mNavReply ) ;
         m_fileName = wxFileNameFromPath(m_path);
         m_dir = wxPathOnly(m_path);
         NavDisposeReply( &mNavReply ) ;

+#if TARGET_CARBON

         if ( navDialogRef )
             NavDialogDispose( navDialogRef ) ;   
         if ( navDialogRef )
             NavDialogDispose( navDialogRef ) ;   

-
+#endif

         return wxID_OK ;
     }
         return wxID_OK ;
     }

+#if TARGET_CARBON

     if ( navDialogRef )
         NavDialogDispose( navDialogRef ) ;   
     if ( navDialogRef )
         NavDialogDispose( navDialogRef ) ;   

-
+#endif

     return wxID_CANCEL;
 }
 
     return wxID_CANCEL;
 }
 

diff --git a/src/mac/filedlg.cpp b/src/mac/filedlg.cpp
index 41a37f0dd3bb4b66caeb96a2e18692c6373725be..0ff9c0e9dc59858bc9b315e686a4cc8e6ba04d80 100644 (file)
--- a/src/mac/filedlg.cpp
+++ b/src/mac/filedlg.cpp
@@ -318,6 +318,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

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


@@ -328,6 +329,7 @@ pascal Boolean CrossPlatformFilterCallback (
                 file.UngetWriteBuf() ;
                 display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
             }
                 file.UngetWriteBuf() ;
                 display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
             }

+#endif

         }
     }
     
         }
     }
     


@@ -546,14 +548,16 @@ int wxFileDialog::ShowModal()
         m_fileName = wxFileNameFromPath(m_path);
         m_dir = wxPathOnly(m_path);
         NavDisposeReply( &mNavReply ) ;
         m_fileName = wxFileNameFromPath(m_path);
         m_dir = wxPathOnly(m_path);
         NavDisposeReply( &mNavReply ) ;

+#if TARGET_CARBON

         if ( navDialogRef )
             NavDialogDispose( navDialogRef ) ;   
         if ( navDialogRef )
             NavDialogDispose( navDialogRef ) ;   

-
+#endif

         return wxID_OK ;
     }
         return wxID_OK ;
     }

+#if TARGET_CARBON

     if ( navDialogRef )
         NavDialogDispose( navDialogRef ) ;   
     if ( navDialogRef )
         NavDialogDispose( navDialogRef ) ;   

-
+#endif

     return wxID_CANCEL;
 }
 
     return wxID_CANCEL;
 }