Fix wxBitmapButton best size calculation in wxOSX/Carbon.

[wxWidgets.git] / src / osx / core / timer.cpp

diff --git a/src/osx/core/timer.cpp b/src/osx/core/timer.cpp
index 3f55f8895c2c1c79fda431de893ecfd4e87a21b3..d5d344f795f88e25739033877cbf269f46928a62 100644 (file)
--- a/src/osx/core/timer.cpp
+++ b/src/osx/core/timer.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2008-07-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2008-07-01

-// RCS-ID:      $Id: timer.cpp 54129 2008-06-11 19:30:52Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -69,7 +69,7 @@ bool wxOSXTimerImpl::Start( int milliseconds, bool mode )
 
     wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeout") );
     wxCHECK_MSG( m_info->m_timerRef == NULL, false, wxT("attempting to restart a timer") );
 
     wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeout") );
     wxCHECK_MSG( m_info->m_timerRef == NULL, false, wxT("attempting to restart a timer") );

-    
+

     CFGregorianUnits gumilli ;
     memset(&gumilli,0,sizeof(gumilli) );
     gumilli.seconds = m_milli / 1000.0;
     CFGregorianUnits gumilli ;
     memset(&gumilli,0,sizeof(gumilli) );
     gumilli.seconds = m_milli / 1000.0;


@@ -81,13 +81,13 @@ bool wxOSXTimerImpl::Start( int milliseconds, bool mode )
 
     m_info->m_timer = this;
     m_info->m_timerRef = CFRunLoopTimerCreate(
 
     m_info->m_timer = this;
     m_info->m_timerRef = CFRunLoopTimerCreate(

-        kCFAllocatorDefault, 
+        kCFAllocatorDefault,

         CFAbsoluteTimeAddGregorianUnits( CFAbsoluteTimeGetCurrent() , NULL, gumilli ),
         IsOneShot() ? 0 : CFTimeInterval( m_milli / 1000.0 ) ,
         0, 0, wxProcessTimer, &ctx);
         CFAbsoluteTimeAddGregorianUnits( CFAbsoluteTimeGetCurrent() , NULL, gumilli ),
         IsOneShot() ? 0 : CFTimeInterval( m_milli / 1000.0 ) ,
         0, 0, wxProcessTimer, &ctx);

-    
+

     wxASSERT_MSG( m_info->m_timerRef != NULL, wxT("unable to create timer"));
     wxASSERT_MSG( m_info->m_timerRef != NULL, wxT("unable to create timer"));

-    
+

     CFRunLoopRef runLoop = 0;
 #if wxOSX_USE_IPHONE
     runLoop = CFRunLoopGetMain();
     CFRunLoopRef runLoop = 0;
 #if wxOSX_USE_IPHONE
     runLoop = CFRunLoopGetMain();