From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 6 Oct 2005 12:53:24 +0000 (+0000)
Subject: don't use a floating point value as a boolean flag; gcc4 (correctly) complains when... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2c01d33555e3125057f4575ca7d0d2aba93f421f

don't use a floating point value as a boolean flag; gcc4 (correctly) complains when it's compared with 0; use different function for setting the current and given time in wxMacCarbonEvent instead


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 90e220dee9..a78ba80150 100644
--- 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 07f8868864..5de1468e75 100644
--- 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);
         }