X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab9a0b84de5207cb26048ed3c237aaffb7a1356c..0738b901b17340f09766524b8d9d79e9ed1268e7:/src/osx/window_osx.cpp

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 42e856aaec..72e3203879 100644
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -1060,6 +1060,11 @@ bool wxWindowMac::Show(bool show)
     if ( m_peer )
         m_peer->SetVisibility( show ) ;
 
+    wxShowEvent eventShow(GetId(), show);
+    eventShow.SetEventObject(this);
+    
+    HandleWindowEvent(eventShow);
+    
     return true;
 }
 
@@ -1206,6 +1211,7 @@ wxWindow *wxGetActiveWindow()
 // Coordinates relative to the window
 void wxWindowMac::WarpPointer(int x_pos, int y_pos)
 {
+#if wxOSX_USE_COCOA_OR_CARBON
     int x = x_pos;
     int y = y_pos;
     DoClientToScreen(&x, &y);
@@ -1220,14 +1226,15 @@ void wxWindowMac::WarpPointer(int x_pos, int y_pos)
 
     event.m_altDown = mState.AltDown();
     event.m_controlDown = mState.ControlDown();
-    event.m_leftDown = mState.LeftDown();
-    event.m_middleDown = mState.MiddleDown();
-    event.m_rightDown = mState.RightDown();
+    event.m_leftDown = mState.LeftIsDown();
+    event.m_middleDown = mState.MiddleIsDown();
+    event.m_rightDown = mState.RightIsDown();
     event.m_metaDown = mState.MetaDown();
     event.m_shiftDown = mState.ShiftDown();
     event.SetId(GetId());
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
+#endif
 }
 
 int wxWindowMac::GetScrollPos(int orient) const