diff options
| author | Herbert Dürr <hdu@apache.org> | 2014-01-23 16:56:03 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-24 11:05:46 +0000 |
| commit | e4653eee7680831e6d0995d51d80fb63309c03ab (patch) | |
| tree | 078ef816c2fa12397403361263e87239dbf308d3 /vcl/quartz | |
| parent | Updated core (diff) | |
| download | core-e4653eee7680831e6d0995d51d80fb63309c03ab.tar.gz core-e4653eee7680831e6d0995d51d80fb63309c03ab.zip | |
Related: #i123895# adjust VCL support for 64bit OSX port
(cherry picked from commit 677d987b931c509c4240840c4f21ccad2b518b12)
Conflicts:
vcl/aqua/source/a11y/aqua11ywrapperrow.mm
vcl/inc/aqua/aquavcltypes.h
vcl/inc/quartz/salgdi.h
vcl/osx/DropTarget.cxx
vcl/osx/salframe.cxx
vcl/osx/salinst.cxx
vcl/osx/salmenu.cxx
vcl/osx/vclnsapp.mm
Change-Id: I30d72e7caa1269982d176bc4d3baf604d5e7a84b
Diffstat (limited to 'vcl/quartz')
| -rw-r--r-- | vcl/quartz/salgdiutils.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/quartz/salgdiutils.cxx b/vcl/quartz/salgdiutils.cxx index c48089f86588..295719e959ec 100644 --- a/vcl/quartz/salgdiutils.cxx +++ b/vcl/quartz/salgdiutils.cxx @@ -166,7 +166,7 @@ void AquaSalGraphics::SetState() bool AquaSalGraphics::CheckContext() { - if( mbWindow && mpFrame != NULL ) + if( mbWindow && mpFrame && mpFrame->getNSWindow() ) { const unsigned int nWidth = mpFrame->maGeometry.nWidth; const unsigned int nHeight = mpFrame->maGeometry.nHeight; |