Remove unnecessary empty destructors

These cause a problem for GCC 14 which detects that there are no
corresponding copy constructors and assignment operators and gives
-Wdeprecated-copy-dtor due to their presence, e.g.

/home/fedora/swt2c/wxWidgets/bld/bk-deps g++ -c -o test_allheaders_allheaders.o  -I/home/fedora/swt2c/wxWidgets/bld/lib/wx/include/gtk3-unicode-3.3 -I../../include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/cairo -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/atk-1.0 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/at-spi2-atk/2.0 -I/usr/include/cloudproviders -I/usr/include/webp -I/usr/include/blkid -I/usr/include/at-spi-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/pixman-1 -I/usr/include/libxml2 -I/usr/include/fribidi -I/usr/include/sysprof-6 -pthread -I/usr/include/libpng16 -DWITH_GZFILEOP  -D__WXGTK__      -I../../tests -DWXUSINGDLL -I../../tests/../samples -I../../3rdparty/catch/single_include -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -O2 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libmount -I/usr/include/libxml2 -I/usr/include/sysprof-6 -I/usr/include/libpng16 -DWITH_GZFILEOP -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/webp -I/usr/include/gtk-3.0/unix-print -I/usr/include/gtk-3.0 -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/cloudproviders -I/usr/include/at-spi-2.0 -I/usr/include/gio-unix-2.0  -fvisibility=hidden -fvisibility-inlines-hidden -fPIC -DPIC   ../../tests/allheaders.cpp
In file included from ../../include/wx/evtloop.h:13,
                 from ../../tests/testprec.h:5,
                 from ../../tests/allheaders.cpp:369:
../../include/wx/event.h: In copy constructor ‘wxSetCursorEvent::wxSetCursorEvent(const wxSetCursorEvent&)’:
../../include/wx/event.h:1943:11: error: implicitly-declared ‘wxCursor::wxCursor(const wxCursor&)’ is deprecated [-Werror=deprecated-copy-dtor]
 1943 |           m_cursor(event.m_cursor)
      |           ^~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../../include/wx/cursor.h:51,
                 from ../../include/wx/event.h:21:
../../include/wx/gtk/cursor.h:37:13: note: because ‘wxCursor’ has user-provided ‘virtual wxCursor::~wxCursor()’
   37 |     virtual ~wxCursor();
      |             ^
../../include/wx/event.h: In member function ‘void wxSetCursorEvent::SetCursor(const wxCursor&)’:
../../include/wx/event.h:1949:57: error: implicitly-declared ‘wxCursor& wxCursor::operator=(const wxCursor&)’ is deprecated [-Werror=deprecated-copy-dtor]
 1949 |     void SetCursor(const wxCursor& cursor) { m_cursor = cursor; }
      |                                                         ^~~~~~
../../include/wx/gtk/cursor.h:37:13: note: because ‘wxCursor’ has user-provided ‘virtual wxCursor::~wxCursor()’
   37 |     virtual ~wxCursor();
      |             ^

Fixes #24248.

Closes #24255.
This commit is contained in:
Scott Talbert 2024-01-26 21:21:02 -05:00 committed by Vadim Zeitlin
parent 50e35c71eb
commit fc35ad92bb
63 changed files with 0 additions and 234 deletions

View file

@ -340,9 +340,6 @@ public:
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
*/
// creator function
virtual ~wxFontBase();
// from the font components
static wxFont *New(

View file

@ -20,7 +20,6 @@ class WXDLLIMPEXP_CORE wxAcceleratorTable : public wxObject
public:
wxAcceleratorTable();
wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
virtual ~wxAcceleratorTable();
bool Ok() const { return IsOk(); }
bool IsOk() const;

View file

@ -31,7 +31,6 @@ class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase
public:
wxPalette();
wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue );
virtual ~wxPalette();
bool Create( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
int GetPixel( unsigned char red, unsigned char green, unsigned char blue ) const;

View file

@ -128,7 +128,6 @@ class WXDLLIMPEXP_CORE wxGraphicsObject : public wxObject
public:
wxGraphicsObject();
wxGraphicsObject( wxGraphicsRenderer* renderer );
virtual ~wxGraphicsObject();
bool IsNull() const;

View file

@ -79,7 +79,6 @@ public:
#endif // wxUSE_IMAGE
wxBitmap(GdkPixbuf* pixbuf, int depth = 0);
explicit wxBitmap(const wxCursor& cursor);
virtual ~wxBitmap();
bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) override;
bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) override

