fixing multilib build

[wxWidgets.git] / src / osx / window_osx.cpp

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 041c9d952e9bd77f99d817e4aa1501746f859d6c..20af778038fda6290717f1d3e6928720880ce49d 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -752,6 +752,9 @@ void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
 
     if ( m_tooltip )
         m_tooltip->SetWindow(this);
+        
+    if (m_peer)
+        m_peer->SetToolTip(tooltip);
 }
 
 #endif
@@ -1058,10 +1061,16 @@ bool wxWindowMac::Show(bool show)
     if ( m_peer )
         m_peer->SetVisibility( show ) ;
 
-    wxShowEvent eventShow(GetId(), show);
-    eventShow.SetEventObject(this);
+#ifdef __WXOSX_IPHONE__
+    // only when there's no native event support 
+    if ( !IsTopLevel() )
+#endif
+    {
+        wxShowEvent eventShow(GetId(), show);
+        eventShow.SetEventObject(this);
     
-    HandleWindowEvent(eventShow);
+        HandleWindowEvent(eventShow);
+    }
     
     return true;
 }
@@ -2461,6 +2470,7 @@ wxWidgetImpl::wxWidgetImpl( wxWindowMac* peer , bool isRootControl )
     Init();
     m_isRootControl = isRootControl;
     m_wxPeer = peer;
+    m_shouldSendEvents = true;
 }
 
 wxWidgetImpl::wxWidgetImpl()