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

Fixed signed/unsigned warning (GetCount() returns size_t, not int); Slight cosmetic cleanup.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2003-11-27 12:09:08 +00:00
parent 41f1cec7ae
commit 685a634c8d
2 changed files with 208 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,7 +56,7 @@ struct OpenUserDataRec {
wxArrayString name ;
wxArrayString extensions ;
wxArrayLong filtermactypes ;
wxString defaultLocation;
wxString defaultLocation;
#if TARGET_CARBON
CFArrayRef menuitems ;
#else
@@ -135,7 +135,7 @@ NavEventProc(
sfilename = wxMacMakeStringFromPascal( filename ) ;
#endif
int pos = sfilename.Find('.',TRUE) ;
int pos = sfilename.Find('.', true) ;
if ( pos != wxNOT_FOUND )
{
sfilename = sfilename.Left(pos+1)+extension ;
@@ -175,7 +175,7 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
{
myData->menuitems = NULL ;
myData->currentfilter = 0 ;
myData->saveMode = FALSE ;
myData->saveMode = false ;
if ( filter && filter[0] )
{
@@ -381,41 +381,42 @@ int wxFileDialog::ShowModal()
dialogCreateOptions.saveFileName = defaultFileNameRef;
NavDialogRef dialog;
NavObjectFilterUPP navFilterUPP = NULL;
CFArrayRef cfArray = NULL; // for popupExtension
CFArrayRef cfArray = NULL; // for popupExtension
OpenUserDataRec myData;
myData.defaultLocation = m_dir;
if (m_dialogStyle & wxSAVE)
{
dialogCreateOptions.optionFlags |= kNavNoTypePopup;
dialogCreateOptions.optionFlags |= kNavDontAutoTranslate;
dialogCreateOptions.optionFlags |= kNavDontAddTranslateItems;
// The extension is important
dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension;
dialogCreateOptions.optionFlags |= kNavNoTypePopup;
dialogCreateOptions.optionFlags |= kNavDontAutoTranslate;
dialogCreateOptions.optionFlags |= kNavDontAddTranslateItems;
// The extension is important
dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension;
err = ::NavCreatePutFileDialog(&dialogCreateOptions,
'TEXT',
'TEXT',
sStandardNavEventFilter,
&myData, // for defaultLocation
&dialog);
'TEXT',
'TEXT',
sStandardNavEventFilter,
&myData, // for defaultLocation
&dialog);
}
else
{
MakeUserDataRec(&myData , m_wildCard);
int numfilters = myData.extensions.GetCount();
if (numfilters > 0){
CFMutableArrayRef popup = CFArrayCreateMutable( kCFAllocatorDefault ,
numfilters , &kCFTypeArrayCallBacks ) ;
dialogCreateOptions.popupExtension = popup ;
myData.menuitems = dialogCreateOptions.popupExtension ;
for ( size_t i = 0 ; i < numfilters ; ++i )
size_t numfilters = myData.extensions.GetCount();
if (numfilters > 0)
{
CFArrayAppendValue( popup , (CFStringRef) wxMacCFStringHolder( myData.name[i] ) ) ;
CFMutableArrayRef popup = CFArrayCreateMutable( kCFAllocatorDefault ,
numfilters , &kCFTypeArrayCallBacks ) ;
dialogCreateOptions.popupExtension = popup ;
myData.menuitems = dialogCreateOptions.popupExtension ;
for ( size_t i = 0 ; i < numfilters ; ++i )
{
CFArrayAppendValue( popup , (CFStringRef) wxMacCFStringHolder( myData.name[i] ) ) ;
}
}
}
navFilterUPP = NewNavObjectFilterUPP(CrossPlatformFilterCallback);
err = ::NavCreateGetFileDialog(&dialogCreateOptions,
NULL, // NavTypeListHandle
@@ -571,9 +572,10 @@ int wxFileDialog::ShowModal()
err = ::AECreateDesc(typeFSS, &location, sizeof(FSSpec), &mDefaultLocation );
if ( mDefaultLocation.dataHandle ) {
if (mSelectDefault) {
if ( mDefaultLocation.dataHandle )
{
if (mSelectDefault)
{
mNavOptions.dialogOptionFlags |= kNavSelectDefaultLocation;
} else {
mNavOptions.dialogOptionFlags &= ~kNavSelectDefaultLocation;
@@ -663,8 +665,8 @@ int wxFileDialog::ShowModal()
return wxID_CANCEL ;
}
if (mNavReply.validRecord) {
if (mNavReply.validRecord)
{
FSSpec outFileSpec ;
AEDesc specDesc ;
AEKeyword keyWord ;
@@ -674,7 +676,8 @@ int wxFileDialog::ShowModal()
for ( long i = 1 ; i <= count ; ++i )
{
OSErr err = ::AEGetNthDesc( &mNavReply.selection , i , typeFSS, &keyWord , &specDesc);
if ( err != noErr ) {
if ( err != noErr )
{
m_path = wxT("") ;
return wxID_CANCEL ;
}

63
src/mac/filedlg.cpp
View File

@@ -56,7 +56,7 @@ struct OpenUserDataRec {
wxArrayString name ;
wxArrayString extensions ;
wxArrayLong filtermactypes ;
wxString defaultLocation;
wxString defaultLocation;
#if TARGET_CARBON
CFArrayRef menuitems ;
#else
@@ -135,7 +135,7 @@ NavEventProc(
sfilename = wxMacMakeStringFromPascal( filename ) ;
#endif
int pos = sfilename.Find('.',TRUE) ;
int pos = sfilename.Find('.', true) ;
if ( pos != wxNOT_FOUND )
{
sfilename = sfilename.Left(pos+1)+extension ;
@@ -175,7 +175,7 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
{
myData->menuitems = NULL ;
myData->currentfilter = 0 ;
myData->saveMode = FALSE ;
myData->saveMode = false ;
if ( filter && filter[0] )
{
@@ -381,41 +381,42 @@ int wxFileDialog::ShowModal()
dialogCreateOptions.saveFileName = defaultFileNameRef;
NavDialogRef dialog;
NavObjectFilterUPP navFilterUPP = NULL;
CFArrayRef cfArray = NULL; // for popupExtension
CFArrayRef cfArray = NULL; // for popupExtension
OpenUserDataRec myData;
myData.defaultLocation = m_dir;
if (m_dialogStyle & wxSAVE)
{
dialogCreateOptions.optionFlags |= kNavNoTypePopup;
dialogCreateOptions.optionFlags |= kNavDontAutoTranslate;
dialogCreateOptions.optionFlags |= kNavDontAddTranslateItems;
// The extension is important
dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension;
dialogCreateOptions.optionFlags |= kNavNoTypePopup;
dialogCreateOptions.optionFlags |= kNavDontAutoTranslate;
dialogCreateOptions.optionFlags |= kNavDontAddTranslateItems;
// The extension is important
dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension;
err = ::NavCreatePutFileDialog(&dialogCreateOptions,
'TEXT',
'TEXT',
sStandardNavEventFilter,
&myData, // for defaultLocation
&dialog);
'TEXT',
'TEXT',
sStandardNavEventFilter,
&myData, // for defaultLocation
&dialog);
}
else
{
MakeUserDataRec(&myData , m_wildCard);
int numfilters = myData.extensions.GetCount();
if (numfilters > 0){
CFMutableArrayRef popup = CFArrayCreateMutable( kCFAllocatorDefault ,
numfilters , &kCFTypeArrayCallBacks ) ;
dialogCreateOptions.popupExtension = popup ;
myData.menuitems = dialogCreateOptions.popupExtension ;
for ( size_t i = 0 ; i < numfilters ; ++i )
size_t numfilters = myData.extensions.GetCount();
if (numfilters > 0)
{
CFArrayAppendValue( popup , (CFStringRef) wxMacCFStringHolder( myData.name[i] ) ) ;
CFMutableArrayRef popup = CFArrayCreateMutable( kCFAllocatorDefault ,
numfilters , &kCFTypeArrayCallBacks ) ;
dialogCreateOptions.popupExtension = popup ;
myData.menuitems = dialogCreateOptions.popupExtension ;
for ( size_t i = 0 ; i < numfilters ; ++i )
{
CFArrayAppendValue( popup , (CFStringRef) wxMacCFStringHolder( myData.name[i] ) ) ;
}
}
}
navFilterUPP = NewNavObjectFilterUPP(CrossPlatformFilterCallback);
err = ::NavCreateGetFileDialog(&dialogCreateOptions,
NULL, // NavTypeListHandle
@@ -571,9 +572,10 @@ int wxFileDialog::ShowModal()
err = ::AECreateDesc(typeFSS, &location, sizeof(FSSpec), &mDefaultLocation );
if ( mDefaultLocation.dataHandle ) {
if (mSelectDefault) {
if ( mDefaultLocation.dataHandle )
{
if (mSelectDefault)
{
mNavOptions.dialogOptionFlags |= kNavSelectDefaultLocation;
} else {
mNavOptions.dialogOptionFlags &= ~kNavSelectDefaultLocation;
@@ -663,8 +665,8 @@ int wxFileDialog::ShowModal()
return wxID_CANCEL ;
}
if (mNavReply.validRecord) {
if (mNavReply.validRecord)
{
FSSpec outFileSpec ;
AEDesc specDesc ;
AEKeyword keyWord ;
@@ -674,7 +676,8 @@ int wxFileDialog::ShowModal()
for ( long i = 1 ; i <= count ; ++i )
{
OSErr err = ::AEGetNthDesc( &mNavReply.selection , i , typeFSS, &keyWord , &specDesc);
if ( err != noErr ) {
if ( err != noErr )
{
m_path = wxT("") ;
return wxID_CANCEL ;
}