fix warnings about unused parameters and functions in wxUniv build; also clean up...

[wxWidgets.git] / src / univ / ctrlrend.cpp

diff --git a/src/univ/ctrlrend.cpp b/src/univ/ctrlrend.cpp
index a693d456571b6cb8b25b232ed7d7e637a69a447a..56e99ae7dd0d34b0edca259815c4bc7ef39dde33 100644 (file)
--- a/src/univ/ctrlrend.cpp
+++ b/src/univ/ctrlrend.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        univ/ctrlrend.cpp
+// Name:        src/univ/ctrlrend.cpp

 // Purpose:     wxControlRenderer implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxControlRenderer implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "renderer.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -35,19 +31,15 @@
     #include "wx/listbox.h"
     #include "wx/scrolbar.h"
     #include "wx/dc.h"
     #include "wx/listbox.h"
     #include "wx/scrolbar.h"
     #include "wx/dc.h"

+    #include "wx/log.h"
+    #include "wx/gauge.h"
+    #include "wx/image.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/image.h"
-#include "wx/log.h"
-

 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/colschem.h"
 
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/colschem.h"
 

-#if wxUSE_GAUGE
-#include "wx/gauge.h"
-#endif
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -134,6 +126,8 @@ void wxRenderer::StandardDrawTextLine(wxDC& dc,
 // wxRenderer: scrollbar geometry
 // ----------------------------------------------------------------------------
 
 // wxRenderer: scrollbar geometry
 // ----------------------------------------------------------------------------
 

+#if wxUSE_SCROLLBAR
+

 /* static */
 void wxRenderer::StandardScrollBarThumbSize(wxCoord length,
                                             int thumbPos,
 /* static */
 void wxRenderer::StandardScrollBarThumbSize(wxCoord length,
                                             int thumbPos,


@@ -177,7 +171,8 @@ wxRect wxRenderer::StandardGetScrollbarRect(const wxScrollBar *scrollbar,
     }
 
     wxSize sizeTotal = scrollbar->GetClientSize();
     }
 
     wxSize sizeTotal = scrollbar->GetClientSize();

-    wxCoord *start, *width, length, arrow;
+    wxCoord *start, *width;
+    wxCoord length, arrow;

     wxRect rect;
     if ( scrollbar->IsVertical() )
     {
     wxRect rect;
     if ( scrollbar->IsVertical() )
     {


@@ -392,6 +387,8 @@ wxHitTest wxRenderer::StandardHitTestScrollbar(const wxScrollBar *scrollbar,
     }
 }
 
     }
 }
 

+#endif // wxUSE_SCROLLBAR
+

 wxRenderer::~wxRenderer()
 {
 }
 wxRenderer::~wxRenderer()
 {
 }


@@ -506,11 +503,13 @@ void wxControlRenderer::DrawBitmap(wxDC &dc,
             }
         }
     }
             }
         }
     }

+#if wxUSE_IMAGE

     else if ( stretch & wxEXPAND )
     {
         // stretch bitmap to fill the entire control
         bmp = wxBitmap(wxImage(bmp.ConvertToImage()).Scale(rect.width, rect.height));
     }
     else if ( stretch & wxEXPAND )
     {
         // stretch bitmap to fill the entire control
         bmp = wxBitmap(wxImage(bmp.ConvertToImage()).Scale(rect.width, rect.height));
     }

+#endif // wxUSE_IMAGE

     else // not stretched, not tiled
     {
         if ( alignment & wxALIGN_RIGHT )
     else // not stretched, not tiled
     {
         if ( alignment & wxALIGN_RIGHT )


@@ -541,11 +540,13 @@ void wxControlRenderer::DrawBitmap(wxDC &dc,
     }
 
     // do draw it
     }
 
     // do draw it

-    dc.DrawBitmap(bmp, x, y, TRUE /* use mask */);
+    dc.DrawBitmap(bmp, x, y, true /* use mask */);

 }
 
 }
 

+#if wxUSE_SCROLLBAR
+

 void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
 void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,

