Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target_carbon added

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-09-13 14:09:16 +00:00
parent 8bebc229c7
commit 613b6bb90a
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mac/carbon/filedlg.cpp
View File

@@ -318,6 +318,7 @@ pascal Boolean CrossPlatformFilterCallback (
wxString file = wxMacMakeStringFromPascal( spec.name ) ; wxString file = wxMacMakeStringFromPascal( spec.name ) ;
display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ; display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
} }
#if TARGET_CARBON
else if ( theItem->descriptorType == typeFSRef ) else if ( theItem->descriptorType == typeFSRef )
{ {
FSRef fsref ; FSRef fsref ;
@@ -328,6 +329,7 @@ pascal Boolean CrossPlatformFilterCallback (
file.UngetWriteBuf() ; file.UngetWriteBuf() ;
display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ; display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
} }
#endif
} }
} }
@@ -546,14 +548,16 @@ int wxFileDialog::ShowModal()
m_fileName = wxFileNameFromPath(m_path); m_fileName = wxFileNameFromPath(m_path);
m_dir = wxPathOnly(m_path); m_dir = wxPathOnly(m_path);
NavDisposeReply( &mNavReply ) ; NavDisposeReply( &mNavReply ) ;
#if TARGET_CARBON
if ( navDialogRef ) if ( navDialogRef )
NavDialogDispose( navDialogRef ) ; NavDialogDispose( navDialogRef ) ;
#endif
return wxID_OK ; return wxID_OK ;
} }
#if TARGET_CARBON
if ( navDialogRef ) if ( navDialogRef )
NavDialogDispose( navDialogRef ) ; NavDialogDispose( navDialogRef ) ;
#endif
return wxID_CANCEL; return wxID_CANCEL;
} }

8
src/mac/filedlg.cpp
View File

@@ -318,6 +318,7 @@ pascal Boolean CrossPlatformFilterCallback (
wxString file = wxMacMakeStringFromPascal( spec.name ) ; wxString file = wxMacMakeStringFromPascal( spec.name ) ;
display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ; display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
} }
#if TARGET_CARBON
else if ( theItem->descriptorType == typeFSRef ) else if ( theItem->descriptorType == typeFSRef )
{ {
FSRef fsref ; FSRef fsref ;
@@ -328,6 +329,7 @@ pascal Boolean CrossPlatformFilterCallback (
file.UngetWriteBuf() ; file.UngetWriteBuf() ;
display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ; display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
} }
#endif
} }
} }
@@ -546,14 +548,16 @@ int wxFileDialog::ShowModal()
m_fileName = wxFileNameFromPath(m_path); m_fileName = wxFileNameFromPath(m_path);
m_dir = wxPathOnly(m_path); m_dir = wxPathOnly(m_path);
NavDisposeReply( &mNavReply ) ; NavDisposeReply( &mNavReply ) ;
#if TARGET_CARBON
if ( navDialogRef ) if ( navDialogRef )
NavDialogDispose( navDialogRef ) ; NavDialogDispose( navDialogRef ) ;
#endif
return wxID_OK ; return wxID_OK ;
} }
#if TARGET_CARBON
if ( navDialogRef ) if ( navDialogRef )
NavDialogDispose( navDialogRef ) ; NavDialogDispose( navDialogRef ) ;
#endif
return wxID_CANCEL; return wxID_CANCEL;
} }