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

10
contrib/include/wx/foldbar/foldpanelitem.h
View File

@@ -51,10 +51,10 @@ public:
int leftSpacing = wxFPB_DEFAULT_LEFTSPACING, int rightSpacing = wxFPB_DEFAULT_RIGHTSPACING) int leftSpacing = wxFPB_DEFAULT_LEFTSPACING, int rightSpacing = wxFPB_DEFAULT_RIGHTSPACING)
: _wnd(wnd) : _wnd(wnd)
, _type(WINDOW) , _type(WINDOW)
, _ySpacing(ySpacing) , _flags(flags)
, _leftSpacing(leftSpacing) , _leftSpacing(leftSpacing)
, _rightSpacing(rightSpacing) , _rightSpacing(rightSpacing)
, _flags(flags) , _ySpacing(ySpacing)
, _lineWidth(0) , _lineWidth(0)
, _lineY(0) , _lineY(0)
{ {
@@ -66,13 +66,13 @@ public:
int rightSpacing = wxFPB_DEFAULT_RIGHTLINESPACING) int rightSpacing = wxFPB_DEFAULT_RIGHTLINESPACING)
: _wnd(0) : _wnd(0)
, _type(SEPARATOR) , _type(SEPARATOR)
, _ySpacing(ySpacing) , _flags(wxFPB_ALIGN_WIDTH)
, _leftSpacing(leftSpacing) , _leftSpacing(leftSpacing)
, _rightSpacing(rightSpacing) , _rightSpacing(rightSpacing)
, _flags(wxFPB_ALIGN_WIDTH) , _ySpacing(ySpacing)
, _sepLineColour(lineColor)
, _lineWidth(0) , _lineWidth(0)
, _lineY(y) , _lineY(y)
, _sepLineColour(lineColor)
{ {
}; };

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

2
contrib/src/foldbar/foldpanelbar.cpp
View File

@@ -235,7 +235,7 @@ void wxFoldPanelBar::RefreshPanelsFrom(wxFoldPanelItem *item)
{ {
wxASSERT(item); wxASSERT(item);
size_t i = _panels.Index(item); int i = _panels.Index(item);
if(i != wxNOT_FOUND) if(i != wxNOT_FOUND)
RefreshPanelsFrom(i); RefreshPanelsFrom(i);
} }

2
contrib/src/foldbar/foldpanelitem.cpp
View File

@@ -38,9 +38,9 @@ wxFoldPanelItem::wxFoldPanelItem( wxWindow *parent, const wxString &caption, wxI
: _controlCreated(false) : _controlCreated(false)
, _yUserSize(0) , _yUserSize(0)
, _yPanelSize(0) , _yPanelSize(0)
, _yLastInsertPos(0)
, _yPos(0) , _yPos(0)
, _userSized(false) , _userSized(false)
, _yLastInsertPos(0)
{ {
wxCHECK2(parent, return); wxCHECK2(parent, return);