diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-18 11:25:26 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-02-19 14:55:22 +0000 |
| commit | ea32554ad0be02d3946eb19c96b2c29081ef66d9 (patch) | |
| tree | 9b5d4543de7ebfc94a9bfc92eacae58c78d6ef1e /vcl/unx | |
| parent | 05eccaef907c9fca4f874b8ffa608d4815fbeebd (diff) | |
Resolves: tdf#97904 opengl stuff isn't implemented for gtk3
Change-Id: I1abbceebadf320f28955f54058b2d0ebfc79b9bc
(cherry picked from commit d967cc35fd0c77d9f3dd0b3d0c7df850db6ec274)
Reviewed-on: https://gerrit.libreoffice.org/22472
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/app/salinst.cxx | 9 | ||||
| -rw-r--r-- | vcl/unx/gtk/gtkinst.cxx | 8 | ||||
| -rw-r--r-- | vcl/unx/kde4/KDESalInstance.cxx | 8 | ||||
| -rw-r--r-- | vcl/unx/kde4/KDESalInstance.hxx | 2 |
4 files changed, 26 insertions, 1 deletions
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx index af3f95cf09a2..0093d3f3e827 100644 --- a/vcl/unx/generic/app/salinst.cxx +++ b/vcl/unx/generic/app/salinst.cxx @@ -65,6 +65,15 @@ extern "C" } } +X11SalInstance::X11SalInstance(SalYieldMutex* pMutex) + : SalGenericInstance(pMutex) + , mpXLib(nullptr) +{ + ImplSVData* pSVData = ImplGetSVData(); + delete pSVData->maAppData.mpToolkitName; + pSVData->maAppData.mpToolkitName = new OUString("x11"); +} + X11SalInstance::~X11SalInstance() { // close session management diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx index 7ae75c43f963..f07363566894 100644 --- a/vcl/unx/gtk/gtkinst.cxx +++ b/vcl/unx/gtk/gtkinst.cxx @@ -186,6 +186,14 @@ void GtkInstance::EnsureInit() InitAtkBridge(); + ImplSVData* pSVData = ImplGetSVData(); + delete pSVData->maAppData.mpToolkitName; +#if GTK_CHECK_VERSION(3,0,0) + pSVData->maAppData.mpToolkitName = new OUString("gtk3"); +#else + pSVData->maAppData.mpToolkitName = new OUString("gtk2"); +#endif + bNeedsInit = false; } diff --git a/vcl/unx/kde4/KDESalInstance.cxx b/vcl/unx/kde4/KDESalInstance.cxx index e28fb2d70328..86c9d8f2e50f 100644 --- a/vcl/unx/kde4/KDESalInstance.cxx +++ b/vcl/unx/kde4/KDESalInstance.cxx @@ -26,6 +26,14 @@ using namespace com::sun::star; +KDESalInstance::KDESalInstance(SalYieldMutex* pMutex) + : X11SalInstance(pMutex) +{ + ImplSVData* pSVData = ImplGetSVData(); + delete pSVData->maAppData.mpToolkitName; + pSVData->maAppData.mpToolkitName = new OUString("kde4"); +} + SalFrame* KDESalInstance::CreateFrame( SalFrame *pParent, SalFrameStyleFlags nState ) { return new KDESalFrame( pParent, nState ); diff --git a/vcl/unx/kde4/KDESalInstance.hxx b/vcl/unx/kde4/KDESalInstance.hxx index 8eabb3be8981..aaa8d2f46d5b 100644 --- a/vcl/unx/kde4/KDESalInstance.hxx +++ b/vcl/unx/kde4/KDESalInstance.hxx @@ -27,7 +27,7 @@ class SalFrame; class KDESalInstance : public X11SalInstance { public: - explicit KDESalInstance( SalYieldMutex* pMutex ) : X11SalInstance( pMutex ) {} + explicit KDESalInstance(SalYieldMutex* pMutex); virtual ~KDESalInstance() {} virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override; |