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

applied patch 1216005 : message and new NavDirDialog

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-07-31 18:32:04 +00:00
parent 5324268eab
commit 516d38cdfd
1 changed files with 58 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/mac/carbon/dirdlg.cpp
View File

@@ -50,57 +50,65 @@ wxDirDialog::wxDirDialog(wxWindow *parent,
int wxDirDialog::ShowModal() int wxDirDialog::ShowModal()
{ {
NavDialogOptions mNavOptions; NavDialogRef dialog;
NavObjectFilterUPP mNavFilterUPP = NULL; NavDialogCreationOptions options;
NavReplyRecord mNavReply; NavReplyRecord reply ;
bool disposeReply = false ;
OSStatus err = noErr;
::NavGetDefaultDialogOptions(&mNavOptions); err = NavGetDefaultDialogCreationOptions(&options);
if (err == noErr)
mNavReply.validRecord = false; {
mNavReply.replacing = false; wxMacCFStringHolder message(m_message, m_font.GetEncoding());
mNavReply.isStationery = false; options.message = message;
mNavReply.translationNeeded = false; err = NavCreateChooseFolderDialog(&options, NULL, NULL, NULL, &dialog);
mNavReply.selection.descriptorType = typeNull; if (err == noErr)
mNavReply.selection.dataHandle = nil; {
mNavReply.keyScript = smSystemScript; err = NavDialogRun(dialog);
mNavReply.fileTranslation = nil; if ( err == noErr )
{
// Set default location, the location err = NavDialogGetReply(dialog, &reply);
// that's displayed when the dialog disposeReply = true ;
// first appears }
}
OSErr err = ::NavChooseFolder(
NULL,
&mNavReply,
&mNavOptions,
NULL,
mNavFilterUPP,
0L); // User Data
if ( (err != noErr) && (err != userCanceledErr) ) {
m_path = wxEmptyString ;
return wxID_CANCEL ;
} }
if (mNavReply.validRecord) { // User chose a folder if ( err == noErr )
{
if ( reply.validRecord )
{
FSRef folderInfo; FSRef folderInfo;
AEDesc specDesc ; AEDesc specDesc ;
OSErr err = ::AECoerceDesc( &mNavReply.selection , typeFSRef, &specDesc); OSErr err = ::AECoerceDesc( &reply.selection , typeFSRef, &specDesc);
if ( err != noErr ) { if ( err != noErr )
{
m_path = wxEmptyString ; m_path = wxEmptyString ;
return wxID_CANCEL ;
} }
else
{
folderInfo = **(FSRef**) specDesc.dataHandle; folderInfo = **(FSRef**) specDesc.dataHandle;
if (specDesc.dataHandle != nil) { m_path = wxMacFSRefToPath( &folderInfo ) ;
if (specDesc.dataHandle != nil)
{
::AEDisposeDesc(&specDesc); ::AEDisposeDesc(&specDesc);
} }
m_path = wxMacFSRefToPath( &folderInfo ) ;
return wxID_OK ;
} }
return wxID_CANCEL; }
else
{
err = paramErr ; // could be any error, only used for giving back wxID_CANCEL
}
}
if ( disposeReply )
::NavDisposeReply(&reply);
// apparently cancelling shouldn't change m_path
if ( err != noErr && err != userCanceledErr )
m_path = wxEmptyString ;
return (err == noErr) ? wxID_OK : wxID_CANCEL ;
} }
#endif #endif