View file

@ -23,7 +23,6 @@ public:
wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID );
wxBrush( const wxBitmap &stippleBitmap );
virtual ~wxBrush();
bool operator==(const wxBrush& brush) const;
bool operator!=(const wxBrush& brush) const { return !(*this == brush); }

View file

@ -28,8 +28,6 @@ public:
wxColour(const GdkRGBA& gdkRGBA);
#endif
virtual ~wxColour();
bool operator==(const wxColour& col) const;
bool operator!=(const wxColour& col) const { return !(*this == col); }

View file

@ -34,8 +34,6 @@ public:
virtual wxPoint GetHotSpot() const override;
virtual ~wxCursor();
// implementation
GdkCursor *GetCursor() const;

View file

@ -61,8 +61,6 @@ public:
// wxGTK-specific
bool Create(const wxString& fontname);
virtual ~wxFont();
// implement base class pure virtuals
virtual double GetFractionalPointSize() const override;
virtual wxFontStyle GetStyle() const override;

View file

@ -22,8 +22,6 @@ public:
wxPen( const wxPenInfo& info );
virtual ~wxPen();
bool operator==(const wxPen& pen) const;
bool operator!=(const wxPen& pen) const { return !(*this == pen); }

View file

@ -113,8 +113,6 @@ public:
}
#endif // WXWIN_COMPATIBILITY_3_0
virtual ~wxBitmap();
#if wxUSE_IMAGE
wxImage ConvertToImage() const;
wxBitmap ConvertToDisabled(unsigned char brightness = 255) const;

View file

@ -24,7 +24,6 @@ public:
wxBrush();
wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
wxBrush(const wxBitmap& stipple);
virtual ~wxBrush();
virtual void SetColour(const wxColour& col) override;
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) override;

View file

@ -29,8 +29,6 @@ public:
virtual wxPoint GetHotSpot() const override;
virtual ~wxCursor();
// implementation only
void SetHCURSOR(WXHCURSOR cursor) { SetHandle((WXHANDLE)cursor); }
WXHCURSOR GetHCURSOR() const { return (WXHCURSOR)GetHandle(); }

View file

@ -91,8 +91,6 @@ public:
bool Create(const wxNativeFontInfo& info, WXHFONT hFont = nullptr);
virtual ~wxFont();
// implement base class pure virtuals
virtual double GetFractionalPointSize() const override;
virtual wxSize GetPixelSize() const override;

View file

@ -28,8 +28,6 @@ public:
wxPen(const wxPenInfo& info);
virtual ~wxPen() = default;
bool operator==(const wxPen& pen) const;
bool operator!=(const wxPen& pen) const { return !(*this == pen); }

View file

@ -20,8 +20,6 @@ public:
wxAcceleratorTable();
wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
virtual ~wxAcceleratorTable();
bool Ok() const { return IsOk(); }
bool IsOk() const;

View file

@ -123,8 +123,6 @@ public:
wxBitmap(const wxCursor &cursor);
#endif
virtual ~wxBitmap() = default;
wxImage ConvertToImage() const override;
// get the given part of bitmap

View file

@ -23,7 +23,6 @@ public:
wxBrush();
wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
wxBrush(const wxBitmap& stipple);
virtual ~wxBrush();
virtual void SetColour(const wxColour& col) override;
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) override;

View file

@ -27,7 +27,6 @@ public:
int hotSpotX = 0, int hotSpotY = 0);
wxCursor(wxStockCursor id) { InitFromStock(id); }
virtual ~wxCursor();
void MacInstall() const ;

View file

@ -85,8 +85,6 @@ public:
bool Create(const wxNativeFontInfo& info);
virtual ~wxFont();
// implement base class pure virtuals
virtual double GetFractionalPointSize() const override;
virtual wxSize GetPixelSize() const override;

