replace wxBitmap::SetPixbuf() with wxBitmap ctor taking pixbuf

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-25 23:33:18 +00:00
parent b05875c977
commit 54195d23c2
5 changed files with 19 additions and 31 deletions
--- a/src/gtk/artgtk.cpp
+++ b/src/gtk/artgtk.cpp
@@ -259,7 +259,7 @@ wxIconBundle DoCreateIconBundle(const char *stockid,
            continue;

        wxIcon icon;
-        icon.SetPixbuf(pixbuf);
+        icon.CopyFromBitmap(wxBitmap(pixbuf));
        bundle.AddIcon(icon);
    }

@@ -296,11 +296,7 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
        }
    }

-    wxBitmap bmp;
-    if (pixbuf != NULL)
-        bmp.SetPixbuf(pixbuf);
-
-    return bmp;
+    return wxBitmap(pixbuf);
 }

 wxIconBundle