]> git.saurik.com Git - wxWidgets.git/commitdiff
fixed VC++ warning in optimized build
authorVadim Zeitlin <vadim@wxwidgets.org>
Thu, 28 Mar 2002 22:32:32 +0000 (22:32 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Thu, 28 Mar 2002 22:32:32 +0000 (22:32 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/artprov.cpp

index 088fc3a2f82f2aeeac3a60974167c0d3605063d9..8da185b4e80eedce0246895db67167c6180c0949 100644 (file)
@@ -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