Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid some -Wfloat-conversion warnings

Browse Source
This commit is contained in:
Paul Cornett
2022-02-13 18:11:55 -08:00
parent 511c537362
commit 3aad506c5b
24 changed files with 55 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/drawing/drawing.cpp
View File

@@ -1072,28 +1072,28 @@ void MyCanvas::DrawWithLogicalOps(wxDC& dc)
#if wxDRAWING_DC_SUPPORTS_ALPHA || wxUSE_GRAPHICS_CONTEXT
void MyCanvas::DrawAlpha(wxDC& dc)
{
wxDouble margin = 20 ;
wxDouble width = 180 ;
const int margin = 20;
const int width = 180;
wxDouble radius = 30 ;
dc.SetPen( wxPen( wxColour( 128, 0, 0 ), 12 ));
dc.SetBrush(*wxRED_BRUSH);
wxRect r(margin,margin+width*0.66,width,width) ;
wxRect r(margin, margin + width * 2 / 3, width, width);
dc.DrawRoundedRectangle( r.x, r.y, r.width, r.width, radius ) ;
dc.SetPen( wxPen( wxColour( 0, 0, 128 ), 12));
dc.SetBrush( wxColour(0, 0, 255, 192) );
r.Offset( width * 0.8 , - width * 0.66 ) ;
r.Offset(width * 4 / 5, -width * 2 / 3);
dc.DrawRoundedRectangle( r.x, r.y, r.width, r.width, radius ) ;
dc.SetPen( wxPen( wxColour( 128, 128, 0 ), 12));
dc.SetBrush( wxBrush( wxColour( 192, 192, 0, 192)));
r.Offset( width * 0.8 , width *0.5 ) ;
r.Offset(width * 4 / 5, width / 2);
dc.DrawRoundedRectangle( r.x, r.y, r.width, r.width, radius ) ;