X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cfeafba1328a39299e17a710675d2597f6ef4bf2..739e35e4fba5df59532ef7e62bcfc8ebbcd72bb5:/src/univ/ctrlrend.cpp diff --git a/src/univ/ctrlrend.cpp b/src/univ/ctrlrend.cpp index a693d45657..39f549ef1e 100644 --- a/src/univ/ctrlrend.cpp +++ b/src/univ/ctrlrend.cpp @@ -17,7 +17,7 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "renderer.h" #endif @@ -541,11 +541,11 @@ void wxControlRenderer::DrawBitmap(wxDC &dc, } // do draw it - dc.DrawBitmap(bmp, x, y, TRUE /* use mask */); + dc.DrawBitmap(bmp, x, y, true /* use mask */); } 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(); @@ -561,7 +561,7 @@ void wxControlRenderer::DrawScrollbar(const wxScrollBar *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)); @@ -628,7 +628,7 @@ void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar, (wxScrollArrows::Arrow)nArrow, m_dc, rectArrow, - TRUE // draw a scrollbar arrow, not just an arrow + true // draw a scrollbar arrow, not just an arrow ); } } @@ -675,7 +675,11 @@ void wxControlRenderer::DrawItems(const wxListBox *lbox, void wxControlRenderer::DoDrawItems(const wxListBox *lbox, size_t itemFirst, size_t itemLast, +#if wxUSE_CHECKLISTBOX bool isCheckLbox) +#else + bool WXUNUSED(isCheckLbox)) +#endif { // prepare for the drawing: calc the initial position wxCoord lineHeight = lbox->GetLineHeight(); @@ -746,7 +750,7 @@ void wxControlRenderer::DoDrawItems(const wxListBox *lbox, 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