don't use a floating point value as a boolean flag; gcc4 (correctly) complains when...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index 90e220dee9c51959ebc4214fd33167755f7b1f97..a78ba801500af0ce6b9b5b474acbd410cda7ee33 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -335,9 +335,13 @@ public :
     {
         return EventTimeToTicks( GetTime() ) ;
     }
-    OSStatus SetTime( EventTime inWhen = 0 /*now*/ ) 
+    OSStatus SetCurrentTime( )
     {
-        return ::SetEventTime( m_eventRef , inWhen ? inWhen : GetCurrentEventTime() ) ;
+        return ::SetEventTime( m_eventRef , GetCurrentEventTime() ) ;
+    }
+    OSStatus SetTime( EventTime when ) 
+    {
+        return ::SetEventTime( m_eventRef , when ) ;
     }
     operator EventRef () { return m_eventRef; }
     

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 07f886886478294f87aac0ade84d07e39001e7ad..5de1468e75f4326e7bab7cda6af2785c03a11213 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -746,7 +746,7 @@ void wxMacWakeUp()
         {
             if ( IsEventInQueue( GetMainEventQueue() , s_wakeupEvent ) )
                 return ;
-            s_wakeupEvent.SetTime(0) ;
+            s_wakeupEvent.SetCurrentTime() ;
             err = PostEventToQueue(GetMainEventQueue(), s_wakeupEvent,
                                   kEventPriorityHigh);
         }