-                                      int thumbPosOld)
+                                      int WXUNUSED(thumbPosOld))

 {
     // we will only redraw the parts which must be redrawn and not everything
     wxRegion rgnUpdate = scrollbar->GetUpdateRegion();
 {
     // we will only redraw the parts which must be redrawn and not everything
     wxRegion rgnUpdate = scrollbar->GetUpdateRegion();


@@ -561,7 +562,7 @@ void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
                    rectUpdate.GetBottom());
 
 #if 0 //def WXDEBUG_SCROLLBAR
                    rectUpdate.GetBottom());
 
 #if 0 //def WXDEBUG_SCROLLBAR

-        static bool s_refreshDebug = FALSE;
+        static bool s_refreshDebug = false;

         if ( s_refreshDebug )
         {
             wxClientDC dc(wxConstCast(scrollbar, wxScrollBar));
         if ( s_refreshDebug )
         {
             wxClientDC dc(wxConstCast(scrollbar, wxScrollBar));


@@ -628,7 +629,7 @@ void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
                 (wxScrollArrows::Arrow)nArrow,
                 m_dc,
                 rectArrow,
                 (wxScrollArrows::Arrow)nArrow,
                 m_dc,
                 rectArrow,

-                TRUE // draw a scrollbar arrow, not just an arrow
+                true // draw a scrollbar arrow, not just an arrow

             );
         }
     }
             );
         }
     }


@@ -654,6 +655,8 @@ void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
     }
 }
 
     }
 }
 

+#endif // wxUSE_SCROLLBAR
+

 void wxControlRenderer::DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {
     wxASSERT_MSG( x1 == x2 || y1 == y2,
 void wxControlRenderer::DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {
     wxASSERT_MSG( x1 == x2 || y1 == y2,


@@ -675,7 +678,11 @@ void wxControlRenderer::DrawItems(const wxListBox *lbox,
 
 void wxControlRenderer::DoDrawItems(const wxListBox *lbox,
                                     size_t itemFirst, size_t itemLast,
 
 void wxControlRenderer::DoDrawItems(const wxListBox *lbox,
                                     size_t itemFirst, size_t itemLast,

+#if wxUSE_CHECKLISTBOX

                                     bool isCheckLbox)
                                     bool isCheckLbox)

+#else
+                                    bool WXUNUSED(isCheckLbox))
+#endif

 {
     // prepare for the drawing: calc the initial position
     wxCoord lineHeight = lbox->GetLineHeight();
 {
     // prepare for the drawing: calc the initial position
     wxCoord lineHeight = lbox->GetLineHeight();


@@ -746,7 +753,7 @@ void wxControlRenderer::DoDrawItems(const wxListBox *lbox,
 void wxControlRenderer::DrawCheckItems(const wxCheckListBox *lbox,
                                        size_t itemFirst, size_t itemLast)
 {
 void wxControlRenderer::DrawCheckItems(const wxCheckListBox *lbox,
                                        size_t itemFirst, size_t itemLast)
 {

-    DoDrawItems(lbox, itemFirst, itemLast, TRUE);
+    DoDrawItems(lbox, itemFirst, itemLast, true);

 }
 
 #endif // wxUSE_CHECKLISTBOX
 }
 
 #endif // wxUSE_CHECKLISTBOX


@@ -809,7 +816,8 @@ void wxControlRenderer::DrawProgressBar(const wxGauge *gauge)
         int steps = ((lenTotal + step - 1) * pos) / (max * step);
 
         // calc the coords of one small rect
         int steps = ((lenTotal + step - 1) * pos) / (max * step);
 
         // calc the coords of one small rect

-        wxCoord *px, dx, dy;
+        wxCoord *px;
+        wxCoord dx, dy;

         if ( gauge->IsVertical() )
         {
             // draw from bottom to top: so first set y to the bottom
         if ( gauge->IsVertical() )
         {
             // draw from bottom to top: so first set y to the bottom


@@ -866,4 +874,3 @@ void wxControlRenderer::DrawProgressBar(const wxGauge *gauge)
 }
 
 #endif // wxUSE_GAUGE
 }
 
 #endif // wxUSE_GAUGE

-