From 5567a40d2649da91505df360e076c65e45791b5e Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 5 Mar 2011 18:36:04 +0000
Subject: [PATCH] merge error

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@67130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/mac/carbon/toolbar.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index ed96f69d22..a666f6a306 100644
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -487,7 +487,6 @@ void wxToolBarTool::UpdateToggleImage( bool toggle )
         dc.DrawRoundedRectangle( 0, 0, w, h, 1.5 );
         dc.DrawBitmap( m_bmpNormal, 3, 3, true );
         
-        dc.DrawBitmap( m_bmpNormal, 0, 0, true );
         dc.SelectObject( wxNullBitmap );
         ControlButtonContentInfo info;
         wxMacCreateBitmapButton( &info, bmp, kControlContentIconRef);