From c1a4ce66a6d0f5830bd80573963dc072f81e6813 Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Thu, 11 Oct 2007 12:18:32 +0000 Subject: [PATCH] Borland still hates ? git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/univ/stdrend.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/univ/stdrend.cpp b/src/univ/stdrend.cpp index f392add9cc..082cf1b884 100644 --- a/src/univ/stdrend.cpp +++ b/src/univ/stdrend.cpp @@ -673,9 +673,10 @@ void wxStdRenderer::DrawCheckButton(wxDC& dc, wxAlignment align, int indexAccel) { - wxBitmap bmp(bitmap.Ok() ? bitmap : GetCheckBitmap(flags)); - - DrawCheckOrRadioButton(dc, label, bmp, rect, flags, align, indexAccel); + if (bitmap.Ok()) + DrawCheckOrRadioButton(dc, label, bitmap, rect, flags, align, indexAccel); + else + DrawCheckOrRadioButton(dc, label, GetCheckBitmap(flags), rect, flags, align, indexAccel); } void wxStdRenderer::DrawRadioButton(wxDC& dc, @@ -686,9 +687,11 @@ void wxStdRenderer::DrawRadioButton(wxDC& dc, wxAlignment align, int indexAccel) { - wxBitmap bmp(bitmap.Ok() ? bitmap : GetRadioBitmap(flags)); - - DrawCheckOrRadioButton(dc, label, bmp, rect, flags, align, indexAccel); + if (bitmap.Ok()) + DrawCheckOrRadioButton(dc, label, bitmap, rect, flags, align, indexAccel); + else + DrawCheckOrRadioButton(dc, label, GetRadioBitmap(flags), rect, flags, align, indexAccel); + } void wxStdRenderer::DrawCheckOrRadioButton(wxDC& dc,