diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-08-24 15:20:47 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-08-25 06:37:07 (GMT) |
| commit | e1309dcfe2b61beb7c3ab23a0250382043dc9168 (patch) | |
| tree | 5e52cf13542f05f5a1fe9734dba15caa703e3664 | |
| parent | 0634c73e702f8c592b84d95b4c8f19a89067c1fc (diff) | |
| download | Qt-e1309dcfe2b61beb7c3ab23a0250382043dc9168.zip Qt-e1309dcfe2b61beb7c3ab23a0250382043dc9168.tar.gz Qt-e1309dcfe2b61beb7c3ab23a0250382043dc9168.tar.bz2 | |
qsystemtrayicon_win.cpp fix determination of NOTIFYICONDATA struct size
Now, that we define _WIN32_WINNT as 0x0500, we have no access to guidItem
in NOTIFYICONDATA. Thus, we cannot determine NOTIFYICONDATAW_V2_SIZE.
But in this case, NOTIFYICONDATAW_V2_SIZE is the same as
sizeof(NOTIFYICONDATA).
On Windows CE exists only one version of this struct anyway.
Reviewed-By: mauricek
| -rw-r--r-- | src/gui/util/qsystemtrayicon_win.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gui/util/qsystemtrayicon_win.cpp b/src/gui/util/qsystemtrayicon_win.cpp index 56872ac..465c1d8 100644 --- a/src/gui/util/qsystemtrayicon_win.cpp +++ b/src/gui/util/qsystemtrayicon_win.cpp @@ -132,14 +132,10 @@ QSystemTrayIconSys::QSystemTrayIconSys(QSystemTrayIcon *object) : hIcon(0), q(object), ignoreNextMouseRelease(false) { -#ifdef Q_OS_WINCE - notifyIconSize = FIELD_OFFSET(NOTIFYICONDATA, szTip[64]); // NOTIFYICONDATAW_V1_SIZE; - maxTipLength = 64; -#elif WINVER <= 0x0500 notifyIconSize = sizeof(NOTIFYICONDATA); +#ifdef Q_OS_WINCE maxTipLength = 64; #else - notifyIconSize = FIELD_OFFSET(NOTIFYICONDATA, guidItem); // NOTIFYICONDATAW_V2_SIZE; maxTipLength = 128; #endif |