diff options
| author | miniak <milan.burda@gmail.com> | 2009-07-01 09:50:01 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius@trolltech.com> | 2009-07-01 09:51:16 (GMT) |
| commit | d4a5ed717ae08034ffbc2377321406720a37bee9 (patch) | |
| tree | 75819205972624b695533c5bf37fae6f81826694 /src | |
| parent | 48406f5ae81fdcb3ba2a01471678d10213a2caa9 (diff) | |
| download | Qt-d4a5ed717ae08034ffbc2377321406720a37bee9.zip Qt-d4a5ed717ae08034ffbc2377321406720a37bee9.tar.gz Qt-d4a5ed717ae08034ffbc2377321406720a37bee9.tar.bz2 | |
src/opengl: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT support
Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/opengl/qgl_win.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp index 40b0ce7..86dd1d8 100644 --- a/src/opengl/qgl_win.cpp +++ b/src/opengl/qgl_win.cpp @@ -642,14 +642,10 @@ public: QString windowClassName = qt_getRegisteredWndClass(); if (parent && !parent->internalWinId()) parent = parent->nativeParentWidget(); - QT_WA({ - const TCHAR *cname = (TCHAR*)windowClassName.utf16(); - dmy_id = CreateWindow(cname, 0, 0, 0, 0, 1, 1, - parent ? parent->winId() : 0, 0, qWinAppInst(), 0); - } , { - dmy_id = CreateWindowA(windowClassName.toLatin1(), 0, 0, 0, 0, 1, 1, - parent ? parent->winId() : 0, 0, qWinAppInst(), 0); - }); + + dmy_id = CreateWindow((const wchar_t *)windowClassName.utf16(), + 0, 0, 0, 0, 1, 1, + parent ? parent->winId() : 0, 0, qWinAppInst(), 0); dmy_pdc = GetDC(dmy_id); PIXELFORMATDESCRIPTOR dmy_pfd; |