View file

@ -20,7 +20,6 @@ public:
wxPalette();
wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
virtual ~wxPalette();
bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;

View file

@ -25,8 +25,6 @@ public:
wxPen(const wxPenInfo& info);
virtual ~wxPen();
bool operator==(const wxPen& pen) const;
bool operator!=(const wxPen& pen) const { return !(*this == pen); }

View file

@ -62,7 +62,6 @@ public:
wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( const char* const* bits );
wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
virtual ~wxBitmap();
static void InitStandardHandlers();

View file

@ -31,7 +31,6 @@ public:
wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID );
wxBrush( const wxBitmap &stippleBitmap );
virtual ~wxBrush();
bool operator==(const wxBrush& brush) const;
bool operator!=(const wxBrush& brush) const { return !(*this == brush); }

View file

@ -38,8 +38,6 @@ public:
// ------------
DEFINE_STD_WXCOLOUR_CONSTRUCTORS
virtual ~wxColour();
bool operator==(const wxColour& col) const;
bool operator!=(const wxColour& col) const { return !(*this == col); }

View file

@ -31,7 +31,6 @@ public:
wxCursor(const wxString& name,
wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
int hotSpotX = 0, int hotSpotY = 0);
virtual ~wxCursor();
// implementation

View file

@ -77,8 +77,6 @@ public:
// DELETEME: no longer seems to be implemented.
// bool Create(const wxNativeFontInfo& fontinfo);
virtual ~wxFont();
// implement base class pure virtuals
virtual double GetFractionalPointSize() const;
virtual wxFontStyle GetStyle() const;

View file

@ -53,7 +53,6 @@ public:
wxPalette();
wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
virtual ~wxPalette();
bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;

View file

@ -38,8 +38,6 @@ public:
wxPen( const wxPenInfo& info );
virtual ~wxPen();
bool operator == ( const wxPen& pen ) const;
bool operator != (const wxPen& pen) const { return !(*this == pen); }

View file

@ -223,12 +223,6 @@ public:
*/
wxAcceleratorTable(const wxString& resource);
/**
Destroys the wxAcceleratorTable object.
See @ref overview_refcount_destruct for more info.
*/
virtual ~wxAcceleratorTable();
/**
Returns @true if the accelerator table is valid.
*/

View file

@ -396,18 +396,6 @@ public:
*/
explicit wxBitmap(const wxCursor& cursor);
/**
Destructor.
See @ref overview_refcount_destruct for more info.
If the application omits to delete the bitmap explicitly, the bitmap will be
destroyed automatically by wxWidgets when the application exits.
@warning
Do not delete a bitmap that is selected into a memory device context.
*/
virtual ~wxBitmap();
/**
Adds a handler to the end of the static list of format handlers.

View file

@ -131,19 +131,6 @@ public:
*/
wxBrush(const wxBrush& brush);
/**
Destructor.
See @ref overview_refcount_destruct for more info.
@remarks Although all remaining brushes are deleted when the application
exits, the application should try to clean up all brushes itself.
This is because wxWidgets cannot know if a pointer to the brush
object is stored in an application data structure, and there is
a risk of double deletion.
*/
virtual ~wxBrush();
/**
Returns a reference to the brush colour.

View file

@ -205,17 +205,6 @@ public:
*/
wxCursor(const wxCursor& cursor);
/**
Destroys the cursor. See
@ref overview_refcount_destruct "reference-counted object destruction"
for more info.
A cursor can be reused for more than one window, and does not get
destroyed when the window is destroyed. wxWidgets destroys all cursors
on application exit, although it is best to clean them up explicitly.
*/
virtual ~wxCursor();
/**
Returns @true if cursor data is present.
*/

View file

