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

GCC fixes: order of initializations, type casting, empty last lines.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-08-05 15:01:34 +00:00
parent f6def1fae7
commit 9cf662c492
5 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/src/foldbar/captionbar.cpp
View File

@@ -44,11 +44,11 @@ wxCaptionBar::wxCaptionBar(wxWindow* parent, const wxString &caption, wxImageLis
const wxCaptionBarStyle &cbstyle, const wxPoint& pos, const wxSize& size, long style)
: wxWindow(parent, id, pos, size, style)
, _caption(caption)
, _collapsed(false)
, _foldIcons(images)
, _rightIndent(wxFPB_BMP_RIGHTSPACE)
, _iconWidth(16)
, _iconHeight(16)
, _collapsed(false)
{
// do initialisy thingy stuff
@@ -239,7 +239,11 @@ void wxCaptionBar::DrawVerticalGradient(wxDC &dc, const wxRect &rect )
wxColour currCol;
for(int y = rect.y; y < rect.y + rect.height; y++)
{
currCol.Set(col1.Red() + rf, col1.Green() + gf, col1.Blue() + bf);
currCol.Set(
(unsigned char)(col1.Red() + rf),
(unsigned char)(col1.Green() + gf),
(unsigned char)(col1.Blue() + bf)
);
dc.SetBrush( wxBrush( currCol, wxSOLID ) );
dc.DrawRectangle( rect.x, rect.y + (y - rect.y), rect.width, rect.height );
//currCol.Set(currCol.Red() + rstep, currCol.Green() + gstep, currCol.Blue() + bstep);
@@ -267,7 +271,11 @@ void wxCaptionBar::DrawHorizontalGradient(wxDC &dc, const wxRect &rect )
wxColour currCol;
for(int x = rect.x; x < rect.x + rect.width; x++)
{
currCol.Set(col1.Red() + rf, col1.Green() + gf, col1.Blue() + bf);
currCol.Set(
(unsigned char)(col1.Red() + rf),
(unsigned char)(col1.Green() + gf),
(unsigned char)(col1.Blue() + bf)
);
dc.SetBrush( wxBrush( currCol, wxSOLID ) );
dc.DrawRectangle( rect.x + (x - rect.x), rect.y, 1, rect.height );
rf += rstep; gf += gstep; bf += bstep;