From 2e21cc260733ff0b2c91dab92c24913af2cb87d5 Mon Sep 17 00:00:00 2001 From: Mariano Reingart Date: Sun, 4 Jan 2015 02:49:44 +0000 Subject: [PATCH] Added missing ctor for wxBitmap using wxIcon for wxQT (taken from wxOSX) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/qt/bitmap.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/wx/qt/bitmap.h b/include/wx/qt/bitmap.h index 62658bb3ac..49fcacf0f8 100644 --- a/include/wx/qt/bitmap.h +++ b/include/wx/qt/bitmap.h @@ -28,6 +28,9 @@ public: wxBitmap(const char* const* bits); wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM); wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH); + + // Convert from wxIcon + wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); } static void InitStandardHandlers();