summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-11-30 16:13:42 +0000
committerMichael Meeks <michael.meeks@collabora.com>2015-12-11 18:48:59 +0000
commitcdc03a2b41e1042685ac0f36c5abb352b5220f3b (patch)
tree2f5caf416a4fe60d0dae53cdf0bd4254b9659ae5
parentbc0ed8d64bf67e50f22ebdfceed89fdb457cccb4 (diff)
vcl: gtk frames should DeInitialize properly, to handle GL cleanup.
Conflicts: vcl/unx/gtk/gtksalframe.cxx Change-Id: Ie6a5464c28b89f08639939690052023e685a3d33
-rw-r--r--vcl/unx/gtk/gtksalframe.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 709c04e9a305..1d5c8974693b 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -773,8 +773,10 @@ void GtkSalFrame::InvalidateGraphics()
{
if( m_pGraphics )
{
- m_pGraphics->SetDrawable( None, m_nXScreen );
+ m_pGraphics->DeInit();
m_pGraphics->SetWindow(nullptr);
+ delete m_pGraphics;
+ m_pGraphics = nullptr;
m_bGraphics = false;
}
}
@@ -842,9 +844,6 @@ GtkSalFrame::~GtkSalFrame()
g_object_unref( G_OBJECT( m_pForeignParent ) );
if( m_pForeignTopLevel )
g_object_unref( G_OBJECT( m_pForeignTopLevel) );
-
- delete m_pGraphics;
- m_pGraphics = NULL;
}
void GtkSalFrame::moveWindow( long nX, long nY )