summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows/qwindowscontext.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/platforms/windows/qwindowscontext.cpp')
-rw-r--r--src/plugins/platforms/windows/qwindowscontext.cpp20
1 files changed, 4 insertions, 16 deletions
diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
index 3da1281004..d3ca49635d 100644
--- a/src/plugins/platforms/windows/qwindowscontext.cpp
+++ b/src/plugins/platforms/windows/qwindowscontext.cpp
@@ -193,9 +193,8 @@ QWindowsContext *QWindowsContext::m_instance = 0;
typedef QHash<HWND, QWindowsWindow *> HandleBaseWindowHash;
struct QWindowsContextPrivate {
- explicit QWindowsContextPrivate(bool isOpenGL);
+ QWindowsContextPrivate();
- const bool m_isOpenGL;
unsigned m_systemInfo;
QSet<QString> m_registeredWindowClassNames;
HandleBaseWindowHash m_windows;
@@ -208,8 +207,7 @@ struct QWindowsContextPrivate {
const HRESULT m_oleInitializeResult;
};
-QWindowsContextPrivate::QWindowsContextPrivate(bool isOpenGL) :
- m_isOpenGL(isOpenGL),
+QWindowsContextPrivate::QWindowsContextPrivate() :
m_systemInfo(0),
m_displayContext(GetDC(0)),
m_defaultDPI(GetDeviceCaps(m_displayContext,LOGPIXELSY)),
@@ -228,8 +226,8 @@ QWindowsContextPrivate::QWindowsContextPrivate(bool isOpenGL) :
}
}
-QWindowsContext::QWindowsContext(bool isOpenGL) :
- d(new QWindowsContextPrivate(isOpenGL))
+QWindowsContext::QWindowsContext() :
+ d(new QWindowsContextPrivate)
{
#ifdef Q_CC_MSVC
# pragma warning( disable : 4996 )
@@ -271,11 +269,6 @@ void QWindowsContext::setWindowCreationContext(const QSharedPointer<QWindowCreat
d->m_creationContext = ctx;
}
-bool QWindowsContext::isOpenGL() const
-{
- return d->m_isOpenGL;
-}
-
int QWindowsContext::defaultDPI() const
{
return d->m_defaultDPI;
@@ -345,11 +338,6 @@ QString QWindowsContext::registerWindowClass(const QWindow *w, bool isGL)
icon = true;
}
- // force CS_OWNDC when the GL graphics system is
- // used as the default renderer
- if (d->m_isOpenGL)
- style |= CS_OWNDC;
-
HBRUSH brush = 0;
if (w && !isGL)
brush = GetSysColorBrush(COLOR_WINDOW);