vcl/unx/gtk3/gtk3gtkinst.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
New commits: commit 23f0cf39096d0ab8696a5a621bf8d6e237ab9958 Author: Caolán McNamara <[email protected]> Date: Tue Dec 13 14:15:15 2016 +0000 loplugin:unreffun and loplugin:unnecessaryoverride for < gtk 3.16.0 Change-Id: I67613a72d92506cd4a12145112d6e9b3f9547be1 diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 947bcc9..e6f5d24 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -948,11 +948,13 @@ private: virtual const GLWindow& getOpenGLWindow() const override { return m_aGLWin; } virtual GLWindow& getModifiableOpenGLWindow() override { return m_aGLWin; } +#if GTK_CHECK_VERSION(3,16,0) static void signalDestroy(GtkWidget*, gpointer context) { GtkOpenGLContext* pThis = static_cast<GtkOpenGLContext*>(context); pThis->m_pGLArea = nullptr; } +#endif virtual bool ImplInit() override { @@ -975,13 +977,13 @@ private: return bRet; } +#if GTK_CHECK_VERSION(3,16,0) virtual void restoreDefaultFramebuffer() override { OpenGLContext::restoreDefaultFramebuffer(); -#if GTK_CHECK_VERSION(3,16,0) gtk_gl_area_attach_buffers(GTK_GL_AREA(m_pGLArea)); -#endif } +#endif virtual void makeCurrent() override {
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
