From c0fce877c478ddbf71a1b651c789e5ea00a00144 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:05:30 +0200 Subject: 3.4 --- shared/customButton.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'shared/customButton.cpp') diff --git a/shared/customButton.cpp b/shared/customButton.cpp index 73b9d1ee..4e897844 100644 --- a/shared/customButton.cpp +++ b/shared/customButton.cpp @@ -1,3 +1,9 @@ +// ************************************************************************** +// * This file is part of the FreeFileSync project. It is distributed under * +// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * Copyright (C) 2008-2010 ZenJu (zhnmju123 AT gmx.de) * +// ************************************************************************** +// #include "customButton.h" #include #include @@ -149,7 +155,7 @@ wxBitmap wxButtonWithImage::createBitmapFromText(const wxString& text) if ((accelPos = text.find(wxT("&"))) != wxString::npos) { textLabelFormatted.Replace(wxT("&"), wxT(""), false); //remove accelerator - indexAccel = accelPos; + indexAccel = static_cast(accelPos); } dc.SetTextForeground(textColor); -- cgit