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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/include/wx/foldbar/foldpanelitem.h b/contrib/include/wx/foldbar/foldpanelitem.h
index edc5432bd0982029af3580c7fec5bc3780ff3c57..509898f30b887eb84ea1bb8ed0313c382bd9d8d5 100644 (file)
--- a/contrib/include/wx/foldbar/foldpanelitem.h
+++ b/contrib/include/wx/foldbar/foldpanelitem.h
@@ -51,10 +51,10 @@ public:
                      int leftSpacing = wxFPB_DEFAULT_LEFTSPACING, int rightSpacing = wxFPB_DEFAULT_RIGHTSPACING) 
         : _wnd(wnd)
         , _type(WINDOW)
                      int leftSpacing = wxFPB_DEFAULT_LEFTSPACING, int rightSpacing = wxFPB_DEFAULT_RIGHTSPACING) 
         : _wnd(wnd)
         , _type(WINDOW)

-        , _ySpacing(ySpacing)
+        , _flags(flags)

         , _leftSpacing(leftSpacing)
         , _rightSpacing(rightSpacing)
         , _leftSpacing(leftSpacing)
         , _rightSpacing(rightSpacing)

-        , _flags(flags)
+        , _ySpacing(ySpacing)

         , _lineWidth(0)
         , _lineY(0)
     {
         , _lineWidth(0)
         , _lineY(0)
     {


@@ -66,13 +66,13 @@ public:
                      int rightSpacing = wxFPB_DEFAULT_RIGHTLINESPACING) 
         : _wnd(0)
         , _type(SEPARATOR)
                      int rightSpacing = wxFPB_DEFAULT_RIGHTLINESPACING) 
         : _wnd(0)
         , _type(SEPARATOR)

-        , _ySpacing(ySpacing)
+        , _flags(wxFPB_ALIGN_WIDTH)

         , _leftSpacing(leftSpacing)
         , _rightSpacing(rightSpacing)
         , _leftSpacing(leftSpacing)
         , _rightSpacing(rightSpacing)

-        , _flags(wxFPB_ALIGN_WIDTH)
-        , _sepLineColour(lineColor)
+        , _ySpacing(ySpacing)

         , _lineWidth(0)
         , _lineY(y)
         , _lineWidth(0)
         , _lineY(y)

+        , _sepLineColour(lineColor)

     {
     };
 
     {
     };
 

diff --git a/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.rc b/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.rc
index 359a983cdbf3966530388052846050116a343c09..8546218dc70891c63a1b825097b5610e02bffcc4 100644 (file)
--- a/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.rc
+++ b/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.rc
@@ -3,4 +3,4 @@ mondrian ICON "sample.ico"
 #define FOLDPANELBARTEST_QUIT     1
 #define FOLDPANELBARTEST_ABOUT    102
 
 #define FOLDPANELBARTEST_QUIT     1
 #define FOLDPANELBARTEST_ABOUT    102
 

-#include "wx/msw/wx.rc"
\ No newline at end of file
+#include "wx/msw/wx.rc"

diff --git a/contrib/src/foldbar/captionbar.cpp b/contrib/src/foldbar/captionbar.cpp
index 64341339d31a6787055068624b7e82a3ccc402c5..34a46ff8394f0534f7da01eafe2d1341d0089cea 100644 (file)
--- a/contrib/src/foldbar/captionbar.cpp
+++ b/contrib/src/foldbar/captionbar.cpp
@@ -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)
                            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)
     , _foldIcons(images)
     , _rightIndent(wxFPB_BMP_RIGHTSPACE)
     , _iconWidth(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;
     for(int y = rect.y; y < rect.y + rect.height; y++)
     {
     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);
         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++)
     {
     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;
         dc.SetBrush( wxBrush( currCol, wxSOLID ) );
         dc.DrawRectangle( rect.x + (x - rect.x), rect.y, 1, rect.height );
         rf += rstep; gf += gstep; bf += bstep;

diff --git a/contrib/src/foldbar/foldpanelbar.cpp b/contrib/src/foldbar/foldpanelbar.cpp
index e7d6ff526842a1bb1a92eedbe5e3d6b48ec12189..b3d9b30e696c2331a2a7cb36c0ee9ed71d53bef2 100644 (file)
--- a/contrib/src/foldbar/foldpanelbar.cpp
+++ b/contrib/src/foldbar/foldpanelbar.cpp
@@ -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)
         RefreshPanelsFrom(i);
 }
     if(i != wxNOT_FOUND)
         RefreshPanelsFrom(i);
 }


@@ -347,4 +347,4 @@ int wxFoldPanelBar::GetPanelsHeight(int &collapsed, int &expanded)
 
     return value;
 
 
     return value;
 

-}
\ No newline at end of file
+}

diff --git a/contrib/src/foldbar/foldpanelitem.cpp b/contrib/src/foldbar/foldpanelitem.cpp
index 6f6897b936f2472b859723947b9caab5a5a14326..08d606c1883617760e29ff074c6d21dd414760bc 100644 (file)
--- a/contrib/src/foldbar/foldpanelitem.cpp
+++ b/contrib/src/foldbar/foldpanelitem.cpp
@@ -38,9 +38,9 @@ wxFoldPanelItem::wxFoldPanelItem( wxWindow *parent, const wxString &caption, wxI
     : _controlCreated(false)
     , _yUserSize(0)
     , _yPanelSize(0)
     : _controlCreated(false)
     , _yUserSize(0)
     , _yPanelSize(0)

+    , _yLastInsertPos(0)

     , _yPos(0)
     , _userSized(false)
     , _yPos(0)
     , _userSized(false)

-    , _yLastInsertPos(0)

 {
     wxCHECK2(parent, return);
 
 {
     wxCHECK2(parent, return);