summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qcursor_win.cpp
diff options
context:
space:
mode:
authorMaurice Kalinowski <maurice.kalinowski@nokia.com>2009-04-28 09:59:36 (GMT)
committerMaurice Kalinowski <maurice.kalinowski@nokia.com>2009-04-29 06:33:55 (GMT)
commit75868b9e64d541ec0ffcfa04fdcc5e36354f47e4 (patch)
treea33d8fc07e7911278070f37c1a00e42d53c7688a /src/gui/kernel/qcursor_win.cpp
parent68999af7823e80aa049c19f332045b1fb074fb96 (diff)
downloadQt-75868b9e64d541ec0ffcfa04fdcc5e36354f47e4.zip
Qt-75868b9e64d541ec0ffcfa04fdcc5e36354f47e4.tar.gz
Qt-75868b9e64d541ec0ffcfa04fdcc5e36354f47e4.tar.bz2
introduce Q_WS_WINCE
Task-number: 246130 Reviewed-by: joerg Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we decided to stick with Q_WS_WIN32, but having a separate define makes the code more readable. In addition Q_WS_WINCE_WM is available for Windows Mobile only parts, where we do not check for the OS on runtime.
Diffstat (limited to 'src/gui/kernel/qcursor_win.cpp')
-rw-r--r--src/gui/kernel/qcursor_win.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/kernel/qcursor_win.cpp b/src/gui/kernel/qcursor_win.cpp
index 85d5a11..a475882 100644
--- a/src/gui/kernel/qcursor_win.cpp
+++ b/src/gui/kernel/qcursor_win.cpp
@@ -66,7 +66,7 @@ QCursorData::~QCursorData()
{
delete bm;
delete bmm;
-#if !defined(Q_OS_WINCE) || defined(GWES_ICONCURS)
+#if !defined(Q_WS_WINCE) || defined(GWES_ICONCURS)
if (hcurs)
DestroyCursor(hcurs);
#endif
@@ -129,7 +129,7 @@ extern HBITMAP qt_createIconMask(const QBitmap &bitmap);
static HCURSOR create32BitCursor(const QPixmap &pixmap, int hx, int hy)
{
HCURSOR cur = 0;
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_WS_WINCE)
QBitmap mask = pixmap.mask();
if (mask.isNull()) {
mask = QBitmap(pixmap.size());
@@ -407,7 +407,7 @@ void QCursorData::update()
}
int n = qMax(1, bbits.width() / 8);
int h = bbits.height();
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_WS_WINCE)
uchar* xBits = new uchar[h * n];
uchar* xMask = new uchar[h * n];
int x = 0;
@@ -430,7 +430,7 @@ void QCursorData::update()
xBits, xMask);
delete [] xBits;
delete [] xMask;
-#elif defined(GWES_ICONCURS) // Q_OS_WINCE
+#elif defined(GWES_ICONCURS) // Q_WS_WINCE
// Windows CE only supports fixed cursor size.
int sysW = GetSystemMetrics(SM_CXCURSOR);
int sysH = GetSystemMetrics(SM_CYCURSOR);