Fix another line somehow missing from the wxGraphicsBitmap forward port.

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

diff --git a/src/osx/nonownedwnd_osx.cpp b/src/osx/nonownedwnd_osx.cpp
index ed53785787c4aa1463acac38b6e36578f6dee365..017107215f22521e3e247c280e9dc01380018a69 100644 (file)
--- a/src/osx/nonownedwnd_osx.cpp
+++ b/src/osx/nonownedwnd_osx.cpp
@@ -153,44 +153,62 @@ bool wxNonOwnedWindow::Create(wxWindow *parent,
 wxNonOwnedWindow::~wxNonOwnedWindow()
 {
     SendDestroyEvent();
 wxNonOwnedWindow::~wxNonOwnedWindow()
 {
     SendDestroyEvent();

-    
+

     wxRemoveWXWindowAssociation( this ) ;
     wxRemoveWXWindowAssociation( this ) ;

-    
+

     DestroyChildren();
     DestroyChildren();

-    
+

     delete m_nowpeer;
     delete m_nowpeer;

+    m_nowpeer = NULL;

 
     // avoid dangling refs
     if ( s_macDeactivateWindow == this )
         s_macDeactivateWindow = NULL;
 }
 
 
     // avoid dangling refs
     if ( s_macDeactivateWindow == this )
         s_macDeactivateWindow = NULL;
 }
 

+bool wxNonOwnedWindow::Destroy()
+{
+    WillBeDestroyed();
+    
+    return wxWindow::Destroy();
+}
+
+void wxNonOwnedWindow::WillBeDestroyed()
+{
+    if ( m_nowpeer )
+        m_nowpeer->WillBeDestroyed();
+}
+

 // ----------------------------------------------------------------------------
 // wxNonOwnedWindow misc
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxNonOwnedWindow misc
 // ----------------------------------------------------------------------------
 

-bool wxNonOwnedWindow::ShowWithEffect(wxShowEffect effect,
-                                unsigned timeout )
-{ 
-    if ( !wxWindow::Show(true) )
+bool wxNonOwnedWindow::OSXShowWithEffect(bool show,
+                                         wxShowEffect effect,
+                                         unsigned timeout)
+{
+    // Cocoa code needs to manage window visibility on its own and so calls
+    // wxWindow::Show() as needed but if we already changed the internal
+    // visibility flag here, Show() would do nothing, so avoid doing it
+#if wxOSX_USE_CARBON
+    if ( !wxWindow::Show(show) )

         return false;
         return false;

+#endif // Carbon

 
 

-    // because apps expect a size event to occur at this moment
-    wxSizeEvent event(GetSize() , m_windowId);
-    event.SetEventObject(this);
-    HandleWindowEvent(event);
-
+    if ( effect == wxSHOW_EFFECT_NONE ||
+            !m_nowpeer || !m_nowpeer->ShowWithEffect(show, effect, timeout) )
+        return Show(show);

 
 

-    return m_nowpeer->ShowWithEffect(true, effect, timeout); 
-}
-
-bool wxNonOwnedWindow::HideWithEffect(wxShowEffect effect,
-                                unsigned timeout )
-{ 
-    if ( !wxWindow::Show(false) )
-        return false;
+    if ( show )
+    {
+        // as apps expect a size event to occur when the window is shown,
+        // generate one when it is shown with effect too
+        wxSizeEvent event(GetSize(), m_windowId);
+        event.SetEventObject(this);
+        HandleWindowEvent(event);
+    }

 
 

-    return m_nowpeer->ShowWithEffect(false, effect, timeout); 
+    return true;

 }
 
 wxPoint wxNonOwnedWindow::GetClientAreaOrigin() const
 }
 
 wxPoint wxNonOwnedWindow::GetClientAreaOrigin() const


@@ -201,17 +219,28 @@ wxPoint wxNonOwnedWindow::GetClientAreaOrigin() const
 }
 
 bool wxNonOwnedWindow::SetBackgroundColour(const wxColour& c )
 }
 
 bool wxNonOwnedWindow::SetBackgroundColour(const wxColour& c )

