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/inc | |
| 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/inc')
| -rw-r--r-- | vcl/inc/svdata.hxx | 1 | ||||
| -rw-r--r-- | vcl/inc/unx/salinst.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index b559cf3ee06d..eef919d32a3b 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -126,6 +126,7 @@ struct ImplSVAppData OUString* mpAppName; // Application name OUString* mpAppFileName; // Abs. Application FileName OUString* mpDisplayName; // Application Display Name + OUString* mpToolkitName; // Toolkit Name Help* mpHelp; // Application help PopupMenu* mpActivePopupMenu; // Actives Popup-Menu (in Execute) ImplIdleMgr* mpIdleMgr; // Idle-Manager diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h index 54119d46f8a2..ee8dbcdc8b9c 100644 --- a/vcl/inc/unx/salinst.h +++ b/vcl/inc/unx/salinst.h @@ -45,7 +45,7 @@ protected: SalXLib *mpXLib; public: - X11SalInstance( SalYieldMutex* pMutex ) : SalGenericInstance( pMutex ), mpXLib(NULL) {} + explicit X11SalInstance(SalYieldMutex* pMutex); virtual ~X11SalInstance(); virtual SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override; |