From 9f63592eba9afa68913a4602c8768fb5378c5847 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 30 Aug 2020 22:01:08 +0200 Subject: [PATCH] Remove unnecessary wxBitmap copy ctor from wxQt This ctor is not needed as the inherited wxObject ctor is sufficient and defining it but not operator=() explicitly results in -Wdeprecated-copy from gcc 10. --- include/wx/qt/bitmap.h | 1 - src/qt/bitmap.cpp | 5 ----- 2 files changed, 6 deletions(-) diff --git a/include/wx/qt/bitmap.h b/include/wx/qt/bitmap.h index 0505d4c3f6..b8eeb57ad5 100644 --- a/include/wx/qt/bitmap.h +++ b/include/wx/qt/bitmap.h @@ -22,7 +22,6 @@ class WXDLLIMPEXP_CORE wxBitmap : public wxBitmapBase public: wxBitmap(); wxBitmap(QPixmap pix); - wxBitmap(const wxBitmap& bmp); wxBitmap(const char bits[], int width, int height, int depth = 1); wxBitmap(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); wxBitmap(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH); diff --git a/src/qt/bitmap.cpp b/src/qt/bitmap.cpp index 28c5d2d30a..4d8ec0638a 100644 --- a/src/qt/bitmap.cpp +++ b/src/qt/bitmap.cpp @@ -174,11 +174,6 @@ wxBitmap::wxBitmap(QPixmap pix) m_refData = new wxBitmapRefData(pix); } -wxBitmap::wxBitmap(const wxBitmap& bmp) -{ - Ref(bmp); -} - wxBitmap::wxBitmap(const char bits[], int width, int height, int depth ) { wxASSERT(depth == 1);