Don't call StartingKey if the key was F2

[wxWidgets.git] / src / mac / classic / toplevel.cpp

diff --git a/src/mac/classic/toplevel.cpp b/src/mac/classic/toplevel.cpp
index efa241a3d14a51d132a8b732600ad2a3dc930dca..013c9fbdb2f51cea16244352a49a7b54fea90e39 100644 (file)
--- a/src/mac/classic/toplevel.cpp
+++ b/src/mac/classic/toplevel.cpp
@@ -211,7 +211,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
 
                 event.m_x = point.h;
                 event.m_y = point.v;
 
                 event.m_x = point.h;
                 event.m_y = point.v;

-                event.m_timeStamp = when;
+                event.SetTimestamp(when);

                 wxWindow* focus = wxWindow::FindFocus() ;
                 event.SetEventObject(focus);
 
                 wxWindow* focus = wxWindow::FindFocus() ;
                 event.SetEventObject(focus);
 


@@ -971,7 +971,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent(
     event.m_x += m_x;
     event.m_y += m_y;
 
     event.m_x += m_x;
     event.m_y += m_y;
 

-    event.m_timeStamp = timestamp;
+    event.SetTimestamp(timestamp);

     event.SetEventObject(this);
     if ( wxTheApp->s_captureWindow )
     {
     event.SetEventObject(this);
     if ( wxTheApp->s_captureWindow )
     {


@@ -1051,7 +1051,7 @@ void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating )
         s_macDeactivateWindow=NULL;
     MacDelayedDeactivation(timestamp);
     wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId);
         s_macDeactivateWindow=NULL;
     MacDelayedDeactivation(timestamp);
     wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId);

-    event.m_timeStamp = timestamp ;
+    event.SetTimestamp(timestamp);

     event.SetEventObject(this);
 
     GetEventHandler()->ProcessEvent(event);
     event.SetEventObject(this);
 
     GetEventHandler()->ProcessEvent(event);