diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-02-18 08:10:57 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-02-18 08:12:23 (GMT) |
| commit | eeb121d54e345e92ab74d8c43e07d803a0e144ea (patch) | |
| tree | ae6d5d595d1b46bcaa721efc95c98c97e078d214 | |
| parent | 7eb4b5efe05708b1e5e31ad5c4b150f601f90049 (diff) | |
| download | Qt-eeb121d54e345e92ab74d8c43e07d803a0e144ea.zip Qt-eeb121d54e345e92ab74d8c43e07d803a0e144ea.tar.gz Qt-eeb121d54e345e92ab74d8c43e07d803a0e144ea.tar.bz2 | |
Compile.
NSInteger is int/long on 32/64 bit.
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qt_cocoa_helpers_mac.mm | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qt_cocoa_helpers_mac_p.h | 1 | ||||
| -rw-r--r-- | src/gui/util/qsystemtrayicon_mac.mm | 1 |
4 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index e7cd718..d5e7534 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -692,6 +692,7 @@ extern "C" { qt_button_down = 0; } +extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); - (void)otherMouseDown:(NSEvent *)theEvent { if (!qt_button_down) diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm index 7f0ae57..901bf0e 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm @@ -648,7 +648,7 @@ bool qt_dispatchKeyEventWithCocoa(void * /*NSEvent * */ keyEvent, QWidget *widge } #endif -Qt::MouseButton cocoaButton2QtButton(long buttonNum) +Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum) { if (buttonNum == 0) return Qt::LeftButton; diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/kernel/qt_cocoa_helpers_mac_p.h index 8d29ce1..c43ea55 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h +++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h @@ -137,7 +137,6 @@ void qt_mac_update_mouseTracking(QWidget *widget); OSStatus qt_mac_drawCGImage(CGContextRef cg, const CGRect *inbounds, CGImageRef); bool qt_mac_checkForNativeSizeGrip(const QWidget *widget); void qt_dispatchTabletProximityEvent(void * /*NSEvent * */ tabletEvent); -Qt::MouseButton cocoaButton2QtButton(long buttonNum); #ifdef QT_MAC_USE_COCOA bool qt_dispatchKeyEventWithCocoa(void * /*NSEvent * */ keyEvent, QWidget *widgetToGetEvent); void qt_cocoaChangeOverrideCursor(const QCursor &cursor); diff --git a/src/gui/util/qsystemtrayicon_mac.mm b/src/gui/util/qsystemtrayicon_mac.mm index 2359822..5cadbbd 100644 --- a/src/gui/util/qsystemtrayicon_mac.mm +++ b/src/gui/util/qsystemtrayicon_mac.mm @@ -382,6 +382,7 @@ QT_END_NAMESPACE [self menuTrackingDone:nil]; } +extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); - (void)otherMouseDown:(NSEvent *)mouseEvent { [self mousePressed:mouseEvent button:cocoaButton2QtButton([mouseEvent buttonNumber])]; |