diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-17 11:56:18 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-17 12:49:10 +0000 |
| commit | 681294d55b6b4edcdef08982596cb4bcee32e635 (patch) | |
| tree | e156116c560a9d989ef4ad0b8e43d17847e6b811 /vcl/inc | |
| parent | 7decc4193028f27354556a007a99088c1ea0b32e (diff) | |
gtk3: use native GtkPopover for calc formula prompt, etc
Change-Id: I9aa7e977228780b6273daa03be5e872342414437
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/salframe.hxx | 21 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 3 |
2 files changed, 23 insertions, 1 deletions
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index 161269bc083d..e51864f3c2f5 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -23,6 +23,7 @@ #include "salwtype.hxx" #include "salgeom.hxx" +#include <vcl/help.hxx> #include <vcl/window.hxx> // complete vcl::Window for SalFrame::CallCallback under -fsanitize=function @@ -231,7 +232,25 @@ public: } // return true to indicate tooltips are shown natively, false otherwise - virtual bool ShowTooltip(const OUString& /*rHelpText*/, const Rectangle& /*rHelpArea*/ ) + virtual bool ShowTooltip(const OUString& /*rHelpText*/, const Rectangle& /*rHelpArea*/) + { + return false; + } + + // return !0 to indicate popovers are shown natively, 0 otherwise + virtual sal_uIntPtr ShowPopover(const OUString& /*rHelpText*/, const Rectangle& /*rHelpArea*/, QuickHelpFlags /*nFlags*/) + { + return 0; + } + + // return true to indicate popovers are shown natively, false otherwise + virtual bool UpdatePopover(sal_uIntPtr /*nId*/, const OUString& /*rHelpText*/, const Rectangle& /*rHelpArea*/) + { + return false; + } + + // return true to indicate popovers are shown natively, false otherwise + virtual bool HidePopover(sal_uIntPtr /*nId*/) { return false; } diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index d3ec70f49f19..fcd3d73e7e24 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -517,6 +517,9 @@ public: #if GTK_CHECK_VERSION(3,0,0) virtual void SetModal(bool bModal) override; virtual bool ShowTooltip(const OUString& rHelpText, const Rectangle& rHelpArea) override; + virtual sal_uIntPtr ShowPopover(const OUString& rHelpText, const Rectangle& rHelpArea, QuickHelpFlags nFlags) override; + virtual bool UpdatePopover(sal_uIntPtr nId, const OUString& rHelpText, const Rectangle& rHelpArea) override; + virtual bool HidePopover(sal_uIntPtr nId) override; #endif static GtkSalFrame *getFromWindow( GtkWindow *pWindow ); |