always use hw-accel, fixes #15536, applied with thanks

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

diff --git a/src/osx/nonownedwnd_osx.cpp b/src/osx/nonownedwnd_osx.cpp
index 183fe42d7fab5b9388b8a7ce9ba71919708f4d6a..9e7f1e185cb9ac5ac75b73bd2e4f418e0ef12da6 100644 (file)
--- a/src/osx/nonownedwnd_osx.cpp
+++ b/src/osx/nonownedwnd_osx.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of wxNonOwnedWindow
 // Author:      Stefan Csomor
 // Created:     2008-03-24
 // Purpose:     implementation of wxNonOwnedWindow
 // Author:      Stefan Csomor
 // Created:     2008-03-24

-// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor 2008
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor 2008
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -307,7 +306,7 @@ void wxNonOwnedWindow::HandleActivated( double timestampsec, bool didActivate )
     HandleWindowEvent(wxevent);
 }
 
     HandleWindowEvent(wxevent);
 }
 

-void wxNonOwnedWindow::HandleResized( double timestampsec )
+void wxNonOwnedWindow::HandleResized( double WXUNUSED(timestampsec) )

 {
     SendSizeEvent();
     // we have to inform some controls that have to reset things
 {
     SendSizeEvent();
     // we have to inform some controls that have to reset things


@@ -478,11 +477,6 @@ void wxNonOwnedWindow::DoGetClientSize( int *width, int *height ) const
        *height = h ;
 }
 
        *height = h ;
 }
 

-double wxNonOwnedWindow::GetMagnificationFactor() const
-{
-    return m_nowpeer->GetMagnificationFactor();
-}
-

 void wxNonOwnedWindow::WindowWasPainted()
 {
     s_lastFlush = clock();
 void wxNonOwnedWindow::WindowWasPainted()
 {
     s_lastFlush = clock();


@@ -502,6 +496,11 @@ WXWindow wxNonOwnedWindow::GetWXWindow() const
     return m_nowpeer ? m_nowpeer->GetWXWindow() : NULL;
 }
 
     return m_nowpeer ? m_nowpeer->GetWXWindow() : NULL;
 }
 

+void *wxNonOwnedWindow::OSXGetViewOrWindow() const
+{
+    return GetWXWindow();
+}
+

 // ---------------------------------------------------------------------------
 // Shape implementation
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // Shape implementation
 // ---------------------------------------------------------------------------