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

cleanup for 10.5

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-10-14 15:48:32 +00:00
parent e6c3d3e655
commit f387b80e0e
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,11 +52,11 @@ static pascal void NavEventProc(
{ {
// Set default location for the modern Navigation APIs // Set default location for the modern Navigation APIs
// Apple Technical Q&A 1151 // Apple Technical Q&A 1151
FSSpec theFSSpec; FSRef theFile;
wxMacFilename2FSSpec(data->GetPath(), &theFSSpec); wxMacPathToFSRef(data->GetPath(), &theFile);
AEDesc theLocation = { typeNull, NULL }; AEDesc theLocation = { typeNull, NULL };
if (noErr == ::AECreateDesc(typeFSS, &theFSSpec, sizeof(FSSpec), &theLocation)) if (noErr == ::AECreateDesc(typeFSRef, &theFile, sizeof(FSRef), &theLocation))
::NavCustomControl(ioParams->context, kNavCtlSetLocation, (void *) &theLocation); ::NavCustomControl(ioParams->context, kNavCtlSetLocation, (void *) &theLocation);
} }
} }
} }

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

@@ -74,10 +74,10 @@ static pascal void NavEventProc(
{ {
// Set default location for the modern Navigation APIs // Set default location for the modern Navigation APIs
// Apple Technical Q&A 1151 // Apple Technical Q&A 1151
FSSpec theFSSpec; FSRef theFile;
wxMacFilename2FSSpec(data->defaultLocation, &theFSSpec); wxMacPathToFSRef(data->defaultLocation, &theFile);
AEDesc theLocation = { typeNull, NULL }; AEDesc theLocation = { typeNull, NULL };
if (noErr == ::AECreateDesc(typeFSS, &theFSSpec, sizeof(FSSpec), &theLocation)) if (noErr == ::AECreateDesc(typeFSRef, &theFile, sizeof(FSRef), &theLocation))
::NavCustomControl(ioParams->context, kNavCtlSetLocation, (void *) &theLocation); ::NavCustomControl(ioParams->context, kNavCtlSetLocation, (void *) &theLocation);
} }
@@ -275,16 +275,11 @@ pascal Boolean CrossPlatformFilterCallback(
NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ; NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ;
if ( !theInfo->isFolder ) if ( !theInfo->isFolder )
{ {
if (theItem->descriptorType == typeFSS) AECoerceDesc (theItem, typeFSRef, theItem);
FSRef fsref ;
if ( AEGetDescData (theItem, &fsref, sizeof (FSRef)) == noErr )
{ {
FSSpec spec;
memcpy( &spec , *theItem->dataHandle , sizeof(FSSpec) ) ;
wxString file = wxMacMakeStringFromPascal( spec.name ) ;
display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
}
else if ( theItem->descriptorType == typeFSRef )
{
FSRef fsref ;
memcpy( &fsref , *theItem->dataHandle , sizeof(FSRef) ) ; memcpy( &fsref , *theItem->dataHandle , sizeof(FSRef) ) ;
wxString file = wxMacFSRefToPath( &fsref ) ; wxString file = wxMacFSRefToPath( &fsref ) ;
display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ; display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;

2
src/mac/carbon/toolbar.cpp
View File

@@ -1648,7 +1648,9 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
drawInfo.kind = kThemeBackgroundMetal; drawInfo.kind = kThemeBackgroundMetal;
HIThemeApplyBackground( &hiToolbarrect, &drawInfo, cgContext, kHIThemeOrientationNormal ); HIThemeApplyBackground( &hiToolbarrect, &drawInfo, cgContext, kHIThemeOrientationNormal );
#ifndef __LP64__
QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext ); QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
#endif
#endif #endif
} }
} }