Kaydet (Commit) 7377c4d6 authored tarafından Michael Meeks's avatar Michael Meeks

Remove OpenGLContext GC window.

Change-Id: I1468fc94aa0c709528a767b96bc26eefdb7ed08f
üst 663d673a
...@@ -101,6 +101,8 @@ OpenGLContext::~OpenGLContext() ...@@ -101,6 +101,8 @@ OpenGLContext::~OpenGLContext()
mpNextContext->mpPrevContext = mpPrevContext; mpNextContext->mpPrevContext = mpPrevContext;
else else
pSVData->maGDIData.mpLastContext = mpPrevContext; pSVData->maGDIData.mpLastContext = mpPrevContext;
m_pChildWindow.disposeAndClear();
} }
#ifdef DBG_UTIL #ifdef DBG_UTIL
...@@ -1080,7 +1082,6 @@ bool OpenGLContext::initWindow() ...@@ -1080,7 +1082,6 @@ bool OpenGLContext::initWindow()
{ {
SystemWindowData winData = generateWinData(mpWindow, false); SystemWindowData winData = generateWinData(mpWindow, false);
m_pChildWindow = new SystemChildWindow(mpWindow, 0, &winData, false); m_pChildWindow = new SystemChildWindow(mpWindow, 0, &winData, false);
m_xChildWindowGC.reset(m_pChildWindow);
} }
if( m_pChildWindow ) if( m_pChildWindow )
...@@ -1108,7 +1109,6 @@ bool OpenGLContext::initWindow() ...@@ -1108,7 +1109,6 @@ bool OpenGLContext::initWindow()
{ {
SystemWindowData winData = generateWinData(mpWindow, mbRequestLegacyContext); SystemWindowData winData = generateWinData(mpWindow, mbRequestLegacyContext);
m_pChildWindow = new SystemChildWindow(mpWindow, 0, &winData, false); m_pChildWindow = new SystemChildWindow(mpWindow, 0, &winData, false);
m_xChildWindowGC.reset(m_pChildWindow);
} }
if( m_pChildWindow ) if( m_pChildWindow )
...@@ -1143,7 +1143,6 @@ bool OpenGLContext::initWindow() ...@@ -1143,7 +1143,6 @@ bool OpenGLContext::initWindow()
if( !m_pChildWindow ) if( !m_pChildWindow )
{ {
m_pChildWindow = VclPtrInstance<SystemChildWindow>(mpWindow, 0, &winData, false); m_pChildWindow = VclPtrInstance<SystemChildWindow>(mpWindow, 0, &winData, false);
m_xChildWindowGC.reset(m_pChildWindow);
} }
pChildSysData = m_pChildWindow->GetSystemData(); pChildSysData = m_pChildWindow->GetSystemData();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment