From 25dd6997c5dfd92e8f8ea056253154b65d109c5a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 28 Mar 2002 22:32:32 +0000 Subject: [PATCH] fixed VC++ warning in optimized build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/artprov.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp index 088fc3a2f8..8da185b4e8 100644 --- a/src/common/artprov.cpp +++ b/src/common/artprov.cpp @@ -194,18 +194,13 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL; wxCHECK_MSG( sm_providers, wxNullIcon, _T("no wxArtProvider exists") ); wxBitmap bmp = GetBitmap(id, client, size); - if ( bmp.Ok() ) - { - wxIcon icon; - icon.CopyFromBitmap(bmp); - return icon; - } - else - { + if ( !bmp.Ok() ) return wxNullIcon; - } -} + wxIcon icon; + icon.CopyFromBitmap(bmp); + return icon; +} class wxArtProviderModule: public wxModule -- 2.45.2