diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-12-29 23:24:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-12-30 19:45:10 +0100 |
| commit | 82a22f62e5b1c7bfa7fb117a0423475f10410194 (patch) | |
| tree | 6667a1fac1f1ddbeacac7003491d7b1a8ab6753f /vcl | |
| parent | c97965e1b5b890a2a48d87d7a060396be71f2a00 (diff) | |
Fix GDK_KEY_RELEASE -> GDK_KEY_RELEASE_MASK
...as found with recent Clang 10 trunk:
> vcl/unx/gtk3/gtk3gtkobject.cxx:255:76: error: bitwise operation between different enumeration types ('GdkEventMask' and 'GdkEventType') is deprecated [-Werror,-Wdeprecated-enum-enum-conversion]
> gtk_widget_add_events( GTK_WIDGET( m_pSocket ), GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE );
> ~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~
This is presumably a typo originating with
31fa4545985acc1594107e087cedc2d99b3d0f0b "split the gtk2 and gtk2 gtkobjects".
<https://developer.gnome.org/gtk3/stable/GtkWidget.html#gtk-widget-add-events>
states that the "gint events" parameter of gtk_widget_add_events is "an event
mask, see GdkEventMask", and /usr/include/gtk-3.0/gdk/gdktypes.h has
> typedef enum
> {
[...]
> GDK_KEY_PRESS_MASK = 1 << 10,
> GDK_KEY_RELEASE_MASK = 1 << 11,
[...]
> } GdkEventMask;
while /usr/include/gtk-3.0/gdk/gdkevents.h (both
gtk3-devel-3.24.13-1.fc31.x86_64) has
> typedef enum
> {
[...]
> GDK_KEY_PRESS = 8,
> GDK_KEY_RELEASE = 9,
[...]
> } GdkEventType;
Change-Id: I23acfef5e59803d2b71eed6c65a78e9895e415af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85971
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkobject.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkobject.cxx b/vcl/unx/gtk3/gtk3gtkobject.cxx index d038a6121432..9b9fff958908 100644 --- a/vcl/unx/gtk3/gtk3gtkobject.cxx +++ b/vcl/unx/gtk3/gtk3gtkobject.cxx @@ -252,9 +252,9 @@ void GtkSalObject::signalDestroy( GtkWidget* pObj, gpointer object ) void GtkSalObjectBase::SetForwardKey( bool bEnable ) { if( bEnable ) - gtk_widget_add_events( GTK_WIDGET( m_pSocket ), GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE ); + gtk_widget_add_events( GTK_WIDGET( m_pSocket ), GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK ); else - gtk_widget_set_events( GTK_WIDGET( m_pSocket ), ~(GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE) & gtk_widget_get_events( GTK_WIDGET( m_pSocket ) ) ); + gtk_widget_set_events( GTK_WIDGET( m_pSocket ), ~(GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK) & gtk_widget_get_events( GTK_WIDGET( m_pSocket ) ) ); } GtkSalObjectWidgetClip::GtkSalObjectWidgetClip(GtkSalFrame* pParent, bool bShow) |