[Libreoffice-commits] core.git: vcl/unx

[Stephan Bergmann (via logerrit)]

 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fadd1bf76f868fd6574cb337c55c723c50917fba
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sun Dec 29 23:18:48 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Dec 30 08:32:59 2019 +0100

    Fix typo GTK_STATE_PRELIGHT -> GTK_STATE_FLAG_PRELIGHT
    
    ...as found with recent Clang 10 trunk:
    
    > vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx:765:68: error: bitwise operation between different enumeration types ('GtkStateFlags' and 'GtkStateType') is deprecated [-Werror,-Wdeprecated-enum-enum-conversion]
    >                 stateFlags = static_cast<GtkStateFlags>(stateFlags | GTK_STATE_PRELIGHT);
    >                                                         ~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~
    
    This is presumably a typo originating with
    625afed7a89732decb068a12bb526fb406cd2c7f "gtk3: improve the GTK3 theming layer
    somewhat", but which should be harmless:  At least with
    /usr/include/gtk-3.0/gtk/gtkenums.h from gtk3-devel-3.24.13-1.fc31.x86_64,
    GTK_STATE_PRELIGHT from
    
    > typedef enum
    > {
    >   GTK_STATE_NORMAL,
    >   GTK_STATE_ACTIVE,
    >   GTK_STATE_PRELIGHT,
    >   GTK_STATE_SELECTED,
    >   GTK_STATE_INSENSITIVE,
    >   GTK_STATE_INCONSISTENT,
    >   GTK_STATE_FOCUSED
    > } GtkStateType;
    
    happens to have the same value (namely 2) as GTK_STATE_FLAG_PRELIGHT from
    
    > typedef enum
    > {
    >   GTK_STATE_FLAG_NORMAL       = 0,
    >   GTK_STATE_FLAG_ACTIVE       = 1 << 0,
    >   GTK_STATE_FLAG_PRELIGHT     = 1 << 1,
    >   GTK_STATE_FLAG_SELECTED     = 1 << 2,
    >   GTK_STATE_FLAG_INSENSITIVE  = 1 << 3,
    >   GTK_STATE_FLAG_INCONSISTENT = 1 << 4,
    >   GTK_STATE_FLAG_FOCUSED      = 1 << 5,
    >   GTK_STATE_FLAG_BACKDROP     = 1 << 6,
    [...]
    > } GtkStateFlags;
    
    Change-Id: Ie751e18b40117228063b2350e41c2b24617f2571
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85969
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 79384edac4b9..9a1a0474efd6 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -762,7 +762,7 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context,
         {
             stateFlags = NWConvertVCLStateToGTKState(rScrollbarVal.mnThumbState);
             if ( rScrollbarVal.mnThumbState & ControlState::PRESSED )
-                stateFlags = static_cast<GtkStateFlags>(stateFlags | GTK_STATE_PRELIGHT);
+                stateFlags = static_cast<GtkStateFlags>(stateFlags | GTK_STATE_FLAG_PRELIGHT);
 
             GtkStyleContext* pScrollbarSliderStyle = scrollbarOrientation == GTK_ORIENTATION_VERTICAL ?
                                                       mpVScrollbarSliderStyle : mpHScrollbarSliderStyle;
@@ -946,7 +946,7 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context,
     {
         stateFlags = NWConvertVCLStateToGTKState(rScrollbarVal.mnThumbState);
         if ( rScrollbarVal.mnThumbState & ControlState::PRESSED )
-            stateFlags = static_cast<GtkStateFlags>(stateFlags | GTK_STATE_PRELIGHT);
+            stateFlags = static_cast<GtkStateFlags>(stateFlags | GTK_STATE_FLAG_PRELIGHT);
 
         GtkStyleContext* pScrollbarSliderStyle = scrollbarOrientation == GTK_ORIENTATION_VERTICAL ?
                                                   mpVScrollbarSliderStyle : mpHScrollbarSliderStyle;