@ -637,20 +637,6 @@ public:
*/
wxFont(const wxNativeFontInfo& nativeInfo);
/**
Destructor.
See @ref overview_refcount_destruct "reference-counted object destruction"
for more info.
@remarks Although all remaining fonts are deleted when the application
exits, the application should try to clean up all fonts
itself. This is because wxWidgets cannot know if a
pointer to the font object is stored in an application
data structure, and there is a risk of double deletion.
*/
virtual ~wxFont();
/**
@name Getters

View file

@ -70,13 +70,6 @@ public:
const unsigned char* green,
const unsigned char* blue);
/**
Destructor.
@see @ref overview_refcount_destruct "reference-counted object destruction"
*/
virtual ~wxPalette();
/**
Creates a palette from arrays of size @a n, one for each red, blue or
green component.

View file

@ -318,18 +318,6 @@ public:
*/
wxPen(const wxPen& pen);
/**
Destructor.
@see @ref overview_refcount_destruct "reference-counted object destruction"
@remarks Although all remaining pens are deleted when the application
exits, the application should try to clean up all pens
itself. This is because wxWidgets cannot know if a
pointer to the pen object is stored in an application
data structure, and there is a risk of double deletion.
*/
virtual ~wxPen();
/**
Returns the pen cap style, which may be one of @c wxCAP_ROUND,
@c wxCAP_PROJECTING and @c wxCAP_BUTT.

View file

@ -140,11 +140,6 @@ void wxFontBase::SetDefaultEncoding(wxFontEncoding encoding)
ms_encodingDefault = encoding;
}
wxFontBase::~wxFontBase()
{
// this destructor is required for Darwin
}
/* static */
wxFont *wxFontBase::New(int size,
wxFontFamily family,

View file

@ -71,10 +71,6 @@ wxGraphicsObject::wxGraphicsObject( wxGraphicsRenderer* renderer )
SetRefData( new wxGraphicsObjectRefData(renderer));
}
wxGraphicsObject::~wxGraphicsObject()
{
}
bool wxGraphicsObject::IsNull() const
{
return m_refData == nullptr;

View file

@ -85,10 +85,6 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
}
}
wxAcceleratorTable::~wxAcceleratorTable()
{
}
bool wxAcceleratorTable::IsOk() const
{
return m_refData != nullptr;

View file

@ -58,10 +58,6 @@ wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green
Create(n, red, green, blue);
}
wxPalette::~wxPalette()
{
}
int wxPalette::GetColoursCount() const
{
if (m_refData)

View file

@ -531,10 +531,6 @@ wxBitmap::wxBitmap(const wxCursor& cursor)
#endif
}
wxBitmap::~wxBitmap()
{
}
bool wxBitmap::Create( int width, int height, int depth )
{
UnRef();

View file

@ -75,11 +75,6 @@ wxBrush::wxBrush( const wxBitmap &stippleBitmap )
M_BRUSHDATA->m_stipple = stippleBitmap;
}
wxBrush::~wxBrush()
{
// m_refData unrefed in ~wxObject
}
wxGDIRefData *wxBrush::CreateGDIRefData() const
{
return new wxBrushRefData;

View file

@ -139,10 +139,6 @@ wxColour::wxColour(const GdkColor& gdkColor)
}
#endif
wxColour::~wxColour()
{
}
bool wxColour::operator == ( const wxColour& col ) const
{
if (m_refData == col.m_refData)

View file

@ -173,10 +173,6 @@ wxCursor::wxCursor(const char bits[], int width, int height,
#endif
}
wxCursor::~wxCursor()
{
}
wxPoint wxCursor::GetHotSpot() const
{
#if GTK_CHECK_VERSION(2,8,0)

View file

@ -275,10 +275,6 @@ bool wxFont::Create(const wxString& fontname)
return true;
}
wxFont::~wxFont()
{
}
// ----------------------------------------------------------------------------
// accessors
// ----------------------------------------------------------------------------

View file

@ -115,11 +115,6 @@ wxPen::wxPen(const wxPenInfo& info)
m_refData = new wxPenRefData(info);
}
wxPen::~wxPen()
{
// m_refData unrefed in ~wxObject
}
wxGDIRefData *wxPen::CreateGDIRefData() const
{
return new wxPenRefData;

View file

@ -665,10 +665,6 @@ bool wxBitmap::ConvertToDIB()
#endif // wxUSE_WXDIB
wxBitmap::~wxBitmap()
{
}
wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
{
wxBitmapRefData *refData = new wxBitmapRefData;

View file

@ -229,10 +229,6 @@ wxBrush::wxBrush(const wxBitmap& stipple)
m_refData = new wxBrushRefData(stipple);
}
wxBrush::~wxBrush()
{
}
// ----------------------------------------------------------------------------
// wxBrush house keeping stuff
// ----------------------------------------------------------------------------

View file

@ -401,10 +401,6 @@ void wxCursor::InitFromStock(wxStockCursor idCursor)
}
}
wxCursor::~wxCursor()
{
}
// ----------------------------------------------------------------------------
// other wxCursor functions
// ----------------------------------------------------------------------------

