[Git][wxwidgets/wxwidgets][master] Don't mix enum and int values in ternary operator

1 view
Skip to first unread message

Vadim Zeitlin (@_VZ_)

unread,
Jul 6, 2024, 8:50:54 PMJul 6
to wx-commi...@googlegroups.com

Vadim Zeitlin pushed to branch master at wxWidgets / wxWidgets

Commits:

  • 712ae81c
    by Vadim Zeitlin at 2024-07-07T02:17:46+02:00
    Don't mix enum and int values in ternary operator
    
    Compilation fix after the recent ad519092e4 (Use generic expander
    renderer in wxPropertyGrid instead of custom drawing., 2024-06-28).
    

1 changed file:

Changes:

  • src/propgrid/propgrid.cpp
    ... ... @@ -1964,14 +1964,14 @@ void wxPropertyGrid::DrawExpanderButton( wxDC& dc, const wxRect& rect,
    1964 1964
                 const_cast<wxPropertyGrid*>(this),
    
    1965 1965
                 dc,
    
    1966 1966
                 r,
    
    1967
    -            property->IsExpanded() ? wxCONTROL_EXPANDED : 0
    
    1967
    +            property->IsExpanded() ? wxCONTROL_EXPANDED : wxCONTROL_NONE
    
    1968 1968
             );
    
    1969 1969
     #elif wxPG_ICON_WIDTH
    
    1970 1970
         wxRendererNative::GetGeneric().DrawTreeItemButton(
    
    1971 1971
                 const_cast<wxPropertyGrid*>(this),
    
    1972 1972
                 dc,
    
    1973 1973
                 r,
    
    1974
    -            property->IsExpanded() ? wxCONTROL_EXPANDED : 0
    
    1974
    +            property->IsExpanded() ? wxCONTROL_EXPANDED : wxCONTROL_NONE
    
    1975 1975
             );
    
    1976 1976
     #else
    
    1977 1977
         wxBitmap bmp = property->IsExpanded() ? s_collbmp : s_expandbmp;
    


View it on GitLab.
You're receiving this email because of your account on gitlab.com. Manage all notifications · Help

Reply all
Reply to author
Forward
0 new messages