summaryrefslogtreecommitdiffstats
path: root/vcl/aqua
diff options
context:
space:
mode:
authorHerbert Dürr <hdu@apache.org>2012-07-11 14:01:20 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-04-09 20:12:02 +0100
commitef4b5aad82da7133e89e37e3e04791398d6fb3a6 (patch)
treef7299a69e175007d319622ad508d4ad730622151 /vcl/aqua
parentResolves: #i120237# workaround a crash on OSX... (diff)
downloadcore-ef4b5aad82da7133e89e37e3e04791398d6fb3a6.tar.gz
core-ef4b5aad82da7133e89e37e3e04791398d6fb3a6.zip
Related: #i120237# cache the updated frame reference in AquaSalGraphics
(cherry picked from commit 6e4214e604f8aa86b08a7fbe315a80d7751ffc2d) Change-Id: Id10d49737ba773e95a3198997e25fbfd98708f65
Diffstat (limited to 'vcl/aqua')
-rw-r--r--vcl/aqua/source/gdi/salvd.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx
index 109b3fb94d0f..e4d5df30fd8d 100644
--- a/vcl/aqua/source/gdi/salvd.cxx
+++ b/vcl/aqua/source/gdi/salvd.cxx
@@ -182,11 +182,18 @@ sal_Bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
}
else
{
- // default to a NSView target context, any will do
+ // default to a NSView target context
AquaSalFrame* pSalFrame = mpGraphics->getGraphicsFrame();
if( !pSalFrame || !AquaSalFrame::isAlive( pSalFrame ))
+ {
if( !GetSalData()->maFrames.empty() )
+ {
+ // get the first matching frame
pSalFrame = *GetSalData()->maFrames.begin();
+ // update the frame reference
+ mpGraphics->setGraphicsFrame( pSalFrame );
+ }
+ }
if( pSalFrame )
{
// #i91990#