Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nsFilePicker should not ignore display directory setting on Mac OS X. Patch by Tony Goold. b=301298 r=pinkerton sr=smfr

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@184835 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
joshmoz%gmail.com 2005-11-17 19:05:35 +00:00
parent bc40bc9809
commit a0741a44c8
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/widget/src/mac/nsFilePicker.cpp
View File

@ -239,8 +239,7 @@ pascal void nsFilePicker::FileDialogEventHandlerProc(NavEventCallbackMessage msg
WindowPtr window = reinterpret_cast<WindowPtr>(cbRec->eventData.eventDataParms.event->message);
nsCOMPtr<nsIEventSink> sink;
nsToolkit::GetWindowEventSink (window, getter_AddRefs(sink));
if (sink)
{
if (sink) {
::BeginUpdate(window);
PRBool handled = PR_FALSE;
sink->DispatchEvent(cbRec->eventData.eventDataParms.event, &handled);
@ -259,6 +258,23 @@ pascal void nsFilePicker::FileDialogEventHandlerProc(NavEventCallbackMessage msg
menuItem.menuCreator = self->mSelectedType + self->mTypeOffset;
menuItem.menuItemName[0] = 0;
(void)::NavCustomControl(cbRec->context, kNavCtlSelectCustomType, &menuItem);
// Set the directory to mDisplayDirectory if available
if (self->mDisplayDirectory != nsnull) {
nsCOMPtr<nsILocalFileMac> localDisplay = do_QueryInterface(self->mDisplayDirectory);
if (localDisplay) {
FSRef displayFSRef;
if (NS_SUCCEEDED(localDisplay->GetFSRef(&displayFSRef))) {
AEDesc desc;
OSErr status = ::AECreateDesc(typeFSRef, &displayFSRef,
sizeof(displayFSRef), &desc);
if (status == noErr) {
(void)::NavCustomControl(cbRec->context, kNavCtlSetLocation, &desc);
(void)::AEDisposeDesc(&desc);
}
}
}
}
}
break;