From: Stefan Csomor Date: Sat, 13 Sep 2003 14:09:16 +0000 (+0000) Subject: target_carbon added X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/613b6bb90a2345b7160dca1a72685c1ad19f3457?ds=inline 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 41a37f0dd3..0ff9c0e9dc 100644 --- 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 ) ; } + #if TARGET_CARBON 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 ) ; } +#endif } } @@ -546,14 +548,16 @@ int wxFileDialog::ShowModal() m_fileName = wxFileNameFromPath(m_path); m_dir = wxPathOnly(m_path); NavDisposeReply( &mNavReply ) ; +#if TARGET_CARBON if ( navDialogRef ) NavDialogDispose( navDialogRef ) ; - +#endif return wxID_OK ; } +#if TARGET_CARBON if ( navDialogRef ) NavDialogDispose( navDialogRef ) ; - +#endif return wxID_CANCEL; } diff --git a/src/mac/filedlg.cpp b/src/mac/filedlg.cpp index 41a37f0dd3..0ff9c0e9dc 100644 --- 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 ) ; } + #if TARGET_CARBON 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 ) ; } +#endif } } @@ -546,14 +548,16 @@ int wxFileDialog::ShowModal() m_fileName = wxFileNameFromPath(m_path); m_dir = wxPathOnly(m_path); NavDisposeReply( &mNavReply ) ; +#if TARGET_CARBON if ( navDialogRef ) NavDialogDispose( navDialogRef ) ; - +#endif return wxID_OK ; } +#if TARGET_CARBON if ( navDialogRef ) NavDialogDispose( navDialogRef ) ; - +#endif return wxID_CANCEL; }