diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-12-17 17:27:30 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-12-19 22:07:19 +0100 |
| commit | e3a002c53a544de02e5119c5b0a2fd4f972156a8 (patch) | |
| tree | d6bd55210bb93fdc2aae2e398b63c3dddeb38326 /include | |
| parent | e994b3fc3b2c9b7d39a715fc4d9453e06434d457 (diff) | |
get native gtk widgets in sidebars working
Change-Id: If65aef1249f54a87d7854c3fa2db4319a24a5a05
Reviewed-on: https://gerrit.libreoffice.org/85326
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/sidebar/PanelLayout.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/svapp.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/sysdata.hxx | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx index 6439ed51afdb..01cb0ff4a447 100644 --- a/include/svx/sidebar/PanelLayout.hxx +++ b/include/svx/sidebar/PanelLayout.hxx @@ -14,6 +14,7 @@ #include <vcl/builder.hxx> #include <vcl/ctrl.hxx> +#include <vcl/layout.hxx> #include <vcl/timer.hxx> #include <vcl/idle.hxx> #include <vcl/weld.hxx> @@ -25,6 +26,7 @@ class SVX_DLLPUBLIC PanelLayout : public Control, public VclBuilderContainer { protected: std::unique_ptr<weld::Builder> m_xBuilder; + VclPtr<VclVBox> m_xVclContentArea; std::unique_ptr<weld::Container> m_xContainer; private: diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index b36c22ed9de9..8b79031342e7 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1341,8 +1341,7 @@ public: static void setDeInitHook(Link<LinkParamNone*,void> const & hook); static weld::Builder* CreateBuilder(weld::Widget* pParent, const OUString &rUIFile); - static weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const OUString &rUIFile); //for the duration of same SfxTabPages in mixed parent types - static weld::Builder* CreateInterimBuilder(weld::Widget* pParent, const OUString &rUIFile); //for the duration of same SfxTabPages in mixed parent types + static weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const OUString &rUIFile); //for the duration of vcl parent windows static weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType, VclButtonsType eButtonType, const OUString& rPrimaryMessage); diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx index 393116d98c70..41277c5b9587 100644 --- a/include/vcl/sysdata.hxx +++ b/include/vcl/sysdata.hxx @@ -181,6 +181,7 @@ struct SystemWindowData // Nothing #elif defined( UNX ) void* pVisual; // the visual to be used + bool bClipUsingNativeWidget; // default is false, true will attempt to clip the childwindow with a native widget #endif }; |