diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 14:41:27 +0100 |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 14:41:27 +0100 |
| commit | c808dd27459e030fde0577feb8ba06e3bd465526 (patch) | |
| tree | 4bf898dc4a88e2b03c9716f940638a2e01c6c0ce /src/plugins/platforms/cocoa/qnsview.h | |
| parent | d9d8845d507a6bdbc9c9f24c0d9d86dca513461d (diff) | |
| parent | 300534fc214f2547a63594ce0891e9a54c8f33ca (diff) | |
Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtbase into newdocs
Change-Id: I7e6cee190a341901dfbf8effb54ebccb91bf7a17
Diffstat (limited to 'src/plugins/platforms/cocoa/qnsview.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.h b/src/plugins/platforms/cocoa/qnsview.h index 32e140f9ff..246d311f7b 100644 --- a/src/plugins/platforms/cocoa/qnsview.h +++ b/src/plugins/platforms/cocoa/qnsview.h @@ -54,6 +54,8 @@ QT_END_NAMESPACE @interface QNSView : NSView <NSTextInputClient> { CGImageRef m_cgImage; + CGImageRef m_maskImage; + uchar *m_maskData; QWindow *m_window; QCocoaWindow *m_platformWindow; Qt::MouseButtons m_buttons; @@ -68,6 +70,7 @@ QT_END_NAMESPACE - (id)initWithQWindow:(QWindow *)window platformWindow:(QCocoaWindow *) platformWindow; - (void)setImage:(QImage *)image; +- (void)setMaskRegion:(const QRegion *)region; - (void)drawRect:(NSRect)dirtyRect; - (void)updateGeometry; - (void)windowNotification : (NSNotification *) windowNotification; |