View file

@ -833,10 +833,6 @@ bool wxFont::DoCreate(const wxFontInfo& info)
return RealizeResource();
}
wxFont::~wxFont()
{
}
// ----------------------------------------------------------------------------
// real implementation
// ----------------------------------------------------------------------------

View file

@ -39,10 +39,6 @@ wxAcceleratorTable::wxAcceleratorTable()
m_refData = nullptr;
}
wxAcceleratorTable::~wxAcceleratorTable()
{
}
// Create from an array
wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
{

View file

@ -89,10 +89,6 @@ wxBrush::wxBrush()
{
}
wxBrush::~wxBrush()
{
}
wxBrush::wxBrush(const wxColour& col, wxBrushStyle style)
{
m_refData = new wxBrushRefData( col, style );

View file

@ -315,10 +315,6 @@ void wxCursor::MacInstall() const
#endif
}
wxCursor::~wxCursor()
{
}
// Global cursor setting
wxCursor gGlobalCursor;
void wxSetCursor(const wxCursor& cursor)

View file

@ -623,10 +623,6 @@ bool wxFont::Create(int pointSize,
return true;
}
wxFont::~wxFont()
{
}
void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
{
UnRef();

View file

@ -70,10 +70,6 @@ wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green
Create(n, red, green, blue);
}
wxPalette::~wxPalette()
{
}
bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
{
UnRef();

View file

@ -101,10 +101,6 @@ wxPen::wxPen()
{
}
wxPen::~wxPen()
{
}
// Should implement Create
wxPen::wxPen(const wxColour& col, int Width, wxPenStyle Style)
{

View file

@ -952,10 +952,6 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int depth )
(void) Create(bits, wxBITMAP_TYPE_XBM_DATA, width, height, depth);
}
wxBitmap::~wxBitmap()
{
}
int wxBitmap::GetHeight() const
{
wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );

View file

@ -83,11 +83,6 @@ wxBrush::wxBrush( const wxBitmap &stippleBitmap )
M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK;
}
wxBrush::~wxBrush()
{
// m_refData unrefed in ~wxObject
}
wxGDIRefData *wxBrush::CreateGDIRefData() const
{
return new wxBrushRefData;

View file

@ -140,10 +140,6 @@ void wxColourRefData::AllocColour( WXColormap cmap )
#define SHIFT (8*(sizeof(short int)-sizeof(char)))
wxColour::~wxColour()
{
}
bool wxColour::operator == ( const wxColour& col ) const
{
if (m_refData == col.m_refData) return true;

View file

@ -146,10 +146,6 @@ wxCursor::wxCursor(const char* const* WXUNUSED(xpmData))
}
#endif
wxCursor::~wxCursor()
{
}
wxGDIRefData *wxCursor::CreateGDIRefData() const
{
return new wxCursorRefData;

View file

@ -439,10 +439,6 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding WXUNUSED(enc))
return true;
}
wxFont::~wxFont()
{
}
wxGDIRefData *wxFont::CreateGDIRefData() const
{
return new wxFontRefData;

View file

@ -126,10 +126,6 @@ wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green
Create(n, red, green, blue);
}
wxPalette::~wxPalette()
{
}
int wxPalette::GetColoursCount() const
{
if (m_refData)

View file

@ -107,11 +107,6 @@ wxPen::wxPen(const wxPenInfo& info)
m_refData = new wxPenRefData(info);
}
wxPen::~wxPen()
{
// m_refData unrefed in ~wxObject
}
wxGDIRefData *wxPen::CreateGDIRefData() const
{
return new wxPenRefData;