Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary wxBitmap copy ctor from wxQt

Browse Source 
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.
This commit is contained in:
Vadim Zeitlin
2020-08-30 22:01:08 +02:00
parent 19bc293086
commit 9f63592eba
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/qt/bitmap.h
View File

@@ -22,7 +22,6 @@ class WXDLLIMPEXP_CORE wxBitmap : public wxBitmapBase
public: public:
wxBitmap(); wxBitmap();
wxBitmap(QPixmap pix); wxBitmap(QPixmap pix);
wxBitmap(const wxBitmap& bmp);
wxBitmap(const char bits[], int width, int height, int depth = 1); wxBitmap(const char bits[], int width, int height, int depth = 1);
wxBitmap(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); wxBitmap(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
wxBitmap(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH); wxBitmap(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH);

5
src/qt/bitmap.cpp
View File

@@ -174,11 +174,6 @@ wxBitmap::wxBitmap(QPixmap pix)
m_refData = new wxBitmapRefData(pix); m_refData = new wxBitmapRefData(pix);
} }
wxBitmap::wxBitmap(const wxBitmap& bmp)
{
Ref(bmp);
}
wxBitmap::wxBitmap(const char bits[], int width, int height, int depth ) wxBitmap::wxBitmap(const char bits[], int width, int height, int depth )
{ {
wxASSERT(depth == 1); wxASSERT(depth == 1);