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

Mac compilation warning fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-10-16 22:43:09 +00:00
parent acc4028ecd
commit 9df4bbf74c
5 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/fileconf.cpp
View File

@@ -1525,9 +1525,9 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
size_t nCount = pGroup->m_aEntries.Count(); size_t nCount = pGroup->m_aEntries.Count();
wxLogTrace( _T("wxFileConfig"), wxLogTrace(_T("wxFileConfig"),
_T(" Removing %u Entries"), _T("Removing %lu Entries"),
nCount ); (unsigned long)nCount );
for ( size_t nEntry = 0; nEntry < nCount; nEntry++ ) for ( size_t nEntry = 0; nEntry < nCount; nEntry++ )
{ {
@@ -1547,8 +1547,8 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
nCount = pGroup->m_aSubgroups.Count(); nCount = pGroup->m_aSubgroups.Count();
wxLogTrace( _T("wxFileConfig"), wxLogTrace( _T("wxFileConfig"),
_T(" Removing %u SubGroups"), _T("Removing %lu SubGroups"),
nCount ); (unsigned long)nCount );
for ( size_t nGroup = 0; nGroup < nCount; nGroup++ ) for ( size_t nGroup = 0; nGroup < nCount; nGroup++ )
{ {

3
src/mac/carbon/dc.cpp
View File

@@ -2041,7 +2041,8 @@ void wxDC::MacInstallPen() const
case wxUSER_DASH : case wxUSER_DASH :
{ {
wxDash* dash ; wxDash* dash ;
int number = m_pen.GetDashes(&dash) ; m_pen.GetDashes(&dash) ;
// right now we don't allocate larger pixmaps // right now we don't allocate larger pixmaps
// int number = // int number =
m_pen.GetDashes(&dash) ; m_pen.GetDashes(&dash) ;

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

@@ -156,7 +156,8 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
++filterIndex ; ++filterIndex ;
for ( int i = 0 ; i < myData->extensions.GetCount() ; i++ ) const size_t extCount = myData->extensions.GetCount();
for ( size_t i = 0 ; i < extCount; i++ )
{ {
int j ; int j ;
for ( j = 0 ; gfilters[j] ; j++ ) for ( j = 0 ; gfilters[j] ; j++ )
@@ -196,7 +197,7 @@ static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecP
return true ; return true ;
{ {
if ( type == data->filtermactypes[i] ) if ( type == (OSType)data->filtermactypes[i] )
return true ; return true ;
wxStringTokenizer tokenizer( data->extensions[i] , ";" ) ; wxStringTokenizer tokenizer( data->extensions[i] , ";" ) ;
@@ -428,7 +429,8 @@ int wxFileDialog::ShowModal()
if ( myData.extensions.GetCount() > 0 ) if ( myData.extensions.GetCount() > 0 )
{ {
mNavOptions.popupExtension = (NavMenuItemSpecArrayHandle) NewHandle( sizeof( NavMenuItemSpec ) * myData.extensions.GetCount() ) ; mNavOptions.popupExtension = (NavMenuItemSpecArrayHandle) NewHandle( sizeof( NavMenuItemSpec ) * myData.extensions.GetCount() ) ;
for ( int i = 0 ; i < myData.extensions.GetCount() ; ++i ) { const size_t extCount = myData.extensions.GetCount();
for ( size_t i = 0 ; i < extCount; ++i ) {
(*mNavOptions.popupExtension)[i].version = kNavMenuItemSpecVersion ; (*mNavOptions.popupExtension)[i].version = kNavMenuItemSpecVersion ;
(*mNavOptions.popupExtension)[i].menuCreator = 'WXNG' ; (*mNavOptions.popupExtension)[i].menuCreator = 'WXNG' ;
(*mNavOptions.popupExtension)[i].menuType = i ; (*mNavOptions.popupExtension)[i].menuType = i ;

3
src/mac/dc.cpp
View File

@@ -2041,7 +2041,8 @@ void wxDC::MacInstallPen() const
case wxUSER_DASH : case wxUSER_DASH :
{ {
wxDash* dash ; wxDash* dash ;
int number = m_pen.GetDashes(&dash) ; m_pen.GetDashes(&dash) ;
// right now we don't allocate larger pixmaps // right now we don't allocate larger pixmaps
// int number = // int number =
m_pen.GetDashes(&dash) ; m_pen.GetDashes(&dash) ;

8
src/mac/filedlg.cpp
View File

@@ -156,7 +156,8 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
++filterIndex ; ++filterIndex ;
for ( int i = 0 ; i < myData->extensions.GetCount() ; i++ ) const size_t extCount = myData->extensions.GetCount();
for ( size_t i = 0 ; i < extCount; i++ )
{ {
int j ; int j ;
for ( j = 0 ; gfilters[j] ; j++ ) for ( j = 0 ; gfilters[j] ; j++ )
@@ -196,7 +197,7 @@ static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecP
return true ; return true ;
{ {
if ( type == data->filtermactypes[i] ) if ( type == (OSType)data->filtermactypes[i] )
return true ; return true ;
wxStringTokenizer tokenizer( data->extensions[i] , ";" ) ; wxStringTokenizer tokenizer( data->extensions[i] , ";" ) ;
@@ -428,7 +429,8 @@ int wxFileDialog::ShowModal()
if ( myData.extensions.GetCount() > 0 ) if ( myData.extensions.GetCount() > 0 )
{ {
mNavOptions.popupExtension = (NavMenuItemSpecArrayHandle) NewHandle( sizeof( NavMenuItemSpec ) * myData.extensions.GetCount() ) ; mNavOptions.popupExtension = (NavMenuItemSpecArrayHandle) NewHandle( sizeof( NavMenuItemSpec ) * myData.extensions.GetCount() ) ;
for ( int i = 0 ; i < myData.extensions.GetCount() ; ++i ) { const size_t extCount = myData.extensions.GetCount();
for ( size_t i = 0 ; i < extCount; ++i ) {
(*mNavOptions.popupExtension)[i].version = kNavMenuItemSpecVersion ; (*mNavOptions.popupExtension)[i].version = kNavMenuItemSpecVersion ;
(*mNavOptions.popupExtension)[i].menuCreator = 'WXNG' ; (*mNavOptions.popupExtension)[i].menuCreator = 'WXNG' ;
(*mNavOptions.popupExtension)[i].menuType = i ; (*mNavOptions.popupExtension)[i].menuType = i ;