diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-15 20:41:33 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-16 12:54:44 +0000 |
| commit | a1ceacc17e3f30d5e9c06b3218ad8ec26ca2f1b9 (patch) | |
| tree | 56a29f66f75f326a0a677ab1697ce28f1bc9fcbf /vcl/source/opengl | |
| parent | 18f41dfaf19d656d290c47d196ef2702e169a522 (diff) | |
boost::foo_ptr->std::foo_ptr
Change-Id: I9219619b538b6530a89f5932ac51eb3b62eb396a
Diffstat (limited to 'vcl/source/opengl')
| -rw-r--r-- | vcl/source/opengl/OpenGLContext.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index fa0684d063a3..4a7edff5b330 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -656,10 +656,10 @@ bool OpenGLContext::init( vcl::Window* pParent ) if(mbInitialized) return true; - m_pWindow.reset(pParent ? NULL : new vcl::Window(0, WB_NOBORDER|WB_NODIALOGCONTROL)); - mpWindow = pParent ? pParent : m_pWindow.get(); - if(m_pWindow) - m_pWindow->setPosSizePixel(0,0,0,0); + m_xWindow.reset(pParent ? NULL : new vcl::Window(0, WB_NOBORDER|WB_NODIALOGCONTROL)); + mpWindow = pParent ? pParent : m_xWindow.get(); + if(m_xWindow) + m_xWindow->setPosSizePixel(0,0,0,0); m_pChildWindow = 0; initWindow(); return ImplInit(); @@ -1043,8 +1043,8 @@ bool OpenGLContext::InitGLEW() void OpenGLContext::setWinPosAndSize(const Point &rPos, const Size& rSize) { - if(m_pWindow) - m_pWindow->SetPosSizePixel(rPos, rSize); + if(m_xWindow) + m_xWindow->SetPosSizePixel(rPos, rSize); if( m_pChildWindow ) m_pChildWindow->SetPosSizePixel(rPos, rSize); @@ -1054,8 +1054,8 @@ void OpenGLContext::setWinPosAndSize(const Point &rPos, const Size& rSize) void OpenGLContext::setWinSize(const Size& rSize) { - if(m_pWindow) - m_pWindow->SetSizePixel(rSize); + if(m_xWindow) + m_xWindow->SetSizePixel(rSize); if( m_pChildWindow ) m_pChildWindow->SetSizePixel(rSize); @@ -1080,7 +1080,7 @@ bool OpenGLContext::initWindow() { SystemWindowData winData = generateWinData(mpWindow, false); m_pChildWindow = new SystemChildWindow(mpWindow, 0, &winData, false); - m_pChildWindowGC.reset(m_pChildWindow); + m_xChildWindowGC.reset(m_pChildWindow); } if( m_pChildWindow ) @@ -1108,7 +1108,7 @@ bool OpenGLContext::initWindow() { SystemWindowData winData = generateWinData(mpWindow, mbRequestLegacyContext); m_pChildWindow = new SystemChildWindow(mpWindow, 0, &winData, false); - m_pChildWindowGC.reset(m_pChildWindow); + m_xChildWindowGC.reset(m_pChildWindow); } if( m_pChildWindow ) @@ -1143,7 +1143,7 @@ bool OpenGLContext::initWindow() if( !m_pChildWindow ) { m_pChildWindow = new SystemChildWindow(mpWindow, 0, &winData, false); - m_pChildWindowGC.reset(m_pChildWindow); + m_xChildWindowGC.reset(m_pChildWindow); } pChildSysData = m_pChildWindow->GetSystemData(); } @@ -1447,8 +1447,8 @@ void OpenGLContext::show() { if (m_pChildWindow) m_pChildWindow->Show(); - else if (m_pWindow) - m_pWindow->Show(); + else if (m_xWindow) + m_xWindow->Show(); } SystemChildWindow* OpenGLContext::getChildWindow() |