diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-05-19 14:46:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-19 15:53:14 +0100 |
| commit | b030ba2e13a02c231783966b23ded76247bb9690 (patch) | |
| tree | 82cfbea3c5ba32cbfb456f3564ef2dfc1e10d62d /vcl/source/opengl | |
| parent | ab25d7cfec956b6c31551ee5c00bd6bcae4b0bb5 (diff) | |
Resolve: "TODO(Q1): Make GetSystemData method virtual"
and remove the casting silliness, allowing the removal of
cairo_cairo.?xx
If anything is to go wrong I'd guess it'll be the windows directx stuff.
Change-Id: I3e22c07b9c26ade9b27a245fdd8408de540643f4
Diffstat (limited to 'vcl/source/opengl')
| -rw-r--r-- | vcl/source/opengl/OpenGLContext.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index f36c61010f30..f254974727c9 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -1114,7 +1114,7 @@ bool OpenGLContext::initWindow() if (m_pChildWindow) { InitChildWindow(m_pChildWindow.get()); - const SystemEnvData* sysData(m_pChildWindow->GetSystemChildSystemData()); + const SystemEnvData* sysData(m_pChildWindow->GetSystemData()); m_aGLWin.hWnd = sysData->hWnd; } @@ -1159,7 +1159,7 @@ bool OpenGLContext::initWindow() { m_pChildWindow = VclPtr<SystemChildWindow>::Create(mpWindow, 0, &winData, false); } - pChildSysData = m_pChildWindow->GetSystemChildSystemData(); + pChildSysData = m_pChildWindow->GetSystemData(); } if (!m_pChildWindow || !pChildSysData) @@ -1309,7 +1309,7 @@ SystemWindowData OpenGLContext::generateWinData(vcl::Window* pParent, bool) aWinData.pVisual = nullptr; #if !defined(LIBO_HEADLESS) - const SystemEnvData* sysData(pParent->GetWindowSystemData()); + const SystemEnvData* sysData(pParent->GetSystemData()); Display *dpy = static_cast<Display*>(sysData->pDisplay); Window win = sysData->aWindow; @@ -1590,7 +1590,7 @@ bool OpenGLContext::supportMultiSampling() const #if defined(MACOSX) NSOpenGLView* OpenGLContext::getOpenGLView() { - return reinterpret_cast<NSOpenGLView*>(m_pChildWindow->GetSystemChildSystemData()->mpNSView); + return reinterpret_cast<NSOpenGLView*>(m_pChildWindow->GetSystemData()->mpNSView); } #endif |