no existing on iphone

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

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 23abdab98c491c696e295bd165ac7920d60b9a10..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_tooltip )
         m_tooltip->SetWindow(this);

+        
+    if (m_peer)
+        m_peer->SetToolTip(tooltip);

 }
 
 #endif
 }
 
 #endif


@@ -1058,10 +1061,16 @@ bool wxWindowMac::Show(bool show)
     if ( m_peer )
         m_peer->SetVisibility( 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;
 }
     
     return true;
 }


@@ -1845,6 +1854,7 @@ bool wxWindowMac::MacDoRedraw( long time )
     {
         case wxBG_STYLE_ERASE:
         case wxBG_STYLE_SYSTEM:
     {
         case wxBG_STYLE_ERASE:
         case wxBG_STYLE_SYSTEM:

+        case wxBG_STYLE_COLOUR:

             {
                 // for the toplevel window this really is the entire area for
                 // all the others only their client area, otherwise they might
             {
                 // for the toplevel window this really is the entire area for
                 // all the others only their client area, otherwise they might


@@ -2460,6 +2470,7 @@ wxWidgetImpl::wxWidgetImpl( wxWindowMac* peer , bool isRootControl )
     Init();
     m_isRootControl = isRootControl;
     m_wxPeer = peer;
     Init();
     m_isRootControl = isRootControl;
     m_wxPeer = peer;

+    m_shouldSendEvents = true;

 }
 
 wxWidgetImpl::wxWidgetImpl()
 }
 
 wxWidgetImpl::wxWidgetImpl()