-{        
+{

     if ( !wxWindow::SetBackgroundColour(c) && m_hasBgCol )
         return false ;
     if ( !wxWindow::SetBackgroundColour(c) && m_hasBgCol )
         return false ;

-    
+

     if ( GetBackgroundStyle() != wxBG_STYLE_CUSTOM )
     {
         if ( m_nowpeer )
             return m_nowpeer->SetBackgroundColour(c);
     }
     return true;
     if ( GetBackgroundStyle() != wxBG_STYLE_CUSTOM )
     {
         if ( m_nowpeer )
             return m_nowpeer->SetBackgroundColour(c);
     }
     return true;

-}    
+}
+
+void wxNonOwnedWindow::SetWindowStyleFlag(long flags)
+{
+    if (flags == GetWindowStyleFlag())
+        return;
+        
+    wxWindow::SetWindowStyleFlag(flags);
+    
+    if (m_nowpeer)
+        m_nowpeer->SetWindowStyleFlag(flags);
+}

 
 // Raise the window to the top of the Z order
 void wxNonOwnedWindow::Raise()
 
 // Raise the window to the top of the Z order
 void wxNonOwnedWindow::Raise()


@@ -306,7 +335,7 @@ bool wxNonOwnedWindow::Show(bool show)
 
     if ( m_nowpeer )
         m_nowpeer->Show(show);
 
     if ( m_nowpeer )
         m_nowpeer->Show(show);

-    
+

     if ( show )
     {
         // because apps expect a size event to occur at this moment
     if ( show )
     {
         // because apps expect a size event to occur at this moment


@@ -314,7 +343,7 @@ bool wxNonOwnedWindow::Show(bool show)
         event.SetEventObject(this);
         HandleWindowEvent(event);
     }
         event.SetEventObject(this);
         HandleWindowEvent(event);
     }

-    
+

     return true ;
 }
 
     return true ;
 }
 


@@ -345,8 +374,8 @@ bool wxNonOwnedWindow::SetBackgroundStyle(wxBackgroundStyle style)
 {
     if ( !wxWindow::SetBackgroundStyle(style) )
         return false ;
 {
     if ( !wxWindow::SetBackgroundStyle(style) )
         return false ;

-        
-    return m_nowpeer->SetBackgroundStyle(style);
+
+    return m_nowpeer ? m_nowpeer->SetBackgroundStyle(style) : true;

 }
 
 void wxNonOwnedWindow::DoMoveWindow(int x, int y, int width, int height)
 }
 
 void wxNonOwnedWindow::DoMoveWindow(int x, int y, int width, int height)


@@ -378,9 +407,9 @@ void wxNonOwnedWindow::DoGetSize( int *width, int *height ) const
 {
     if ( m_nowpeer == NULL )
         return;
 {
     if ( m_nowpeer == NULL )
         return;

-        
+

     int w,h;
     int w,h;

-    
+

     m_nowpeer->GetSize(w, h);
 
     if (width)
     m_nowpeer->GetSize(w, h);
 
     if (width)


@@ -395,8 +424,13 @@ void wxNonOwnedWindow::DoGetClientSize( int *width, int *height ) const
         return;
 
     int left, top, w, h;
         return;
 
     int left, top, w, h;

+    // perhaps we should do this for all ?
+#ifdef __WXOSX_IPHONE__
+    m_peer->GetContentArea(left, top, w, h);
+#else

     m_nowpeer->GetContentArea(left, top, w, h);
     m_nowpeer->GetContentArea(left, top, w, h);

-
+#endif
+    

     if (width)
        *width = w ;
     if (height)
     if (width)
        *width = w ;
     if (height)


@@ -422,7 +456,7 @@ WXWindow wxNonOwnedWindow::GetWXWindow() const
 bool wxNonOwnedWindow::DoSetShape(const wxRegion& region)
 {
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
 bool wxNonOwnedWindow::DoSetShape(const wxRegion& region)
 {
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,

-                 _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
+                 wxT("Shaped windows must be created with the wxFRAME_SHAPED style."));

 
     // The empty region signifies that the shape
     // should be removed from the window.
 
     // The empty region signifies that the shape
     // should be removed from the window.