fixed VC++ warning in optimized build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-28 22:32:32 +00:00
parent edfb58b74c
commit 25dd6997c5
1 changed files with 5 additions and 10 deletions
--- 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