getting rid of warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
68a9d9d04f
commit
79654e256b
@ -1766,7 +1766,7 @@ static void MacEnsureDefaultExtensionsLoaded()
|
|||||||
} ;
|
} ;
|
||||||
// we could load the pc exchange prefs here too
|
// we could load the pc exchange prefs here too
|
||||||
|
|
||||||
for ( int i = 0 ; i < WXSIZEOF( defaults ) ; ++i )
|
for ( size_t i = 0 ; i < WXSIZEOF( defaults ) ; ++i )
|
||||||
{
|
{
|
||||||
gMacDefaultExtensions.Add( defaults[i] ) ;
|
gMacDefaultExtensions.Add( defaults[i] ) ;
|
||||||
}
|
}
|
||||||
|
@ -456,7 +456,6 @@ void wxInitializeStockObjects ()
|
|||||||
#if defined(__WXMAC__)
|
#if defined(__WXMAC__)
|
||||||
int sizeFont = 12;
|
int sizeFont = 12;
|
||||||
|
|
||||||
FontFamilyID fontId ;
|
|
||||||
Str255 fontName ;
|
Str255 fontName ;
|
||||||
SInt16 fontSize ;
|
SInt16 fontSize ;
|
||||||
Style fontStyle ;
|
Style fontStyle ;
|
||||||
|
@ -337,7 +337,6 @@ wxLongLong wxGetLocalTimeMillis()
|
|||||||
return (val + tp.millitm);
|
return (val + tp.millitm);
|
||||||
#elif defined(__WXMAC__)
|
#elif defined(__WXMAC__)
|
||||||
|
|
||||||
unsigned long secs ;
|
|
||||||
UInt64 gMilliAtStart = 0 ;
|
UInt64 gMilliAtStart = 0 ;
|
||||||
Nanoseconds upTime = AbsoluteToNanoseconds( UpTime() ) ;
|
Nanoseconds upTime = AbsoluteToNanoseconds( UpTime() ) ;
|
||||||
if ( gMilliAtStart == 0 )
|
if ( gMilliAtStart == 0 )
|
||||||
@ -350,7 +349,7 @@ wxLongLong wxGetLocalTimeMillis()
|
|||||||
UInt64 millival = gMilliAtStart ;
|
UInt64 millival = gMilliAtStart ;
|
||||||
millival += upTime.lo / 1000 ;
|
millival += upTime.lo / 1000 ;
|
||||||
millival += ( ( (UInt64) upTime.hi ) << 32 ) / 1000 ;
|
millival += ( ( (UInt64) upTime.hi ) << 32 ) / 1000 ;
|
||||||
return millival ;
|
val = millival ;
|
||||||
#else // no gettimeofday() nor ftime()
|
#else // no gettimeofday() nor ftime()
|
||||||
// We use wxGetLocalTime() to get the seconds since
|
// We use wxGetLocalTime() to get the seconds since
|
||||||
// 00:00:00 Jan 1st 1970 and then whatever is available
|
// 00:00:00 Jan 1st 1970 and then whatever is available
|
||||||
|
Loading…
Reference in New Issue
Block a user