Patch [ 1314868 ] [wxMSW] Show MDI child menubars when ShowFullScreen(false)

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

diff --git a/src/mac/classic/toplevel.cpp b/src/mac/classic/toplevel.cpp
index efa241a3d14a51d132a8b732600ad2a3dc930dca..d9d095ca97b4323cf02b061f9d3e504f67bfd377 100644 (file)
--- a/src/mac/classic/toplevel.cpp
+++ b/src/mac/classic/toplevel.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "toplevel.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -211,7 +207,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
 
                 event.m_x = point.h;
                 event.m_y = point.v;
-                event.m_timeStamp = when;
+                event.SetTimestamp(when);
                 wxWindow* focus = wxWindow::FindFocus() ;
                 event.SetEventObject(focus);
 
@@ -950,7 +946,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent(
             if ( abs( localwhere.h - gs_lastWhere.h ) < 3 && abs( localwhere.v - gs_lastWhere.v ) < 3 )
             {
                 // This is not right if the second mouse down
-                // event occured in a differen window. We
+                // event occurred in a different window. We
                 // correct this in MacDispatchMouseEvent.
                 if ( controlDown )
                     event.SetEventType(wxEVT_RIGHT_DCLICK ) ;
@@ -971,7 +967,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent(
     event.m_x += m_x;
     event.m_y += m_y;
 
-    event.m_timeStamp = timestamp;
+    event.SetTimestamp(timestamp);
     event.SetEventObject(this);
     if ( wxTheApp->s_captureWindow )
     {
@@ -1051,7 +1047,7 @@ void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating )
         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);