diff --git a/include/wx/font.h b/include/wx/font.h index b3aa02cd1e..e37a5d3095 100644 --- a/include/wx/font.h +++ b/include/wx/font.h @@ -340,9 +340,6 @@ public: wxFontEncoding encoding = wxFONTENCODING_DEFAULT); */ - // creator function - virtual ~wxFontBase(); - // from the font components static wxFont *New( diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h index 6310f2b05d..39cb7cf079 100644 --- a/include/wx/generic/accel.h +++ b/include/wx/generic/accel.h @@ -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; diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h index 0c9e12aae9..53a3b31433 100644 --- a/include/wx/generic/paletteg.h +++ b/include/wx/generic/paletteg.h @@ -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; diff --git a/include/wx/graphics.h b/include/wx/graphics.h index 5aacb2a3c5..9de930ddda 100644 --- a/include/wx/graphics.h +++ b/include/wx/graphics.h @@ -128,7 +128,6 @@ class WXDLLIMPEXP_CORE wxGraphicsObject : public wxObject public: wxGraphicsObject(); wxGraphicsObject( wxGraphicsRenderer* renderer ); - virtual ~wxGraphicsObject(); bool IsNull() const; diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index bb76a4d57f..75264df923 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -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 diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h index c5ef66753f..7b47cdb102 100644 --- a/include/wx/gtk/brush.h +++ b/include/wx/gtk/brush.h @@ -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); } diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index 159730e0a4..032ea1e8c7 100644 --- a/include/wx/gtk/colour.h +++ b/include/wx/gtk/colour.h @@ -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); } diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h index 2bd6b1857f..6dbd444716 100644 --- a/include/wx/gtk/cursor.h +++ b/include/wx/gtk/cursor.h @@ -34,8 +34,6 @@ public: virtual wxPoint GetHotSpot() const override; - virtual ~wxCursor(); - // implementation GdkCursor *GetCursor() const; diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index 3774019727..a19d86b81c 100644 --- a/include/wx/gtk/font.h +++ b/include/wx/gtk/font.h @@ -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; diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h index 6799979114..2dcb42ce40 100644 --- a/include/wx/gtk/pen.h +++ b/include/wx/gtk/pen.h @@ -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); } diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index 6b5cd6efe6..f7a6e822f5 100644 --- a/include/wx/msw/bitmap.h +++ b/include/wx/msw/bitmap.h @@ -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; diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h index 6434ab4c4a..e70f485d66 100644 --- a/include/wx/msw/brush.h +++ b/include/wx/msw/brush.h @@ -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; diff --git a/include/wx/msw/cursor.h b/include/wx/msw/cursor.h index 8498e5df0b..9c947229e0 100644 --- a/include/wx/msw/cursor.h +++ b/include/wx/msw/cursor.h @@ -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(); } diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h index c2256808b3..5146b3d0a0 100644 --- a/include/wx/msw/font.h +++ b/include/wx/msw/font.h @@ -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; diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h index e0e6359897..8d78df3ee9 100644 --- a/include/wx/msw/pen.h +++ b/include/wx/msw/pen.h @@ -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); } diff --git a/include/wx/osx/accel.h b/include/wx/osx/accel.h index b7f87cc0bf..441d110248 100644 --- a/include/wx/osx/accel.h +++ b/include/wx/osx/accel.h @@ -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; diff --git a/include/wx/osx/bitmap.h b/include/wx/osx/bitmap.h index 107ac76291..b512727a2e 100644 --- a/include/wx/osx/bitmap.h +++ b/include/wx/osx/bitmap.h @@ -123,8 +123,6 @@ public: wxBitmap(const wxCursor &cursor); #endif - virtual ~wxBitmap() = default; - wxImage ConvertToImage() const override; // get the given part of bitmap diff --git a/include/wx/osx/brush.h b/include/wx/osx/brush.h index 0f09421673..79945ec13e 100644 --- a/include/wx/osx/brush.h +++ b/include/wx/osx/brush.h @@ -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; diff --git a/include/wx/osx/cursor.h b/include/wx/osx/cursor.h index ee6f48920a..c23bbefce6 100644 --- a/include/wx/osx/cursor.h +++ b/include/wx/osx/cursor.h @@ -27,7 +27,6 @@ public: int hotSpotX = 0, int hotSpotY = 0); wxCursor(wxStockCursor id) { InitFromStock(id); } - virtual ~wxCursor(); void MacInstall() const ; diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h index 4ba8c44eb6..38d50154cf 100644 --- a/include/wx/osx/font.h +++ b/include/wx/osx/font.h @@ -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; diff --git a/include/wx/osx/palette.h b/include/wx/osx/palette.h index ea0c2a32ab..982e2189a4 100644 --- a/include/wx/osx/palette.h +++ b/include/wx/osx/palette.h @@ -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; diff --git a/include/wx/osx/pen.h b/include/wx/osx/pen.h index 575dd77466..1af818d1a3 100644 --- a/include/wx/osx/pen.h +++ b/include/wx/osx/pen.h @@ -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); } diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h index 2161cdfc8a..ded44f0b2e 100644 --- a/include/wx/x11/bitmap.h +++ b/include/wx/x11/bitmap.h @@ -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(); diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h index 7a3f76cfc5..2e20d6337b 100644 --- a/include/wx/x11/brush.h +++ b/include/wx/x11/brush.h @@ -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); } diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h index 91e40ff294..5ffaade459 100644 --- a/include/wx/x11/colour.h +++ b/include/wx/x11/colour.h @@ -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); } diff --git a/include/wx/x11/cursor.h b/include/wx/x11/cursor.h index 09c250a210..5bbbeda9ce 100644 --- a/include/wx/x11/cursor.h +++ b/include/wx/x11/cursor.h @@ -31,7 +31,6 @@ public: wxCursor(const wxString& name, wxBitmapType type = wxCURSOR_DEFAULT_TYPE, int hotSpotX = 0, int hotSpotY = 0); - virtual ~wxCursor(); // implementation diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h index d3fde5fad9..ae3c9a36fa 100644 --- a/include/wx/x11/font.h +++ b/include/wx/x11/font.h @@ -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; diff --git a/include/wx/x11/palette.h b/include/wx/x11/palette.h index 6c8ebd3570..52e02dcf7e 100644 --- a/include/wx/x11/palette.h +++ b/include/wx/x11/palette.h @@ -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; diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h index e7f780fad8..b27963b797 100644 --- a/include/wx/x11/pen.h +++ b/include/wx/x11/pen.h @@ -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); } diff --git a/interface/wx/accel.h b/interface/wx/accel.h index 97e88b27c5..bedd8142b9 100644 --- a/interface/wx/accel.h +++ b/interface/wx/accel.h @@ -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. */ diff --git a/interface/wx/bitmap.h b/interface/wx/bitmap.h index 2d3eff7d05..ebc3d6bc05 100644 --- a/interface/wx/bitmap.h +++ b/interface/wx/bitmap.h @@ -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. diff --git a/interface/wx/brush.h b/interface/wx/brush.h index d23d588828..9c24c7a196 100644 --- a/interface/wx/brush.h +++ b/interface/wx/brush.h @@ -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. diff --git a/interface/wx/cursor.h b/interface/wx/cursor.h index a2908742a4..5e2a5f7421 100644 --- a/interface/wx/cursor.h +++ b/interface/wx/cursor.h @@ -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. */ diff --git a/interface/wx/font.h b/interface/wx/font.h index 4930b36125..3d189749e4 100644 --- a/interface/wx/font.h +++ b/interface/wx/font.h @@ -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 diff --git a/interface/wx/palette.h b/interface/wx/palette.h index 9c3aeeaedd..e45450cff4 100644 --- a/interface/wx/palette.h +++ b/interface/wx/palette.h @@ -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. diff --git a/interface/wx/pen.h b/interface/wx/pen.h index bcd29d5484..94b6e99483 100644 --- a/interface/wx/pen.h +++ b/interface/wx/pen.h @@ -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. diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp index 2e2da76527..5c6591e18c 100644 --- a/src/common/fontcmn.cpp +++ b/src/common/fontcmn.cpp @@ -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, diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp index 31d6ddb223..8c74fa3727 100644 --- a/src/common/graphcmn.cpp +++ b/src/common/graphcmn.cpp @@ -71,10 +71,6 @@ wxGraphicsObject::wxGraphicsObject( wxGraphicsRenderer* renderer ) SetRefData( new wxGraphicsObjectRefData(renderer)); } -wxGraphicsObject::~wxGraphicsObject() -{ -} - bool wxGraphicsObject::IsNull() const { return m_refData == nullptr; diff --git a/src/generic/accel.cpp b/src/generic/accel.cpp index f1afef810d..79c9ea474f 100644 --- a/src/generic/accel.cpp +++ b/src/generic/accel.cpp @@ -85,10 +85,6 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[] } } -wxAcceleratorTable::~wxAcceleratorTable() -{ -} - bool wxAcceleratorTable::IsOk() const { return m_refData != nullptr; diff --git a/src/generic/paletteg.cpp b/src/generic/paletteg.cpp index 76d076df6c..1692a28723 100644 --- a/src/generic/paletteg.cpp +++ b/src/generic/paletteg.cpp @@ -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) diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index 6f3d78b474..5f82496ed2 100644 --- a/src/gtk/bitmap.cpp +++ b/src/gtk/bitmap.cpp @@ -531,10 +531,6 @@ wxBitmap::wxBitmap(const wxCursor& cursor) #endif } -wxBitmap::~wxBitmap() -{ -} - bool wxBitmap::Create( int width, int height, int depth ) { UnRef(); diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp index 968ace8b14..ff8d240c46 100644 --- a/src/gtk/brush.cpp +++ b/src/gtk/brush.cpp @@ -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; diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index 41b2ae2a11..adcd081e1a 100644 --- a/src/gtk/colour.cpp +++ b/src/gtk/colour.cpp @@ -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) diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp index 382dc82840..fa910a9528 100644 --- a/src/gtk/cursor.cpp +++ b/src/gtk/cursor.cpp @@ -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) diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index 41ae3457da..7a1f61cbbf 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -275,10 +275,6 @@ bool wxFont::Create(const wxString& fontname) return true; } -wxFont::~wxFont() -{ -} - // ---------------------------------------------------------------------------- // accessors // ---------------------------------------------------------------------------- diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp index e32d8a335b..76b6d1218a 100644 --- a/src/gtk/pen.cpp +++ b/src/gtk/pen.cpp @@ -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; diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index 6f06027f14..66f455acc6 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -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; diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp index f1cfe69048..196742cc42 100644 --- a/src/msw/brush.cpp +++ b/src/msw/brush.cpp @@ -229,10 +229,6 @@ wxBrush::wxBrush(const wxBitmap& stipple) m_refData = new wxBrushRefData(stipple); } -wxBrush::~wxBrush() -{ -} - // ---------------------------------------------------------------------------- // wxBrush house keeping stuff // ---------------------------------------------------------------------------- diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index 6c3a0469dc..d7cde5fef6 100644 --- a/src/msw/cursor.cpp +++ b/src/msw/cursor.cpp @@ -401,10 +401,6 @@ void wxCursor::InitFromStock(wxStockCursor idCursor) } } -wxCursor::~wxCursor() -{ -} - // ---------------------------------------------------------------------------- // other wxCursor functions // ---------------------------------------------------------------------------- diff --git a/src/msw/font.cpp b/src/msw/font.cpp index 44615ac951..093a626210 100644 --- a/src/msw/font.cpp +++ b/src/msw/font.cpp @@ -833,10 +833,6 @@ bool wxFont::DoCreate(const wxFontInfo& info) return RealizeResource(); } -wxFont::~wxFont() -{ -} - // ---------------------------------------------------------------------------- // real implementation // ---------------------------------------------------------------------------- diff --git a/src/osx/accel.cpp b/src/osx/accel.cpp index 2645ec0fde..4282ef7188 100644 --- a/src/osx/accel.cpp +++ b/src/osx/accel.cpp @@ -39,10 +39,6 @@ wxAcceleratorTable::wxAcceleratorTable() m_refData = nullptr; } -wxAcceleratorTable::~wxAcceleratorTable() -{ -} - // Create from an array wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]) { diff --git a/src/osx/brush.cpp b/src/osx/brush.cpp index a70d15a9f5..9de474203b 100644 --- a/src/osx/brush.cpp +++ b/src/osx/brush.cpp @@ -89,10 +89,6 @@ wxBrush::wxBrush() { } -wxBrush::~wxBrush() -{ -} - wxBrush::wxBrush(const wxColour& col, wxBrushStyle style) { m_refData = new wxBrushRefData( col, style ); diff --git a/src/osx/carbon/cursor.cpp b/src/osx/carbon/cursor.cpp index 2b7313c764..add2b133e4 100644 --- a/src/osx/carbon/cursor.cpp +++ b/src/osx/carbon/cursor.cpp @@ -315,10 +315,6 @@ void wxCursor::MacInstall() const #endif } -wxCursor::~wxCursor() -{ -} - // Global cursor setting wxCursor gGlobalCursor; void wxSetCursor(const wxCursor& cursor) diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp index af19e63f17..0b05ca11c5 100644 --- a/src/osx/carbon/font.cpp +++ b/src/osx/carbon/font.cpp @@ -623,10 +623,6 @@ bool wxFont::Create(int pointSize, return true; } -wxFont::~wxFont() -{ -} - void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info) { UnRef(); diff --git a/src/osx/palette.cpp b/src/osx/palette.cpp index ae35fd2de4..9af83c06ae 100644 --- a/src/osx/palette.cpp +++ b/src/osx/palette.cpp @@ -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(); diff --git a/src/osx/pen.cpp b/src/osx/pen.cpp index eff7448150..1f42d84cb9 100644 --- a/src/osx/pen.cpp +++ b/src/osx/pen.cpp @@ -101,10 +101,6 @@ wxPen::wxPen() { } -wxPen::~wxPen() -{ -} - // Should implement Create wxPen::wxPen(const wxColour& col, int Width, wxPenStyle Style) { diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp index fe2b577de5..ab167debcb 100644 --- a/src/x11/bitmap.cpp +++ b/src/x11/bitmap.cpp @@ -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") ); diff --git a/src/x11/brush.cpp b/src/x11/brush.cpp index c08ec473ec..c61ec13e7d 100644 --- a/src/x11/brush.cpp +++ b/src/x11/brush.cpp @@ -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; diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp index 381d071c3a..44e908ae80 100644 --- a/src/x11/colour.cpp +++ b/src/x11/colour.cpp @@ -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; diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp index b8c7646d2e..a0b61aba67 100644 --- a/src/x11/cursor.cpp +++ b/src/x11/cursor.cpp @@ -146,10 +146,6 @@ wxCursor::wxCursor(const char* const* WXUNUSED(xpmData)) } #endif -wxCursor::~wxCursor() -{ -} - wxGDIRefData *wxCursor::CreateGDIRefData() const { return new wxCursorRefData; diff --git a/src/x11/font.cpp b/src/x11/font.cpp index 87cf779d16..cb1ff19bc0 100644 --- a/src/x11/font.cpp +++ b/src/x11/font.cpp @@ -439,10 +439,6 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding WXUNUSED(enc)) return true; } -wxFont::~wxFont() -{ -} - wxGDIRefData *wxFont::CreateGDIRefData() const { return new wxFontRefData; diff --git a/src/x11/palette.cpp b/src/x11/palette.cpp index b7c420239c..3c273468ff 100644 --- a/src/x11/palette.cpp +++ b/src/x11/palette.cpp @@ -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) diff --git a/src/x11/pen.cpp b/src/x11/pen.cpp index 1ddd3f5b85..8b8c93b337 100644 --- a/src/x11/pen.cpp +++ b/src/x11/pen.cpp @@ -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;