From d3c7fc996a73e9f6a83067bc28a3c5581a3fee65 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 5 Sep 2006 20:47:48 +0000 Subject: [PATCH] mark all dtors which are virtual because base class dtor is virtual explicitly virtual themselves git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/include/wx/animate/animate.h | 10 +-- contrib/include/wx/applet/loadpage.h | 4 +- contrib/include/wx/applet/prepecho.h | 2 +- contrib/include/wx/applet/prepifelse.h | 2 +- contrib/include/wx/applet/prepinclude.h | 2 +- contrib/include/wx/applet/window.h | 2 +- demos/bombs/bombs.h | 2 +- demos/dbbrowse/dbbrowse.h | 2 +- demos/forty/forty.h | 4 +- demos/forty/game.h | 8 +- demos/life/dialogs.h | 2 +- demos/life/life.h | 4 +- demos/poem/wxpoem.h | 4 +- include/wx/aui/floatpane.h | 2 +- include/wx/cmdproc.h | 2 +- include/wx/cmndata.h | 8 +- include/wx/cocoa/bitmap.h | 4 +- include/wx/cocoa/brush.h | 2 +- include/wx/cocoa/clipbrd.h | 2 +- include/wx/cocoa/cursor.h | 4 +- include/wx/cocoa/dataobj2.h | 2 +- include/wx/cocoa/dc.h | 2 +- include/wx/cocoa/dcclient.h | 6 +- include/wx/cocoa/dcmemory.h | 2 +- include/wx/cocoa/dcscreen.h | 2 +- include/wx/cocoa/dialog.h | 2 +- include/wx/cocoa/dirdlg.h | 2 +- include/wx/cocoa/filedlg.h | 2 +- include/wx/cocoa/glcanvas.h | 2 +- include/wx/cocoa/icon.h | 2 +- include/wx/cocoa/mdi.h | 2 +- include/wx/cocoa/pen.h | 2 +- include/wx/cocoa/region.h | 4 +- include/wx/cocoa/sound.h | 2 +- include/wx/cocoa/timer.h | 2 +- include/wx/dataview.h | 4 +- include/wx/dbgrid.h | 2 +- include/wx/dc.h | 2 +- include/wx/docmdi.h | 2 +- include/wx/docview.h | 12 +-- include/wx/encconv.h | 2 +- include/wx/event.h | 2 +- include/wx/fs_mem.h | 2 +- include/wx/fs_zip.h | 2 +- include/wx/gdicmn.h | 2 +- include/wx/generic/colour.h | 2 +- include/wx/generic/dataview.h | 4 +- include/wx/generic/datectrl.h | 2 +- include/wx/generic/dcpsg.h | 2 +- include/wx/generic/dirctrlg.h | 4 +- include/wx/generic/dragimgg.h | 2 +- include/wx/generic/helpext.h | 2 +- include/wx/generic/imaglist.h | 2 +- include/wx/generic/listctrl.h | 2 +- include/wx/generic/logg.h | 2 +- include/wx/generic/mdig.h | 4 +- include/wx/generic/notebook.h | 2 +- include/wx/generic/paletteg.h | 2 +- include/wx/generic/progdlgg.h | 2 +- include/wx/generic/region.h | 4 +- include/wx/generic/sashwin.h | 2 +- include/wx/generic/splash.h | 2 +- include/wx/generic/tabg.h | 108 ++++++++++++----------- include/wx/generic/timer.h | 2 +- include/wx/gtk/bitmap.h | 4 +- include/wx/gtk/brush.h | 2 +- include/wx/gtk/choice.h | 2 +- include/wx/gtk/clipbrd.h | 2 +- include/wx/gtk/colour.h | 2 +- include/wx/gtk/combobox.h | 2 +- include/wx/gtk/cursor.h | 2 +- include/wx/gtk/dataobj2.h | 2 +- include/wx/gtk/dataview.h | 4 +- include/wx/gtk/dc.h | 2 +- include/wx/gtk/dcmemory.h | 2 +- include/wx/gtk/dialog.h | 2 +- include/wx/gtk/font.h | 2 +- include/wx/gtk/glcanvas.h | 4 +- include/wx/gtk/gnome/gprint.h | 6 +- include/wx/gtk/mdi.h | 4 +- include/wx/gtk/menuitem.h | 2 +- include/wx/gtk/msgdlg.h | 2 +- include/wx/gtk/pen.h | 2 +- include/wx/gtk/region.h | 2 +- include/wx/gtk/scrolbar.h | 2 +- include/wx/gtk/textctrl.h | 2 +- include/wx/gtk/timer.h | 2 +- include/wx/gtk1/bitmap.h | 4 +- include/wx/gtk1/brush.h | 2 +- include/wx/gtk1/choice.h | 2 +- include/wx/gtk1/clipbrd.h | 2 +- include/wx/gtk1/colour.h | 2 +- include/wx/gtk1/combobox.h | 2 +- include/wx/gtk1/cursor.h | 2 +- include/wx/gtk1/dataobj2.h | 2 +- include/wx/gtk1/dc.h | 2 +- include/wx/gtk1/dcmemory.h | 2 +- include/wx/gtk1/dialog.h | 2 +- include/wx/gtk1/font.h | 2 +- include/wx/gtk1/glcanvas.h | 4 +- include/wx/gtk1/mdi.h | 4 +- include/wx/gtk1/menuitem.h | 2 +- include/wx/gtk1/msgdlg.h | 2 +- include/wx/gtk1/pen.h | 2 +- include/wx/gtk1/region.h | 2 +- include/wx/gtk1/scrolbar.h | 2 +- include/wx/gtk1/textctrl.h | 2 +- include/wx/gtk1/timer.h | 2 +- include/wx/hash.h | 4 +- include/wx/html/helpdata.h | 4 +- include/wx/html/helpdlg.h | 2 +- include/wx/html/helpfrm.h | 2 +- include/wx/html/helpwnd.h | 2 +- include/wx/html/htmlcell.h | 4 +- include/wx/html/htmltag.h | 4 +- include/wx/html/htmlwin.h | 2 +- include/wx/html/htmprint.h | 6 +- include/wx/html/winpars.h | 2 +- include/wx/ipcbase.h | 2 +- include/wx/layout.h | 4 +- include/wx/mac/carbon/accel.h | 2 +- include/wx/mac/carbon/bitmap.h | 4 +- include/wx/mac/carbon/brush.h | 2 +- include/wx/mac/carbon/clipbrd.h | 2 +- include/wx/mac/carbon/colour.h | 2 +- include/wx/mac/carbon/cursor.h | 2 +- include/wx/mac/carbon/dataobj.h | 2 +- include/wx/mac/carbon/dataobj2.h | 2 +- include/wx/mac/carbon/dc.h | 2 +- include/wx/mac/carbon/dcclient.h | 6 +- include/wx/mac/carbon/dcmemory.h | 2 +- include/wx/mac/carbon/dcprint.h | 2 +- include/wx/mac/carbon/dcscreen.h | 2 +- include/wx/mac/carbon/dialog.h | 2 +- include/wx/mac/carbon/dnd.h | 2 +- include/wx/mac/carbon/drawer.h | 2 +- include/wx/mac/carbon/fontdlg.h | 4 +- include/wx/mac/carbon/glcanvas.h | 4 +- include/wx/mac/carbon/helpxxxx.h | 2 +- include/wx/mac/carbon/icon.h | 2 +- include/wx/mac/carbon/imaglist.h | 2 +- include/wx/mac/carbon/listctrl.h | 2 +- include/wx/mac/carbon/mdi.h | 6 +- include/wx/mac/carbon/metafile.h | 4 +- include/wx/mac/carbon/minifram.h | 2 +- include/wx/mac/carbon/notebook.h | 2 +- include/wx/mac/carbon/palette.h | 4 +- include/wx/mac/carbon/pen.h | 4 +- include/wx/mac/carbon/printdlg.h | 4 +- include/wx/mac/carbon/private.h | 6 +- include/wx/mac/carbon/radiobox.h | 2 +- include/wx/mac/carbon/radiobut.h | 2 +- include/wx/mac/carbon/region.h | 4 +- include/wx/mac/carbon/scrolbar.h | 2 +- include/wx/mac/carbon/slider.h | 2 +- include/wx/mac/carbon/sound.h | 2 +- include/wx/mac/carbon/statusbr.h | 2 +- include/wx/mac/carbon/tabctrl.h | 2 +- include/wx/mac/carbon/textctrl.h | 2 +- include/wx/mac/carbon/timer.h | 2 +- include/wx/mac/carbon/toolbar.h | 2 +- include/wx/mac/carbon/treectrl.h | 2 +- include/wx/mac/classic/accel.h | 2 +- include/wx/mac/classic/bitmap.h | 6 +- include/wx/mac/classic/brush.h | 2 +- include/wx/mac/classic/clipbrd.h | 2 +- include/wx/mac/classic/colour.h | 2 +- include/wx/mac/classic/cursor.h | 4 +- include/wx/mac/classic/dataobj.h | 2 +- include/wx/mac/classic/dataobj2.h | 2 +- include/wx/mac/classic/dc.h | 2 +- include/wx/mac/classic/dcclient.h | 6 +- include/wx/mac/classic/dcmemory.h | 2 +- include/wx/mac/classic/dcprint.h | 2 +- include/wx/mac/classic/dcscreen.h | 2 +- include/wx/mac/classic/dialog.h | 2 +- include/wx/mac/classic/dnd.h | 2 +- include/wx/mac/classic/glcanvas.h | 4 +- include/wx/mac/classic/helpxxxx.h | 2 +- include/wx/mac/classic/icon.h | 2 +- include/wx/mac/classic/imaglist.h | 2 +- include/wx/mac/classic/listctrl.h | 2 +- include/wx/mac/classic/mdi.h | 6 +- include/wx/mac/classic/metafile.h | 6 +- include/wx/mac/classic/minifram.h | 2 +- include/wx/mac/classic/notebook.h | 2 +- include/wx/mac/classic/palette.h | 4 +- include/wx/mac/classic/pen.h | 4 +- include/wx/mac/classic/printdlg.h | 4 +- include/wx/mac/classic/radiobox.h | 2 +- include/wx/mac/classic/region.h | 4 +- include/wx/mac/classic/scrolbar.h | 2 +- include/wx/mac/classic/slider.h | 2 +- include/wx/mac/classic/sound.h | 2 +- include/wx/mac/classic/statusbr.h | 2 +- include/wx/mac/classic/tabctrl.h | 2 +- include/wx/mac/classic/textctrl.h | 2 +- include/wx/mac/classic/timer.h | 2 +- include/wx/mac/classic/toolbar.h | 2 +- include/wx/mac/classic/treectrl.h | 2 +- include/wx/mac/corefoundation/stdpaths.h | 2 +- include/wx/mediactrl.h | 2 +- include/wx/mgl/app.h | 2 +- include/wx/mgl/bitmap.h | 4 +- include/wx/mgl/brush.h | 2 +- include/wx/mgl/clipbrd.h | 2 +- include/wx/mgl/cursor.h | 2 +- include/wx/mgl/dc.h | 2 +- include/wx/mgl/dcmemory.h | 2 +- include/wx/mgl/dcscreen.h | 2 +- include/wx/mgl/font.h | 2 +- include/wx/mgl/palette.h | 2 +- include/wx/mgl/pen.h | 2 +- include/wx/mgl/region.h | 4 +- include/wx/motif/accel.h | 2 +- include/wx/motif/bmpbuttn.h | 2 +- include/wx/motif/choice.h | 2 +- include/wx/motif/clipbrd.h | 2 +- include/wx/motif/colour.h | 2 +- include/wx/motif/combobox.h | 2 +- include/wx/motif/cursor.h | 2 +- include/wx/motif/dc.h | 2 +- include/wx/motif/dcclient.h | 4 +- include/wx/motif/dcmemory.h | 2 +- include/wx/motif/dcprint.h | 2 +- include/wx/motif/dcscreen.h | 2 +- include/wx/motif/dialog.h | 2 +- include/wx/motif/dnd.h | 4 +- include/wx/motif/icon.h | 2 +- include/wx/motif/listbox.h | 2 +- include/wx/motif/mdi.h | 6 +- include/wx/motif/menuitem.h | 2 +- include/wx/motif/minifram.h | 2 +- include/wx/motif/palette.h | 4 +- include/wx/motif/print.h | 4 +- include/wx/motif/radiobox.h | 2 +- include/wx/motif/radiobut.h | 2 +- include/wx/motif/scrolbar.h | 2 +- include/wx/motif/slider.h | 2 +- include/wx/motif/spinbutt.h | 2 +- include/wx/motif/statbmp.h | 2 +- include/wx/motif/statbox.h | 2 +- include/wx/motif/timer.h | 2 +- include/wx/msw/clipbrd.h | 2 +- include/wx/msw/colour.h | 2 +- include/wx/msw/dc.h | 4 +- include/wx/msw/dde.h | 6 +- include/wx/msw/dragimag.h | 2 +- include/wx/msw/glcanvas.h | 4 +- include/wx/msw/helpwin.h | 2 +- include/wx/msw/imaglist.h | 2 +- include/wx/msw/mdi.h | 4 +- include/wx/msw/metafile.h | 2 +- include/wx/msw/ole/automtn.h | 2 +- include/wx/msw/palette.h | 4 +- include/wx/msw/scrolbar.h | 2 +- include/wx/msw/tabctrl.h | 2 +- include/wx/msw/textctrl.h | 2 +- include/wx/msw/timer.h | 2 +- include/wx/msw/wince/textctrlce.h | 2 +- include/wx/object.h | 2 +- include/wx/os2/accel.h | 2 +- include/wx/os2/brush.h | 4 +- include/wx/os2/clipbrd.h | 2 +- include/wx/os2/colour.h | 2 +- include/wx/os2/cursor.h | 2 +- include/wx/os2/dataobj2.h | 2 +- include/wx/os2/dc.h | 4 +- include/wx/os2/helpwin.h | 2 +- include/wx/os2/icon.h | 2 +- include/wx/os2/mdi.h | 4 +- include/wx/os2/metafile.h | 6 +- include/wx/os2/palette.h | 4 +- include/wx/os2/pen.h | 4 +- include/wx/os2/print.h | 4 +- include/wx/os2/printos2.h | 4 +- include/wx/os2/radiobox.h | 2 +- include/wx/os2/region.h | 4 +- include/wx/os2/scrolbar.h | 2 +- include/wx/os2/slider.h | 2 +- include/wx/os2/sound.h | 2 +- include/wx/os2/tabctrl.h | 2 +- include/wx/os2/textctrl.h | 2 +- include/wx/os2/timer.h | 2 +- include/wx/palmos/clipbrd.h | 2 +- include/wx/palmos/dc.h | 4 +- include/wx/palmos/dragimag.h | 2 +- include/wx/palmos/glcanvas.h | 4 +- include/wx/palmos/help.h | 4 +- include/wx/palmos/imaglist.h | 2 +- include/wx/palmos/mdi.h | 4 +- include/wx/palmos/metafile.h | 2 +- include/wx/palmos/palette.h | 4 +- include/wx/palmos/progdlg.h | 2 +- include/wx/palmos/radiobox.h | 2 +- include/wx/palmos/scrolbar.h | 2 +- include/wx/palmos/slider.h | 2 +- include/wx/palmos/sound.h | 2 +- include/wx/palmos/tabctrl.h | 2 +- include/wx/palmos/textctrl.h | 2 +- include/wx/palmos/timer.h | 2 +- include/wx/printdlg.h | 4 +- include/wx/prntbase.h | 6 +- include/wx/protocol/file.h | 2 +- include/wx/protocol/http.h | 2 +- include/wx/quantize.h | 2 +- include/wx/richtext/richtextbuffer.h | 14 +-- include/wx/richtext/richtextctrl.h | 2 +- include/wx/richtext/richtextstyles.h | 10 +-- include/wx/sckstrm.h | 6 +- include/wx/sizer.h | 2 +- include/wx/tbarbase.h | 2 +- include/wx/textctrl.h | 2 +- include/wx/unix/joystick.h | 2 +- include/wx/unix/sound.h | 2 +- include/wx/valgen.h | 2 +- include/wx/valtext.h | 2 +- include/wx/variant.h | 2 +- include/wx/wfstream.h | 4 +- include/wx/x11/app.h | 2 +- include/wx/x11/bitmap.h | 2 +- include/wx/x11/brush.h | 2 +- include/wx/x11/clipbrd.h | 2 +- include/wx/x11/colour.h | 2 +- include/wx/x11/cursor.h | 2 +- include/wx/x11/dataobj.h | 2 +- include/wx/x11/dataobj2.h | 2 +- include/wx/x11/dc.h | 2 +- include/wx/x11/dcclient.h | 2 +- include/wx/x11/dcmemory.h | 2 +- include/wx/x11/dcprint.h | 2 +- include/wx/x11/dnd.h | 4 +- include/wx/x11/glcanvas.h | 4 +- include/wx/x11/minifram.h | 2 +- include/wx/x11/palette.h | 4 +- include/wx/x11/pen.h | 2 +- include/wx/x11/print.h | 4 +- include/wx/x11/region.h | 2 +- include/wx/x11/reparent.h | 2 +- include/wx/xrc/xmlres.h | 2 +- include/wx/xti.h | 10 +-- include/wx/xtistrm.h | 4 +- include/wx/xtixml.h | 4 +- src/common/combocmn.cpp | 6 +- src/common/fs_inet.cpp | 2 +- src/common/fs_mem.cpp | 2 +- src/common/strconv.cpp | 6 +- src/common/variant.cpp | 2 +- src/generic/datavgen.cpp | 4 +- src/generic/grid.cpp | 2 +- src/generic/notebook.cpp | 2 +- src/generic/paletteg.cpp | 2 +- src/generic/regiong.cpp | 2 +- src/gtk/bitmap.cpp | 2 +- src/gtk/colour.cpp | 2 +- src/gtk/cursor.cpp | 2 +- src/gtk/region.cpp | 2 +- src/gtk1/bitmap.cpp | 2 +- src/gtk1/colour.cpp | 2 +- src/gtk1/cursor.cpp | 2 +- src/gtk1/region.cpp | 2 +- src/html/chm.cpp | 4 +- src/html/helpwnd.cpp | 2 +- src/html/m_image.cpp | 2 +- src/html/m_tables.cpp | 2 +- src/mac/carbon/accel.cpp | 2 +- src/mac/carbon/brush.cpp | 2 +- src/mac/carbon/checklst.cpp | 4 +- src/mac/carbon/cursor.cpp | 2 +- src/mac/carbon/dccg.cpp | 4 +- src/mac/carbon/dcprint.cpp | 2 +- src/mac/carbon/fontdlg.cpp | 2 +- src/mac/carbon/mediactrl.cpp | 2 +- src/mac/carbon/metafile.cpp | 2 +- src/mac/carbon/region.cpp | 2 +- src/mac/carbon/sound.cpp | 4 +- src/mac/carbon/textctrl.cpp | 10 +-- src/mac/carbon/toolbar.cpp | 2 +- src/mac/classic/accel.cpp | 2 +- src/mac/classic/brush.cpp | 2 +- src/mac/classic/dcprint.cpp | 4 +- src/mac/classic/region.cpp | 2 +- src/mac/classic/toolbar.cpp | 2 +- src/mac/corefoundation/hidjoystick.cpp | 2 +- src/mgl/app.cpp | 2 +- src/mgl/bitmap.cpp | 2 +- src/mgl/cursor.cpp | 2 +- src/mgl/palette.cpp | 2 +- src/mgl/region.cpp | 2 +- src/motif/accel.cpp | 2 +- src/motif/cursor.cpp | 2 +- src/motif/font.cpp | 4 +- src/motif/spinbutt.cpp | 2 +- src/msdos/utilsdos.cpp | 2 +- src/msw/accel.cpp | 2 +- src/msw/mediactrl.cpp | 6 +- src/msw/urlmsw.cpp | 2 +- src/os2/accel.cpp | 2 +- src/os2/region.cpp | 2 +- src/palmos/accel.cpp | 2 +- src/univ/menu.cpp | 2 +- src/univ/themes/win32.cpp | 2 +- src/unix/dialup.cpp | 2 +- src/unix/mediactrl.cpp | 2 +- src/unix/sound.cpp | 2 +- src/x11/bitmap.cpp | 2 +- src/x11/colour.cpp | 2 +- src/x11/cursor.cpp | 2 +- src/x11/evtloop.cpp | 2 +- src/x11/font.cpp | 2 +- src/x11/region.cpp | 4 +- utils/HelpGen/src/docripper.h | 2 +- utils/HelpGen/src/ifcontext.h | 2 +- utils/configtool/src/appsettings.h | 2 +- utils/configtool/src/configitem.h | 2 +- utils/configtool/src/configtooldoc.h | 6 +- utils/configtool/src/configtree.h | 4 +- utils/configtool/src/htmlparser.h | 2 +- utils/configtool/src/mainframe.h | 2 +- utils/configtool/src/propeditor.h | 2 +- utils/configtool/src/property.h | 2 +- utils/configtool/src/wxconfigtool.h | 2 +- utils/helpview/src/helpview.h | 2 +- utils/helpview/src/remhelp.h | 4 +- utils/nplugin/src/npapp.h | 2 +- utils/nplugin/src/npframe.h | 2 +- utils/tex2rtf/src/htmlutil.cpp | 2 +- utils/tex2rtf/src/tex2any.h | 10 +-- utils/tex2rtf/src/tex2rtf.h | 2 +- utils/wxOLE/gtk/wxole.cpp | 2 +- utils/wxOLE/gtk/wxole.h | 6 +- utils/wxOLE/samples/servlet/servlet.cpp | 2 +- 432 files changed, 644 insertions(+), 638 deletions(-) diff --git a/contrib/include/wx/animate/animate.h b/contrib/include/wx/animate/animate.h index 2ce5c52760..ffb7b1b1c0 100644 --- a/contrib/include/wx/animate/animate.h +++ b/contrib/include/wx/animate/animate.h @@ -70,7 +70,7 @@ class WXDLLIMPEXP_ANIMATE wxAnimationPlayer : public wxObject public: wxAnimationPlayer(wxAnimationBase *animation = (wxAnimationBase *) NULL, bool destroyAnimation = false); - ~wxAnimationPlayer(); + virtual ~wxAnimationPlayer(); //// Accessors @@ -226,8 +226,8 @@ class WXDLLIMPEXP_ANIMATE wxAnimationBase : public wxObject DECLARE_ABSTRACT_CLASS(wxAnimationBase) public: - wxAnimationBase() {}; - ~wxAnimationBase() {}; + wxAnimationBase() {} + virtual ~wxAnimationBase() {} //// Accessors. Should be overridden by each derived class. @@ -262,7 +262,7 @@ class WXDLLIMPEXP_ANIMATE wxGIFAnimation : public wxAnimationBase public: wxGIFAnimation(); - ~wxGIFAnimation(); + virtual ~wxGIFAnimation(); //// Accessors @@ -308,7 +308,7 @@ public: { Create(parent, id, filename, pos, size, style, name); } - ~wxAnimationCtrlBase(); + virtual ~wxAnimationCtrlBase(); bool Create(wxWindow *parent, wxWindowID id, const wxString& filename = wxEmptyString, diff --git a/contrib/include/wx/applet/loadpage.h b/contrib/include/wx/applet/loadpage.h index 223dabc4b7..4c504a810d 100644 --- a/contrib/include/wx/applet/loadpage.h +++ b/contrib/include/wx/applet/loadpage.h @@ -66,7 +66,7 @@ public: wxLoadPageEvent(const wxString &hRef = "",wxHtmlAppletWindow *htmlWindow = NULL); // Destructor - ~wxLoadPageEvent() {} + virtual ~wxLoadPageEvent() {} // Clone Virtual virtual wxEvent *Clone() const { return new wxLoadPageEvent(m_hRef, m_htmlWindow); } @@ -96,7 +96,7 @@ public: wxPageLoadedEvent(); // Destructor - ~wxPageLoadedEvent() {} + virtual ~wxPageLoadedEvent() {} // Clone Virtual virtual wxEvent *Clone() const { diff --git a/contrib/include/wx/applet/prepecho.h b/contrib/include/wx/applet/prepecho.h index 118174a05a..e0eb9baa2c 100644 --- a/contrib/include/wx/applet/prepecho.h +++ b/contrib/include/wx/applet/prepecho.h @@ -45,7 +45,7 @@ private: public: wxEchoPrep() : wxHtmlProcessor() {} - ~wxEchoPrep() {} + virtual ~wxEchoPrep() {} // Process input text and return processed result wxString Process(const wxString& text) const; diff --git a/contrib/include/wx/applet/prepifelse.h b/contrib/include/wx/applet/prepifelse.h index 67f28bd75a..14c54a1f59 100644 --- a/contrib/include/wx/applet/prepifelse.h +++ b/contrib/include/wx/applet/prepifelse.h @@ -45,7 +45,7 @@ private: public: wxIfElsePrep() : wxHtmlProcessor() {} - ~wxIfElsePrep() {} + virtual ~wxIfElsePrep() {} // Process input text and return processed result wxString Process(const wxString& text) const; diff --git a/contrib/include/wx/applet/prepinclude.h b/contrib/include/wx/applet/prepinclude.h index c021cf56dc..2a0b816b51 100644 --- a/contrib/include/wx/applet/prepinclude.h +++ b/contrib/include/wx/applet/prepinclude.h @@ -49,7 +49,7 @@ private: wxFileSystem *m_FS; public: wxIncludePrep() : wxHtmlProcessor() {} - ~wxIncludePrep() {} + virtual ~wxIncludePrep() {} // Process input text and return processed result wxString Process(const wxString& text) const; diff --git a/contrib/include/wx/applet/window.h b/contrib/include/wx/applet/window.h index 5746a12543..bea958fd6f 100644 --- a/contrib/include/wx/applet/window.h +++ b/contrib/include/wx/applet/window.h @@ -140,7 +140,7 @@ public: const wxString& name = "htmlAppletWindow"); // Destructor - ~wxHtmlAppletWindow(); + virtual ~wxHtmlAppletWindow(); // Create an instance of an applet based on it's class name wxApplet *CreateApplet( diff --git a/demos/bombs/bombs.h b/demos/bombs/bombs.h index c7b511633d..52ee72bd9d 100644 --- a/demos/bombs/bombs.h +++ b/demos/bombs/bombs.h @@ -88,7 +88,7 @@ public: wxSize GetGridSizeInPixels() const; - ~BombsCanvas(); + virtual ~BombsCanvas(); private: diff --git a/demos/dbbrowse/dbbrowse.h b/demos/dbbrowse/dbbrowse.h index 0bf41ebd3a..34a6f6035c 100644 --- a/demos/dbbrowse/dbbrowse.h +++ b/demos/dbbrowse/dbbrowse.h @@ -14,7 +14,7 @@ class MainFrame: public wxFrame { public: MainFrame(wxFrame *frame, wxChar *title, const wxPoint& pos, const wxSize& size); - ~MainFrame(void); + virtual ~MainFrame(void); public: // menu callbacks diff --git a/demos/forty/forty.h b/demos/forty/forty.h index 2763590151..e1e9eb7e75 100644 --- a/demos/forty/forty.h +++ b/demos/forty/forty.h @@ -16,8 +16,8 @@ class FortyApp: public wxApp { public: - FortyApp(){}; - ~FortyApp(); + FortyApp(){} + virtual ~FortyApp(); bool OnInit(); static const wxColour& BackgroundColour(); diff --git a/demos/forty/game.h b/demos/forty/game.h index b9951cd01c..80db1a7254 100644 --- a/demos/forty/game.h +++ b/demos/forty/game.h @@ -24,7 +24,7 @@ const int MaxMoves = 800; class Pack : public Pile { public: Pack(int x, int y); - ~Pack(); + virtual ~Pack(); void Redraw(wxDC& dc); void ResetPile() { m_topCard = NumCards - 1; } void Shuffle(); @@ -39,7 +39,7 @@ public: class Base : public Pile { public: Base(int x, int y); - ~Base(){}; + virtual ~Base(){} bool AcceptCard(Card* card); }; @@ -50,7 +50,7 @@ public: class Foundation : public Pile { public: Foundation(int x, int y); - ~Foundation(){}; + virtual ~Foundation(){} bool AcceptCard(Card* card); }; @@ -61,7 +61,7 @@ public: class Discard : public Pile { public: Discard(int x, int y); - ~Discard(){}; + virtual ~Discard(){} void Redraw(wxDC& dc); void GetTopCardPos(int& x, int& y); Card* RemoveTopCard(wxDC& dc, int m_xOffset, int m_yOffset); diff --git a/demos/life/dialogs.h b/demos/life/dialogs.h index 3f0c658f93..060eb67472 100644 --- a/demos/life/dialogs.h +++ b/demos/life/dialogs.h @@ -37,7 +37,7 @@ class LifeSamplesDialog : public wxDialog public: // ctor and dtor LifeSamplesDialog(wxWindow *parent); - ~LifeSamplesDialog(); + virtual ~LifeSamplesDialog(); // members const LifePattern& GetPattern(); diff --git a/demos/life/life.h b/demos/life/life.h index 5dd43cf0b1..ea0007d77a 100644 --- a/demos/life/life.h +++ b/demos/life/life.h @@ -41,7 +41,7 @@ class LifeCanvas : public wxWindow public: // ctor and dtor LifeCanvas(wxWindow* parent, Life* life, bool interactive = true); - ~LifeCanvas(); + virtual ~LifeCanvas(); // view management int GetCellSize() const { return m_cellsize; }; @@ -122,7 +122,7 @@ class LifeFrame : public wxFrame public: // ctor and dtor LifeFrame(); - ~LifeFrame(); + virtual ~LifeFrame(); // member functions void UpdateInfoText(); diff --git a/demos/poem/wxpoem.h b/demos/poem/wxpoem.h index 6f84d621fe..605ed69fa5 100644 --- a/demos/poem/wxpoem.h +++ b/demos/poem/wxpoem.h @@ -29,7 +29,7 @@ class MyCanvas: public wxWindow { public: MyCanvas(wxFrame *frame); - ~MyCanvas(); + virtual ~MyCanvas(); void OnPaint(wxPaintEvent& event); void OnMouseEvent(wxMouseEvent& event); @@ -47,7 +47,7 @@ class MainWindow: public wxFrame public: MyCanvas *canvas; MainWindow(wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style); - ~MainWindow(); + virtual ~MainWindow(); void OnCloseWindow(wxCloseEvent& event); void OnChar(wxKeyEvent& event); diff --git a/include/wx/aui/floatpane.h b/include/wx/aui/floatpane.h index 98312e70f8..98f79fe072 100644 --- a/include/wx/aui/floatpane.h +++ b/include/wx/aui/floatpane.h @@ -37,7 +37,7 @@ public: const wxPaneInfo& pane, wxWindowID id = wxID_ANY ); - ~wxFloatingPane(); + virtual ~wxFloatingPane(); void SetPaneWindow(const wxPaneInfo& pane); private: void OnSize(wxSizeEvent& event); diff --git a/include/wx/cmdproc.h b/include/wx/cmdproc.h index de7d68429c..cc39b0f31f 100644 --- a/include/wx/cmdproc.h +++ b/include/wx/cmdproc.h @@ -26,7 +26,7 @@ class WXDLLEXPORT wxCommand : public wxObject { public: wxCommand(bool canUndoIt = false, const wxString& name = wxEmptyString); - ~wxCommand(){} + virtual ~wxCommand(){} // Override this to perform a command virtual bool Do() = 0; diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h index d533e84546..f10801e67e 100644 --- a/include/wx/cmndata.h +++ b/include/wx/cmndata.h @@ -31,7 +31,7 @@ class WXDLLEXPORT wxColourData: public wxObject public: wxColourData(); wxColourData(const wxColourData& data); - ~wxColourData(); + virtual ~wxColourData(); void SetChooseFull(bool flag) { m_chooseFull = flag; } bool GetChooseFull() const { return m_chooseFull; } @@ -172,7 +172,7 @@ class WXDLLEXPORT wxPrintData: public wxObject public: wxPrintData(); wxPrintData(const wxPrintData& printData); - ~wxPrintData(); + virtual ~wxPrintData(); int GetNoCopies() const { return m_printNoCopies; } bool GetCollate() const { return m_printCollate; } @@ -282,7 +282,7 @@ public: wxPrintDialogData(); wxPrintDialogData(const wxPrintDialogData& dialogData); wxPrintDialogData(const wxPrintData& printData); - ~wxPrintDialogData(); + virtual ~wxPrintDialogData(); int GetFromPage() const { return m_printFromPage; }; int GetToPage() const { return m_printToPage; }; @@ -363,7 +363,7 @@ public: wxPageSetupDialogData(); wxPageSetupDialogData(const wxPageSetupDialogData& dialogData); wxPageSetupDialogData(const wxPrintData& printData); - ~wxPageSetupDialogData(); + virtual ~wxPageSetupDialogData(); wxSize GetPaperSize() const { return m_paperSize; }; wxPaperSize GetPaperId() const { return m_printData.GetPaperId(); }; diff --git a/include/wx/cocoa/bitmap.h b/include/wx/cocoa/bitmap.h index d823a048f4..d08dd9ea5a 100644 --- a/include/wx/cocoa/bitmap.h +++ b/include/wx/cocoa/bitmap.h @@ -43,7 +43,7 @@ public: // Construct a mask from a mono bitmap (copies the bitmap). wxMask(const wxBitmap& bitmap); - ~wxMask(); + virtual ~wxMask(); bool Create(const wxBitmap& bitmap, const wxColour& colour); bool Create(const wxBitmap& bitmap, int paletteIndex); @@ -86,7 +86,7 @@ public: wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); } // destructor - ~wxBitmap(); + virtual ~wxBitmap(); // ------------------------------------------------------------------------ // Implementation diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h index 689981f391..a7639fc998 100644 --- a/include/wx/cocoa/brush.h +++ b/include/wx/cocoa/brush.h @@ -31,7 +31,7 @@ public: wxBrush(); wxBrush(const wxColour& col, int style = wxSOLID); wxBrush(const wxBitmap& stipple); - ~wxBrush(); + virtual ~wxBrush(); // ------------------------------------------------------------------------ // Implementation diff --git a/include/wx/cocoa/clipbrd.h b/include/wx/cocoa/clipbrd.h index 29c95bc812..82b10d6c15 100644 --- a/include/wx/cocoa/clipbrd.h +++ b/include/wx/cocoa/clipbrd.h @@ -22,7 +22,7 @@ class wxClipboard : public wxClipboardBase DECLARE_DYNAMIC_CLASS(wxClipboard) public: wxClipboard(); - ~wxClipboard(); + virtual ~wxClipboard(); // open the clipboard before SetData() and GetData() virtual bool Open(); diff --git a/include/wx/cocoa/cursor.h b/include/wx/cocoa/cursor.h index bd054b0889..d99375d26e 100644 --- a/include/wx/cocoa/cursor.h +++ b/include/wx/cocoa/cursor.h @@ -22,7 +22,7 @@ class WXDLLEXPORT wxCursorRefData: public wxObjectRefData friend class WXDLLEXPORT wxCursor; public: wxCursorRefData(); - ~wxCursorRefData(); + virtual ~wxCursorRefData(); protected: int m_width, m_height; @@ -47,7 +47,7 @@ public: int hotSpotX = 0, int hotSpotY = 0); wxCursor(int cursor_type); - ~wxCursor(); + virtual ~wxCursor(); virtual bool Ok() const { return m_refData ; } diff --git a/include/wx/cocoa/dataobj2.h b/include/wx/cocoa/dataobj2.h index 5c2f561778..aca32452fc 100644 --- a/include/wx/cocoa/dataobj2.h +++ b/include/wx/cocoa/dataobj2.h @@ -23,7 +23,7 @@ public: wxBitmapDataObject(const wxBitmap& bitmap); // destr - ~wxBitmapDataObject(); + virtual ~wxBitmapDataObject(); // override base class virtual to update PNG data too virtual void SetBitmap(const wxBitmap& bitmap); diff --git a/include/wx/cocoa/dc.h b/include/wx/cocoa/dc.h index c9cc225042..d04424ba90 100644 --- a/include/wx/cocoa/dc.h +++ b/include/wx/cocoa/dc.h @@ -29,7 +29,7 @@ class WXDLLEXPORT wxDC: public wxDCBase //------------------------------------------------------------------------- public: wxDC(); - ~wxDC(); + virtual ~wxDC(); //------------------------------------------------------------------------- // wxCocoa specifics diff --git a/include/wx/cocoa/dcclient.h b/include/wx/cocoa/dcclient.h index 5bfc6a15e9..c927f0e5bf 100644 --- a/include/wx/cocoa/dcclient.h +++ b/include/wx/cocoa/dcclient.h @@ -25,7 +25,7 @@ public: wxWindowDC(void); // Create a DC corresponding to a window wxWindowDC(wxWindow *win); - ~wxWindowDC(void); + virtual ~wxWindowDC(void); protected: wxWindow *m_window; @@ -45,7 +45,7 @@ public: wxClientDC(void); // Create a DC corresponding to a window wxClientDC(wxWindow *win); - ~wxClientDC(void); + virtual ~wxClientDC(void); protected: // DC stack virtual bool CocoaLockFocus(); @@ -59,7 +59,7 @@ public: wxPaintDC(void); // Create a DC corresponding to a window wxPaintDC(wxWindow *win); - ~wxPaintDC(void); + virtual ~wxPaintDC(void); protected: // DC stack virtual bool CocoaLockFocus(); diff --git a/include/wx/cocoa/dcmemory.h b/include/wx/cocoa/dcmemory.h index 889b5ce9bd..e6580bab96 100644 --- a/include/wx/cocoa/dcmemory.h +++ b/include/wx/cocoa/dcmemory.h @@ -20,7 +20,7 @@ class WXDLLEXPORT wxMemoryDC: public wxDC public: wxMemoryDC(void); wxMemoryDC( wxDC *dc ); // Create compatible DC - ~wxMemoryDC(void); + virtual ~wxMemoryDC(void); virtual void SelectObject(const wxBitmap& bitmap); virtual void DoGetSize(int *width, int *height) const; protected: diff --git a/include/wx/cocoa/dcscreen.h b/include/wx/cocoa/dcscreen.h index 6d097f32ab..5b67bb8eca 100644 --- a/include/wx/cocoa/dcscreen.h +++ b/include/wx/cocoa/dcscreen.h @@ -20,7 +20,7 @@ class WXDLLEXPORT wxScreenDC: public wxDC public: wxScreenDC(void); wxScreenDC( wxDC *dc ); // Create compatible DC - ~wxScreenDC(void); + virtual ~wxScreenDC(void); // Compatibility with X's requirements for drawing on top of all windows static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return true; } diff --git a/include/wx/cocoa/dialog.h b/include/wx/cocoa/dialog.h index aef976203a..b05ae8d104 100644 --- a/include/wx/cocoa/dialog.h +++ b/include/wx/cocoa/dialog.h @@ -65,7 +65,7 @@ public: long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr); - ~wxDialog(); + virtual ~wxDialog(); protected: void Init(); diff --git a/include/wx/cocoa/dirdlg.h b/include/wx/cocoa/dirdlg.h index b221050d99..f2df94556b 100644 --- a/include/wx/cocoa/dirdlg.h +++ b/include/wx/cocoa/dirdlg.h @@ -31,7 +31,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxString& name = wxDirDialogNameStr); - ~wxDirDialog(); + virtual ~wxDirDialog(); virtual int ShowModal(); diff --git a/include/wx/cocoa/filedlg.h b/include/wx/cocoa/filedlg.h index 17834726c1..634b98d417 100644 --- a/include/wx/cocoa/filedlg.h +++ b/include/wx/cocoa/filedlg.h @@ -33,7 +33,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, const wxString& name = wxFileDialogNameStr); - ~wxFileDialog(); + virtual ~wxFileDialog(); virtual void SetPath(const wxString& path); virtual void GetPaths(wxArrayString& paths) const; diff --git a/include/wx/cocoa/glcanvas.h b/include/wx/cocoa/glcanvas.h index 49f6a52595..fdbecd935c 100644 --- a/include/wx/cocoa/glcanvas.h +++ b/include/wx/cocoa/glcanvas.h @@ -32,7 +32,7 @@ public: const wxPalette& WXUNUSED(palette), const wxGLContext *other /* for sharing display lists */ ); - ~wxGLContext(); + virtual ~wxGLContext(); void SetCurrent(); diff --git a/include/wx/cocoa/icon.h b/include/wx/cocoa/icon.h index 93e822526d..f7bdd3b1c2 100644 --- a/include/wx/cocoa/icon.h +++ b/include/wx/cocoa/icon.h @@ -33,7 +33,7 @@ public: { LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON); } - ~wxIcon(); + virtual ~wxIcon(); bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ , int desiredWidth /* = -1 */ , int desiredHeight = -1); diff --git a/include/wx/cocoa/mdi.h b/include/wx/cocoa/mdi.h index b68ca4431a..272c4508d9 100644 --- a/include/wx/cocoa/mdi.h +++ b/include/wx/cocoa/mdi.h @@ -156,7 +156,7 @@ class wxMDIClientWindow: public wxWindow public: wxMDIClientWindow(); wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 ); - ~wxMDIClientWindow(); + virtual ~wxMDIClientWindow(); virtual bool CreateClient( wxMDIParentFrame *parent, long style = 0 ); }; diff --git a/include/wx/cocoa/pen.h b/include/wx/cocoa/pen.h index 236c326b70..9f46d56bec 100644 --- a/include/wx/cocoa/pen.h +++ b/include/wx/cocoa/pen.h @@ -28,7 +28,7 @@ public: wxPen(); wxPen(const wxColour& col, int width = 1, int style = wxSOLID); wxPen(const wxBitmap& stipple, int width); - ~wxPen(); + virtual ~wxPen(); // wxObjectRefData wxObjectRefData *CreateRefData() const; diff --git a/include/wx/cocoa/region.h b/include/wx/cocoa/region.h index 24ac542e83..c658eaf49a 100644 --- a/include/wx/cocoa/region.h +++ b/include/wx/cocoa/region.h @@ -37,7 +37,7 @@ public: const wxColour& transColour, int tolerance = 0) : wxRegionGeneric() { Union(bmp, transColour, tolerance); } - ~wxRegion() {} + virtual ~wxRegion() {} wxRegion(const wxRegion& r) : wxRegionGeneric(r) {} @@ -82,7 +82,7 @@ public: wxRegionIterator(const wxRegionIterator& iterator) : wxRegionIteratorGeneric(iterator) {} - ~wxRegionIterator() {} + virtual ~wxRegionIterator() {} wxRegionIterator& operator=(const wxRegionIterator& iter) { return *(wxRegionIterator*)&(this->wxRegionIteratorGeneric::operator=(iter)); } diff --git a/include/wx/cocoa/sound.h b/include/wx/cocoa/sound.h index c85e7d3978..d764e8bfea 100644 --- a/include/wx/cocoa/sound.h +++ b/include/wx/cocoa/sound.h @@ -29,7 +29,7 @@ public: : m_cocoaNSSound(NULL) { LoadWAV(data,size,true); } wxSound(const wxSound& sound); // why not? - ~wxSound(); + virtual ~wxSound(); public: bool Create(const wxString& fileName, bool isResource = false); diff --git a/include/wx/cocoa/timer.h b/include/wx/cocoa/timer.h index 626a85635a..fb1677a977 100644 --- a/include/wx/cocoa/timer.h +++ b/include/wx/cocoa/timer.h @@ -25,7 +25,7 @@ public: wxTimer() { Init(); } wxTimer(wxEvtHandler *owner, int timerid = -1) : wxTimerBase(owner, timerid) { Init(); } - ~wxTimer(); + virtual ~wxTimer(); virtual bool Start(int millisecs = -1, bool oneShot = false); virtual void Stop(); diff --git a/include/wx/dataview.h b/include/wx/dataview.h index f9ef2529fd..195b4f87b2 100644 --- a/include/wx/dataview.h +++ b/include/wx/dataview.h @@ -257,7 +257,7 @@ class WXDLLIMPEXP_ADV wxDataViewColumnBase: public wxObject public: wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column, int fixed_width = 80, wxDataViewColumnSizing sizing = wxDATAVIEW_COL_WIDTH_FIXED, int flags = 0 ); - ~wxDataViewColumnBase(); + virtual ~wxDataViewColumnBase(); virtual void SetTitle( const wxString &title ); virtual wxString GetTitle(); @@ -297,7 +297,7 @@ class WXDLLIMPEXP_ADV wxDataViewCtrlBase: public wxControl { public: wxDataViewCtrlBase(); - ~wxDataViewCtrlBase(); + virtual ~wxDataViewCtrlBase(); virtual bool AssociateModel( wxDataViewListModel *model ); wxDataViewListModel* GetModel(); diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h index 901af313c3..b08f2c6bcb 100644 --- a/include/wx/dbgrid.h +++ b/include/wx/dbgrid.h @@ -115,7 +115,7 @@ class WXDLLIMPEXP_DBGRID wxDbGridTableBase : public wxGridTableBase public: wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo, int count = wxUSE_QUERY, bool takeOwnership = true); - ~wxDbGridTableBase(); + virtual ~wxDbGridTableBase(); virtual int GetNumberRows() { diff --git a/include/wx/dc.h b/include/wx/dc.h index 668140b758..98e922fff7 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -132,7 +132,7 @@ public: ResetClipping(); } - ~wxDCBase() { } + virtual ~wxDCBase() { } #if WXWIN_COMPATIBILITY_2_6 wxDEPRECATED( virtual void BeginDrawing() ); diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h index af8543afa4..e94973701c 100644 --- a/include/wx/docmdi.h +++ b/include/wx/docmdi.h @@ -65,7 +65,7 @@ public: wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame")); - ~wxDocMDIChildFrame(); + virtual ~wxDocMDIChildFrame(); bool Create(wxDocument *doc, wxView *view, diff --git a/include/wx/docview.h b/include/wx/docview.h index 36a9bd114e..5aa48192a3 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -65,7 +65,7 @@ class WXDLLEXPORT wxDocument : public wxEvtHandler { public: wxDocument(wxDocument *parent = (wxDocument *) NULL); - ~wxDocument(); + virtual ~wxDocument(); // accessors void SetFilename(const wxString& filename, bool notifyViews = false); @@ -175,7 +175,7 @@ class WXDLLEXPORT wxView: public wxEvtHandler public: // wxView(wxDocument *doc = (wxDocument *) NULL); wxView(); - ~wxView(); + virtual ~wxView(); wxDocument *GetDocument() const { return m_viewDocument; } virtual void SetDocument(wxDocument *doc); @@ -249,7 +249,7 @@ public: wxClassInfo *viewClassInfo = (wxClassInfo *)NULL, long flags = wxDEFAULT_TEMPLATE_FLAGS); - ~wxDocTemplate(); + virtual ~wxDocTemplate(); // By default, these two member functions dynamically creates document and // view using dynamic instance construction. Override these if you need a @@ -315,7 +315,7 @@ class WXDLLEXPORT wxDocManager: public wxEvtHandler { public: wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = true); - ~wxDocManager(); + virtual ~wxDocManager(); virtual bool Initialize(); @@ -468,7 +468,7 @@ public: const wxSize& size = wxDefaultSize, long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame")); - ~wxDocChildFrame(){} + virtual ~wxDocChildFrame(){} // Extend event processing to search the view's event table virtual bool ProcessEvent(wxEvent& event); @@ -559,7 +559,7 @@ class WXDLLEXPORT wxFileHistory : public wxObject { public: wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1); - ~wxFileHistory(); + virtual ~wxFileHistory(); // Operations virtual void AddFileToHistory(const wxString& file); diff --git a/include/wx/encconv.h b/include/wx/encconv.h index 4639f48638..6a54439eeb 100644 --- a/include/wx/encconv.h +++ b/include/wx/encconv.h @@ -54,7 +54,7 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject public: wxEncodingConverter(); - ~wxEncodingConverter() { if (m_Table) delete[] m_Table; } + virtual ~wxEncodingConverter() { if (m_Table) delete[] m_Table; } // Initialize conversion. Both output or input encoding may // be wxFONTENCODING_UNICODE, but only if wxUSE_WCHAR_T is set to 1. diff --git a/include/wx/event.h b/include/wx/event.h index 4de9cac013..43ed9f4e21 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -1185,7 +1185,7 @@ public: g_isPainting++; } - ~wxPaintEvent() + virtual ~wxPaintEvent() { g_isPainting--; } diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h index 0586319898..7dd33a3c70 100644 --- a/include/wx/fs_mem.h +++ b/include/wx/fs_mem.h @@ -28,7 +28,7 @@ class WXDLLIMPEXP_BASE wxMemoryFSHandlerBase : public wxFileSystemHandler { public: wxMemoryFSHandlerBase(); - ~wxMemoryFSHandlerBase(); + virtual ~wxMemoryFSHandlerBase(); // Add file to list of files stored in memory. Stored data (bitmap, text or // raw data) will be copied into private memory stream and available under diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h index ba864ce522..e98b3f82ad 100644 --- a/include/wx/fs_zip.h +++ b/include/wx/fs_zip.h @@ -34,7 +34,7 @@ class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler virtual wxString FindFirst(const wxString& spec, int flags = 0); virtual wxString FindNext(); void Cleanup(); - ~wxZipFSHandler(); + virtual ~wxZipFSHandler(); private: // these vars are used by FindFirst/Next: diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index 8462c37eb2..07e68c9c21 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -541,7 +541,7 @@ public: #if !wxUSE_STL wxResourceCache(const unsigned int keyType) : wxList(keyType) { } #endif - ~wxResourceCache(); + virtual ~wxResourceCache(); }; // --------------------------------------------------------------------------- diff --git a/include/wx/generic/colour.h b/include/wx/generic/colour.h index a5707e3039..66aa3800d4 100644 --- a/include/wx/generic/colour.h +++ b/include/wx/generic/colour.h @@ -30,7 +30,7 @@ public: wxColour& operator=(const wxColour& col); // dtor - ~wxColour(); + virtual ~wxColour(); // accessors bool Ok() const { return m_isInit; } diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h index 89d16535c0..bb5e2e7338 100644 --- a/include/wx/generic/dataview.h +++ b/include/wx/generic/dataview.h @@ -32,7 +32,7 @@ class WXDLLIMPEXP_ADV wxDataViewCell: public wxDataViewCellBase { public: wxDataViewCell( const wxString &varianttype, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT ); - ~wxDataViewCell(); + virtual ~wxDataViewCell(); virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0; virtual wxSize GetSize() = 0; @@ -143,7 +143,7 @@ public: wxDataViewProgressCell( const wxString &label = wxEmptyString, const wxString &varianttype = wxT("long"), wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT ); - ~wxDataViewProgressCell(); + virtual ~wxDataViewProgressCell(); bool SetValue( const wxVariant &value ); diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h index 4dac18355a..eef18e204f 100644 --- a/include/wx/generic/datectrl.h +++ b/include/wx/generic/datectrl.h @@ -26,7 +26,7 @@ class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase public: // creating the control wxDatePickerCtrlGeneric() { Init(); } - ~wxDatePickerCtrlGeneric() ; + virtual ~wxDatePickerCtrlGeneric() ; wxDatePickerCtrlGeneric(wxWindow *parent, wxWindowID id, const wxDateTime& date = wxDefaultDateTime, diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h index 7d9ea915f3..4debcc07e2 100644 --- a/include/wx/generic/dcpsg.h +++ b/include/wx/generic/dcpsg.h @@ -43,7 +43,7 @@ public: wxPostScriptDC(const wxPrintData& printData); // Recommended destructor :-) - ~wxPostScriptDC(); + virtual ~wxPostScriptDC(); virtual bool Ok() const; diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h index 586d026f27..169123db39 100644 --- a/include/wx/generic/dirctrlg.h +++ b/include/wx/generic/dirctrlg.h @@ -60,7 +60,7 @@ class WXDLLEXPORT wxDirItemData : public wxTreeItemData { public: wxDirItemData(const wxString& path, const wxString& name, bool isDir); - ~wxDirItemData(){} + virtual ~wxDirItemData(){} void SetNewDirName(const wxString& path); bool HasSubDirs() const; @@ -225,7 +225,7 @@ public: void Init(); - ~wxDirFilterListCtrl() {} + virtual ~wxDirFilterListCtrl() {} //// Operations void FillFilterList(const wxString& filter, int defaultFilter); diff --git a/include/wx/generic/dragimgg.h b/include/wx/generic/dragimgg.h index 72dde38d4d..9ea4a54324 100644 --- a/include/wx/generic/dragimgg.h +++ b/include/wx/generic/dragimgg.h @@ -151,7 +151,7 @@ public: } #endif - ~wxGenericDragImage(); + virtual ~wxGenericDragImage(); // Attributes //////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/generic/helpext.h b/include/wx/generic/helpext.h index 9925bedb34..ec671668fe 100644 --- a/include/wx/generic/helpext.h +++ b/include/wx/generic/helpext.h @@ -37,7 +37,7 @@ class WXDLLIMPEXP_ADV wxExtHelpController : public wxHelpControllerBase { public: wxExtHelpController(wxWindow* parentWindow = NULL); - ~wxExtHelpController(); + virtual ~wxExtHelpController(); /** Tell it which browser to use. The Netscape support will check whether Netscape is already diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h index b04487f70e..32870b1cad 100644 --- a/include/wx/generic/imaglist.h +++ b/include/wx/generic/imaglist.h @@ -55,7 +55,7 @@ class WXDLLEXPORT wxGenericImageList: public wxObject public: wxGenericImageList() { m_width = m_height = 0; } wxGenericImageList( int width, int height, bool mask = true, int initialCount = 1 ); - ~wxGenericImageList(); + virtual ~wxGenericImageList(); bool Create( int width, int height, bool mask = true, int initialCount = 1 ); bool Create(); diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index 0224f03c14..2c6d41ebc5 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -77,7 +77,7 @@ public: { Create(parent, winid, pos, size, style, validator, name); } - ~wxGenericListCtrl(); + virtual ~wxGenericListCtrl(); bool Create( wxWindow *parent, wxWindowID winid = wxID_ANY, diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h index b9580939ad..36268ea5d3 100644 --- a/include/wx/generic/logg.h +++ b/include/wx/generic/logg.h @@ -90,7 +90,7 @@ public: bool bShow = true, // show window immediately? bool bPassToOld = true); // pass messages to the old target? - ~wxLogWindow(); + virtual ~wxLogWindow(); // window operations // show/hide the log window diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h index eb253e08ef..d7c560d2c3 100644 --- a/include/wx/generic/mdig.h +++ b/include/wx/generic/mdig.h @@ -48,7 +48,7 @@ public: long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, const wxString& name = wxFrameNameStr); - ~wxGenericMDIParentFrame(); + virtual ~wxGenericMDIParentFrame(); bool Create( wxWindow *parent, wxWindowID winid, const wxString& title, @@ -230,7 +230,7 @@ class WXDLLEXPORT wxGenericMDIClientWindow: public wxNotebook public: wxGenericMDIClientWindow(); wxGenericMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 ); - ~wxGenericMDIClientWindow(); + virtual ~wxGenericMDIClientWindow(); virtual bool CreateClient( wxGenericMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL ); virtual int SetSelection(size_t nPage); diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h index f95ca0e394..6913929298 100644 --- a/include/wx/generic/notebook.h +++ b/include/wx/generic/notebook.h @@ -52,7 +52,7 @@ public: long style = 0, const wxString& name = wxNotebookNameStr); // dtor - ~wxNotebook(); + virtual ~wxNotebook(); // accessors // --------- diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h index 35a9fa1fa3..f059c0c4f5 100644 --- a/include/wx/generic/paletteg.h +++ b/include/wx/generic/paletteg.h @@ -35,7 +35,7 @@ class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase wxPalette(); wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue ); - ~wxPalette(); + virtual ~wxPalette(); bool operator == ( const wxPalette& palette ) const; bool operator != ( const wxPalette& palette ) const; virtual bool Ok() const; diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h index dff9e2fc06..81fda8c37e 100644 --- a/include/wx/generic/progdlgg.h +++ b/include/wx/generic/progdlgg.h @@ -44,7 +44,7 @@ public: /* Destructor. Re-enables event handling for other windows. */ - ~wxProgressDialog(); + virtual ~wxProgressDialog(); /* Update the status bar to the new value. @param value new value diff --git a/include/wx/generic/region.h b/include/wx/generic/region.h index d8da3a0eab..7580f863e3 100644 --- a/include/wx/generic/region.h +++ b/include/wx/generic/region.h @@ -27,7 +27,7 @@ public: wxRegionGeneric(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegionGeneric(const wxRect& rect); wxRegionGeneric(); - ~wxRegionGeneric(); + virtual ~wxRegionGeneric(); bool Ok() const { return m_refData != NULL; } @@ -109,7 +109,7 @@ public: wxRegionIteratorGeneric(); wxRegionIteratorGeneric(const wxRegionGeneric& region); wxRegionIteratorGeneric(const wxRegionIteratorGeneric& iterator); - ~wxRegionIteratorGeneric(); + virtual ~wxRegionIteratorGeneric(); wxRegionIteratorGeneric& operator=(const wxRegionIteratorGeneric& iterator); diff --git a/include/wx/generic/sashwin.h b/include/wx/generic/sashwin.h index f223891efa..6c33ff5f15 100644 --- a/include/wx/generic/sashwin.h +++ b/include/wx/generic/sashwin.h @@ -87,7 +87,7 @@ public: Create(parent, id, pos, size, style, name); } - ~wxSashWindow(); + virtual ~wxSashWindow(); bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = wxT("sashWindow")); diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h index a8bf2ae8a1..fa7393e8bc 100644 --- a/include/wx/generic/splash.h +++ b/include/wx/generic/splash.h @@ -43,7 +43,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP); - ~wxSplashScreen(); + virtual ~wxSplashScreen(); void OnCloseWindow(wxCloseEvent& event); void OnNotify(wxTimerEvent& event); diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h index 30cfeaf587..c24ed23ce5 100644 --- a/include/wx/generic/tabg.h +++ b/include/wx/generic/tabg.h @@ -32,7 +32,7 @@ class WXDLLEXPORT wxTabControl: public wxObject DECLARE_DYNAMIC_CLASS(wxTabControl) public: wxTabControl(wxTabView *v = (wxTabView *) NULL); - ~wxTabControl(void); + virtual ~wxTabControl(void); virtual void OnDraw(wxDC& dc, bool lastInRow); void SetLabel(const wxString& str) { m_controlLabel = str; } @@ -99,7 +99,7 @@ class WXDLLEXPORT wxTabView: public wxObject DECLARE_DYNAMIC_CLASS(wxTabView) public: wxTabView(long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR); - ~wxTabView(); + virtual ~wxTabView(); inline int GetNumberOfLayers() const { return m_layers.GetCount(); } #if WXWIN_COMPATIBILITY_2_4 @@ -270,87 +270,93 @@ protected: * A dialog box class that is tab-friendly */ -class WXDLLEXPORT wxTabbedDialog: public wxDialog +class WXDLLEXPORT wxTabbedDialog : public wxDialog { -DECLARE_DYNAMIC_CLASS(wxTabbedDialog) + DECLARE_DYNAMIC_CLASS(wxTabbedDialog) public: - - wxTabbedDialog(wxWindow *parent, wxWindowID id, const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long windowStyle = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr); - ~wxTabbedDialog(void); - - inline wxTabView *GetTabView() const { return m_tabView; } - inline void SetTabView(wxTabView *v) { m_tabView = v; } - - void OnCloseWindow(wxCloseEvent& event); - void OnMouseEvent(wxMouseEvent& event); - void OnPaint(wxPaintEvent& event); + wxTabbedDialog(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long windowStyle = wxDEFAULT_DIALOG_STYLE, + const wxString& name = wxDialogNameStr); + virtual ~wxTabbedDialog(); + + wxTabView *GetTabView() const { return m_tabView; } + void SetTabView(wxTabView *v) { m_tabView = v; } + + void OnCloseWindow(wxCloseEvent& event); + void OnMouseEvent(wxMouseEvent& event); + void OnPaint(wxPaintEvent& event); protected: - wxTabView* m_tabView; + wxTabView* m_tabView; -DECLARE_EVENT_TABLE() +private: + DECLARE_EVENT_TABLE() }; /* * A panel class that is tab-friendly */ -class WXDLLEXPORT wxTabbedPanel: public wxPanel +class WXDLLEXPORT wxTabbedPanel : public wxPanel { -DECLARE_DYNAMIC_CLASS(wxTabbedPanel) + DECLARE_DYNAMIC_CLASS(wxTabbedPanel) public: + wxTabbedPanel(wxWindow *parent, + wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long windowStyle = 0, + const wxString& name = wxPanelNameStr); + virtual ~wxTabbedPanel(); - wxTabbedPanel(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long windowStyle = 0, const wxString& name = wxPanelNameStr); - ~wxTabbedPanel(void); - - inline wxTabView *GetTabView() const { return m_tabView; } - inline void SetTabView(wxTabView *v) { m_tabView = v; } + wxTabView *GetTabView() const { return m_tabView; } + void SetTabView(wxTabView *v) { m_tabView = v; } - void OnMouseEvent(wxMouseEvent& event); - void OnPaint(wxPaintEvent& event); + void OnMouseEvent(wxMouseEvent& event); + void OnPaint(wxPaintEvent& event); protected: - wxTabView* m_tabView; + wxTabView* m_tabView; -DECLARE_EVENT_TABLE() +private: + DECLARE_EVENT_TABLE() }; WX_DECLARE_HASH_MAP(int, wxWindow*, wxIntegerHash, wxIntegerEqual, wxIntToWindowHashMap); -class WXDLLEXPORT wxPanelTabView: public wxTabView +class WXDLLEXPORT wxPanelTabView : public wxTabView { -DECLARE_DYNAMIC_CLASS(wxPanelTabView) + DECLARE_DYNAMIC_CLASS(wxPanelTabView) + public: - wxPanelTabView(wxPanel *pan, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR); - ~wxPanelTabView(void); + wxPanelTabView(wxPanel *pan, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR); + virtual ~wxPanelTabView(void); - // Called when a tab is activated - virtual void OnTabActivate(int activateId, int deactivateId); + // Called when a tab is activated + virtual void OnTabActivate(int activateId, int deactivateId); - // Specific to this class - void AddTabWindow(int id, wxWindow *window); - wxWindow *GetTabWindow(int id) const ; - void ClearWindows(bool deleteWindows = true); - inline wxWindow *GetCurrentWindow() const { return m_currentWindow; } + // Specific to this class + void AddTabWindow(int id, wxWindow *window); + wxWindow *GetTabWindow(int id) const ; + void ClearWindows(bool deleteWindows = true); + wxWindow *GetCurrentWindow() const { return m_currentWindow; } - void ShowWindowForTab(int id); - // inline wxList& GetWindows() const { return (wxList&) m_tabWindows; } + void ShowWindowForTab(int id); + // wxList& GetWindows() const { return (wxList&) m_tabWindows; } protected: - // List of panels, one for each tab. Indexed - // by tab ID. - wxIntToWindowHashMap m_tabWindows; - wxWindow* m_currentWindow; - wxPanel* m_panel; + // List of panels, one for each tab. Indexed + // by tab ID. + wxIntToWindowHashMap m_tabWindows; + wxWindow* m_currentWindow; + wxPanel* m_panel; }; #endif diff --git a/include/wx/generic/timer.h b/include/wx/generic/timer.h index e184a1ea16..63f0ab1a63 100644 --- a/include/wx/generic/timer.h +++ b/include/wx/generic/timer.h @@ -23,7 +23,7 @@ public: wxTimer() { Init(); } wxTimer(wxEvtHandler *owner, int timerid = -1) : wxTimerBase(owner, timerid) { Init(); } - ~wxTimer(); + virtual ~wxTimer(); virtual bool Start(int millisecs = -1, bool oneShot = false); virtual void Stop(); diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index 18c1a5305a..21d6bcd286 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -26,7 +26,7 @@ public: wxMask( const wxBitmap& bitmap, int paletteIndex ); #endif // wxUSE_PALETTE wxMask( const wxBitmap& bitmap ); - ~wxMask(); + virtual ~wxMask(); bool Create( const wxBitmap& bitmap, const wxColour& colour ); #if wxUSE_PALETTE @@ -57,7 +57,7 @@ public: wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); } wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); } - ~wxBitmap(); + virtual ~wxBitmap(); bool operator == ( const wxBitmap& bmp ) const; bool operator != ( const wxBitmap& bmp ) const; bool Ok() const; diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h index 6a92478809..47ebc69caa 100644 --- a/include/wx/gtk/brush.h +++ b/include/wx/gtk/brush.h @@ -24,7 +24,7 @@ public: wxBrush( const wxColour &colour, int style = wxSOLID ); wxBrush( const wxBitmap &stippleBitmap ); - ~wxBrush(); + virtual ~wxBrush(); bool Ok() const { return m_refData != NULL; } diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h index 4a3527f52c..172fb049d8 100644 --- a/include/wx/gtk/choice.h +++ b/include/wx/gtk/choice.h @@ -45,7 +45,7 @@ public: Create(parent, id, pos, size, choices, style, validator, name); } - ~wxChoice(); + virtual ~wxChoice(); bool Create( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, diff --git a/include/wx/gtk/clipbrd.h b/include/wx/gtk/clipbrd.h index c831e3cc18..6f9083dde2 100644 --- a/include/wx/gtk/clipbrd.h +++ b/include/wx/gtk/clipbrd.h @@ -18,7 +18,7 @@ class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase { public: wxClipboard(); - ~wxClipboard(); + virtual ~wxClipboard(); // open the clipboard before SetData() and GetData() virtual bool Open(); diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index 25ef5e9d82..8eaa38e963 100644 --- a/include/wx/gtk/colour.h +++ b/include/wx/gtk/colour.h @@ -25,7 +25,7 @@ public: DEFINE_STD_WXCOLOUR_CONSTRUCTORS wxColour(const GdkColor& gdkColor); - ~wxColour(); + virtual ~wxColour(); bool Ok() const { return m_refData != NULL; } diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h index e74e589182..f8540a2bd8 100644 --- a/include/wx/gtk/combobox.h +++ b/include/wx/gtk/combobox.h @@ -42,7 +42,7 @@ public: Create(parent, id, value, pos, size, choices, style, validator, name); } - ~wxComboBox(); + virtual ~wxComboBox(); bool Create(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h index f673ab3ae2..ef1a252726 100644 --- a/include/wx/gtk/cursor.h +++ b/include/wx/gtk/cursor.h @@ -31,7 +31,7 @@ public: wxCursor( const char bits[], int width, int height, int hotSpotX=-1, int hotSpotY=-1, const char maskBits[] = NULL, const wxColour *fg = NULL, const wxColour *bg = NULL ); - ~wxCursor(); + virtual ~wxCursor(); bool operator == ( const wxCursor& cursor ) const; bool operator != ( const wxCursor& cursor ) const; bool Ok() const; diff --git a/include/wx/gtk/dataobj2.h b/include/wx/gtk/dataobj2.h index afb922c85b..50f177cf65 100644 --- a/include/wx/gtk/dataobj2.h +++ b/include/wx/gtk/dataobj2.h @@ -23,7 +23,7 @@ public: wxBitmapDataObject(const wxBitmap& bitmap); // destr - ~wxBitmapDataObject(); + virtual ~wxBitmapDataObject(); // override base class virtual to update PNG data too virtual void SetBitmap(const wxBitmap& bitmap); diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h index 9afb521ac9..3d650b3cac 100644 --- a/include/wx/gtk/dataview.h +++ b/include/wx/gtk/dataview.h @@ -85,7 +85,7 @@ public: wxDataViewCustomCell( const wxString &varianttype = wxT("string"), wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, bool no_init = false ); - ~wxDataViewCustomCell(); + virtual ~wxDataViewCustomCell(); bool Init(); virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0; @@ -125,7 +125,7 @@ public: wxDataViewProgressCell( const wxString &label = wxEmptyString, const wxString &varianttype = wxT("long"), wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT ); - ~wxDataViewProgressCell(); + virtual ~wxDataViewProgressCell(); bool SetValue( const wxVariant &value ); diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h index ea4b5b3e88..9534317f42 100644 --- a/include/wx/gtk/dc.h +++ b/include/wx/gtk/dc.h @@ -70,7 +70,7 @@ class WXDLLIMPEXP_CORE wxDC : public wxDCBase { public: wxDC(); - ~wxDC() { } + virtual ~wxDC() { } #if wxUSE_PALETTE void SetColourMap( const wxPalette& palette ) { SetPalette(palette); }; diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h index e950326b95..b6b80af1ad 100644 --- a/include/wx/gtk/dcmemory.h +++ b/include/wx/gtk/dcmemory.h @@ -28,7 +28,7 @@ class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC public: wxMemoryDC(); wxMemoryDC( wxDC *dc ); // Create compatible DC - ~wxMemoryDC(); + virtual ~wxMemoryDC(); virtual void SelectObject( const wxBitmap& bitmap ); // these get reimplemented for mono-bitmaps to behave diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h index 8bf37778ee..0269e17a23 100644 --- a/include/wx/gtk/dialog.h +++ b/include/wx/gtk/dialog.h @@ -45,7 +45,7 @@ public: const wxSize &size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr ); - ~wxDialog() {} + virtual ~wxDialog() {} virtual bool Show( bool show = TRUE ); virtual int ShowModal(); diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index 59d2b41f6e..94b5d36009 100644 --- a/include/wx/gtk/font.h +++ b/include/wx/gtk/font.h @@ -49,7 +49,7 @@ public: // wxGTK-specific bool Create(const wxString& fontname); - ~wxFont(); + virtual ~wxFont(); // implement base class pure virtuals virtual int GetPointSize() const; diff --git a/include/wx/gtk/glcanvas.h b/include/wx/gtk/glcanvas.h index 9619864f94..1dd9dd5d6f 100644 --- a/include/wx/gtk/glcanvas.h +++ b/include/wx/gtk/glcanvas.h @@ -66,7 +66,7 @@ public: const wxPalette& WXUNUSED(palette), const wxGLContext *other /* for sharing display lists */ ); - ~wxGLContext(); + virtual ~wxGLContext(); void SetCurrent(); void SetColour(const wxChar *colour); @@ -138,7 +138,7 @@ public: int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette ); - ~wxGLCanvas(); + virtual ~wxGLCanvas(); void SetCurrent(); void SetColour(const wxChar *colour); diff --git a/include/wx/gtk/gnome/gprint.h b/include/wx/gtk/gnome/gprint.h index eb5764a170..328d5ab2d3 100644 --- a/include/wx/gtk/gnome/gprint.h +++ b/include/wx/gtk/gnome/gprint.h @@ -98,7 +98,7 @@ public: wxGnomePrintDialog( wxWindow *parent, wxPrintDialogData* data = NULL ); wxGnomePrintDialog( wxWindow *parent, wxPrintData* data); - ~wxGnomePrintDialog(); + virtual ~wxGnomePrintDialog(); wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); } @@ -138,7 +138,7 @@ class wxGnomePageSetupDialog: public wxPageSetupDialogBase public: wxGnomePageSetupDialog( wxWindow *parent, wxPageSetupDialogData* data = NULL ); - ~wxGnomePageSetupDialog(); + virtual ~wxGnomePageSetupDialog(); virtual wxPageSetupDialogData& GetPageSetupDialogData(); @@ -198,7 +198,7 @@ class wxGnomePrintDC: public wxDC { public: wxGnomePrintDC( wxGnomePrinter *printer ); - ~wxGnomePrintDC(); + virtual ~wxGnomePrintDC(); bool Ok() const; diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h index 0fca26b942..9a84aeb815 100644 --- a/include/wx/gtk/mdi.h +++ b/include/wx/gtk/mdi.h @@ -33,7 +33,7 @@ public: (void)Create(parent, id, title, pos, size, style, name); } - ~wxMDIParentFrame(); + virtual ~wxMDIParentFrame(); bool Create( wxWindow *parent, wxWindowID id, const wxString& title, @@ -183,7 +183,7 @@ class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow public: wxMDIClientWindow(); wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 ); - ~wxMDIClientWindow(); + virtual ~wxMDIClientWindow(); virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL ); private: diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h index b6f403e0a2..7ac723e239 100644 --- a/include/wx/gtk/menuitem.h +++ b/include/wx/gtk/menuitem.h @@ -25,7 +25,7 @@ public: const wxString& help = wxEmptyString, wxItemKind kind = wxITEM_NORMAL, wxMenu *subMenu = (wxMenu *)NULL); - ~wxMenuItem(); + virtual ~wxMenuItem(); // implement base class virtuals virtual void SetText( const wxString& str ); diff --git a/include/wx/gtk/msgdlg.h b/include/wx/gtk/msgdlg.h index dbbcf9eb93..58f2403194 100644 --- a/include/wx/gtk/msgdlg.h +++ b/include/wx/gtk/msgdlg.h @@ -27,7 +27,7 @@ public: const wxString& caption = wxMessageBoxCaptionStr, long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition); - ~wxMessageDialog(); + virtual ~wxMessageDialog(); int ShowModal(); virtual bool Show( bool WXUNUSED(show) = true ) { return false; }; diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h index 56927ff21b..44a80105e0 100644 --- a/include/wx/gtk/pen.h +++ b/include/wx/gtk/pen.h @@ -25,7 +25,7 @@ public: wxPen() { } wxPen( const wxColour &colour, int width = 1, int style = wxSOLID ); - ~wxPen(); + virtual ~wxPen(); bool Ok() const { return m_refData != NULL; } diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h index db25989eb6..50aa865bd3 100644 --- a/include/wx/gtk/region.h +++ b/include/wx/gtk/region.h @@ -64,7 +64,7 @@ public: Union(bmp, transColour, tolerance); } - ~wxRegion(); + virtual ~wxRegion(); bool Ok() const { return m_refData != NULL; } diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h index 3f94c5c062..81cf28aad1 100644 --- a/include/wx/gtk/scrolbar.h +++ b/include/wx/gtk/scrolbar.h @@ -41,7 +41,7 @@ public: long style = wxSB_HORIZONTAL, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxScrollBarNameStr ); - ~wxScrollBar(); + virtual ~wxScrollBar(); int GetThumbPosition() const; int GetThumbSize() const; int GetPageSize() const; diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h index f22b710ee5..17c7006d41 100644 --- a/include/wx/gtk/textctrl.h +++ b/include/wx/gtk/textctrl.h @@ -28,7 +28,7 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString &name = wxTextCtrlNameStr); - ~wxTextCtrl(); + virtual ~wxTextCtrl(); bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/gtk/timer.h b/include/wx/gtk/timer.h index f35a07a7f8..010c631632 100644 --- a/include/wx/gtk/timer.h +++ b/include/wx/gtk/timer.h @@ -20,7 +20,7 @@ public: wxTimer() { Init(); } wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id) { Init(); } - ~wxTimer(); + virtual ~wxTimer(); virtual bool Start( int millisecs = -1, bool oneShot = FALSE ); virtual void Stop(); diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h index 8640396da0..21dc2c07d2 100644 --- a/include/wx/gtk1/bitmap.h +++ b/include/wx/gtk1/bitmap.h @@ -40,7 +40,7 @@ public: wxMask( const wxBitmap& bitmap, int paletteIndex ); #endif // wxUSE_PALETTE wxMask( const wxBitmap& bitmap ); - ~wxMask(); + virtual ~wxMask(); bool Create( const wxBitmap& bitmap, const wxColour& colour ); #if wxUSE_PALETTE @@ -71,7 +71,7 @@ public: wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); } wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); } - ~wxBitmap(); + virtual ~wxBitmap(); bool operator == ( const wxBitmap& bmp ) const; bool operator != ( const wxBitmap& bmp ) const; bool Ok() const; diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h index eb425d067e..f6efa7c8b5 100644 --- a/include/wx/gtk1/brush.h +++ b/include/wx/gtk1/brush.h @@ -34,7 +34,7 @@ public: wxBrush( const wxColour &colour, int style = wxSOLID ); wxBrush( const wxBitmap &stippleBitmap ); - ~wxBrush(); + virtual ~wxBrush(); bool Ok() const { return m_refData != NULL; } diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h index 7369005ed9..01539cbf10 100644 --- a/include/wx/gtk1/choice.h +++ b/include/wx/gtk1/choice.h @@ -45,7 +45,7 @@ public: Create(parent, id, pos, size, choices, style, validator, name); } - ~wxChoice(); + virtual ~wxChoice(); bool Create( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, diff --git a/include/wx/gtk1/clipbrd.h b/include/wx/gtk1/clipbrd.h index 8d17cdc6f4..c5cda19136 100644 --- a/include/wx/gtk1/clipbrd.h +++ b/include/wx/gtk1/clipbrd.h @@ -27,7 +27,7 @@ class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase { public: wxClipboard(); - ~wxClipboard(); + virtual ~wxClipboard(); // open the clipboard before SetData() and GetData() virtual bool Open(); diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h index c09dfe5ef1..4fc19fc767 100644 --- a/include/wx/gtk1/colour.h +++ b/include/wx/gtk1/colour.h @@ -41,7 +41,7 @@ public: wxColour() { } DEFINE_STD_WXCOLOUR_CONSTRUCTORS - ~wxColour(); + virtual ~wxColour(); virtual bool FromString(const wxChar *str); diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h index 2e85af60cf..73d7eb06d6 100644 --- a/include/wx/gtk1/combobox.h +++ b/include/wx/gtk1/combobox.h @@ -61,7 +61,7 @@ public: Create(parent, id, value, pos, size, choices, style, validator, name); } - ~wxComboBox(); + virtual ~wxComboBox(); bool Create(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, diff --git a/include/wx/gtk1/cursor.h b/include/wx/gtk1/cursor.h index cdc2717854..71e36b2a53 100644 --- a/include/wx/gtk1/cursor.h +++ b/include/wx/gtk1/cursor.h @@ -34,7 +34,7 @@ public: wxCursor( const char bits[], int width, int height, int hotSpotX=-1, int hotSpotY=-1, const char maskBits[] = NULL, const wxColour *fg = NULL, const wxColour *bg = NULL ); - ~wxCursor(); + virtual ~wxCursor(); bool operator == ( const wxCursor& cursor ) const; bool operator != ( const wxCursor& cursor ) const; bool Ok() const; diff --git a/include/wx/gtk1/dataobj2.h b/include/wx/gtk1/dataobj2.h index 9672274e2f..8f0e07fe7c 100644 --- a/include/wx/gtk1/dataobj2.h +++ b/include/wx/gtk1/dataobj2.h @@ -23,7 +23,7 @@ public: wxBitmapDataObject(const wxBitmap& bitmap); // destr - ~wxBitmapDataObject(); + virtual ~wxBitmapDataObject(); // override base class virtual to update PNG data too virtual void SetBitmap(const wxBitmap& bitmap); diff --git a/include/wx/gtk1/dc.h b/include/wx/gtk1/dc.h index f7023538ab..418ef426b0 100644 --- a/include/wx/gtk1/dc.h +++ b/include/wx/gtk1/dc.h @@ -39,7 +39,7 @@ class WXDLLIMPEXP_CORE wxDC : public wxDCBase { public: wxDC(); - ~wxDC() { } + virtual ~wxDC() { } #if wxUSE_PALETTE void SetColourMap( const wxPalette& palette ) { SetPalette(palette); }; diff --git a/include/wx/gtk1/dcmemory.h b/include/wx/gtk1/dcmemory.h index d4f5f4875f..c998df979e 100644 --- a/include/wx/gtk1/dcmemory.h +++ b/include/wx/gtk1/dcmemory.h @@ -28,7 +28,7 @@ class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC public: wxMemoryDC(); wxMemoryDC( wxDC *dc ); // Create compatible DC - ~wxMemoryDC(); + virtual ~wxMemoryDC(); virtual void SelectObject( const wxBitmap& bitmap ); void DoGetSize( int *width, int *height ) const; diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h index 6aac74cb96..da34a90902 100644 --- a/include/wx/gtk1/dialog.h +++ b/include/wx/gtk1/dialog.h @@ -45,7 +45,7 @@ public: const wxSize &size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr ); - ~wxDialog() {} + virtual ~wxDialog() {} void OnApply( wxCommandEvent &event ); void OnCancel( wxCommandEvent &event ); diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h index e6033d971a..8f17e61493 100644 --- a/include/wx/gtk1/font.h +++ b/include/wx/gtk1/font.h @@ -62,7 +62,7 @@ public: // wxGTK-specific bool Create(const wxString& fontname); - ~wxFont(); + virtual ~wxFont(); // implement base class pure virtuals virtual int GetPointSize() const; diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h index 1dd103cfc1..ce59b1ad67 100644 --- a/include/wx/gtk1/glcanvas.h +++ b/include/wx/gtk1/glcanvas.h @@ -66,7 +66,7 @@ public: const wxPalette& WXUNUSED(palette), const wxGLContext *other /* for sharing display lists */ ); - ~wxGLContext(); + virtual ~wxGLContext(); void SetCurrent(); void SetColour(const wxChar *colour); @@ -138,7 +138,7 @@ public: int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette ); - ~wxGLCanvas(); + virtual ~wxGLCanvas(); void SetCurrent(); void SetColour(const wxChar *colour); diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h index eee60c7029..6a248897a0 100644 --- a/include/wx/gtk1/mdi.h +++ b/include/wx/gtk1/mdi.h @@ -54,7 +54,7 @@ public: (void)Create(parent, id, title, pos, size, style, name); } - ~wxMDIParentFrame(); + virtual ~wxMDIParentFrame(); bool Create( wxWindow *parent, wxWindowID id, const wxString& title, @@ -204,7 +204,7 @@ class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow public: wxMDIClientWindow(); wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 ); - ~wxMDIClientWindow(); + virtual ~wxMDIClientWindow(); virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL ); private: diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h index 19a3a045a5..95312d428c 100644 --- a/include/wx/gtk1/menuitem.h +++ b/include/wx/gtk1/menuitem.h @@ -25,7 +25,7 @@ public: const wxString& help = wxEmptyString, wxItemKind kind = wxITEM_NORMAL, wxMenu *subMenu = (wxMenu *)NULL); - ~wxMenuItem(); + virtual ~wxMenuItem(); // implement base class virtuals virtual void SetText( const wxString& str ); diff --git a/include/wx/gtk1/msgdlg.h b/include/wx/gtk1/msgdlg.h index f335b676aa..2e2879af5e 100644 --- a/include/wx/gtk1/msgdlg.h +++ b/include/wx/gtk1/msgdlg.h @@ -27,7 +27,7 @@ public: const wxString& caption = wxMessageBoxCaptionStr, long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition); - ~wxMessageDialog(); + virtual ~wxMessageDialog(); int ShowModal(); virtual bool Show( bool WXUNUSED(show) = true ) { return false; }; diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h index fe95ad1003..dac2e0ff79 100644 --- a/include/wx/gtk1/pen.h +++ b/include/wx/gtk1/pen.h @@ -38,7 +38,7 @@ public: wxPen() { } wxPen( const wxColour &colour, int width = 1, int style = wxSOLID ); - ~wxPen(); + virtual ~wxPen(); bool Ok() const { return m_refData != NULL; } diff --git a/include/wx/gtk1/region.h b/include/wx/gtk1/region.h index 12a5b207bf..fb1697fc32 100644 --- a/include/wx/gtk1/region.h +++ b/include/wx/gtk1/region.h @@ -71,7 +71,7 @@ public: Union(bmp, transColour, tolerance); } - ~wxRegion(); + virtual ~wxRegion(); bool Ok() const { return m_refData != NULL; } diff --git a/include/wx/gtk1/scrolbar.h b/include/wx/gtk1/scrolbar.h index 9ddd84763e..2950e85ce5 100644 --- a/include/wx/gtk1/scrolbar.h +++ b/include/wx/gtk1/scrolbar.h @@ -42,7 +42,7 @@ public: long style = wxSB_HORIZONTAL, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxScrollBarNameStr ); - ~wxScrollBar(); + virtual ~wxScrollBar(); int GetThumbPosition() const; int GetThumbSize() const; int GetPageSize() const; diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h index 29158f1e42..c34e71de27 100644 --- a/include/wx/gtk1/textctrl.h +++ b/include/wx/gtk1/textctrl.h @@ -28,7 +28,7 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString &name = wxTextCtrlNameStr); - ~wxTextCtrl(); + virtual ~wxTextCtrl(); bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/gtk1/timer.h b/include/wx/gtk1/timer.h index ec715f932c..1f78b5de53 100644 --- a/include/wx/gtk1/timer.h +++ b/include/wx/gtk1/timer.h @@ -20,7 +20,7 @@ public: wxTimer() { Init(); } wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id) { Init(); } - ~wxTimer(); + virtual ~wxTimer(); virtual bool Start( int millisecs = -1, bool oneShot = FALSE ); virtual void Stop(); diff --git a/include/wx/hash.h b/include/wx/hash.h index 07ece7d0aa..a85d83c83b 100644 --- a/include/wx/hash.h +++ b/include/wx/hash.h @@ -426,7 +426,7 @@ public: wxHashTable(int the_key_type = wxKEY_INTEGER, int size = wxHASH_SIZE_DEFAULT); - ~wxHashTable(); + virtual ~wxHashTable(); // copy ctor and assignment operator wxHashTable(const wxHashTable& table) : wxObject() @@ -542,7 +542,7 @@ private: size_t size = wxHASH_SIZE_DEFAULT) \ { Create(keyType, size); } \ \ - ~hashclass() { Destroy(); } \ + virtual ~hashclass() { Destroy(); } \ \ void Put(long key, long val, eltype *data) { DoPut(key, val, data); } \ void Put(long key, eltype *data) { DoPut(key, key, data); } \ diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h index a330095139..02eb64c8fa 100644 --- a/include/wx/html/helpdata.h +++ b/include/wx/html/helpdata.h @@ -131,7 +131,7 @@ class WXDLLIMPEXP_HTML wxHtmlSearchEngine : public wxObject { public: wxHtmlSearchEngine() : wxObject() {} - ~wxHtmlSearchEngine() {} + virtual ~wxHtmlSearchEngine() {} // Sets the keyword we will be searching for virtual void LookFor(const wxString& keyword, bool case_sensitive, bool whole_words_only); @@ -193,7 +193,7 @@ class WXDLLIMPEXP_HTML wxHtmlHelpData : public wxObject public: wxHtmlHelpData(); - ~wxHtmlHelpData(); + virtual ~wxHtmlHelpData(); // Sets directory where temporary files are stored. // These temp files are index & contents file in binary (much faster to read) diff --git a/include/wx/html/helpdlg.h b/include/wx/html/helpdlg.h index 16af1ecf92..832224824c 100644 --- a/include/wx/html/helpdlg.h +++ b/include/wx/html/helpdlg.h @@ -44,7 +44,7 @@ public: wxHtmlHelpDialog(wxWindow* parent, wxWindowID wxWindowID, const wxString& title = wxEmptyString, int style = wxHF_DEFAULT_STYLE, wxHtmlHelpData* data = NULL); - ~wxHtmlHelpDialog(); + virtual ~wxHtmlHelpDialog(); bool Create(wxWindow* parent, wxWindowID id, const wxString& title = wxEmptyString, int style = wxHF_DEFAULT_STYLE); diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h index 4735ed9391..f543ee41a8 100644 --- a/include/wx/html/helpfrm.h +++ b/include/wx/html/helpfrm.h @@ -77,7 +77,7 @@ public: int style = wxHF_DEFAULT_STYLE, wxHtmlHelpData* data = NULL); bool Create(wxWindow* parent, wxWindowID id, const wxString& title = wxEmptyString, int style = wxHF_DEFAULT_STYLE); - ~wxHtmlHelpFrame(); + virtual ~wxHtmlHelpFrame(); /// Returns the data associated with the window. wxHtmlHelpData* GetData() { return m_Data; } diff --git a/include/wx/html/helpwnd.h b/include/wx/html/helpwnd.h index be0bc67cd5..2e718c3fb5 100644 --- a/include/wx/html/helpwnd.h +++ b/include/wx/html/helpwnd.h @@ -91,7 +91,7 @@ public: const wxSize& size = wxDefaultSize, int style = wxTAB_TRAVERSAL|wxNO_BORDER, int helpStyle = wxHF_DEFAULT_STYLE); - ~wxHtmlHelpWindow(); + virtual ~wxHtmlHelpWindow(); wxHtmlHelpData* GetData() { return m_Data; } wxHtmlHelpController* GetController() const { return m_helpController; } diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h index 0395a8d82d..e0203bf9c1 100644 --- a/include/wx/html/htmlcell.h +++ b/include/wx/html/htmlcell.h @@ -403,7 +403,7 @@ class WXDLLIMPEXP_HTML wxHtmlContainerCell : public wxHtmlCell { public: wxHtmlContainerCell(wxHtmlContainerCell *parent); - ~wxHtmlContainerCell(); + virtual ~wxHtmlContainerCell(); virtual void Layout(int w); virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, @@ -593,7 +593,7 @@ public: // it's width according to parent container's width // (w is percent of parent's width) wxHtmlWidgetCell(wxWindow *wnd, int w = 0); - ~wxHtmlWidgetCell() { m_Wnd->Destroy(); } + virtual ~wxHtmlWidgetCell() { m_Wnd->Destroy(); } virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info); virtual void DrawInvisible(wxDC& dc, int x, int y, diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h index d598176767..b73ffc7441 100644 --- a/include/wx/html/htmltag.h +++ b/include/wx/html/htmltag.h @@ -39,7 +39,7 @@ private: public: wxHtmlTagsCache() : wxObject() {m_CacheSize = 0; m_Cache = NULL;} wxHtmlTagsCache(const wxString& source); - ~wxHtmlTagsCache() {free(m_Cache);} + virtual ~wxHtmlTagsCache() {free(m_Cache);} // Finds parameters for tag starting at at and fills the variables void QueryTag(int at, int* end1, int* end2); @@ -68,7 +68,7 @@ protected: wxHtmlEntitiesParser *entParser); friend class wxHtmlParser; public: - ~wxHtmlTag(); + virtual ~wxHtmlTag(); wxHtmlTag *GetParent() const {return m_Parent;} wxHtmlTag *GetFirstSibling() const; diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h index 1930ade24f..f8338ab280 100644 --- a/include/wx/html/htmlwin.h +++ b/include/wx/html/htmlwin.h @@ -249,7 +249,7 @@ public: Init(); Create(parent, id, pos, size, style, name); } - ~wxHtmlWindow(); + virtual ~wxHtmlWindow(); bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h index dd6c2e0f79..da25bc2813 100644 --- a/include/wx/html/htmprint.h +++ b/include/wx/html/htmprint.h @@ -34,7 +34,7 @@ class WXDLLIMPEXP_HTML wxHtmlDCRenderer : public wxObject { public: wxHtmlDCRenderer(); - ~wxHtmlDCRenderer(); + virtual ~wxHtmlDCRenderer(); // Following 3 methods *must* be called before any call to Render: @@ -117,7 +117,7 @@ class WXDLLIMPEXP_HTML wxHtmlPrintout : public wxPrintout { public: wxHtmlPrintout(const wxString& title = wxT("Printout")); - ~wxHtmlPrintout(); + virtual ~wxHtmlPrintout(); void SetHtmlText(const wxString& html, const wxString &basepath = wxEmptyString, bool isdir = true); // prepares the class for printing this html document. @@ -217,7 +217,7 @@ class WXDLLIMPEXP_HTML wxHtmlEasyPrinting : public wxObject { public: wxHtmlEasyPrinting(const wxString& name = wxT("Printing"), wxWindow *parentWindow = NULL); - ~wxHtmlEasyPrinting(); + virtual ~wxHtmlEasyPrinting(); bool PreviewFile(const wxString &htmlfile); bool PreviewText(const wxString &htmltext, const wxString& basepath = wxEmptyString); diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h index f173ec1ba9..125183e0b0 100644 --- a/include/wx/html/winpars.h +++ b/include/wx/html/winpars.h @@ -41,7 +41,7 @@ class WXDLLIMPEXP_HTML wxHtmlWinParser : public wxHtmlParser public: wxHtmlWinParser(wxHtmlWindowInterface *wndIface = NULL); - ~wxHtmlWinParser(); + virtual ~wxHtmlWinParser(); virtual void InitParser(const wxString& source); virtual void DoneParser(); diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h index cfc442eb97..45f61b66f4 100644 --- a/include/wx/ipcbase.h +++ b/include/wx/ipcbase.h @@ -49,7 +49,7 @@ public: wxConnectionBase(wxChar *buffer, int size); // use external buffer wxConnectionBase(); // use internal, adaptive buffer wxConnectionBase(const wxConnectionBase& copy); - ~wxConnectionBase(void); + virtual ~wxConnectionBase(void); void SetConnected( bool c ) { m_connected = c; } bool GetConnected() { return m_connected; } diff --git a/include/wx/layout.h b/include/wx/layout.h index 2af9f146a8..62655782b8 100644 --- a/include/wx/layout.h +++ b/include/wx/layout.h @@ -71,7 +71,7 @@ public: // note that default copy ctor and assignment operators are ok - ~wxIndividualLayoutConstraint(){} + virtual ~wxIndividualLayoutConstraint(){} void Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val = 0, int marg = wxLAYOUT_DEFAULT_MARGIN); @@ -174,7 +174,7 @@ public: // note that default copy ctor and assignment operators are ok - ~wxLayoutConstraints(){} + virtual ~wxLayoutConstraints(){} bool SatisfyConstraints(wxWindowBase *win, int *noChanges); bool AreSatisfied() const diff --git a/include/wx/mac/carbon/accel.h b/include/wx/mac/carbon/accel.h index 9702282af9..e2b2e58b0a 100644 --- a/include/wx/mac/carbon/accel.h +++ b/include/wx/mac/carbon/accel.h @@ -22,7 +22,7 @@ public: wxAcceleratorTable(); wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array - ~wxAcceleratorTable(); + virtual ~wxAcceleratorTable(); bool operator == (const wxAcceleratorTable& accel) const { return m_refData == accel.m_refData; } diff --git a/include/wx/mac/carbon/bitmap.h b/include/wx/mac/carbon/bitmap.h index 29772d299b..fbeceb2993 100644 --- a/include/wx/mac/carbon/bitmap.h +++ b/include/wx/mac/carbon/bitmap.h @@ -49,7 +49,7 @@ public: // implementation helper only : construct a mask from a 32 bit memory buffer wxMask(const wxMemoryBuffer& buf, int width , int height , int bytesPerRow ) ; - ~wxMask(); + virtual ~wxMask(); bool Create(const wxBitmap& bitmap, const wxColour& colour); bool Create(const wxBitmap& bitmap); @@ -127,7 +127,7 @@ public: // Convert from wxIcon wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); } - ~wxBitmap(); + virtual ~wxBitmap(); wxImage ConvertToImage() const; diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h index 31b9593ab0..24e9c68219 100644 --- a/include/wx/mac/carbon/brush.h +++ b/include/wx/mac/carbon/brush.h @@ -35,7 +35,7 @@ public: wxBrush(short macThemeBrush ) ; wxBrush(const wxColour& col, int style = wxSOLID); wxBrush(const wxBitmap& stipple); - ~wxBrush(); + virtual ~wxBrush(); virtual void SetColour(const wxColour& col) ; virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ; diff --git a/include/wx/mac/carbon/clipbrd.h b/include/wx/mac/carbon/clipbrd.h index 36e47b9318..f484bbd7d3 100644 --- a/include/wx/mac/carbon/clipbrd.h +++ b/include/wx/mac/carbon/clipbrd.h @@ -32,7 +32,7 @@ class WXDLLEXPORT wxClipboard : public wxClipboardBase public: wxClipboard(); - ~wxClipboard(); + virtual ~wxClipboard(); // open the clipboard before SetData() and GetData() virtual bool Open(); diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h index 2cad2126ee..219761c48f 100644 --- a/include/wx/mac/carbon/colour.h +++ b/include/wx/mac/carbon/colour.h @@ -27,7 +27,7 @@ public: DEFINE_STD_WXCOLOUR_CONSTRUCTORS // dtor - ~wxColour(); + virtual ~wxColour(); // accessors bool Ok() const {return m_isInit; } diff --git a/include/wx/mac/carbon/cursor.h b/include/wx/mac/carbon/cursor.h index cf62dbf40a..33d8ef8cf5 100644 --- a/include/wx/mac/carbon/cursor.h +++ b/include/wx/mac/carbon/cursor.h @@ -32,7 +32,7 @@ public: int hotSpotX = 0, int hotSpotY = 0); wxCursor(int cursor_type); - ~wxCursor(); + virtual ~wxCursor(); bool CreateFromXpm(const char **bits) ; virtual bool Ok() const ; diff --git a/include/wx/mac/carbon/dataobj.h b/include/wx/mac/carbon/dataobj.h index fa4e139f5f..fa1aa17600 100644 --- a/include/wx/mac/carbon/dataobj.h +++ b/include/wx/mac/carbon/dataobj.h @@ -21,7 +21,7 @@ class WXDLLEXPORT wxDataObject : public wxDataObjectBase public: wxDataObject(); #ifdef __DARWIN__ - ~wxDataObject() { } + virtual ~wxDataObject() { } #endif virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const; diff --git a/include/wx/mac/carbon/dataobj2.h b/include/wx/mac/carbon/dataobj2.h index e9b95865ac..b647d2a465 100644 --- a/include/wx/mac/carbon/dataobj2.h +++ b/include/wx/mac/carbon/dataobj2.h @@ -24,7 +24,7 @@ public: wxBitmapDataObject(const wxBitmap& bitmap); // destr - ~wxBitmapDataObject(); + virtual ~wxBitmapDataObject(); // override base class virtual to update PNG data too virtual void SetBitmap(const wxBitmap& bitmap); diff --git a/include/wx/mac/carbon/dc.h b/include/wx/mac/carbon/dc.h index 6080697290..b3217d919f 100644 --- a/include/wx/mac/carbon/dc.h +++ b/include/wx/mac/carbon/dc.h @@ -81,7 +81,7 @@ class WXDLLEXPORT wxDC: public wxDCBase public: wxDC(); - ~wxDC(); + virtual ~wxDC(); // implement base class pure virtuals // ---------------------------------- diff --git a/include/wx/mac/carbon/dcclient.h b/include/wx/mac/carbon/dcclient.h index 993e01dacd..a62be04d31 100644 --- a/include/wx/mac/carbon/dcclient.h +++ b/include/wx/mac/carbon/dcclient.h @@ -31,7 +31,7 @@ class WXDLLEXPORT wxWindowDC: public wxDC // Create a DC corresponding to a canvas wxWindowDC(wxWindow *win); - ~wxWindowDC(void); + virtual ~wxWindowDC(void); protected : virtual void DoGetSize( int *width, int *height ) const; wxWindow *m_window; @@ -48,7 +48,7 @@ class WXDLLEXPORT wxClientDC: public wxWindowDC // Create a DC corresponding to a canvas wxClientDC(wxWindow *win); - ~wxClientDC(void); + virtual ~wxClientDC(void); protected: virtual void DoGetSize( int *width, int *height ) const; @@ -64,7 +64,7 @@ class WXDLLEXPORT wxPaintDC: public wxWindowDC // Create a DC corresponding to a canvas wxPaintDC(wxWindow *win); - ~wxPaintDC(void); + virtual ~wxPaintDC(void); protected: virtual void DoGetSize( int *width, int *height ) const; diff --git a/include/wx/mac/carbon/dcmemory.h b/include/wx/mac/carbon/dcmemory.h index b5103a8e6e..bc6f99ee3a 100644 --- a/include/wx/mac/carbon/dcmemory.h +++ b/include/wx/mac/carbon/dcmemory.h @@ -21,7 +21,7 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC public: wxMemoryDC(void); wxMemoryDC( wxDC *dc ); // Create compatible DC - ~wxMemoryDC(void); + virtual ~wxMemoryDC(void); virtual void SelectObject( const wxBitmap& bitmap ); wxBitmap GetSelectedObject() { return m_selected ; } diff --git a/include/wx/mac/carbon/dcprint.h b/include/wx/mac/carbon/dcprint.h index 2cfdd1a814..2a5da88252 100644 --- a/include/wx/mac/carbon/dcprint.h +++ b/include/wx/mac/carbon/dcprint.h @@ -25,7 +25,7 @@ class WXDLLEXPORT wxPrinterDC: public wxDC // Create a printer DC wxPrinterDC(const wxPrintData& printdata ); - ~wxPrinterDC(); + virtual ~wxPrinterDC(); virtual bool StartDoc( const wxString& WXUNUSED(message) ) ; virtual void EndDoc(void) ; diff --git a/include/wx/mac/carbon/dcscreen.h b/include/wx/mac/carbon/dcscreen.h index c1da01e7ef..4e2ed0511f 100644 --- a/include/wx/mac/carbon/dcscreen.h +++ b/include/wx/mac/carbon/dcscreen.h @@ -21,7 +21,7 @@ class WXDLLEXPORT wxScreenDC: public wxWindowDC public: // Create a DC representing the whole screen wxScreenDC(); - ~wxScreenDC(); + virtual ~wxScreenDC(); // Compatibility with X's requirements for // drawing on top of all windows diff --git a/include/wx/mac/carbon/dialog.h b/include/wx/mac/carbon/dialog.h index aadb9849b7..5fa0912f67 100644 --- a/include/wx/mac/carbon/dialog.h +++ b/include/wx/mac/carbon/dialog.h @@ -58,7 +58,7 @@ public: long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr); - ~wxDialog(); + virtual ~wxDialog(); // virtual bool Destroy(); virtual bool Show(bool show = true); diff --git a/include/wx/mac/carbon/dnd.h b/include/wx/mac/carbon/dnd.h index 00d96c315b..3d4676d009 100644 --- a/include/wx/mac/carbon/dnd.h +++ b/include/wx/mac/carbon/dnd.h @@ -86,7 +86,7 @@ public: const wxCursor &cursorMove = wxNullCursor, const wxCursor &cursorStop = wxNullCursor); - ~wxDropSource(); + virtual ~wxDropSource(); // do it (call this in response to a mouse button press, for example) // params: if bAllowMove is false, data can be only copied diff --git a/include/wx/mac/carbon/drawer.h b/include/wx/mac/carbon/drawer.h index 1bd500db33..95ca484463 100644 --- a/include/wx/mac/carbon/drawer.h +++ b/include/wx/mac/carbon/drawer.h @@ -43,7 +43,7 @@ public: this->Create(parent, id, title, size, edge, name); } - ~wxDrawerWindow(); + virtual ~wxDrawerWindow(); // Create a drawer window. // If parent is NULL, create as a tool window. diff --git a/include/wx/mac/carbon/fontdlg.h b/include/wx/mac/carbon/fontdlg.h index f2c7fb5a60..c2fb0706b9 100644 --- a/include/wx/mac/carbon/fontdlg.h +++ b/include/wx/mac/carbon/fontdlg.h @@ -30,7 +30,7 @@ class WXDLLEXPORT wxFontDialog : public wxDialog public: wxFontDialog(); wxFontDialog(wxWindow *parent, const wxFontData& data); - ~wxFontDialog(); + virtual ~wxFontDialog(); bool Create(wxWindow *parent, const wxFontData& data); @@ -89,7 +89,7 @@ DECLARE_EVENT_TABLE() public: wxFontDialog(); wxFontDialog(wxWindow *parent, const wxFontData& data); - ~wxFontDialog(); + virtual ~wxFontDialog(); bool Create(wxWindow *parent, const wxFontData& data); diff --git a/include/wx/mac/carbon/glcanvas.h b/include/wx/mac/carbon/glcanvas.h index be7f16eb3d..802067a0cb 100644 --- a/include/wx/mac/carbon/glcanvas.h +++ b/include/wx/mac/carbon/glcanvas.h @@ -61,7 +61,7 @@ public: const wxPalette& WXUNUSED(palette), const wxGLContext *other /* for sharing display lists */ ); - ~wxGLContext(); + virtual ~wxGLContext(); void SetCurrent(); void Update(); // must be called after window drag/grows/zoom or clut change @@ -94,7 +94,7 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette ); - ~wxGLCanvas(); + virtual ~wxGLCanvas(); bool Create(wxWindow *parent, const wxGLContext *shared, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name, diff --git a/include/wx/mac/carbon/helpxxxx.h b/include/wx/mac/carbon/helpxxxx.h index bcccd05ccc..415ccdb1c0 100644 --- a/include/wx/mac/carbon/helpxxxx.h +++ b/include/wx/mac/carbon/helpxxxx.h @@ -23,7 +23,7 @@ class WXDLLEXPORT wxXXXXHelpController: public wxHelpControllerBase public: wxXXXXHelpController(); - ~wxXXXXHelpController(); + virtual ~wxXXXXHelpController(); // Must call this to set the filename and server name virtual bool Initialize(const wxString& file); diff --git a/include/wx/mac/carbon/icon.h b/include/wx/mac/carbon/icon.h index 3adb3f7e0d..5a3b8d45cb 100644 --- a/include/wx/mac/carbon/icon.h +++ b/include/wx/mac/carbon/icon.h @@ -29,7 +29,7 @@ public: { LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON); } - ~wxIcon(); + virtual ~wxIcon(); bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ , int desiredWidth /* = -1 */ , int desiredHeight = -1); diff --git a/include/wx/mac/carbon/imaglist.h b/include/wx/mac/carbon/imaglist.h index 2877432b26..acc2c42ec1 100644 --- a/include/wx/mac/carbon/imaglist.h +++ b/include/wx/mac/carbon/imaglist.h @@ -55,7 +55,7 @@ class WXDLLEXPORT wxImageList: public wxObject public: wxImageList() { m_width = m_height = 0; } wxImageList( int width, int height, bool mask = true, int initialCount = 1 ); - ~wxImageList(); + virtual ~wxImageList(); bool Create( int width, int height, bool mask = true, int initialCount = 1 ); bool Create(); diff --git a/include/wx/mac/carbon/listctrl.h b/include/wx/mac/carbon/listctrl.h index a83e843e4a..503d3ecf53 100644 --- a/include/wx/mac/carbon/listctrl.h +++ b/include/wx/mac/carbon/listctrl.h @@ -176,7 +176,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl { Create(parent, id, pos, size, style, validator, name); } - ~wxListCtrl(); + virtual ~wxListCtrl(); bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListCtrlNameStr); diff --git a/include/wx/mac/carbon/mdi.h b/include/wx/mac/carbon/mdi.h index 2bb1d94beb..7739d6e876 100644 --- a/include/wx/mac/carbon/mdi.h +++ b/include/wx/mac/carbon/mdi.h @@ -41,7 +41,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIParentFrame(); + virtual ~wxMDIParentFrame(); bool Create(wxWindow *parent, wxWindowID id, @@ -129,7 +129,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIChildFrame(); + virtual ~wxMDIChildFrame(); bool Create(wxMDIParentFrame *parent, wxWindowID id, @@ -174,7 +174,7 @@ class WXDLLEXPORT wxMDIClientWindow: public wxWindow CreateClient(parent, style); } - ~wxMDIClientWindow(); + virtual ~wxMDIClientWindow(); // Note: this is virtual, to allow overridden behaviour. virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL); diff --git a/include/wx/mac/carbon/metafile.h b/include/wx/mac/carbon/metafile.h index add0be172a..d959a386a9 100644 --- a/include/wx/mac/carbon/metafile.h +++ b/include/wx/mac/carbon/metafile.h @@ -40,7 +40,7 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject DECLARE_DYNAMIC_CLASS(wxMetafile) public: wxMetafile(const wxString& file = wxEmptyString); - ~wxMetafile(void); + virtual ~wxMetafile(void); // After this is called, the metafile cannot be used for anything // since it is now owned by the clipboard. @@ -75,7 +75,7 @@ class WXDLLEXPORT wxMetafileDC: public wxDC int width = 0, int height = 0, const wxString& description = wxEmptyString); - ~wxMetafileDC(void); + virtual ~wxMetafileDC(void); // Should be called at end of drawing virtual wxMetafile *Close(void); diff --git a/include/wx/mac/carbon/minifram.h b/include/wx/mac/carbon/minifram.h index 0768e68b4e..4ef85c5356 100644 --- a/include/wx/mac/carbon/minifram.h +++ b/include/wx/mac/carbon/minifram.h @@ -34,7 +34,7 @@ public: Create(parent, id, title, pos, size, style | wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT , name); } - ~wxMiniFrame() {} + virtual ~wxMiniFrame() {} protected: }; diff --git a/include/wx/mac/carbon/notebook.h b/include/wx/mac/carbon/notebook.h index 234fbf2aba..299b438dbe 100644 --- a/include/wx/mac/carbon/notebook.h +++ b/include/wx/mac/carbon/notebook.h @@ -50,7 +50,7 @@ public: long style = 0, const wxString& name = wxNotebookNameStr); // dtor - ~wxNotebook(); + virtual ~wxNotebook(); // accessors // --------- diff --git a/include/wx/mac/carbon/palette.h b/include/wx/mac/carbon/palette.h index ada43c0b8a..53cbb2f579 100644 --- a/include/wx/mac/carbon/palette.h +++ b/include/wx/mac/carbon/palette.h @@ -24,7 +24,7 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData friend class WXDLLEXPORT wxPalette; public: wxPaletteRefData(); - ~wxPaletteRefData(); + virtual ~wxPaletteRefData(); protected: wxColour* m_palette; wxInt32 m_count ; @@ -40,7 +40,7 @@ public: wxPalette(); wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); - ~wxPalette(); + 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/mac/carbon/pen.h b/include/wx/mac/carbon/pen.h index 5ff21fcf2b..5dde4b541d 100644 --- a/include/wx/mac/carbon/pen.h +++ b/include/wx/mac/carbon/pen.h @@ -24,7 +24,7 @@ class WXDLLEXPORT wxPenRefData: public wxGDIRefData public: wxPenRefData(); wxPenRefData(const wxPenRefData& data); - ~wxPenRefData(); + virtual ~wxPenRefData(); wxPenRefData& operator=(const wxPenRefData& data); @@ -52,7 +52,7 @@ public: wxPen(); wxPen(const wxColour& col, int width = 1, int style = wxSOLID); wxPen(const wxBitmap& stipple, int width); - ~wxPen(); + virtual ~wxPen(); inline bool operator == (const wxPen& pen) const { return m_refData == pen.m_refData; } inline bool operator != (const wxPen& pen) const { return m_refData != pen.m_refData; } diff --git a/include/wx/mac/carbon/printdlg.h b/include/wx/mac/carbon/printdlg.h index 06950083fc..a12b983908 100644 --- a/include/wx/mac/carbon/printdlg.h +++ b/include/wx/mac/carbon/printdlg.h @@ -31,7 +31,7 @@ public: wxMacPrintDialog(); wxMacPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL); wxMacPrintDialog(wxWindow *parent, wxPrintData* data ); - ~wxMacPrintDialog(); + virtual ~wxMacPrintDialog(); bool Create(wxWindow *parent, wxPrintDialogData* data = NULL); virtual int ShowModal(); @@ -59,7 +59,7 @@ class WXDLLEXPORT wxMacPageSetupDialog: public wxPageSetupDialogBase { public: wxMacPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL); - ~wxMacPageSetupDialog(); + virtual ~wxMacPageSetupDialog(); virtual wxPageSetupData& GetPageSetupDialogData(); diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h index 2897d0a116..168648c6c9 100644 --- a/include/wx/mac/carbon/private.h +++ b/include/wx/mac/carbon/private.h @@ -951,7 +951,7 @@ class wxMacDataBrowserListControl : public wxMacDataItemBrowserControl , public { public: wxMacDataBrowserListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style ); - ~wxMacDataBrowserListControl(); + virtual ~wxMacDataBrowserListControl(); // create a list item (can be a subclass of wxMacListBoxItem) @@ -1034,7 +1034,7 @@ public: wxMacCGContext( CGrafPtr port ); wxMacCGContext( CGContextRef cgcontext ); wxMacCGContext(); - ~wxMacCGContext(); + virtual ~wxMacCGContext(); virtual void Clip( const wxRegion ®ion ); virtual void StrokePath( const wxGraphicPath *p ); @@ -1073,7 +1073,7 @@ class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData public: wxBitmapRefData(int width , int height , int depth); wxBitmapRefData(); - ~wxBitmapRefData(); + virtual ~wxBitmapRefData(); void Free(); bool Ok() const { return m_ok; } diff --git a/include/wx/mac/carbon/radiobox.h b/include/wx/mac/carbon/radiobox.h index fddba3c722..8cead00522 100644 --- a/include/wx/mac/carbon/radiobox.h +++ b/include/wx/mac/carbon/radiobox.h @@ -41,7 +41,7 @@ public: Create(parent, id, title, pos, size, choices, majorDim, style, val, name); } - ~wxRadioBox(); + virtual ~wxRadioBox(); bool Create(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, diff --git a/include/wx/mac/carbon/radiobut.h b/include/wx/mac/carbon/radiobut.h index 8b3c063f95..572261ed2c 100644 --- a/include/wx/mac/carbon/radiobut.h +++ b/include/wx/mac/carbon/radiobut.h @@ -27,7 +27,7 @@ public: { Create(parent, id, label, pos, size, style, validator, name); } - ~wxRadioButton(); + virtual ~wxRadioButton(); bool Create(wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/include/wx/mac/carbon/region.h b/include/wx/mac/carbon/region.h index 504a944e3b..e0f51c0f2e 100644 --- a/include/wx/mac/carbon/region.h +++ b/include/wx/mac/carbon/region.h @@ -48,7 +48,7 @@ public: Union(bmp, transColour, tolerance); } - ~wxRegion(); + virtual ~wxRegion(); //# Modify region // Clear current region @@ -137,7 +137,7 @@ public: wxRegionIterator(); wxRegionIterator(const wxRegion& region); wxRegionIterator(const wxRegionIterator& iterator); - ~wxRegionIterator(); + virtual ~wxRegionIterator(); wxRegionIterator& operator=(const wxRegionIterator& iterator); diff --git a/include/wx/mac/carbon/scrolbar.h b/include/wx/mac/carbon/scrolbar.h index b2538c5548..cabbeb9dc3 100644 --- a/include/wx/mac/carbon/scrolbar.h +++ b/include/wx/mac/carbon/scrolbar.h @@ -23,7 +23,7 @@ class WXDLLEXPORT wxScrollBar: public wxControl public: inline wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; } - ~wxScrollBar(); + virtual ~wxScrollBar(); inline wxScrollBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/mac/carbon/slider.h b/include/wx/mac/carbon/slider.h index e9702ea6fa..fa507b201d 100644 --- a/include/wx/mac/carbon/slider.h +++ b/include/wx/mac/carbon/slider.h @@ -37,7 +37,7 @@ public: Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name); } - ~wxSlider(); + virtual ~wxSlider(); bool Create(wxWindow *parent, wxWindowID id, int value, int minValue, int maxValue, diff --git a/include/wx/mac/carbon/sound.h b/include/wx/mac/carbon/sound.h index cec0de6bc1..ab2555f5e9 100644 --- a/include/wx/mac/carbon/sound.h +++ b/include/wx/mac/carbon/sound.h @@ -23,7 +23,7 @@ public: wxSound(); wxSound(const wxString& fileName, bool isResource = FALSE); wxSound(int size, const wxByte* data); - ~wxSound(); + virtual ~wxSound(); public: bool Create(const wxString& fileName, bool isResource = FALSE); diff --git a/include/wx/mac/carbon/statusbr.h b/include/wx/mac/carbon/statusbr.h index e3335d0f7b..c5ecf314c3 100644 --- a/include/wx/mac/carbon/statusbr.h +++ b/include/wx/mac/carbon/statusbr.h @@ -22,7 +22,7 @@ class WXDLLEXPORT wxStatusBarMac : public wxStatusBarGeneric long style = 0, const wxString& name = wxPanelNameStr); - ~wxStatusBarMac(); + virtual ~wxStatusBarMac(); bool Create(wxWindow *parent, wxWindowID id, long style , diff --git a/include/wx/mac/carbon/tabctrl.h b/include/wx/mac/carbon/tabctrl.h index 1fa2f7721d..0be13cddd1 100644 --- a/include/wx/mac/carbon/tabctrl.h +++ b/include/wx/mac/carbon/tabctrl.h @@ -40,7 +40,7 @@ class WXDLLEXPORT wxTabCtrl: public wxControl { Create(parent, id, pos, size, style, name); } - ~wxTabCtrl(); + virtual ~wxTabCtrl(); // Accessors diff --git a/include/wx/mac/carbon/textctrl.h b/include/wx/mac/carbon/textctrl.h index 595c3d1f8d..e4871fff87 100644 --- a/include/wx/mac/carbon/textctrl.h +++ b/include/wx/mac/carbon/textctrl.h @@ -47,7 +47,7 @@ public: Create(parent, id, value, pos, size, style, validator, name); } - ~wxTextCtrl(); + virtual ~wxTextCtrl(); bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/mac/carbon/timer.h b/include/wx/mac/carbon/timer.h index 467ce4be50..f9a5d79861 100644 --- a/include/wx/mac/carbon/timer.h +++ b/include/wx/mac/carbon/timer.h @@ -24,7 +24,7 @@ class WXDLLEXPORT wxTimer: public wxTimerBase public: wxTimer() { Init(); } wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id) { Init(); } - ~wxTimer(); + virtual ~wxTimer(); virtual bool Start(int milliseconds = -1, bool one_shot = FALSE); // Start timer diff --git a/include/wx/mac/carbon/toolbar.h b/include/wx/mac/carbon/toolbar.h index ee979c767e..527c97e793 100644 --- a/include/wx/mac/carbon/toolbar.h +++ b/include/wx/mac/carbon/toolbar.h @@ -37,7 +37,7 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase Init(); Create(parent, id, pos, size, style, name); } - ~wxToolBar(); + virtual ~wxToolBar(); bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER|wxTB_HORIZONTAL, diff --git a/include/wx/mac/carbon/treectrl.h b/include/wx/mac/carbon/treectrl.h index a1f651a0b2..1e37d9f3d4 100644 --- a/include/wx/mac/carbon/treectrl.h +++ b/include/wx/mac/carbon/treectrl.h @@ -129,7 +129,7 @@ public: { Create(parent, id, pos, size, style, validator, name); } - ~wxTreeCtrl(); + virtual ~wxTreeCtrl(); bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/mac/classic/accel.h b/include/wx/mac/classic/accel.h index 9702282af9..e2b2e58b0a 100644 --- a/include/wx/mac/classic/accel.h +++ b/include/wx/mac/classic/accel.h @@ -22,7 +22,7 @@ public: wxAcceleratorTable(); wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array - ~wxAcceleratorTable(); + virtual ~wxAcceleratorTable(); bool operator == (const wxAcceleratorTable& accel) const { return m_refData == accel.m_refData; } diff --git a/include/wx/mac/classic/bitmap.h b/include/wx/mac/classic/bitmap.h index 7380a5486a..c20a8a41bc 100644 --- a/include/wx/mac/classic/bitmap.h +++ b/include/wx/mac/classic/bitmap.h @@ -46,7 +46,7 @@ public: // Construct a mask from a mono bitmap (copies the bitmap). wxMask(const wxBitmap& bitmap); - ~wxMask(); + virtual ~wxMask(); bool Create(const wxBitmap& bitmap, const wxColour& colour); bool Create(const wxBitmap& bitmap, int paletteIndex); @@ -74,7 +74,7 @@ class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData friend class WXDLLEXPORT wxCursor; public: wxBitmapRefData(); - ~wxBitmapRefData(); + virtual ~wxBitmapRefData(); public: int m_width; @@ -153,7 +153,7 @@ public: // Convert from wxImage: wxBitmap(const wxImage& image, int depth = -1); - ~wxBitmap(); + virtual ~wxBitmap(); wxImage ConvertToImage() const; diff --git a/include/wx/mac/classic/brush.h b/include/wx/mac/classic/brush.h index 5c65beb50d..9f5ab8885c 100644 --- a/include/wx/mac/classic/brush.h +++ b/include/wx/mac/classic/brush.h @@ -35,7 +35,7 @@ public: wxBrush(short macThemeBrush ) ; wxBrush(const wxColour& col, int style = wxSOLID); wxBrush(const wxBitmap& stipple); - ~wxBrush(); + virtual ~wxBrush(); virtual void SetColour(const wxColour& col) ; virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ; diff --git a/include/wx/mac/classic/clipbrd.h b/include/wx/mac/classic/clipbrd.h index 36e47b9318..f484bbd7d3 100644 --- a/include/wx/mac/classic/clipbrd.h +++ b/include/wx/mac/classic/clipbrd.h @@ -32,7 +32,7 @@ class WXDLLEXPORT wxClipboard : public wxClipboardBase public: wxClipboard(); - ~wxClipboard(); + virtual ~wxClipboard(); // open the clipboard before SetData() and GetData() virtual bool Open(); diff --git a/include/wx/mac/classic/colour.h b/include/wx/mac/classic/colour.h index 87a768d936..283941e72c 100644 --- a/include/wx/mac/classic/colour.h +++ b/include/wx/mac/classic/colour.h @@ -32,7 +32,7 @@ public: wxColour& operator = ( const wxColour& col ); // dtor - ~wxColour(); + virtual ~wxColour(); // accessors bool Ok() const {return m_isInit; } diff --git a/include/wx/mac/classic/cursor.h b/include/wx/mac/classic/cursor.h index a18b2b9a96..2cd524a745 100644 --- a/include/wx/mac/classic/cursor.h +++ b/include/wx/mac/classic/cursor.h @@ -22,7 +22,7 @@ class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData friend class WXDLLEXPORT wxCursor; public: wxCursorRefData(); - ~wxCursorRefData(); + virtual ~wxCursorRefData(); protected: WXHCURSOR m_hCursor; @@ -53,7 +53,7 @@ public: int hotSpotX = 0, int hotSpotY = 0); wxCursor(int cursor_type); - ~wxCursor(); + virtual ~wxCursor(); bool CreateFromXpm(const char **bits) ; virtual bool Ok() const { return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ; } diff --git a/include/wx/mac/classic/dataobj.h b/include/wx/mac/classic/dataobj.h index fa4e139f5f..fa1aa17600 100644 --- a/include/wx/mac/classic/dataobj.h +++ b/include/wx/mac/classic/dataobj.h @@ -21,7 +21,7 @@ class WXDLLEXPORT wxDataObject : public wxDataObjectBase public: wxDataObject(); #ifdef __DARWIN__ - ~wxDataObject() { } + virtual ~wxDataObject() { } #endif virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const; diff --git a/include/wx/mac/classic/dataobj2.h b/include/wx/mac/classic/dataobj2.h index 36c670b2aa..4cea480372 100644 --- a/include/wx/mac/classic/dataobj2.h +++ b/include/wx/mac/classic/dataobj2.h @@ -24,7 +24,7 @@ public: wxBitmapDataObject(const wxBitmap& bitmap); // destr - ~wxBitmapDataObject(); + virtual ~wxBitmapDataObject(); // override base class virtual to update PNG data too virtual void SetBitmap(const wxBitmap& bitmap); diff --git a/include/wx/mac/classic/dc.h b/include/wx/mac/classic/dc.h index a14d40e6a8..88b7dacfb3 100644 --- a/include/wx/mac/classic/dc.h +++ b/include/wx/mac/classic/dc.h @@ -50,7 +50,7 @@ class WXDLLEXPORT wxDC: public wxDCBase public: wxDC(); - ~wxDC(); + virtual ~wxDC(); // implement base class pure virtuals diff --git a/include/wx/mac/classic/dcclient.h b/include/wx/mac/classic/dcclient.h index e8f9dc7e8a..8efbefbaab 100644 --- a/include/wx/mac/classic/dcclient.h +++ b/include/wx/mac/classic/dcclient.h @@ -31,7 +31,7 @@ class WXDLLEXPORT wxWindowDC: public wxDC // Create a DC corresponding to a canvas wxWindowDC(wxWindow *win); - ~wxWindowDC(void); + virtual ~wxWindowDC(void); virtual void DoGetSize( int *width, int *height ) const; protected : wxWindow *m_window; @@ -48,7 +48,7 @@ class WXDLLEXPORT wxClientDC: public wxWindowDC // Create a DC corresponding to a canvas wxClientDC(wxWindow *win); - ~wxClientDC(void); + virtual ~wxClientDC(void); virtual void DoGetSize( int *width, int *height ) const; }; @@ -62,7 +62,7 @@ class WXDLLEXPORT wxPaintDC: public wxWindowDC // Create a DC corresponding to a canvas wxPaintDC(wxWindow *win); - ~wxPaintDC(void); + virtual ~wxPaintDC(void); virtual void DoGetSize( int *width, int *height ) const; }; diff --git a/include/wx/mac/classic/dcmemory.h b/include/wx/mac/classic/dcmemory.h index 800dae556e..c9780e2c68 100644 --- a/include/wx/mac/classic/dcmemory.h +++ b/include/wx/mac/classic/dcmemory.h @@ -21,7 +21,7 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC public: wxMemoryDC(void); wxMemoryDC( wxDC *dc ); // Create compatible DC - ~wxMemoryDC(void); + virtual ~wxMemoryDC(void); virtual void SelectObject( const wxBitmap& bitmap ); virtual void DoGetSize( int *width, int *height ) const; wxBitmap GetSelectedObject() { return m_selected ; } diff --git a/include/wx/mac/classic/dcprint.h b/include/wx/mac/classic/dcprint.h index 73b33861a6..444295fda6 100644 --- a/include/wx/mac/classic/dcprint.h +++ b/include/wx/mac/classic/dcprint.h @@ -25,7 +25,7 @@ class WXDLLEXPORT wxPrinterDC: public wxDC #if wxUSE_PRINTING_ARCHITECTURE // Create a printer DC wxPrinterDC(const wxPrintData& printdata ); - ~wxPrinterDC(); + virtual ~wxPrinterDC(); virtual bool StartDoc( const wxString& WXUNUSED(message) ) ; virtual void EndDoc(void) ; diff --git a/include/wx/mac/classic/dcscreen.h b/include/wx/mac/classic/dcscreen.h index c1da01e7ef..4e2ed0511f 100644 --- a/include/wx/mac/classic/dcscreen.h +++ b/include/wx/mac/classic/dcscreen.h @@ -21,7 +21,7 @@ class WXDLLEXPORT wxScreenDC: public wxWindowDC public: // Create a DC representing the whole screen wxScreenDC(); - ~wxScreenDC(); + virtual ~wxScreenDC(); // Compatibility with X's requirements for // drawing on top of all windows diff --git a/include/wx/mac/classic/dialog.h b/include/wx/mac/classic/dialog.h index 813321910a..169abdf2ba 100644 --- a/include/wx/mac/classic/dialog.h +++ b/include/wx/mac/classic/dialog.h @@ -58,7 +58,7 @@ public: long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr); - ~wxDialog(); + virtual ~wxDialog(); // virtual bool Destroy(); virtual bool Show(bool show = true); diff --git a/include/wx/mac/classic/dnd.h b/include/wx/mac/classic/dnd.h index 00d96c315b..3d4676d009 100644 --- a/include/wx/mac/classic/dnd.h +++ b/include/wx/mac/classic/dnd.h @@ -86,7 +86,7 @@ public: const wxCursor &cursorMove = wxNullCursor, const wxCursor &cursorStop = wxNullCursor); - ~wxDropSource(); + virtual ~wxDropSource(); // do it (call this in response to a mouse button press, for example) // params: if bAllowMove is false, data can be only copied diff --git a/include/wx/mac/classic/glcanvas.h b/include/wx/mac/classic/glcanvas.h index 53f7a8c73c..630b29a291 100644 --- a/include/wx/mac/classic/glcanvas.h +++ b/include/wx/mac/classic/glcanvas.h @@ -61,7 +61,7 @@ public: const wxPalette& WXUNUSED(palette), const wxGLContext *other /* for sharing display lists */ ); - ~wxGLContext(); + virtual ~wxGLContext(); void SetCurrent(); void Update(); // must be called after window drag/grows/zoom or clut change @@ -94,7 +94,7 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette ); - ~wxGLCanvas(); + virtual ~wxGLCanvas(); bool Create(wxWindow *parent, const wxGLContext *shared, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name, diff --git a/include/wx/mac/classic/helpxxxx.h b/include/wx/mac/classic/helpxxxx.h index bcccd05ccc..415ccdb1c0 100644 --- a/include/wx/mac/classic/helpxxxx.h +++ b/include/wx/mac/classic/helpxxxx.h @@ -23,7 +23,7 @@ class WXDLLEXPORT wxXXXXHelpController: public wxHelpControllerBase public: wxXXXXHelpController(); - ~wxXXXXHelpController(); + virtual ~wxXXXXHelpController(); // Must call this to set the filename and server name virtual bool Initialize(const wxString& file); diff --git a/include/wx/mac/classic/icon.h b/include/wx/mac/classic/icon.h index 8a137f6d18..841fd38810 100644 --- a/include/wx/mac/classic/icon.h +++ b/include/wx/mac/classic/icon.h @@ -29,7 +29,7 @@ public: { LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON); } - ~wxIcon(); + virtual ~wxIcon(); bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ , int desiredWidth /* = -1 */ , int desiredHeight = -1); diff --git a/include/wx/mac/classic/imaglist.h b/include/wx/mac/classic/imaglist.h index defe67ce55..29de5d09f4 100644 --- a/include/wx/mac/classic/imaglist.h +++ b/include/wx/mac/classic/imaglist.h @@ -60,7 +60,7 @@ class WXDLLEXPORT wxImageList: public wxObject { Create(width, height, mask, initialCount); } - ~wxImageList(); + virtual ~wxImageList(); // Attributes diff --git a/include/wx/mac/classic/listctrl.h b/include/wx/mac/classic/listctrl.h index a83e843e4a..503d3ecf53 100644 --- a/include/wx/mac/classic/listctrl.h +++ b/include/wx/mac/classic/listctrl.h @@ -176,7 +176,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl { Create(parent, id, pos, size, style, validator, name); } - ~wxListCtrl(); + virtual ~wxListCtrl(); bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListCtrlNameStr); diff --git a/include/wx/mac/classic/mdi.h b/include/wx/mac/classic/mdi.h index ec09332a38..d3b1aaa6b5 100644 --- a/include/wx/mac/classic/mdi.h +++ b/include/wx/mac/classic/mdi.h @@ -40,7 +40,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIParentFrame(); + virtual ~wxMDIParentFrame(); bool Create(wxWindow *parent, wxWindowID id, @@ -109,7 +109,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIChildFrame(); + virtual ~wxMDIChildFrame(); bool Create(wxMDIParentFrame *parent, wxWindowID id, @@ -154,7 +154,7 @@ class WXDLLEXPORT wxMDIClientWindow: public wxWindow CreateClient(parent, style); } - ~wxMDIClientWindow(); + virtual ~wxMDIClientWindow(); // Note: this is virtual, to allow overridden behaviour. virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL); diff --git a/include/wx/mac/classic/metafile.h b/include/wx/mac/classic/metafile.h index c4ae5d1047..4cd1f66ca8 100644 --- a/include/wx/mac/classic/metafile.h +++ b/include/wx/mac/classic/metafile.h @@ -38,7 +38,7 @@ class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData friend class WXDLLEXPORT wxMetafile; public: wxMetafileRefData(void); - ~wxMetafileRefData(void); + virtual ~wxMetafileRefData(void); public: WXHMETAFILE m_metafile; @@ -51,7 +51,7 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject DECLARE_DYNAMIC_CLASS(wxMetafile) public: wxMetafile(const wxString& file = wxEmptyString); - ~wxMetafile(void); + virtual ~wxMetafile(void); // After this is called, the metafile cannot be used for anything // since it is now owned by the clipboard. @@ -86,7 +86,7 @@ class WXDLLEXPORT wxMetafileDC: public wxDC int width = 0, int height = 0, const wxString& description = wxEmptyString); - ~wxMetafileDC(void); + virtual ~wxMetafileDC(void); // Should be called at end of drawing virtual wxMetafile *Close(void); diff --git a/include/wx/mac/classic/minifram.h b/include/wx/mac/classic/minifram.h index 0768e68b4e..4ef85c5356 100644 --- a/include/wx/mac/classic/minifram.h +++ b/include/wx/mac/classic/minifram.h @@ -34,7 +34,7 @@ public: Create(parent, id, title, pos, size, style | wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT , name); } - ~wxMiniFrame() {} + virtual ~wxMiniFrame() {} protected: }; diff --git a/include/wx/mac/classic/notebook.h b/include/wx/mac/classic/notebook.h index 3caae8cb68..336b65f0c6 100644 --- a/include/wx/mac/classic/notebook.h +++ b/include/wx/mac/classic/notebook.h @@ -50,7 +50,7 @@ public: long style = 0, const wxString& name = wxNotebookNameStr); // dtor - ~wxNotebook(); + virtual ~wxNotebook(); // accessors // --------- diff --git a/include/wx/mac/classic/palette.h b/include/wx/mac/classic/palette.h index e800fd4232..8fbbf4ebfb 100644 --- a/include/wx/mac/classic/palette.h +++ b/include/wx/mac/classic/palette.h @@ -24,7 +24,7 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData friend class WXDLLEXPORT wxPalette; public: wxPaletteRefData(); - ~wxPaletteRefData(); + virtual ~wxPaletteRefData(); protected: wxColour* m_palette; wxInt32 m_count ; @@ -40,7 +40,7 @@ public: wxPalette(); wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); - ~wxPalette(); + 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/mac/classic/pen.h b/include/wx/mac/classic/pen.h index f9bf0775d8..131cb24474 100644 --- a/include/wx/mac/classic/pen.h +++ b/include/wx/mac/classic/pen.h @@ -24,7 +24,7 @@ class WXDLLEXPORT wxPenRefData: public wxGDIRefData public: wxPenRefData(); wxPenRefData(const wxPenRefData& data); - ~wxPenRefData(); + virtual ~wxPenRefData(); wxPenRefData& operator=(const wxPenRefData& data); @@ -52,7 +52,7 @@ public: wxPen(); wxPen(const wxColour& col, int width = 1, int style = wxSOLID); wxPen(const wxBitmap& stipple, int width); - ~wxPen(); + virtual ~wxPen(); inline bool operator == (const wxPen& pen) const { return m_refData == pen.m_refData; } inline bool operator != (const wxPen& pen) const { return m_refData != pen.m_refData; } diff --git a/include/wx/mac/classic/printdlg.h b/include/wx/mac/classic/printdlg.h index 3fc28c3d03..ea04282cda 100644 --- a/include/wx/mac/classic/printdlg.h +++ b/include/wx/mac/classic/printdlg.h @@ -31,7 +31,7 @@ class WXDLLEXPORT wxPrintDialog: public wxDialog wxPrintDialog(); wxPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL); wxPrintDialog(wxWindow *parent, wxPrintData* data ); - ~wxPrintDialog(); + virtual ~wxPrintDialog(); bool Create(wxWindow *parent, wxPrintDialogData* data = NULL); virtual int ShowModal(); @@ -54,7 +54,7 @@ class WXDLLEXPORT wxPageSetupDialog: public wxDialog public: wxPageSetupDialog(); wxPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL); - ~wxPageSetupDialog(); + virtual ~wxPageSetupDialog(); bool Create(wxWindow *parent, wxPageSetupData *data = NULL); virtual int ShowModal(); diff --git a/include/wx/mac/classic/radiobox.h b/include/wx/mac/classic/radiobox.h index 11fdf686ad..0287fe792a 100644 --- a/include/wx/mac/classic/radiobox.h +++ b/include/wx/mac/classic/radiobox.h @@ -41,7 +41,7 @@ public: Create(parent, id, title, pos, size, choices, majorDim, style, val, name); } - ~wxRadioBox(); + virtual ~wxRadioBox(); bool Create(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, diff --git a/include/wx/mac/classic/region.h b/include/wx/mac/classic/region.h index 4e246f4506..db388cedde 100644 --- a/include/wx/mac/classic/region.h +++ b/include/wx/mac/classic/region.h @@ -47,7 +47,7 @@ public: Union(bmp, transColour, tolerance); } - ~wxRegion(); + virtual ~wxRegion(); //# Modify region // Clear current region @@ -133,7 +133,7 @@ public: wxRegionIterator(); wxRegionIterator(const wxRegion& region); wxRegionIterator(const wxRegionIterator& iterator); - ~wxRegionIterator(); + virtual ~wxRegionIterator(); wxRegionIterator& operator=(const wxRegionIterator& iterator); diff --git a/include/wx/mac/classic/scrolbar.h b/include/wx/mac/classic/scrolbar.h index 1e49e090bf..781eaec6f2 100644 --- a/include/wx/mac/classic/scrolbar.h +++ b/include/wx/mac/classic/scrolbar.h @@ -23,7 +23,7 @@ class WXDLLEXPORT wxScrollBar: public wxControl public: inline wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; } - ~wxScrollBar(); + virtual ~wxScrollBar(); inline wxScrollBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/mac/classic/slider.h b/include/wx/mac/classic/slider.h index e79d35eb63..c270758973 100644 --- a/include/wx/mac/classic/slider.h +++ b/include/wx/mac/classic/slider.h @@ -37,7 +37,7 @@ public: Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name); } - ~wxSlider(); + virtual ~wxSlider(); bool Create(wxWindow *parent, wxWindowID id, int value, int minValue, int maxValue, diff --git a/include/wx/mac/classic/sound.h b/include/wx/mac/classic/sound.h index 8cbc2f1062..52e93a326b 100644 --- a/include/wx/mac/classic/sound.h +++ b/include/wx/mac/classic/sound.h @@ -23,7 +23,7 @@ public: wxSound(); wxSound(const wxString& fileName, bool isResource = FALSE); wxSound(int size, const wxByte* data); - ~wxSound(); + virtual ~wxSound(); public: bool Create(const wxString& fileName, bool isResource = FALSE); diff --git a/include/wx/mac/classic/statusbr.h b/include/wx/mac/classic/statusbr.h index 1dd2c38ce3..c878416dff 100644 --- a/include/wx/mac/classic/statusbr.h +++ b/include/wx/mac/classic/statusbr.h @@ -25,7 +25,7 @@ class WXDLLEXPORT wxStatusBarMac : public wxStatusBarGeneric Create(parent, id, style, name); } - ~wxStatusBarMac(); + virtual ~wxStatusBarMac(); bool Create(wxWindow *parent, wxWindowID id, long style , diff --git a/include/wx/mac/classic/tabctrl.h b/include/wx/mac/classic/tabctrl.h index 98631b07ed..666dadd313 100644 --- a/include/wx/mac/classic/tabctrl.h +++ b/include/wx/mac/classic/tabctrl.h @@ -38,7 +38,7 @@ class WXDLLEXPORT wxTabCtrl: public wxControl { Create(parent, id, pos, size, style, name); } - ~wxTabCtrl(); + virtual ~wxTabCtrl(); // Accessors diff --git a/include/wx/mac/classic/textctrl.h b/include/wx/mac/classic/textctrl.h index 29fb31fe7b..d25ac7814a 100644 --- a/include/wx/mac/classic/textctrl.h +++ b/include/wx/mac/classic/textctrl.h @@ -25,7 +25,7 @@ public: // creation // -------- wxTextCtrl() { Init(); } - ~wxTextCtrl(); + virtual ~wxTextCtrl(); wxTextCtrl(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/mac/classic/timer.h b/include/wx/mac/classic/timer.h index 467ce4be50..f9a5d79861 100644 --- a/include/wx/mac/classic/timer.h +++ b/include/wx/mac/classic/timer.h @@ -24,7 +24,7 @@ class WXDLLEXPORT wxTimer: public wxTimerBase public: wxTimer() { Init(); } wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id) { Init(); } - ~wxTimer(); + virtual ~wxTimer(); virtual bool Start(int milliseconds = -1, bool one_shot = FALSE); // Start timer diff --git a/include/wx/mac/classic/toolbar.h b/include/wx/mac/classic/toolbar.h index 18141faa1a..7cc0f7ebe7 100644 --- a/include/wx/mac/classic/toolbar.h +++ b/include/wx/mac/classic/toolbar.h @@ -38,7 +38,7 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase Init(); Create(parent, id, pos, size, style, name); } - ~wxToolBar(); + virtual ~wxToolBar(); bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER|wxTB_HORIZONTAL, diff --git a/include/wx/mac/classic/treectrl.h b/include/wx/mac/classic/treectrl.h index 5a4f05b264..52702e2ab0 100644 --- a/include/wx/mac/classic/treectrl.h +++ b/include/wx/mac/classic/treectrl.h @@ -127,7 +127,7 @@ public: { Create(parent, id, pos, size, style, validator, name); } - ~wxTreeCtrl(); + virtual ~wxTreeCtrl(); bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/mac/corefoundation/stdpaths.h b/include/wx/mac/corefoundation/stdpaths.h index a73ca4b514..9950bdbbd7 100644 --- a/include/wx/mac/corefoundation/stdpaths.h +++ b/include/wx/mac/corefoundation/stdpaths.h @@ -26,7 +26,7 @@ class WXDLLIMPEXP_BASE wxStandardPathsCF : public wxStandardPathsBase { public: wxStandardPathsCF(); - ~wxStandardPathsCF(); + virtual ~wxStandardPathsCF(); // wxMac specific: allow user to specify a different bundle wxStandardPathsCF(wxCFBundleRef bundle); diff --git a/include/wx/mediactrl.h b/include/wx/mediactrl.h index d62ceda8be..a8153a2808 100644 --- a/include/wx/mediactrl.h +++ b/include/wx/mediactrl.h @@ -151,7 +151,7 @@ public: { Create(parent, winid, location, pos, size, style, szBackend, validator, name); } - ~wxMediaCtrl(); + virtual ~wxMediaCtrl(); bool Create(wxWindow* parent, wxWindowID winid, const wxString& fileName = wxEmptyString, diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h index b5a60a7fd8..d5f88c7c4f 100644 --- a/include/wx/mgl/app.h +++ b/include/wx/mgl/app.h @@ -29,7 +29,7 @@ class WXDLLEXPORT wxApp: public wxAppBase { public: wxApp(); - ~wxApp(); + virtual ~wxApp(); /* override for altering the way wxGTK intializes the GUI * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h index 97adf8cacf..770dd5153a 100644 --- a/include/wx/mgl/bitmap.h +++ b/include/wx/mgl/bitmap.h @@ -40,7 +40,7 @@ public: wxMask(const wxBitmap& bitmap, const wxColour& colour); wxMask(const wxBitmap& bitmap, int paletteIndex); wxMask(const wxBitmap& bitmap); - ~wxMask(); + virtual ~wxMask(); bool Create(const wxBitmap& bitmap, const wxColour& colour); bool Create(const wxBitmap& bitmap, int paletteIndex); @@ -77,7 +77,7 @@ public: wxBitmap(char **bits) { CreateFromXpm((const char **)bits); } wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_RESOURCE); wxBitmap(const wxImage& image, int depth = -1); - ~wxBitmap() {} + virtual ~wxBitmap() {} bool operator == (const wxBitmap& bmp) const; bool operator != (const wxBitmap& bmp) const; bool Ok() const; diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h index ae8f784b80..8208130df5 100644 --- a/include/wx/mgl/brush.h +++ b/include/wx/mgl/brush.h @@ -33,7 +33,7 @@ public: wxBrush() {} wxBrush(const wxColour &colour, int style = wxSOLID); wxBrush(const wxBitmap &stippleBitmap); - ~wxBrush() {} + virtual ~wxBrush() {} bool operator == (const wxBrush& brush) const; bool operator != (const wxBrush& brush) const; bool Ok() const; diff --git a/include/wx/mgl/clipbrd.h b/include/wx/mgl/clipbrd.h index 824816aba1..98a82d1149 100644 --- a/include/wx/mgl/clipbrd.h +++ b/include/wx/mgl/clipbrd.h @@ -26,7 +26,7 @@ class WXDLLEXPORT wxClipboard : public wxClipboardBase { public: wxClipboard() {} - ~wxClipboard() {} + virtual ~wxClipboard() {} // open the clipboard before SetData() and GetData() virtual bool Open() {} diff --git a/include/wx/mgl/cursor.h b/include/wx/mgl/cursor.h index c3146e569d..5a0c378bac 100644 --- a/include/wx/mgl/cursor.h +++ b/include/wx/mgl/cursor.h @@ -32,7 +32,7 @@ public: wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_CUR_RESOURCE, int hotSpotX = 0, int hotSpotY = 0); - ~wxCursor(); + virtual ~wxCursor(); bool operator == (const wxCursor& cursor) const; bool operator != (const wxCursor& cursor) const; bool Ok() const; diff --git a/include/wx/mgl/dc.h b/include/wx/mgl/dc.h index 6b08885fab..192a729417 100644 --- a/include/wx/mgl/dc.h +++ b/include/wx/mgl/dc.h @@ -51,7 +51,7 @@ class WXDLLEXPORT wxDC : public wxDCBase public: wxDC(); - ~wxDC(); + virtual ~wxDC(); // implement base class pure virtuals // ---------------------------------- diff --git a/include/wx/mgl/dcmemory.h b/include/wx/mgl/dcmemory.h index 0113b67fbd..73407d12f9 100644 --- a/include/wx/mgl/dcmemory.h +++ b/include/wx/mgl/dcmemory.h @@ -28,7 +28,7 @@ class WXDLLEXPORT wxMemoryDC : public wxDC public: wxMemoryDC(); wxMemoryDC(wxDC *dc); // Create compatible DC - ~wxMemoryDC(); + virtual ~wxMemoryDC(); virtual void SelectObject(const wxBitmap& bitmap); // these get reimplemented for mono-bitmaps to behave diff --git a/include/wx/mgl/dcscreen.h b/include/wx/mgl/dcscreen.h index 684e211875..2f5a178b08 100644 --- a/include/wx/mgl/dcscreen.h +++ b/include/wx/mgl/dcscreen.h @@ -26,7 +26,7 @@ class WXDLLEXPORT wxScreenDC: public wxDC { public: wxScreenDC(); - ~wxScreenDC(); + virtual ~wxScreenDC(); static bool StartDrawingOnTop(wxWindow *WXUNUSED(window)) { return TRUE; } static bool StartDrawingOnTop(wxRect *WXUNUSED(rect) = NULL) { return TRUE; } diff --git a/include/wx/mgl/font.h b/include/wx/mgl/font.h index 3f748c413a..75fd7e9aaa 100644 --- a/include/wx/mgl/font.h +++ b/include/wx/mgl/font.h @@ -58,7 +58,7 @@ public: bool Create(const wxNativeFontInfo& fontinfo); - ~wxFont() {} + virtual ~wxFont() {} // implement base class pure virtuals virtual int GetPointSize() const; diff --git a/include/wx/mgl/palette.h b/include/wx/mgl/palette.h index 436f02b208..9d7574dd7c 100644 --- a/include/wx/mgl/palette.h +++ b/include/wx/mgl/palette.h @@ -34,7 +34,7 @@ class WXDLLEXPORT wxPalette: public wxPaletteBase public: wxPalette(); wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); - ~wxPalette(); + virtual ~wxPalette(); bool operator == (const wxPalette& palette) const; bool operator != (const wxPalette& palette) const; virtual bool Ok() const; diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h index 7b5edafd3b..fefa2373c6 100644 --- a/include/wx/mgl/pen.h +++ b/include/wx/mgl/pen.h @@ -33,7 +33,7 @@ public: wxPen() {} wxPen(const wxColour &colour, int width = 1, int style = wxSOLID); wxPen(const wxBitmap& stipple, int width); - ~wxPen() {} + virtual ~wxPen() {} bool operator == (const wxPen& pen) const; bool operator != (const wxPen& pen) const; diff --git a/include/wx/mgl/region.h b/include/wx/mgl/region.h index 0386a85783..ec8c23c596 100644 --- a/include/wx/mgl/region.h +++ b/include/wx/mgl/region.h @@ -40,7 +40,7 @@ public: } wxRegion(); - ~wxRegion(); + virtual ~wxRegion(); //# Modify region // Clear current region @@ -120,7 +120,7 @@ class WXDLLEXPORT wxRegionIterator : public wxObject public: wxRegionIterator(void); wxRegionIterator(const wxRegion& region); - ~wxRegionIterator(void); + virtual ~wxRegionIterator(void); void Reset(void) { m_currentNode = NULL; } void Reset(const wxRegion& region); diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h index f51093d326..9cfde947d9 100644 --- a/include/wx/motif/accel.h +++ b/include/wx/motif/accel.h @@ -24,7 +24,7 @@ public: wxAcceleratorTable(const wxString& resource); // Load from .rc resource wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array - ~wxAcceleratorTable(); + virtual ~wxAcceleratorTable(); bool operator == (const wxAcceleratorTable& accel) const { return m_refData == accel.m_refData; } bool operator != (const wxAcceleratorTable& accel) const { return m_refData != accel.m_refData; } diff --git a/include/wx/motif/bmpbuttn.h b/include/wx/motif/bmpbuttn.h index 352fe041bb..68215c9537 100644 --- a/include/wx/motif/bmpbuttn.h +++ b/include/wx/motif/bmpbuttn.h @@ -21,7 +21,7 @@ class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase DECLARE_DYNAMIC_CLASS(wxBitmapButton) public: wxBitmapButton(); - ~wxBitmapButton(); + virtual ~wxBitmapButton(); wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h index 34d562dc74..bc8f39cf7d 100644 --- a/include/wx/motif/choice.h +++ b/include/wx/motif/choice.h @@ -28,7 +28,7 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase public: wxChoice(); - ~wxChoice(); + virtual ~wxChoice(); wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/motif/clipbrd.h b/include/wx/motif/clipbrd.h index d09f966beb..7aecda908d 100644 --- a/include/wx/motif/clipbrd.h +++ b/include/wx/motif/clipbrd.h @@ -41,7 +41,7 @@ class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase { public: wxClipboard(); - ~wxClipboard(); + virtual ~wxClipboard(); // open the clipboard before SetData() and GetData() virtual bool Open(); diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h index 7f289660bf..8bdddeb06b 100644 --- a/include/wx/motif/colour.h +++ b/include/wx/motif/colour.h @@ -32,7 +32,7 @@ public: wxColour& operator = ( const wxColour& col ); // dtor - ~wxColour(); + virtual ~wxColour(); // accessors diff --git a/include/wx/motif/combobox.h b/include/wx/motif/combobox.h index fcdf4094f9..e47a4e8b64 100644 --- a/include/wx/motif/combobox.h +++ b/include/wx/motif/combobox.h @@ -21,7 +21,7 @@ class WXDLLEXPORT wxComboBox: public wxChoice public: wxComboBox() { m_inSetSelection = false; } - ~wxComboBox(); + virtual ~wxComboBox(); inline wxComboBox(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h index 2ef7e2dbda..ed65bb52d9 100644 --- a/include/wx/motif/cursor.h +++ b/include/wx/motif/cursor.h @@ -37,7 +37,7 @@ public: #endif wxCursor(wxStockCursor id); - ~wxCursor(); + virtual ~wxCursor(); virtual bool Ok() const; diff --git a/include/wx/motif/dc.h b/include/wx/motif/dc.h index 5af2889108..8d60b16414 100644 --- a/include/wx/motif/dc.h +++ b/include/wx/motif/dc.h @@ -43,7 +43,7 @@ class WXDLLEXPORT wxDC : public wxDCBase public: wxDC(); - ~wxDC() { } + virtual ~wxDC() { } // implement base class pure virtuals // ---------------------------------- diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h index 5a00c3cd2f..2208d7c829 100644 --- a/include/wx/motif/dcclient.h +++ b/include/wx/motif/dcclient.h @@ -36,7 +36,7 @@ public: wxWindowDC(); wxWindowDC( wxWindow *win ); - ~wxWindowDC(); + virtual ~wxWindowDC(); // TODO this function is Motif-only for now - should it go into base class? void Clear(const wxRect& rect); @@ -174,7 +174,7 @@ public: wxPaintDC() { } wxPaintDC(wxWindow* win); - ~wxPaintDC(); + virtual ~wxPaintDC(); }; class WXDLLEXPORT wxClientDC: public wxWindowDC diff --git a/include/wx/motif/dcmemory.h b/include/wx/motif/dcmemory.h index caae8445ee..121dda6604 100644 --- a/include/wx/motif/dcmemory.h +++ b/include/wx/motif/dcmemory.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC public: wxMemoryDC(); wxMemoryDC( wxDC *dc ); // Create compatible DC - ~wxMemoryDC(); + virtual ~wxMemoryDC(); virtual void SelectObject( const wxBitmap& bitmap ); diff --git a/include/wx/motif/dcprint.h b/include/wx/motif/dcprint.h index 61e593c15e..543879f38a 100644 --- a/include/wx/motif/dcprint.h +++ b/include/wx/motif/dcprint.h @@ -22,7 +22,7 @@ public: // Create a printer DC wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = true, int orientation = wxPORTRAIT); - ~wxPrinterDC(); + virtual ~wxPrinterDC(); }; #endif diff --git a/include/wx/motif/dcscreen.h b/include/wx/motif/dcscreen.h index e302fdc936..8c270b511c 100644 --- a/include/wx/motif/dcscreen.h +++ b/include/wx/motif/dcscreen.h @@ -21,7 +21,7 @@ class WXDLLEXPORT wxScreenDC: public wxWindowDC public: // Create a DC representing the whole screen wxScreenDC(); - ~wxScreenDC(); + virtual ~wxScreenDC(); // Compatibility with X's requirements for // drawing on top of all windows diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h index de59365802..d4b0da8672 100644 --- a/include/wx/motif/dialog.h +++ b/include/wx/motif/dialog.h @@ -37,7 +37,7 @@ public: long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr); - ~wxDialog(); + virtual ~wxDialog(); virtual bool Destroy(); diff --git a/include/wx/motif/dnd.h b/include/wx/motif/dnd.h index 96c3f9a13d..614096f548 100644 --- a/include/wx/motif/dnd.h +++ b/include/wx/motif/dnd.h @@ -41,7 +41,7 @@ class WXDLLEXPORT wxDropTarget: public wxObject public: wxDropTarget(); - ~wxDropTarget(); + virtual ~wxDropTarget(); virtual void OnEnter() { } virtual void OnLeave() { } @@ -143,7 +143,7 @@ public: wxDropSource( wxWindow *win ); wxDropSource( wxDataObject &data, wxWindow *win ); - ~wxDropSource(void); + virtual ~wxDropSource(void); void SetData( wxDataObject &data ); wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index 3508a84d3e..c22eb5e562 100644 --- a/include/wx/motif/icon.h +++ b/include/wx/motif/icon.h @@ -38,7 +38,7 @@ public: LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ANY); } - ~wxIcon(); + virtual ~wxIcon(); bool LoadFile(const wxString& name, wxBitmapType type, int desiredWidth, int desiredHeight = -1); diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h index c0c4d1b56f..d124453bde 100644 --- a/include/wx/motif/listbox.h +++ b/include/wx/motif/listbox.h @@ -63,7 +63,7 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr); - ~wxListBox(); + virtual ~wxListBox(); // implementation of wxControlWithItems virtual unsigned int GetCount() const; diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h index 115e1205cb..e27da81e02 100644 --- a/include/wx/motif/mdi.h +++ b/include/wx/motif/mdi.h @@ -45,7 +45,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIParentFrame(); + virtual ~wxMDIParentFrame(); bool Create(wxWindow *parent, wxWindowID id, @@ -129,7 +129,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIChildFrame(); + virtual ~wxMDIChildFrame(); bool Create(wxMDIParentFrame *parent, wxWindowID id, @@ -219,7 +219,7 @@ public: CreateClient(parent, style); } - ~wxMDIClientWindow(); + virtual ~wxMDIClientWindow(); // Note: this is virtual, to allow overridden behaviour. virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL); diff --git a/include/wx/motif/menuitem.h b/include/wx/motif/menuitem.h index 0a3011eafd..e9c6bc965d 100644 --- a/include/wx/motif/menuitem.h +++ b/include/wx/motif/menuitem.h @@ -30,7 +30,7 @@ public: const wxString& help = wxEmptyString, wxItemKind kind = wxITEM_NORMAL, wxMenu *subMenu = (wxMenu *)NULL); - ~wxMenuItem(); + virtual ~wxMenuItem(); // accessors (some more are inherited from wxOwnerDrawn or are below) virtual void SetText(const wxString& label); diff --git a/include/wx/motif/minifram.h b/include/wx/motif/minifram.h index 563691c5b9..a649a04740 100644 --- a/include/wx/motif/minifram.h +++ b/include/wx/motif/minifram.h @@ -34,7 +34,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMiniFrame() {} + virtual ~wxMiniFrame() {} protected: }; diff --git a/include/wx/motif/palette.h b/include/wx/motif/palette.h index a1fa11be7e..d4e00e6efb 100644 --- a/include/wx/motif/palette.h +++ b/include/wx/motif/palette.h @@ -37,7 +37,7 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData friend class WXDLLEXPORT wxPalette; public: wxPaletteRefData(); - ~wxPaletteRefData(); + virtual ~wxPaletteRefData(); protected: wxList m_palettes; @@ -53,7 +53,7 @@ public: wxPalette(); wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); - ~wxPalette(); + 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/motif/print.h b/include/wx/motif/print.h index edfe2d2a09..9a6575ef81 100644 --- a/include/wx/motif/print.h +++ b/include/wx/motif/print.h @@ -24,7 +24,7 @@ class WXDLLEXPORT wxPrinter: public wxPrinterBase public: wxPrinter(wxPrintData *data = NULL); - ~wxPrinter(); + virtual ~wxPrinter(); virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true); virtual bool PrintDialog(wxWindow *parent); @@ -42,7 +42,7 @@ class WXDLLEXPORT wxPrintPreview: public wxPrintPreviewBase public: wxPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL); - ~wxPrintPreview(); + virtual ~wxPrintPreview(); virtual bool Print(bool interactive); virtual void DetermineScaling(); diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h index 1e4085f911..9620f6f3ea 100644 --- a/include/wx/motif/radiobox.h +++ b/include/wx/motif/radiobox.h @@ -54,7 +54,7 @@ public: majorDim, style, val, name); } - ~wxRadioBox(); + virtual ~wxRadioBox(); bool Create(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/motif/radiobut.h b/include/wx/motif/radiobut.h index 7ed22be9b9..5c06a40dea 100644 --- a/include/wx/motif/radiobut.h +++ b/include/wx/motif/radiobut.h @@ -17,7 +17,7 @@ class WXDLLEXPORT wxRadioButton: public wxControl DECLARE_DYNAMIC_CLASS(wxRadioButton) public: wxRadioButton(); - ~wxRadioButton() { RemoveFromCycle(); } + virtual ~wxRadioButton() { RemoveFromCycle(); } inline wxRadioButton(wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/include/wx/motif/scrolbar.h b/include/wx/motif/scrolbar.h index f01f2b95f1..cee6f8abb3 100644 --- a/include/wx/motif/scrolbar.h +++ b/include/wx/motif/scrolbar.h @@ -19,7 +19,7 @@ class WXDLLEXPORT wxScrollBar: public wxScrollBarBase public: inline wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; } - ~wxScrollBar(); + virtual ~wxScrollBar(); inline wxScrollBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/motif/slider.h b/include/wx/motif/slider.h index 4789727c92..adb6201cad 100644 --- a/include/wx/motif/slider.h +++ b/include/wx/motif/slider.h @@ -33,7 +33,7 @@ public: Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name); } - ~wxSlider(); + virtual ~wxSlider(); bool Create(wxWindow *parent, wxWindowID id, int value, int minValue, int maxValue, diff --git a/include/wx/motif/spinbutt.h b/include/wx/motif/spinbutt.h index eadbf39eea..6350672923 100644 --- a/include/wx/motif/spinbutt.h +++ b/include/wx/motif/spinbutt.h @@ -33,7 +33,7 @@ public: { Create(parent, id, pos, size, style, name); } - ~wxSpinButton(); + virtual ~wxSpinButton(); bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, diff --git a/include/wx/motif/statbmp.h b/include/wx/motif/statbmp.h index c177b6b1fa..fe481c5f88 100644 --- a/include/wx/motif/statbmp.h +++ b/include/wx/motif/statbmp.h @@ -21,7 +21,7 @@ class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase public: wxStaticBitmap() { } - ~wxStaticBitmap(); + virtual ~wxStaticBitmap(); wxStaticBitmap(wxWindow *parent, wxWindowID id, const wxBitmap& label, diff --git a/include/wx/motif/statbox.h b/include/wx/motif/statbox.h index 1682037dc1..62c3d2ad8e 100644 --- a/include/wx/motif/statbox.h +++ b/include/wx/motif/statbox.h @@ -29,7 +29,7 @@ public: Create(parent, id, label, pos, size, style, name); } - ~wxStaticBox(); + virtual ~wxStaticBox(); bool Create(wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/include/wx/motif/timer.h b/include/wx/motif/timer.h index 3fa435893c..add463502d 100644 --- a/include/wx/motif/timer.h +++ b/include/wx/motif/timer.h @@ -20,7 +20,7 @@ public: wxTimer() { Init(); } wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id) { Init(); } - ~wxTimer(); + virtual ~wxTimer(); virtual bool Start(int milliseconds = -1, bool oneShot = false); virtual void Stop(); diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h index be3f0b64e5..3d0277004e 100644 --- a/include/wx/msw/clipbrd.h +++ b/include/wx/msw/clipbrd.h @@ -54,7 +54,7 @@ class WXDLLEXPORT wxClipboard : public wxClipboardBase public: wxClipboard(); - ~wxClipboard(); + virtual ~wxClipboard(); // open the clipboard before SetData() and GetData() virtual bool Open(); diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index 4b40ce3fda..d3d2562382 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/colour.h @@ -30,7 +30,7 @@ public: // dtor - ~wxColour(); + virtual ~wxColour(); // accessors diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h index 49927b84b3..1bfa0488d6 100644 --- a/include/wx/msw/dc.h +++ b/include/wx/msw/dc.h @@ -30,7 +30,7 @@ class wxDCCacheEntry: public wxObject public: wxDCCacheEntry(WXHBITMAP hBitmap, int w, int h, int depth); wxDCCacheEntry(WXHDC hDC, int depth); - ~wxDCCacheEntry(); + virtual ~wxDCCacheEntry(); WXHBITMAP m_bitmap; WXHDC m_dc; @@ -46,7 +46,7 @@ class WXDLLEXPORT wxDC : public wxDCBase { public: wxDC(WXHDC hDC) { Init(); m_hDC = hDC; } - ~wxDC(); + virtual ~wxDC(); // implement base class pure virtuals // ---------------------------------- diff --git a/include/wx/msw/dde.h b/include/wx/msw/dde.h index 2a34b01bc7..51eeb91262 100644 --- a/include/wx/msw/dde.h +++ b/include/wx/msw/dde.h @@ -47,7 +47,7 @@ class WXDLLIMPEXP_BASE wxDDEConnection: public wxConnectionBase public: wxDDEConnection(wxChar *buffer, int size); // use external buffer wxDDEConnection(); // use internal buffer - ~wxDDEConnection(void); + virtual ~wxDDEConnection(void); // Calls that CLIENT can make virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); @@ -85,7 +85,7 @@ class WXDLLIMPEXP_BASE wxDDEServer: public wxServerBase public: wxDDEServer(void); - ~wxDDEServer(void); + virtual ~wxDDEServer(void); bool Create(const wxString& server_name); // Returns false if can't create server (e.g. port // number is already in use) virtual wxConnectionBase *OnAcceptConnection(const wxString& topic); @@ -113,7 +113,7 @@ class WXDLLIMPEXP_BASE wxDDEClient: public wxClientBase DECLARE_DYNAMIC_CLASS(wxDDEClient) public: wxDDEClient(void); - ~wxDDEClient(void); + virtual ~wxDDEClient(void); bool ValidHost(const wxString& host); virtual wxConnectionBase *MakeConnection(const wxString& host, const wxString& server, const wxString& topic); // Call this to make a connection. diff --git a/include/wx/msw/dragimag.h b/include/wx/msw/dragimag.h index 362767c24a..d76a95a9b3 100644 --- a/include/wx/msw/dragimag.h +++ b/include/wx/msw/dragimag.h @@ -168,7 +168,7 @@ public: } #endif - ~wxDragImage(); + virtual ~wxDragImage(); // Attributes //////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/msw/glcanvas.h b/include/wx/msw/glcanvas.h index 62207cbc59..6cfa954599 100644 --- a/include/wx/msw/glcanvas.h +++ b/include/wx/msw/glcanvas.h @@ -59,7 +59,7 @@ public: const wxPalette& WXUNUSED(palette), const wxGLContext *other /* for sharing display lists */ ); - ~wxGLContext(); + virtual ~wxGLContext(); void SetCurrent(); @@ -111,7 +111,7 @@ public: int *attribList = 0, const wxPalette& palette = wxNullPalette); - ~wxGLCanvas(); + virtual ~wxGLCanvas(); // Replaces wxWindow::Create functionality, since // we need to use a different window class diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h index 2bb0716395..24321b4166 100644 --- a/include/wx/msw/helpwin.h +++ b/include/wx/msw/helpwin.h @@ -24,7 +24,7 @@ class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase public: wxWinHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) {} - ~wxWinHelpController() {} + virtual ~wxWinHelpController() {} // Must call this to set the filename virtual bool Initialize(const wxString& file); diff --git a/include/wx/msw/imaglist.h b/include/wx/msw/imaglist.h index d02588d2f0..b2cedac507 100644 --- a/include/wx/msw/imaglist.h +++ b/include/wx/msw/imaglist.h @@ -62,7 +62,7 @@ public: { Create(width, height, mask, initialCount); } - ~wxImageList(); + virtual ~wxImageList(); // Attributes diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index b872359a2b..2148e5ab0a 100644 --- a/include/wx/msw/mdi.h +++ b/include/wx/msw/mdi.h @@ -38,7 +38,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIParentFrame(); + virtual ~wxMDIParentFrame(); bool Create(wxWindow *parent, wxWindowID id, @@ -139,7 +139,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIChildFrame(); + virtual ~wxMDIChildFrame(); bool Create(wxMDIParentFrame *parent, wxWindowID id, diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h index 95c316092c..bac1890381 100644 --- a/include/wx/msw/metafile.h +++ b/include/wx/msw/metafile.h @@ -30,7 +30,7 @@ class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData friend class WXDLLEXPORT wxMetafile; public: wxMetafileRefData(); - ~wxMetafileRefData(); + virtual ~wxMetafileRefData(); public: WXHANDLE m_metafile; diff --git a/include/wx/msw/ole/automtn.h b/include/wx/msw/ole/automtn.h index b5d7b8c543..1aa3c148e4 100644 --- a/include/wx/msw/ole/automtn.h +++ b/include/wx/msw/ole/automtn.h @@ -31,7 +31,7 @@ class WXDLLEXPORT wxAutomationObject: public wxObject { public: wxAutomationObject(WXIDISPATCH* dispatchPtr = NULL); - ~wxAutomationObject(); + virtual ~wxAutomationObject(); // Set/get dispatch pointer inline void SetDispatchPtr(WXIDISPATCH* dispatchPtr) { m_dispatchPtr = dispatchPtr; }; diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h index 761efefa10..8dc61757f4 100644 --- a/include/wx/msw/palette.h +++ b/include/wx/msw/palette.h @@ -21,7 +21,7 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData friend class WXDLLEXPORT wxPalette; public: wxPaletteRefData(void); - ~wxPaletteRefData(void); + virtual ~wxPaletteRefData(void); protected: WXHPALETTE m_hPalette; }; @@ -36,7 +36,7 @@ public: wxPalette(void); wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); - ~wxPalette(void); + virtual ~wxPalette(void); 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/msw/scrolbar.h b/include/wx/msw/scrolbar.h index 45e6dec23b..b1dc497e11 100644 --- a/include/wx/msw/scrolbar.h +++ b/include/wx/msw/scrolbar.h @@ -17,7 +17,7 @@ class WXDLLEXPORT wxScrollBar: public wxScrollBarBase { public: wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; } - ~wxScrollBar(); + virtual ~wxScrollBar(); wxScrollBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/msw/tabctrl.h b/include/wx/msw/tabctrl.h index bfab81c112..4e348af1d2 100644 --- a/include/wx/msw/tabctrl.h +++ b/include/wx/msw/tabctrl.h @@ -40,7 +40,7 @@ class WXDLLEXPORT wxTabCtrl: public wxControl { Create(parent, id, pos, size, style, name); } - ~wxTabCtrl(); + virtual ~wxTabCtrl(); // Accessors diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h index 2202637d03..c12e9089bc 100644 --- a/include/wx/msw/textctrl.h +++ b/include/wx/msw/textctrl.h @@ -31,7 +31,7 @@ public: Create(parent, id, value, pos, size, style, validator, name); } - ~wxTextCtrl(); + virtual ~wxTextCtrl(); bool Create(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, diff --git a/include/wx/msw/timer.h b/include/wx/msw/timer.h index 0607121c6c..ad80f5080c 100644 --- a/include/wx/msw/timer.h +++ b/include/wx/msw/timer.h @@ -20,7 +20,7 @@ public: wxTimer() { Init(); } wxTimer(wxEvtHandler *owner, int id = wxID_ANY) : wxTimerBase(owner, id) { Init(); } - ~wxTimer(); + virtual ~wxTimer(); virtual bool Start(int milliseconds = -1, bool oneShot = false); virtual void Stop(); diff --git a/include/wx/msw/wince/textctrlce.h b/include/wx/msw/wince/textctrlce.h index 706b6ff5e4..0ed278f7cd 100644 --- a/include/wx/msw/wince/textctrlce.h +++ b/include/wx/msw/wince/textctrlce.h @@ -36,7 +36,7 @@ public: Create(parent, id, value, pos, size, style, validator, name); } - ~wxTextCtrl(); + virtual ~wxTextCtrl(); bool Create(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, diff --git a/include/wx/object.h b/include/wx/object.h index 0123f40fb6..e66613c3dc 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -501,7 +501,7 @@ class WXDLLIMPEXP_BASE wxDynamicObject : public wxObject public: // instantiates this object with an instance of its superclass wxDynamicObject(wxObject* superClassInstance, const wxDynamicClassInfo *info) ; - ~wxDynamicObject(); + virtual ~wxDynamicObject(); void SetProperty (const wxChar *propertyName, const wxxVariant &value); wxxVariant GetProperty (const wxChar *propertyName) const ; diff --git a/include/wx/os2/accel.h b/include/wx/os2/accel.h index 60f3de60c0..0df2799ba8 100644 --- a/include/wx/os2/accel.h +++ b/include/wx/os2/accel.h @@ -38,7 +38,7 @@ public: ,const wxAcceleratorEntry vaEntries[] ); // Load from array - ~wxAcceleratorTable(); + virtual ~wxAcceleratorTable(); inline bool operator== (const wxAcceleratorTable& rAccel) const { return m_refData == rAccel.m_refData; }; diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h index 877ee04e51..a072e4b82e 100644 --- a/include/wx/os2/brush.h +++ b/include/wx/os2/brush.h @@ -24,7 +24,7 @@ class WXDLLEXPORT wxBrushRefData: public wxGDIRefData public: wxBrushRefData(); wxBrushRefData(const wxBrushRefData& rData); - ~wxBrushRefData(); + virtual ~wxBrushRefData(); protected: int m_nStyle; @@ -45,7 +45,7 @@ public: wxBrush(); wxBrush(const wxColour& rCol, int nStyle = wxSOLID); wxBrush(const wxBitmap& rStipple); - ~wxBrush(); + virtual ~wxBrush(); inline bool operator == (const wxBrush& rBrush) const { return m_refData == rBrush.m_refData; } inline bool operator != (const wxBrush& rBrush) const { return m_refData != rBrush.m_refData; } diff --git a/include/wx/os2/clipbrd.h b/include/wx/os2/clipbrd.h index 2db04c431a..522d5641a0 100644 --- a/include/wx/os2/clipbrd.h +++ b/include/wx/os2/clipbrd.h @@ -57,7 +57,7 @@ class WXDLLEXPORT wxClipboard : public wxClipboardBase public: wxClipboard(); - ~wxClipboard(); + virtual ~wxClipboard(); // open the clipboard before SetData() and GetData() virtual bool Open(); diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h index 5f01ff010c..f8d69fa6e2 100644 --- a/include/wx/os2/colour.h +++ b/include/wx/os2/colour.h @@ -31,7 +31,7 @@ public: wxColour&operator = (const wxColour& rCol); // Dtor - ~wxColour(); + virtual ~wxColour(); // Accessors bool Ok(void) const {return m_bIsInit; } diff --git a/include/wx/os2/cursor.h b/include/wx/os2/cursor.h index 029dec50cb..e1595d8daf 100644 --- a/include/wx/os2/cursor.h +++ b/include/wx/os2/cursor.h @@ -18,7 +18,7 @@ class WXDLLEXPORT wxCursorRefData: public wxGDIImageRefData { public: wxCursorRefData(); - ~wxCursorRefData() { Free(); } + virtual ~wxCursorRefData() { Free(); } virtual void Free(void); bool m_bDestroyCursor; }; // end of CLASS wxCursorRefData diff --git a/include/wx/os2/dataobj2.h b/include/wx/os2/dataobj2.h index 548b13b978..302dd1dc2a 100644 --- a/include/wx/os2/dataobj2.h +++ b/include/wx/os2/dataobj2.h @@ -24,7 +24,7 @@ public: wxBitmapDataObject(const wxBitmap& bitmap); // destr - ~wxBitmapDataObject(); + virtual ~wxBitmapDataObject(); // override base class virtual to update PNG data too virtual void SetBitmap(const wxBitmap& bitmap); diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h index e1ad714f22..01c4ff4a1c 100644 --- a/include/wx/os2/dc.h +++ b/include/wx/os2/dc.h @@ -84,7 +84,7 @@ public: wxDCCacheEntry( HPS hPS ,int nDepth ); - ~wxDCCacheEntry(); + virtual ~wxDCCacheEntry(); WXHBITMAP m_hBitmap; HPS m_hPS; @@ -100,7 +100,7 @@ class WXDLLEXPORT wxDC : public wxDCBase public: wxDC(void); - ~wxDC(); + virtual ~wxDC(); // implement base class pure virtuals // ---------------------------------- diff --git a/include/wx/os2/helpwin.h b/include/wx/os2/helpwin.h index 6700a6f6f3..2b77213b7c 100644 --- a/include/wx/os2/helpwin.h +++ b/include/wx/os2/helpwin.h @@ -24,7 +24,7 @@ class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase public: wxWinHelpController(); - ~wxWinHelpController(); + virtual ~wxWinHelpController(); // Must call this to set the filename and server name virtual bool Initialize(const wxString& file); diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h index 08f54374f2..9c254a8353 100644 --- a/include/wx/os2/icon.h +++ b/include/wx/os2/icon.h @@ -56,7 +56,7 @@ public: LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICO); } - ~wxIcon(); + virtual ~wxIcon(); bool LoadFile( const wxString& rName ,long lFlags = wxBITMAP_TYPE_ICO_RESOURCE diff --git a/include/wx/os2/mdi.h b/include/wx/os2/mdi.h index a7d61b0cc3..7bea970db9 100644 --- a/include/wx/os2/mdi.h +++ b/include/wx/os2/mdi.h @@ -38,7 +38,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIParentFrame(); + virtual ~wxMDIParentFrame(); bool Create(wxWindow *parent, wxWindowID id, @@ -120,7 +120,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIChildFrame(); + virtual ~wxMDIChildFrame(); bool Create(wxMDIParentFrame *parent, wxWindowID id, diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h index 332bab1c94..82e4ef70c8 100644 --- a/include/wx/os2/metafile.h +++ b/include/wx/os2/metafile.h @@ -37,7 +37,7 @@ class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData friend class WXDLLEXPORT wxMetafile; public: wxMetafileRefData(void); - ~wxMetafileRefData(void); + virtual ~wxMetafileRefData(void); public: WXHANDLE m_metafile; @@ -51,7 +51,7 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject DECLARE_DYNAMIC_CLASS(wxMetafile) public: wxMetafile(const wxString& file = wxEmptyString); - ~wxMetafile(void); + virtual ~wxMetafile(void); // After this is called, the metafile cannot be used for anything // since it is now owned by the clipboard. @@ -86,7 +86,7 @@ public: // Then don't need to supply them to wxMakeMetaFilePlaceable. wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg); - ~wxMetafileDC(void); + virtual ~wxMetafileDC(void); // Should be called at end of drawing virtual wxMetafile *Close(void); diff --git a/include/wx/os2/palette.h b/include/wx/os2/palette.h index 0ffd177910..a255f50665 100644 --- a/include/wx/os2/palette.h +++ b/include/wx/os2/palette.h @@ -22,7 +22,7 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData friend class WXDLLEXPORT wxPalette; public: wxPaletteRefData(); - ~wxPaletteRefData(); + virtual ~wxPaletteRefData(); // protected: WXHPALETTE m_hPalette; HPS m_hPS; @@ -42,7 +42,7 @@ public: ,const unsigned char* pGreen ,const unsigned char* pBlue ); - ~wxPalette(); + virtual ~wxPalette(); bool Create( int n ,const unsigned char* pRed diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h index 900838c450..3594ffebec 100644 --- a/include/wx/os2/pen.h +++ b/include/wx/os2/pen.h @@ -25,7 +25,7 @@ class WXDLLEXPORT wxPenRefData: public wxGDIRefData public: wxPenRefData(); wxPenRefData(const wxPenRefData& rData); - ~wxPenRefData(); + virtual ~wxPenRefData(); protected: int m_nWidth; @@ -54,7 +54,7 @@ public: wxPen( const wxBitmap& rStipple ,int nWidth ); - ~wxPen(); + virtual ~wxPen(); inline bool operator == (const wxPen& rPen) const { return m_refData == rPen.m_refData; } diff --git a/include/wx/os2/print.h b/include/wx/os2/print.h index baf6ecbcf9..34c9336604 100644 --- a/include/wx/os2/print.h +++ b/include/wx/os2/print.h @@ -24,7 +24,7 @@ class WXDLLEXPORT wxOS2Printer: public wxPrinterBase public: wxOS2Printer(wxPrintData *data = NULL); - ~wxOS2Printer(); + virtual ~wxOS2Printer(); virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE); virtual wxDC* PrintDialog(wxWindow *parent); @@ -43,7 +43,7 @@ class WXDLLEXPORT wxOS2PrintPreview: public wxPrintPreviewBase public: wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL); - ~wxOS2PrintPreview(); + virtual ~wxOS2PrintPreview(); virtual bool Print(bool interactive); virtual void DetermineScaling(); diff --git a/include/wx/os2/printos2.h b/include/wx/os2/printos2.h index bf026a06b2..171ce9fd07 100644 --- a/include/wx/os2/printos2.h +++ b/include/wx/os2/printos2.h @@ -26,7 +26,7 @@ class WXDLLEXPORT wxOS2Printer: public wxPrinterBase public: wxOS2Printer(wxPrintDialogData *data = NULL); - ~wxOS2Printer(); + virtual ~wxOS2Printer(); virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true); virtual wxDC* PrintDialog(wxWindow *parent); @@ -46,7 +46,7 @@ class WXDLLEXPORT wxOS2PrintPreview: public wxPrintPreviewBase public: wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintDialogData *data = NULL); wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data); - ~wxOS2PrintPreview(); + virtual ~wxOS2PrintPreview(); virtual bool Print(bool interactive); virtual void DetermineScaling(); diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h index bc6257dfff..eb790894ce 100644 --- a/include/wx/os2/radiobox.h +++ b/include/wx/os2/radiobox.h @@ -72,7 +72,7 @@ public: ); } - ~wxRadioBox(); + virtual ~wxRadioBox(); bool Create( wxWindow* pParent ,wxWindowID vId diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h index b19dfd045d..00ba96adc9 100644 --- a/include/wx/os2/region.h +++ b/include/wx/os2/region.h @@ -53,7 +53,7 @@ public: } wxRegion(); - ~wxRegion(); + virtual ~wxRegion(); // // Modify region @@ -243,7 +243,7 @@ DECLARE_DYNAMIC_CLASS(wxRegionIterator); public: wxRegionIterator(); wxRegionIterator(const wxRegion& rRegion); - ~wxRegionIterator(); + virtual ~wxRegionIterator(); void Reset(void) { m_lCurrent = 0; } void Reset(const wxRegion& rRegion); diff --git a/include/wx/os2/scrolbar.h b/include/wx/os2/scrolbar.h index ea0b911915..8ec1d95814 100644 --- a/include/wx/os2/scrolbar.h +++ b/include/wx/os2/scrolbar.h @@ -46,7 +46,7 @@ public: ,rsName ); } - ~wxScrollBar(); + virtual ~wxScrollBar(); bool Create( wxWindow* pParent ,wxWindowID vId diff --git a/include/wx/os2/slider.h b/include/wx/os2/slider.h index bc74fe3945..38d9ecfc14 100644 --- a/include/wx/os2/slider.h +++ b/include/wx/os2/slider.h @@ -43,7 +43,7 @@ public: ,rsName ); } - ~wxSlider(); + virtual ~wxSlider(); bool Create( wxWindow* pParent ,wxWindowID vId diff --git a/include/wx/os2/sound.h b/include/wx/os2/sound.h index c5b39444e4..2b6c07a54c 100644 --- a/include/wx/os2/sound.h +++ b/include/wx/os2/sound.h @@ -21,7 +21,7 @@ public: wxSound(); wxSound(const wxString& fileName, bool isResource = FALSE); wxSound(int size, const wxByte* data); - ~wxSound(); + virtual ~wxSound(); public: // Create from resource or file diff --git a/include/wx/os2/tabctrl.h b/include/wx/os2/tabctrl.h index b07e5a73c5..40049d3325 100644 --- a/include/wx/os2/tabctrl.h +++ b/include/wx/os2/tabctrl.h @@ -38,7 +38,7 @@ class WXDLLEXPORT wxTabCtrl: public wxControl { Create(parent, id, pos, size, style, name); } - ~wxTabCtrl(); + virtual ~wxTabCtrl(); // Accessors diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h index 7e4a1127b8..547e1191a9 100644 --- a/include/wx/os2/textctrl.h +++ b/include/wx/os2/textctrl.h @@ -30,7 +30,7 @@ public: { Create(pParent, vId, rsValue, rPos, rSize, lStyle, rValidator, rsName); } - ~wxTextCtrl(); + virtual ~wxTextCtrl(); bool Create( wxWindow* pParent ,wxWindowID vId diff --git a/include/wx/os2/timer.h b/include/wx/os2/timer.h index 90019563b3..fb7bddc775 100644 --- a/include/wx/os2/timer.h +++ b/include/wx/os2/timer.h @@ -27,7 +27,7 @@ public: ,nId ) { Init(); } - ~wxTimer(); + virtual ~wxTimer(); virtual void Notify(void); virtual bool Start( int nMilliseconds = -1 diff --git a/include/wx/palmos/clipbrd.h b/include/wx/palmos/clipbrd.h index 4b96595fb7..3f8023f4ec 100644 --- a/include/wx/palmos/clipbrd.h +++ b/include/wx/palmos/clipbrd.h @@ -54,7 +54,7 @@ class WXDLLEXPORT wxClipboard : public wxObject public: wxClipboard(); - ~wxClipboard(); + virtual ~wxClipboard(); // open the clipboard before SetData() and GetData() virtual bool Open(); diff --git a/include/wx/palmos/dc.h b/include/wx/palmos/dc.h index f9facffd55..ce2fc9a905 100644 --- a/include/wx/palmos/dc.h +++ b/include/wx/palmos/dc.h @@ -31,7 +31,7 @@ class wxDCCacheEntry: public wxObject public: wxDCCacheEntry(WXHBITMAP hBitmap, int w, int h, int depth); wxDCCacheEntry(WXHDC hDC, int depth); - ~wxDCCacheEntry(); + virtual ~wxDCCacheEntry(); WXHBITMAP m_bitmap; WXHDC m_dc; @@ -45,7 +45,7 @@ class WXDLLEXPORT wxDC : public wxDCBase { public: wxDC(); - ~wxDC(); + virtual ~wxDC(); // implement base class pure virtuals // ---------------------------------- diff --git a/include/wx/palmos/dragimag.h b/include/wx/palmos/dragimag.h index 5f016bece6..b3c2089cc2 100644 --- a/include/wx/palmos/dragimag.h +++ b/include/wx/palmos/dragimag.h @@ -159,7 +159,7 @@ public: } #endif - ~wxDragImage(); + virtual ~wxDragImage(); // Attributes //////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/palmos/glcanvas.h b/include/wx/palmos/glcanvas.h index 15f7f0dff5..013ee3d81d 100644 --- a/include/wx/palmos/glcanvas.h +++ b/include/wx/palmos/glcanvas.h @@ -59,7 +59,7 @@ public: const wxPalette& WXUNUSED(palette), const wxGLContext *other /* for sharing display lists */ ); - ~wxGLContext(); + virtual ~wxGLContext(); void SetCurrent(); @@ -111,7 +111,7 @@ public: int *attribList = 0, const wxPalette& palette = wxNullPalette); - ~wxGLCanvas(); + virtual ~wxGLCanvas(); // Replaces wxWindow::Create functionality, since // we need to use a different window class diff --git a/include/wx/palmos/help.h b/include/wx/palmos/help.h index f412bfb0bd..3b4e831fdb 100644 --- a/include/wx/palmos/help.h +++ b/include/wx/palmos/help.h @@ -23,8 +23,8 @@ class WXDLLEXPORT wxPalmHelpController: public wxHelpControllerBase DECLARE_CLASS(wxPalmHelpController) public: - wxPalmHelpController() {}; - ~wxPalmHelpController() {}; + wxPalmHelpController() {} + virtual ~wxPalmHelpController() {} // Must call this to set the filename virtual bool Initialize(const wxString& file); diff --git a/include/wx/palmos/imaglist.h b/include/wx/palmos/imaglist.h index 06a3a869ea..415eb65ddf 100644 --- a/include/wx/palmos/imaglist.h +++ b/include/wx/palmos/imaglist.h @@ -62,7 +62,7 @@ public: { Create(width, height, mask, initialCount); } - ~wxImageList(); + virtual ~wxImageList(); // Attributes diff --git a/include/wx/palmos/mdi.h b/include/wx/palmos/mdi.h index 401feb3d01..c0e4293505 100644 --- a/include/wx/palmos/mdi.h +++ b/include/wx/palmos/mdi.h @@ -39,7 +39,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIParentFrame(); + virtual ~wxMDIParentFrame(); bool Create(wxWindow *parent, wxWindowID id, @@ -128,7 +128,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIChildFrame(); + virtual ~wxMDIChildFrame(); bool Create(wxMDIParentFrame *parent, wxWindowID id, diff --git a/include/wx/palmos/metafile.h b/include/wx/palmos/metafile.h index 333f460b99..14c623979f 100644 --- a/include/wx/palmos/metafile.h +++ b/include/wx/palmos/metafile.h @@ -30,7 +30,7 @@ class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData friend class WXDLLEXPORT wxMetafile; public: wxMetafileRefData(); - ~wxMetafileRefData(); + virtual ~wxMetafileRefData(); public: WXHANDLE m_metafile; diff --git a/include/wx/palmos/palette.h b/include/wx/palmos/palette.h index 28e4109d20..03678ac15d 100644 --- a/include/wx/palmos/palette.h +++ b/include/wx/palmos/palette.h @@ -21,7 +21,7 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData friend class WXDLLEXPORT wxPalette; public: wxPaletteRefData(void); - ~wxPaletteRefData(void); + virtual ~wxPaletteRefData(void); protected: WXHPALETTE m_hPalette; }; @@ -36,7 +36,7 @@ public: wxPalette(void); wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); - ~wxPalette(void); + virtual ~wxPalette(void); 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/palmos/progdlg.h b/include/wx/palmos/progdlg.h index a45452f49a..fa897d81f3 100644 --- a/include/wx/palmos/progdlg.h +++ b/include/wx/palmos/progdlg.h @@ -27,7 +27,7 @@ public: int maximum = 100, wxWindow *parent = NULL, int style = wxPD_APP_MODAL | wxPD_AUTO_HIDE); - ~wxProgressDialog(); + virtual ~wxProgressDialog(); virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL); void Resume(); diff --git a/include/wx/palmos/radiobox.h b/include/wx/palmos/radiobox.h index e2f1e7bd1c..fc8d8721d9 100644 --- a/include/wx/palmos/radiobox.h +++ b/include/wx/palmos/radiobox.h @@ -61,7 +61,7 @@ public: style, val, name); } - ~wxRadioBox(); + virtual ~wxRadioBox(); bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/palmos/scrolbar.h b/include/wx/palmos/scrolbar.h index f312d7f63b..edcc06dca0 100644 --- a/include/wx/palmos/scrolbar.h +++ b/include/wx/palmos/scrolbar.h @@ -17,7 +17,7 @@ class WXDLLEXPORT wxScrollBar: public wxScrollBarBase { public: wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; } - ~wxScrollBar(); + virtual ~wxScrollBar(); wxScrollBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/palmos/slider.h b/include/wx/palmos/slider.h index 41c32a3712..263e4a7153 100644 --- a/include/wx/palmos/slider.h +++ b/include/wx/palmos/slider.h @@ -33,7 +33,7 @@ public: Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name); } - ~wxSlider(); + virtual ~wxSlider(); bool Create(wxWindow *parent, wxWindowID id, int value, int minValue, int maxValue, diff --git a/include/wx/palmos/sound.h b/include/wx/palmos/sound.h index 7106796323..7b813f5b61 100644 --- a/include/wx/palmos/sound.h +++ b/include/wx/palmos/sound.h @@ -22,7 +22,7 @@ public: wxSound(); wxSound(const wxString& fileName, bool isResource = false); wxSound(int size, const wxByte* data); - ~wxSound(); + virtual ~wxSound(); public: // Create from resource or file diff --git a/include/wx/palmos/tabctrl.h b/include/wx/palmos/tabctrl.h index cb1a3dc4f5..f0a5207017 100644 --- a/include/wx/palmos/tabctrl.h +++ b/include/wx/palmos/tabctrl.h @@ -40,7 +40,7 @@ class WXDLLEXPORT wxTabCtrl: public wxControl { Create(parent, id, pos, size, style, name); } - ~wxTabCtrl(); + virtual ~wxTabCtrl(); // Accessors diff --git a/include/wx/palmos/textctrl.h b/include/wx/palmos/textctrl.h index 0c4174e420..465d2134fa 100644 --- a/include/wx/palmos/textctrl.h +++ b/include/wx/palmos/textctrl.h @@ -31,7 +31,7 @@ public: Create(parent, id, value, pos, size, style, validator, name); } - ~wxTextCtrl(); + virtual ~wxTextCtrl(); bool Create(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, diff --git a/include/wx/palmos/timer.h b/include/wx/palmos/timer.h index 9df998f710..c072c4d929 100644 --- a/include/wx/palmos/timer.h +++ b/include/wx/palmos/timer.h @@ -20,7 +20,7 @@ public: wxTimer() { Init(); } wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id) { Init(); } - ~wxTimer(); + virtual ~wxTimer(); virtual bool Start(int milliseconds = -1, bool oneShot = FALSE); virtual void Stop(); diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h index 9179ab5f51..6079f4a100 100644 --- a/include/wx/printdlg.h +++ b/include/wx/printdlg.h @@ -55,7 +55,7 @@ class WXDLLEXPORT wxPrintDialog : public wxObject public: wxPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL); wxPrintDialog(wxWindow *parent, wxPrintData* data); - ~wxPrintDialog(); + virtual ~wxPrintDialog(); virtual int ShowModal(); @@ -101,7 +101,7 @@ class WXDLLEXPORT wxPageSetupDialog: public wxObject { public: wxPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL); - ~wxPageSetupDialog(); + virtual ~wxPageSetupDialog(); int ShowModal(); wxPageSetupDialogData& GetPageSetupDialogData(); diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h index 3e39b0ea38..73a5d46675 100644 --- a/include/wx/prntbase.h +++ b/include/wx/prntbase.h @@ -306,7 +306,7 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("canvas")); - ~wxPreviewCanvas(); + virtual ~wxPreviewCanvas(); void OnPaint(wxPaintEvent& event); void OnChar(wxKeyEvent &event); @@ -340,7 +340,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame")); - ~wxPreviewFrame(); + virtual ~wxPreviewFrame(); void OnCloseWindow(wxCloseEvent& event); virtual void Initialize(); @@ -401,7 +401,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = wxT("panel")); - ~wxPreviewControlBar(); + virtual ~wxPreviewControlBar(); virtual void CreateButtons(); virtual void SetZoomControl(int zoom); diff --git a/include/wx/protocol/file.h b/include/wx/protocol/file.h index a04606b122..9a5af4b6f2 100644 --- a/include/wx/protocol/file.h +++ b/include/wx/protocol/file.h @@ -26,7 +26,7 @@ protected: wxProtocolError m_error; public: wxFileProto(); - ~wxFileProto(); + virtual ~wxFileProto(); wxProtocolError GetError() { return m_error; } bool Abort() { return TRUE; } diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h index 2f6437e24a..79f37c7924 100644 --- a/include/wx/protocol/http.h +++ b/include/wx/protocol/http.h @@ -25,7 +25,7 @@ class WXDLLIMPEXP_NET wxHTTP : public wxProtocol { public: wxHTTP(); - ~wxHTTP(); + virtual ~wxHTTP(); virtual bool Connect(const wxString& host, unsigned short port); virtual bool Connect(const wxString& host) { return Connect(host, 0); } diff --git a/include/wx/quantize.h b/include/wx/quantize.h index 24e3fab0fa..db6110dc62 100644 --- a/include/wx/quantize.h +++ b/include/wx/quantize.h @@ -42,7 +42,7 @@ DECLARE_DYNAMIC_CLASS(wxQuantize) //// Constructor wxQuantize() {} - ~wxQuantize() {} + virtual ~wxQuantize() {} //// Operations diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h index 38c3b901c0..65df044c96 100644 --- a/include/wx/richtext/richtextbuffer.h +++ b/include/wx/richtext/richtextbuffer.h @@ -533,7 +533,7 @@ public: // Constructors wxRichTextObject(wxRichTextObject* parent = NULL); - ~wxRichTextObject(); + virtual ~wxRichTextObject(); // Overrideables @@ -686,7 +686,7 @@ public: // Constructors wxRichTextCompositeObject(wxRichTextObject* parent = NULL); - ~wxRichTextCompositeObject(); + virtual ~wxRichTextCompositeObject(); // Overrideables @@ -1110,7 +1110,7 @@ public: wxRichTextParagraph(wxRichTextObject* parent = NULL, wxTextAttrEx* style = NULL); wxRichTextParagraph(const wxString& text, wxRichTextObject* parent = NULL, wxTextAttrEx* style = NULL); - ~wxRichTextParagraph(); + virtual ~wxRichTextParagraph(); wxRichTextParagraph(const wxRichTextParagraph& obj):wxRichTextBox() { Copy(obj); } // Overrideables @@ -1280,7 +1280,7 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextImageBlock: public wxObject public: wxRichTextImageBlock(); wxRichTextImageBlock(const wxRichTextImageBlock& block); - ~wxRichTextImageBlock(); + virtual ~wxRichTextImageBlock(); void Init(); void Clear(); @@ -1427,7 +1427,7 @@ public: wxRichTextBuffer() { Init(); } wxRichTextBuffer(const wxRichTextBuffer& obj):wxRichTextParagraphLayoutBox() { Init(); Copy(obj); } - ~wxRichTextBuffer() ; + virtual ~wxRichTextBuffer() ; // Accessors @@ -1728,7 +1728,7 @@ public: // Ctor for multiple actions wxRichTextCommand(const wxString& name); - ~wxRichTextCommand(); + virtual ~wxRichTextCommand(); bool Do(); bool Undo(); @@ -1754,7 +1754,7 @@ public: wxRichTextAction(wxRichTextCommand* cmd, const wxString& name, wxRichTextCommandId id, wxRichTextBuffer* buffer, wxRichTextCtrl* ctrl, bool ignoreFirstTime = false); - ~wxRichTextAction(); + virtual ~wxRichTextAction(); bool Do(); bool Undo(); diff --git a/include/wx/richtext/richtextctrl.h b/include/wx/richtext/richtextctrl.h index 5e6f37cb9c..a2abcbd989 100644 --- a/include/wx/richtext/richtextctrl.h +++ b/include/wx/richtext/richtextctrl.h @@ -100,7 +100,7 @@ public: wxRichTextCtrl( ); wxRichTextCtrl( wxWindow* parent, wxWindowID id = -1, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxRE_MULTILINE ); - ~wxRichTextCtrl( ); + virtual ~wxRichTextCtrl( ); // Operations diff --git a/include/wx/richtext/richtextstyles.h b/include/wx/richtext/richtextstyles.h index deae6c3d13..08ff7e683b 100644 --- a/include/wx/richtext/richtextstyles.h +++ b/include/wx/richtext/richtextstyles.h @@ -44,7 +44,7 @@ public: // Constructors wxRichTextStyleDefinition(const wxString& name = wxEmptyString) { Init(); m_name = name; } - ~wxRichTextStyleDefinition() {} + virtual ~wxRichTextStyleDefinition() {} void Init() {} @@ -80,7 +80,7 @@ public: wxRichTextCharacterStyleDefinition(const wxString& name = wxEmptyString): wxRichTextStyleDefinition(name) {} - ~wxRichTextCharacterStyleDefinition() {} + virtual ~wxRichTextCharacterStyleDefinition() {} protected: }; @@ -98,7 +98,7 @@ public: wxRichTextParagraphStyleDefinition(const wxString& name = wxEmptyString): wxRichTextStyleDefinition(name) {} - ~wxRichTextParagraphStyleDefinition() {} + virtual ~wxRichTextParagraphStyleDefinition() {} /// The next style. void SetNextStyle(const wxString& name) { m_nextStyle = name; } @@ -121,7 +121,7 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextStyleSheet: public wxObject public: /// Constructors wxRichTextStyleSheet() { Init(); } - ~wxRichTextStyleSheet() { DeleteStyles(); } + virtual ~wxRichTextStyleSheet() { DeleteStyles(); } /// Initialisation void Init(); @@ -190,7 +190,7 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextStyleListBox: public wxHtmlListBox public: wxRichTextStyleListBox(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0); - ~wxRichTextStyleListBox(); + virtual ~wxRichTextStyleListBox(); /// Creates a suitable HTML fragment for a definition wxString CreateHTML(wxRichTextStyleDefinition* def) const; diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h index 30d0130757..60fced8eb2 100644 --- a/include/wx/sckstrm.h +++ b/include/wx/sckstrm.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream { public: wxSocketOutputStream(wxSocketBase& s); - ~wxSocketOutputStream(); + virtual ~wxSocketOutputStream(); wxFileOffset SeekO( wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode) ) { return -1; } @@ -40,7 +40,7 @@ class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream { public: wxSocketInputStream(wxSocketBase& s); - ~wxSocketInputStream(); + virtual ~wxSocketInputStream(); wxFileOffset SeekI( wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode) ) { return -1; } @@ -60,7 +60,7 @@ class WXDLLIMPEXP_NET wxSocketStream : public wxSocketInputStream, { public: wxSocketStream(wxSocketBase& s); - ~wxSocketStream(); + virtual ~wxSocketStream(); DECLARE_NO_COPY_CLASS(wxSocketStream) }; diff --git a/include/wx/sizer.h b/include/wx/sizer.h index 1aab873030..e278b0d2ba 100644 --- a/include/wx/sizer.h +++ b/include/wx/sizer.h @@ -327,7 +327,7 @@ class WXDLLEXPORT wxSizer: public wxObject, public wxClientDataContainer { public: wxSizer() { m_containingWindow = NULL; } - ~wxSizer(); + virtual ~wxSizer(); // methods for adding elements to the sizer: there are Add/Insert/Prepend // overloads for each of window/sizer/spacer/wxSizerItem diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h index 2414b2c56b..8eb5f22af4 100644 --- a/include/wx/tbarbase.h +++ b/include/wx/tbarbase.h @@ -105,7 +105,7 @@ public: m_toolStyle = wxTOOL_STYLE_CONTROL; } - ~wxToolBarToolBase(){} + virtual ~wxToolBarToolBase(){} // accessors // --------- diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index 83dcaeecb4..a25c2f16e3 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -286,7 +286,7 @@ public: // -------- wxTextCtrlBase(){} - ~wxTextCtrlBase(){} + virtual ~wxTextCtrlBase(){} // accessors // --------- diff --git a/include/wx/unix/joystick.h b/include/wx/unix/joystick.h index c52edff09a..6267c1e19a 100644 --- a/include/wx/unix/joystick.h +++ b/include/wx/unix/joystick.h @@ -26,7 +26,7 @@ class WXDLLEXPORT wxJoystick: public wxObject */ wxJoystick(int joystick = wxJOYSTICK1); - ~wxJoystick(); + virtual ~wxJoystick(); // Attributes //////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/unix/sound.h b/include/wx/unix/sound.h index 41fc0582a4..9e6fa7501a 100644 --- a/include/wx/unix/sound.h +++ b/include/wx/unix/sound.h @@ -61,7 +61,7 @@ public: wxSound(); wxSound(const wxString& fileName, bool isResource = false); wxSound(int size, const wxByte* data); - ~wxSound(); + virtual ~wxSound(); // Create from resource or file bool Create(const wxString& fileName, bool isResource = false); diff --git a/include/wx/valgen.h b/include/wx/valgen.h index 1a4c017840..35dd44ff5f 100644 --- a/include/wx/valgen.h +++ b/include/wx/valgen.h @@ -26,7 +26,7 @@ public: wxGenericValidator(wxArrayInt* val); wxGenericValidator(const wxGenericValidator& copyFrom); - ~wxGenericValidator(){} + virtual ~wxGenericValidator(){} // Make a clone of this validator (or return NULL) - currently necessary // if you're passing a reference to a validator. diff --git a/include/wx/valtext.h b/include/wx/valtext.h index 394c160fcf..1bea80e06c 100644 --- a/include/wx/valtext.h +++ b/include/wx/valtext.h @@ -37,7 +37,7 @@ public: wxTextValidator(long style = wxFILTER_NONE, wxString *val = 0); wxTextValidator(const wxTextValidator& val); - ~wxTextValidator(){} + virtual ~wxTextValidator(){} // Make a clone of this validator (or return NULL) - currently necessary // if you're passing a reference to a validator. diff --git a/include/wx/variant.h b/include/wx/variant.h index c8d99a3de8..a618b1da57 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -109,7 +109,7 @@ public: #endif wxVariant(const wxVariant& variant); - ~wxVariant(); + virtual ~wxVariant(); // Generic operators // Assignment diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h index 42b75669cd..1d2a54ce58 100644 --- a/include/wx/wfstream.h +++ b/include/wx/wfstream.h @@ -34,7 +34,7 @@ public: wxFileInputStream(const wxString& ifileName); wxFileInputStream(wxFile& file); wxFileInputStream(int fd); - ~wxFileInputStream(); + virtual ~wxFileInputStream(); wxFileOffset GetLength() const; @@ -133,7 +133,7 @@ public: wxFFileInputStream(const wxString& fileName, const wxChar *mode = _T("rb")); wxFFileInputStream(wxFFile& file); wxFFileInputStream(FILE *file); - ~wxFFileInputStream(); + virtual ~wxFFileInputStream(); wxFileOffset GetLength() const; diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h index 0ad9c3e79e..416a3e2ae3 100644 --- a/include/wx/x11/app.h +++ b/include/wx/x11/app.h @@ -40,7 +40,7 @@ class WXDLLEXPORT wxApp : public wxAppBase public: wxApp(); - ~wxApp(); + virtual ~wxApp(); // override base class (pure) virtuals // ----------------------------------- diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h index c25b55b8d7..f846fe2784 100644 --- a/include/wx/x11/bitmap.h +++ b/include/wx/x11/bitmap.h @@ -37,7 +37,7 @@ public: wxMask( const wxBitmap& bitmap, const wxColour& colour ); wxMask( const wxBitmap& bitmap, int paletteIndex ); wxMask( const wxBitmap& bitmap ); - ~wxMask(); + virtual ~wxMask(); bool Create( const wxBitmap& bitmap, const wxColour& colour ); bool Create( const wxBitmap& bitmap, int paletteIndex ); diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h index c794e34416..47581c1034 100644 --- a/include/wx/x11/brush.h +++ b/include/wx/x11/brush.h @@ -33,7 +33,7 @@ public: wxBrush( const wxColour &colour, int style = wxSOLID ); wxBrush( const wxBitmap &stippleBitmap ); - ~wxBrush(); + virtual ~wxBrush(); bool Ok() const { return m_refData != NULL; } diff --git a/include/wx/x11/clipbrd.h b/include/wx/x11/clipbrd.h index 0abdaf4759..326e70c48a 100644 --- a/include/wx/x11/clipbrd.h +++ b/include/wx/x11/clipbrd.h @@ -27,7 +27,7 @@ class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase { public: wxClipboard(); - ~wxClipboard(); + virtual ~wxClipboard(); // open the clipboard before SetData() and GetData() virtual bool Open(); diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h index 502886f31f..9d9824199d 100644 --- a/include/wx/x11/colour.h +++ b/include/wx/x11/colour.h @@ -42,7 +42,7 @@ public: wxColour() {} DEFINE_STD_WXCOLOUR_CONSTRUCTORS - ~wxColour(); + virtual ~wxColour(); bool Ok() const { return m_refData != NULL; } diff --git a/include/wx/x11/cursor.h b/include/wx/x11/cursor.h index 39a29e7e6d..bdb7b8ca7b 100644 --- a/include/wx/x11/cursor.h +++ b/include/wx/x11/cursor.h @@ -34,7 +34,7 @@ public: wxCursor( const char bits[], int width, int height, int hotSpotX=-1, int hotSpotY=-1, const char maskBits[]=0, wxColour *fg=0, wxColour *bg=0 ); - ~wxCursor(); + virtual ~wxCursor(); bool operator == ( const wxCursor& cursor ) const; bool operator != ( const wxCursor& cursor ) const; bool Ok() const; diff --git a/include/wx/x11/dataobj.h b/include/wx/x11/dataobj.h index c997d4c3bf..6ec1bcad39 100644 --- a/include/wx/x11/dataobj.h +++ b/include/wx/x11/dataobj.h @@ -20,7 +20,7 @@ public: wxDataObject(); #ifdef __DARWIN__ - ~wxDataObject() { } + virtual ~wxDataObject() { } #endif virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const; diff --git a/include/wx/x11/dataobj2.h b/include/wx/x11/dataobj2.h index 1d4b877a21..6aefcebe98 100644 --- a/include/wx/x11/dataobj2.h +++ b/include/wx/x11/dataobj2.h @@ -23,7 +23,7 @@ public: wxBitmapDataObject(const wxBitmap& bitmap); // destr - ~wxBitmapDataObject(); + virtual ~wxBitmapDataObject(); // override base class virtual to update PNG data too virtual void SetBitmap(const wxBitmap& bitmap); diff --git a/include/wx/x11/dc.h b/include/wx/x11/dc.h index 9bcd8d3d5c..7c80e92e19 100644 --- a/include/wx/x11/dc.h +++ b/include/wx/x11/dc.h @@ -41,7 +41,7 @@ class WXDLLEXPORT wxDC : public wxDCBase { public: wxDC(); - ~wxDC() { } + virtual ~wxDC() { } // implement base class pure virtuals // ---------------------------------- diff --git a/include/wx/x11/dcclient.h b/include/wx/x11/dcclient.h index 7f939a3ec9..7fa64da873 100644 --- a/include/wx/x11/dcclient.h +++ b/include/wx/x11/dcclient.h @@ -35,7 +35,7 @@ public: wxWindowDC(); wxWindowDC( wxWindow *win ); - ~wxWindowDC(); + virtual ~wxWindowDC(); virtual bool CanDrawBitmap() const { return true; } virtual bool CanGetTextExtent() const { return true; } diff --git a/include/wx/x11/dcmemory.h b/include/wx/x11/dcmemory.h index 5fd1114288..a9d5ebd7f7 100644 --- a/include/wx/x11/dcmemory.h +++ b/include/wx/x11/dcmemory.h @@ -19,7 +19,7 @@ class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC public: wxMemoryDC(); wxMemoryDC( wxDC *dc ); // Create compatible DC - ~wxMemoryDC(); + virtual ~wxMemoryDC(); virtual void SelectObject( const wxBitmap& bitmap ); // implementation diff --git a/include/wx/x11/dcprint.h b/include/wx/x11/dcprint.h index 941c83f900..74ac920148 100644 --- a/include/wx/x11/dcprint.h +++ b/include/wx/x11/dcprint.h @@ -22,7 +22,7 @@ public: // Create a printer DC wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, int orientation = wxPORTRAIT); - ~wxPrinterDC(); + virtual ~wxPrinterDC(); }; #endif diff --git a/include/wx/x11/dnd.h b/include/wx/x11/dnd.h index 62400ca5e3..1643f0d7e7 100644 --- a/include/wx/x11/dnd.h +++ b/include/wx/x11/dnd.h @@ -41,7 +41,7 @@ class WXDLLEXPORT wxDropTarget: public wxObject public: wxDropTarget(); - ~wxDropTarget(); + virtual ~wxDropTarget(); virtual void OnEnter() { } virtual void OnLeave() { } @@ -143,7 +143,7 @@ public: wxDropSource( wxWindow *win ); wxDropSource( wxDataObject &data, wxWindow *win ); - ~wxDropSource(void); + virtual ~wxDropSource(void); void SetData( wxDataObject &data ); wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); diff --git a/include/wx/x11/glcanvas.h b/include/wx/x11/glcanvas.h index 266be112a3..c00e486283 100644 --- a/include/wx/x11/glcanvas.h +++ b/include/wx/x11/glcanvas.h @@ -57,7 +57,7 @@ public: const wxPalette& WXUNUSED(palette), const wxGLContext *other /* for sharing display lists */ ); - ~wxGLContext(); + virtual ~wxGLContext(); void SetCurrent(); void SetColour(const wxChar *colour); @@ -124,7 +124,7 @@ public: int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette ); - ~wxGLCanvas(); + virtual ~wxGLCanvas(); void SetCurrent(); void SetColour(const wxChar *colour); diff --git a/include/wx/x11/minifram.h b/include/wx/x11/minifram.h index 5c833353f1..92b641c996 100644 --- a/include/wx/x11/minifram.h +++ b/include/wx/x11/minifram.h @@ -34,7 +34,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMiniFrame() {} + virtual ~wxMiniFrame() {} protected: }; diff --git a/include/wx/x11/palette.h b/include/wx/x11/palette.h index 2054a9a128..f427ec3e23 100644 --- a/include/wx/x11/palette.h +++ b/include/wx/x11/palette.h @@ -37,7 +37,7 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData friend class WXDLLEXPORT wxPalette; public: wxPaletteRefData(); - ~wxPaletteRefData(); + virtual ~wxPaletteRefData(); protected: wxList m_palettes; @@ -53,7 +53,7 @@ public: wxPalette(); wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); - ~wxPalette(); + 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 17c2288831..eeff1b0756 100644 --- a/include/wx/x11/pen.h +++ b/include/wx/x11/pen.h @@ -36,7 +36,7 @@ public: wxPen( const wxColour &colour, int width = 1, int style = wxSOLID ); wxPen( const wxBitmap &stipple, int width ); - ~wxPen(); + virtual ~wxPen(); bool Ok() const { return m_refData != NULL; } diff --git a/include/wx/x11/print.h b/include/wx/x11/print.h index a814a64dcc..66eaab2ed1 100644 --- a/include/wx/x11/print.h +++ b/include/wx/x11/print.h @@ -24,7 +24,7 @@ class WXDLLEXPORT wxPrinter: public wxPrinterBase public: wxPrinter(wxPrintData *data = NULL); - ~wxPrinter(); + virtual ~wxPrinter(); virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE); virtual bool PrintDialog(wxWindow *parent); @@ -42,7 +42,7 @@ class WXDLLEXPORT wxPrintPreview: public wxPrintPreviewBase public: wxPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL); - ~wxPrintPreview(); + virtual ~wxPrintPreview(); virtual bool Print(bool interactive); virtual void DetermineScaling(); diff --git a/include/wx/x11/region.h b/include/wx/x11/region.h index 73b4b2f8c2..24f8b4c825 100644 --- a/include/wx/x11/region.h +++ b/include/wx/x11/region.h @@ -73,7 +73,7 @@ public: Union(bmp, transColour, tolerance); } - ~wxRegion(); + virtual ~wxRegion(); bool Ok() const { return m_refData != NULL; } diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h index 1d6494a8ab..b795e725f2 100644 --- a/include/wx/x11/reparent.h +++ b/include/wx/x11/reparent.h @@ -57,7 +57,7 @@ class WXDLLIMPEXP_CORE wxAdoptedWindow: public wxWindow public: wxAdoptedWindow(); wxAdoptedWindow(WXWindow window); - ~wxAdoptedWindow(); + virtual ~wxAdoptedWindow(); void SetHandle(WXWindow window) { m_mainWindow = window; m_clientWindow = window; } WXWindow GetHandle() const { return GetMainWindow(); } diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h index 715133b2cb..0c9a105cf4 100644 --- a/include/wx/xrc/xmlres.h +++ b/include/wx/xrc/xmlres.h @@ -125,7 +125,7 @@ public: const wxString& domain=wxEmptyString); // Destructor. - ~wxXmlResource(); + virtual ~wxXmlResource(); // Loads resources from XML files that match given filemask. // This method understands VFS (see filesys.h). diff --git a/include/wx/xti.h b/include/wx/xti.h index 302b6605ae..cf176c4b2f 100644 --- a/include/wx/xti.h +++ b/include/wx/xti.h @@ -768,7 +768,7 @@ class wxSetter##property : public wxSetter \ public: \ wxINFUNC_CLASS_TYPE_FIX(Klass) \ wxSetter##property() : wxSetter( wxT(#setterMethod) ) {} \ - ~wxSetter##property() {} \ + virtual ~wxSetter##property() {} \ void Set( wxObject *object, const wxxVariant &variantValue ) const \ { \ Klass *obj = dynamic_cast(object) ; \ @@ -785,7 +785,7 @@ class wxGetter##property : public wxGetter \ public : \ wxINFUNC_CLASS_TYPE_FIX(Klass) \ wxGetter##property() : wxGetter( wxT(#gettermethod) ) {} \ - ~wxGetter##property() {} \ + virtual ~wxGetter##property() {} \ void Get( const wxObject *object , wxxVariant &result) const \ { \ const Klass *obj = dynamic_cast(object) ; \ @@ -799,7 +799,7 @@ class wxAdder##property : public wxAdder \ public: \ wxINFUNC_CLASS_TYPE_FIX(Klass) \ wxAdder##property() : wxAdder( wxT(#addermethod) ) {} \ - ~wxAdder##property() {} \ + virtual ~wxAdder##property() {} \ void Add( wxObject *object, const wxxVariant &variantValue ) const \ { \ Klass *obj = dynamic_cast(object) ; \ @@ -816,7 +816,7 @@ class wxCollectionGetter##property : public wxCollectionGetter \ public : \ wxINFUNC_CLASS_TYPE_FIX(Klass) \ wxCollectionGetter##property() : wxCollectionGetter( wxT(#gettermethod) ) {} \ - ~wxCollectionGetter##property() {} \ + virtual ~wxCollectionGetter##property() {} \ void Get( const wxObject *object , wxxVariantArray &result) const \ { \ const Klass *obj = dynamic_cast(object) ; \ @@ -873,7 +873,7 @@ class WXDLLIMPEXP_BASE wxGenericPropertyAccessor : public wxPropertyAccessor { public : wxGenericPropertyAccessor( const wxString &propName ) ; - ~wxGenericPropertyAccessor() ; + virtual ~wxGenericPropertyAccessor() ; void RenameProperty( const wxString& WXUNUSED_UNLESS_DEBUG(oldName), const wxString& newName ) diff --git a/include/wx/xtistrm.h b/include/wx/xtistrm.h index c6dbcddfe3..1af026cfe9 100644 --- a/include/wx/xtistrm.h +++ b/include/wx/xtistrm.h @@ -74,7 +74,7 @@ class WXDLLIMPEXP_BASE wxWriter : public wxObject { public : wxWriter() ; - ~wxWriter() ; + virtual ~wxWriter() ; // with this call you start writing out a new top-level object void WriteObject(const wxObject *object, const wxClassInfo *classInfo , wxPersister *persister , const wxString &name , wxxVariantArray &WXUNUSED(metadata)) ; @@ -159,7 +159,7 @@ class WXDLLIMPEXP_BASE wxReader : public wxObject { public : wxReader() ; - ~wxReader() ; + virtual ~wxReader() ; // the only thing wxReader knows about is the class info by object ID wxClassInfo *GetObjectClassInfo(int objectID) ; diff --git a/include/wx/xtixml.h b/include/wx/xtixml.h index 20482693b0..2466e4731c 100644 --- a/include/wx/xtixml.h +++ b/include/wx/xtixml.h @@ -25,7 +25,7 @@ class WXDLLIMPEXP_XML wxXmlWriter : public wxWriter public : wxXmlWriter( wxXmlNode * parent ) ; - ~wxXmlWriter() ; + virtual ~wxXmlWriter() ; // // streaming callbacks @@ -84,7 +84,7 @@ class WXDLLIMPEXP_XML wxXmlReader : public wxReader { public: wxXmlReader(wxXmlNode *parent) { m_parent = parent ; } - ~wxXmlReader() {} + virtual ~wxXmlReader() {} // Reads a component from XML. The return value is the root object ID, which can // then be used to ask the depersister about that object diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp index 0157152551..666049997d 100644 --- a/src/common/combocmn.cpp +++ b/src/common/combocmn.cpp @@ -140,7 +140,7 @@ class wxComboFrameEventHandler : public wxEvtHandler { public: wxComboFrameEventHandler( wxComboCtrlBase* pCb ); - ~wxComboFrameEventHandler(); + virtual ~wxComboFrameEventHandler(); void OnPopup(); @@ -438,7 +438,7 @@ public: { m_combo = combo; } - ~wxComboBoxExtraInputHandler() { } + virtual ~wxComboBoxExtraInputHandler() { } void OnKey(wxKeyEvent& event); void OnFocus(wxFocusEvent& event); @@ -510,7 +510,7 @@ public: m_combo = combo; m_beenInside = false; } - ~wxComboPopupExtraEventHandler() { } + virtual ~wxComboPopupExtraEventHandler() { } void OnMouseEvent( wxMouseEvent& event ); diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp index d927b9aa74..9f3551a742 100644 --- a/src/common/fs_inet.cpp +++ b/src/common/fs_inet.cpp @@ -40,7 +40,7 @@ public: wxTemporaryFileInputStream(const wxString& filename) : wxFileInputStream(filename), m_filename(filename) {} - ~wxTemporaryFileInputStream() + virtual ~wxTemporaryFileInputStream() { // NB: copied from wxFileInputStream dtor, we need to do it before // wxRemoveFile diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp index ae176a802d..054cb609ef 100644 --- a/src/common/fs_mem.cpp +++ b/src/common/fs_mem.cpp @@ -49,7 +49,7 @@ class MemFSHashObj : public wxObject InitTime(); } - ~MemFSHashObj() + virtual ~MemFSHashObj() { delete[] m_Data; } diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index 52f1a41c17..b83ff1a340 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -2585,7 +2585,7 @@ public: Init( wxCFStringEncFromFontEnc(encoding) ); } - ~wxMBConv_cocoa() + virtual ~wxMBConv_cocoa() { } @@ -2740,7 +2740,7 @@ public: Init( wxMacGetSystemEncFromFontEnc(encoding) ); } - ~wxMBConv_mac() + virtual ~wxMBConv_mac() { OSStatus status = noErr ; if (m_MB2WC_converter) @@ -2913,7 +2913,7 @@ public : m_uniBack = NULL ; } - ~wxMBConv_macUTF8D() + virtual ~wxMBConv_macUTF8D() { if (m_uni!=NULL) DisposeUnicodeToTextInfo(&m_uni); diff --git a/src/common/variant.cpp b/src/common/variant.cpp index 06ef8faf22..dbf272e7e2 100644 --- a/src/common/variant.cpp +++ b/src/common/variant.cpp @@ -60,7 +60,7 @@ DECLARE_DYNAMIC_CLASS(wxVariantDataList) public: wxVariantDataList() {} wxVariantDataList(const wxList& list); - ~wxVariantDataList(); + virtual ~wxVariantDataList(); wxList& GetValue() { return m_value; } void SetValue(const wxList& value) ; diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index c9ca4db621..0f48a82300 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -55,7 +55,7 @@ public: const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxString &name = wxT("wxdataviewctrlheaderwindow") ); - ~wxDataViewHeaderWindow(); + virtual ~wxDataViewHeaderWindow(); void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; } wxDataViewCtrl *GetOwner() { return m_owner; } @@ -140,7 +140,7 @@ public: const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxString &name = wxT("wxdataviewctrlmainwindow") ); - ~wxDataViewMainWindow(); + virtual ~wxDataViewMainWindow(); // notifications from wxDataViewListModel bool RowAppended(); diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index d91d508dd2..5fcffb809e 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -199,7 +199,7 @@ public: wxGridRowLabelWindow *rowLblWin, wxGridColLabelWindow *colLblWin, wxWindowID id, const wxPoint &pos, const wxSize &size ); - ~wxGridWindow() {} + virtual ~wxGridWindow() {} void ScrollWindow( int dx, int dy, const wxRect *rect ); diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp index df0e524065..255f598ab8 100644 --- a/src/generic/notebook.cpp +++ b/src/generic/notebook.cpp @@ -84,7 +84,7 @@ class WXDLLEXPORT wxNotebookTabView: public wxTabView DECLARE_DYNAMIC_CLASS(wxNotebookTabView) public: wxNotebookTabView(wxNotebook* notebook, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR); - ~wxNotebookTabView(void); + virtual ~wxNotebookTabView(void); // Called when a tab is activated virtual void OnTabActivate(int activateId, int deactivateId); diff --git a/src/generic/paletteg.cpp b/src/generic/paletteg.cpp index 6ccfde5439..741a78893a 100644 --- a/src/generic/paletteg.cpp +++ b/src/generic/paletteg.cpp @@ -33,7 +33,7 @@ class wxPaletteRefData: public wxObjectRefData public: wxPaletteRefData(void); - ~wxPaletteRefData(void); + virtual ~wxPaletteRefData(void); int m_count; wxPaletteEntry *m_entries; diff --git a/src/generic/regiong.cpp b/src/generic/regiong.cpp index e5595ff19e..9c7bf1d034 100644 --- a/src/generic/regiong.cpp +++ b/src/generic/regiong.cpp @@ -226,7 +226,7 @@ public: extents = refData.extents; } - ~wxRegionRefData() + virtual ~wxRegionRefData() { free(rects); } diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index a14de5ece0..27e64ff532 100644 --- a/src/gtk/bitmap.cpp +++ b/src/gtk/bitmap.cpp @@ -184,7 +184,7 @@ class wxBitmapRefData: public wxObjectRefData { public: wxBitmapRefData(); - ~wxBitmapRefData(); + virtual ~wxBitmapRefData(); GdkPixmap *m_pixmap; GdkPixbuf *m_pixbuf; diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index 79b2c37f1d..af91273257 100644 --- a/src/gtk/colour.cpp +++ b/src/gtk/colour.cpp @@ -35,7 +35,7 @@ public: m_colormap = NULL; } - ~wxColourRefData() + virtual ~wxColourRefData() { FreeColour(); } diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp index 11c913bb57..f051a5332c 100644 --- a/src/gtk/cursor.cpp +++ b/src/gtk/cursor.cpp @@ -29,7 +29,7 @@ class wxCursorRefData: public wxObjectRefData public: wxCursorRefData(); - ~wxCursorRefData(); + virtual ~wxCursorRefData(); GdkCursor *m_cursor; }; diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp index 0fd5a8ac44..0cb6a0ee19 100644 --- a/src/gtk/region.cpp +++ b/src/gtk/region.cpp @@ -46,7 +46,7 @@ public: m_region = gdk_region_copy(refData.m_region); } - ~wxRegionRefData() + virtual ~wxRegionRefData() { if (m_region) gdk_region_destroy( m_region ); diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp index 41161ec1e7..6b0631a2e8 100644 --- a/src/gtk1/bitmap.cpp +++ b/src/gtk1/bitmap.cpp @@ -228,7 +228,7 @@ class wxBitmapRefData: public wxObjectRefData { public: wxBitmapRefData(); - ~wxBitmapRefData(); + virtual ~wxBitmapRefData(); GdkPixmap *m_pixmap; GdkBitmap *m_bitmap; diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp index 68652fed39..7adf4b1dc2 100644 --- a/src/gtk1/colour.cpp +++ b/src/gtk1/colour.cpp @@ -47,7 +47,7 @@ public: m_hasPixel = data.m_hasPixel; } - ~wxColourRefData() + virtual ~wxColourRefData() { FreeColour(); } diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp index 2a9b130532..3f87647fd3 100644 --- a/src/gtk1/cursor.cpp +++ b/src/gtk1/cursor.cpp @@ -36,7 +36,7 @@ class wxCursorRefData: public wxObjectRefData public: wxCursorRefData(); - ~wxCursorRefData(); + virtual ~wxCursorRefData(); GdkCursor *m_cursor; }; diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp index f0eadcdc00..80fd038c6d 100644 --- a/src/gtk1/region.cpp +++ b/src/gtk1/region.cpp @@ -63,7 +63,7 @@ public: m_region = gdk_regions_union(wxGdkRegion(), refData.m_region); } - ~wxRegionRefData() + virtual ~wxRegionRefData() { if (m_region) gdk_region_destroy( m_region ); diff --git a/src/html/chm.cpp b/src/html/chm.cpp index 4d8dba1662..1a58175c2d 100644 --- a/src/html/chm.cpp +++ b/src/html/chm.cpp @@ -364,7 +364,7 @@ public: wxChmInputStream(const wxString& archive, const wxString& file, bool simulate = false); /// Destructor - ~wxChmInputStream(); + virtual ~wxChmInputStream(); /// Return the size of the accessed file in archive virtual size_t GetSize() const { return m_size; } @@ -743,7 +743,7 @@ class wxChmFSHandler : public wxFileSystemHandler public: /// Constructor and Destructor wxChmFSHandler(); - ~wxChmFSHandler(); + virtual ~wxChmFSHandler(); /// Is able to open location? virtual bool CanOpen(const wxString& location); diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp index c5d94e07e1..1b55a9c21a 100644 --- a/src/html/helpwnd.cpp +++ b/src/html/helpwnd.cpp @@ -93,7 +93,7 @@ class wxHtmlHelpHashData : public wxObject public: wxHtmlHelpHashData(int index, wxTreeItemId id) : wxObject() { m_Index = index; m_Id = id;} - ~wxHtmlHelpHashData() {} + virtual ~wxHtmlHelpHashData() {} int m_Index; wxTreeItemId m_Id; diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp index d4a9eaebee..41c8a636df 100644 --- a/src/html/m_image.cpp +++ b/src/html/m_image.cpp @@ -289,7 +289,7 @@ public: wxFSFile *input, int w = wxDefaultCoord, int h = wxDefaultCoord, double scale = 1.0, int align = wxHTML_ALIGN_BOTTOM, const wxString& mapname = wxEmptyString); - ~wxHtmlImageCell(); + virtual ~wxHtmlImageCell(); void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info); virtual wxHtmlLinkInfo *GetLink(int x = 0, int y = 0) const; diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp index 22aa730ef0..7f965d7e0c 100644 --- a/src/html/m_tables.cpp +++ b/src/html/m_tables.cpp @@ -98,7 +98,7 @@ private: public: wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag, double pixel_scale = 1.0); - ~wxHtmlTableCell(); + virtual ~wxHtmlTableCell(); virtual void RemoveExtraSpacing(bool top, bool bottom); diff --git a/src/mac/carbon/accel.cpp b/src/mac/carbon/accel.cpp index 69cc8cbbe3..839184384c 100644 --- a/src/mac/carbon/accel.cpp +++ b/src/mac/carbon/accel.cpp @@ -36,7 +36,7 @@ class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData friend class WXDLLEXPORT wxAcceleratorTable; public: wxAcceleratorRefData(); - ~wxAcceleratorRefData(); + virtual ~wxAcceleratorRefData(); wxAccelList m_accels; }; diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp index 4f56a3a614..88dd4bc8de 100644 --- a/src/mac/carbon/brush.cpp +++ b/src/mac/carbon/brush.cpp @@ -28,7 +28,7 @@ class WXDLLEXPORT wxBrushRefData: public wxGDIRefData public: wxBrushRefData(); wxBrushRefData(const wxBrushRefData& data); - ~wxBrushRefData(); + virtual ~wxBrushRefData(); protected: wxMacBrushKind m_macBrushKind ; diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp index 87906f151a..458a6e43f6 100644 --- a/src/mac/carbon/checklst.cpp +++ b/src/mac/carbon/checklst.cpp @@ -37,7 +37,7 @@ class wxMacDataBrowserCheckListControl : public wxMacDataBrowserListControl , pu { public: wxMacDataBrowserCheckListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style ); - ~wxMacDataBrowserCheckListControl(); + virtual ~wxMacDataBrowserCheckListControl(); virtual wxMacListBoxItem* CreateItem(); @@ -174,7 +174,7 @@ public : m_isChecked = false; } - ~wxMacCheckListBoxItem() + virtual ~wxMacCheckListBoxItem() { } diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp index 94d1b3d1fb..bf87cc5a88 100644 --- a/src/mac/carbon/cursor.cpp +++ b/src/mac/carbon/cursor.cpp @@ -36,7 +36,7 @@ class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData public: wxCursorRefData(); - ~wxCursorRefData(); + virtual ~wxCursorRefData(); protected: WXHCURSOR m_hCursor; diff --git a/src/mac/carbon/dccg.cpp b/src/mac/carbon/dccg.cpp index 5e659d94a7..9a6cd4390d 100755 --- a/src/mac/carbon/dccg.cpp +++ b/src/mac/carbon/dccg.cpp @@ -408,7 +408,7 @@ protected : } } - ~ImagePattern() + virtual ~ImagePattern() { if ( m_image ) CGImageRelease( m_image ) ; @@ -523,7 +523,7 @@ public : } protected : - ~HatchPattern() {} + virtual ~HatchPattern() {} CGRect m_imageBounds ; int m_hatch ; diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp index 47958b22ab..c0779550ef 100644 --- a/src/mac/carbon/dcprint.cpp +++ b/src/mac/carbon/dcprint.cpp @@ -53,7 +53,7 @@ class wxMacCarbonPrinterDC : public wxNativePrinterDC { public : wxMacCarbonPrinterDC( wxPrintData* data ) ; - ~wxMacCarbonPrinterDC() ; + virtual ~wxMacCarbonPrinterDC() ; virtual bool StartDoc( wxPrinterDC* dc , const wxString& message ) ; virtual void EndDoc( wxPrinterDC* dc ) ; virtual void StartPage( wxPrinterDC* dc ) ; diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp index 3aefb6d5b2..180181b1ea 100644 --- a/src/mac/carbon/fontdlg.cpp +++ b/src/mac/carbon/fontdlg.cpp @@ -286,7 +286,7 @@ class wxFontColourSwatchCtrl: public wxControl DECLARE_CLASS(wxFontColourSwatchCtrl) public: wxFontColourSwatchCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0); - ~wxFontColourSwatchCtrl(); + virtual ~wxFontColourSwatchCtrl(); void OnPaint(wxPaintEvent& event); void OnMouseEvent(wxMouseEvent& event); diff --git a/src/mac/carbon/mediactrl.cpp b/src/mac/carbon/mediactrl.cpp index 5b729dc6c4..946a3909eb 100644 --- a/src/mac/carbon/mediactrl.cpp +++ b/src/mac/carbon/mediactrl.cpp @@ -75,7 +75,7 @@ class WXDLLIMPEXP_MEDIA wxQTMediaBackend : public wxMediaBackendCommonBase { public: wxQTMediaBackend(); - ~wxQTMediaBackend(); + virtual ~wxQTMediaBackend(); virtual bool CreateControl(wxControl* ctrl, wxWindow* parent, wxWindowID id, diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp index 1defd6020b..f25d2d061d 100644 --- a/src/mac/carbon/metafile.cpp +++ b/src/mac/carbon/metafile.cpp @@ -38,7 +38,7 @@ class wxMetafileRefData: public wxGDIRefData public: wxMetafileRefData(); - ~wxMetafileRefData(); + virtual ~wxMetafileRefData(); private: PicHandle m_metafile; diff --git a/src/mac/carbon/region.cpp b/src/mac/carbon/region.cpp index 23e905e869..1f26fe1575 100644 --- a/src/mac/carbon/region.cpp +++ b/src/mac/carbon/region.cpp @@ -38,7 +38,7 @@ public: CopyRgn( data.m_macRgn , m_macRgn ); } - ~wxRegionRefData() + virtual ~wxRegionRefData() { DisposeRgn( m_macRgn ); } RgnHandle m_macRgn; diff --git a/src/mac/carbon/sound.cpp b/src/mac/carbon/sound.cpp index f6ccb1557b..51e73daa10 100644 --- a/src/mac/carbon/sound.cpp +++ b/src/mac/carbon/sound.cpp @@ -90,7 +90,7 @@ public: { } - ~wxQTTimer() + virtual ~wxQTTimer() { if(m_pbPlaying) *m_pbPlaying = false; @@ -156,7 +156,7 @@ public: { } - ~wxSMTimer() + virtual ~wxSMTimer() { if(m_pbPlaying) *m_pbPlaying = false; diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp index 0fbd547e59..6994913a85 100644 --- a/src/mac/carbon/textctrl.cpp +++ b/src/mac/carbon/textctrl.cpp @@ -118,7 +118,7 @@ public : m_param1 = p1 ; } - ~wxMacObjectFunctor1() {} + virtual ~wxMacObjectFunctor1() {} virtual void* operator()() { @@ -177,7 +177,7 @@ class wxMacTextControl : public wxMacControl { public : wxMacTextControl( wxTextCtrl *peer ) ; - ~wxMacTextControl() ; + virtual ~wxMacTextControl() ; virtual wxString GetStringValue() const = 0 ; virtual void SetStringValue( const wxString &val ) = 0 ; @@ -305,7 +305,7 @@ public : const wxString& str, const wxPoint& pos, const wxSize& size, long style ) ; - ~wxMacMLTEHIViewControl() ; + virtual ~wxMacMLTEHIViewControl() ; virtual OSStatus SetFocus( ControlFocusPart focusPart ) ; virtual bool HasFocus() const ; @@ -326,7 +326,7 @@ public : const wxString& str, const wxPoint& pos, const wxSize& size, long style ) ; - ~wxMacUnicodeTextControl(); + virtual ~wxMacUnicodeTextControl(); virtual void VisibilityChanged(bool shown); virtual wxString GetStringValue() const ; @@ -362,7 +362,7 @@ public : const wxString& str, const wxPoint& pos, const wxSize& size, long style ) ; - ~wxMacMLTEClassicControl() ; + virtual ~wxMacMLTEClassicControl() ; virtual void VisibilityChanged(bool shown) ; virtual void SuperChangedPosition() ; diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp index af1ccc6717..6292291bdb 100644 --- a/src/mac/carbon/toolbar.cpp +++ b/src/mac/carbon/toolbar.cpp @@ -79,7 +79,7 @@ public: SetControlHandle( (ControlRef) control->GetHandle() ); } - ~wxToolBarTool() + virtual ~wxToolBarTool() { ClearControl(); diff --git a/src/mac/classic/accel.cpp b/src/mac/classic/accel.cpp index 89ac19e521..71714f9d7f 100644 --- a/src/mac/classic/accel.cpp +++ b/src/mac/classic/accel.cpp @@ -36,7 +36,7 @@ class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData friend class WXDLLEXPORT wxAcceleratorTable; public: wxAcceleratorRefData(); - ~wxAcceleratorRefData(); + virtual ~wxAcceleratorRefData(); wxAccelList m_accels; }; diff --git a/src/mac/classic/brush.cpp b/src/mac/classic/brush.cpp index a2e9e6d798..a848d256dd 100644 --- a/src/mac/classic/brush.cpp +++ b/src/mac/classic/brush.cpp @@ -27,7 +27,7 @@ class WXDLLEXPORT wxBrushRefData: public wxGDIRefData public: wxBrushRefData(); wxBrushRefData(const wxBrushRefData& data); - ~wxBrushRefData(); + virtual ~wxBrushRefData(); protected: wxMacBrushKind m_macBrushKind ; diff --git a/src/mac/classic/dcprint.cpp b/src/mac/classic/dcprint.cpp index b26db3e8c6..03f81738af 100644 --- a/src/mac/classic/dcprint.cpp +++ b/src/mac/classic/dcprint.cpp @@ -52,7 +52,7 @@ class wxMacCarbonPrinterDC : public wxNativePrinterDC { public : wxMacCarbonPrinterDC( wxPrintData* data ) ; - ~wxMacCarbonPrinterDC() ; + virtual ~wxMacCarbonPrinterDC() ; virtual bool StartDoc( wxPrinterDC* dc , const wxString& message ) ; virtual void EndDoc( wxPrinterDC* dc ) ; virtual void StartPage( wxPrinterDC* dc ) ; @@ -185,7 +185,7 @@ class wxMacClassicPrinterDC : public wxNativePrinterDC { public : wxMacClassicPrinterDC( wxPrintData* data ) ; - ~wxMacClassicPrinterDC() ; + virtual ~wxMacClassicPrinterDC() ; virtual bool StartDoc( wxPrinterDC* dc , const wxString& message ) ; virtual void EndDoc( wxPrinterDC* dc ) ; virtual void StartPage( wxPrinterDC* dc ) ; diff --git a/src/mac/classic/region.cpp b/src/mac/classic/region.cpp index 2b25c299cc..6d3e1bafc5 100644 --- a/src/mac/classic/region.cpp +++ b/src/mac/classic/region.cpp @@ -39,7 +39,7 @@ public: CopyRgn( data.m_macRgn , m_macRgn ) ; } - ~wxRegionRefData() + virtual ~wxRegionRefData() { DisposeRgn( m_macRgn ) ; } diff --git a/src/mac/classic/toolbar.cpp b/src/mac/classic/toolbar.cpp index b1db448182..15b9379cba 100644 --- a/src/mac/classic/toolbar.cpp +++ b/src/mac/classic/toolbar.cpp @@ -54,7 +54,7 @@ public: Init() ; } - ~wxToolBarTool() + virtual ~wxToolBarTool() { if ( m_controlHandle ) DisposeControl( m_controlHandle ) ; diff --git a/src/mac/corefoundation/hidjoystick.cpp b/src/mac/corefoundation/hidjoystick.cpp index d9be35e342..a0e63d71db 100644 --- a/src/mac/corefoundation/hidjoystick.cpp +++ b/src/mac/corefoundation/hidjoystick.cpp @@ -75,7 +75,7 @@ class wxHIDJoystick : public wxHIDDevice { public: wxHIDJoystick(); - ~wxHIDJoystick(); + virtual ~wxHIDJoystick(); bool Create(int nWhich); virtual void BuildCookies(CFArrayRef Array); diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp index 247d9558de..53c61fad16 100644 --- a/src/mgl/app.cpp +++ b/src/mgl/app.cpp @@ -124,7 +124,7 @@ class wxRootWindow : public wxWindow SetMGLwindow_t(MGL_wmGetRootWindow(g_winMng)); SetBackgroundColour(wxTHEME_COLOUR(DESKTOP)); } - ~wxRootWindow() + virtual ~wxRootWindow() { // we don't want to delete MGL_WM's rootWnd m_wnd = NULL; diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp index d2795dffb0..85cfbe0fee 100644 --- a/src/mgl/bitmap.cpp +++ b/src/mgl/bitmap.cpp @@ -155,7 +155,7 @@ class wxBitmapRefData: public wxObjectRefData { public: wxBitmapRefData(); - ~wxBitmapRefData(); + virtual ~wxBitmapRefData(); int m_width; int m_height; diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp index c60a9eaf11..7614434e79 100644 --- a/src/mgl/cursor.cpp +++ b/src/mgl/cursor.cpp @@ -36,7 +36,7 @@ class wxCursorRefData: public wxObjectRefData public: wxCursorRefData(); - ~wxCursorRefData(); + virtual ~wxCursorRefData(); MGLCursor *m_cursor; }; diff --git a/src/mgl/palette.cpp b/src/mgl/palette.cpp index e47260ed12..531023287f 100644 --- a/src/mgl/palette.cpp +++ b/src/mgl/palette.cpp @@ -26,7 +26,7 @@ class wxPaletteRefData: public wxObjectRefData { public: wxPaletteRefData(void); - ~wxPaletteRefData(void); + virtual ~wxPaletteRefData(void); int m_count; palette_t *m_entries; diff --git a/src/mgl/region.cpp b/src/mgl/region.cpp index 6819daf689..f53a93131b 100644 --- a/src/mgl/region.cpp +++ b/src/mgl/region.cpp @@ -45,7 +45,7 @@ public: m_region = data.m_region; } - ~wxRegionRefData() {} + virtual ~wxRegionRefData() {} MGLRegion m_region; }; diff --git a/src/motif/accel.cpp b/src/motif/accel.cpp index e3d7e23be3..ac913b5881 100644 --- a/src/motif/accel.cpp +++ b/src/motif/accel.cpp @@ -28,7 +28,7 @@ class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData friend class WXDLLEXPORT wxAcceleratorTable; public: wxAcceleratorRefData(); - ~wxAcceleratorRefData(); + virtual ~wxAcceleratorRefData(); public: int m_count; diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp index afb0b8a83f..a40c79befa 100644 --- a/src/motif/cursor.cpp +++ b/src/motif/cursor.cpp @@ -54,7 +54,7 @@ class WXDLLEXPORT wxCursorRefData: public wxObjectRefData friend class WXDLLEXPORT wxCursor; public: wxCursorRefData(); - ~wxCursorRefData(); + virtual ~wxCursorRefData(); wxXCursorList m_cursors; // wxXCursor objects, one per display wxStockCursor m_cursorId; // wxWidgets standard cursor id diff --git a/src/motif/font.cpp b/src/motif/font.cpp index b16a93e085..6ecf549405 100644 --- a/src/motif/font.cpp +++ b/src/motif/font.cpp @@ -54,7 +54,7 @@ class wxXFont : public wxObject { public: wxXFont(); - ~wxXFont(); + virtual ~wxXFont(); #if !wxMOTIF_NEW_FONT_HANDLING WXFontStructPtr m_fontStruct; // XFontStruct @@ -91,7 +91,7 @@ public: data.m_underlined, data.m_faceName, data.m_encoding); } - ~wxFontRefData(); + virtual ~wxFontRefData(); protected: // common part of all ctors diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp index 4f32323ea2..dd10927d96 100644 --- a/src/motif/spinbutt.cpp +++ b/src/motif/spinbutt.cpp @@ -93,7 +93,7 @@ public: Create( parent, id, d, pos, size ); } - ~wxArrowButton() + virtual ~wxArrowButton() { delete m_timer; } bool Create( wxSpinButton* parent, wxWindowID id, ArrowDirection d, diff --git a/src/msdos/utilsdos.cpp b/src/msdos/utilsdos.cpp index 799a3fc5e7..6bbd0de3f2 100644 --- a/src/msdos/utilsdos.cpp +++ b/src/msdos/utilsdos.cpp @@ -329,7 +329,7 @@ public: : wxFFileInputStream(name, _T("rt")) { } - ~wxTempFileInStream() + virtual ~wxTempFileInStream() { m_file->Close(); wxRemoveFile(m_file->GetName()); diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp index 458a14a21b..63588c3086 100644 --- a/src/msw/accel.cpp +++ b/src/msw/accel.cpp @@ -47,7 +47,7 @@ class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData friend class WXDLLEXPORT wxAcceleratorTable; public: wxAcceleratorRefData(); - ~wxAcceleratorRefData(); + virtual ~wxAcceleratorRefData(); inline HACCEL GetHACCEL() const { return m_hAccel; } protected: diff --git a/src/msw/mediactrl.cpp b/src/msw/mediactrl.cpp index b4d8268bea..1578d45777 100644 --- a/src/msw/mediactrl.cpp +++ b/src/msw/mediactrl.cpp @@ -1507,7 +1507,7 @@ class WXDLLIMPEXP_MEDIA wxMCIMediaBackend : public wxMediaBackendCommonBase { public: wxMCIMediaBackend(); - ~wxMCIMediaBackend(); + virtual ~wxMCIMediaBackend(); virtual bool CreateControl(wxControl* ctrl, wxWindow* parent, wxWindowID id, @@ -1867,7 +1867,7 @@ class WXDLLIMPEXP_MEDIA wxQTMediaBackend : public wxMediaBackendCommonBase { public: wxQTMediaBackend(); - ~wxQTMediaBackend(); + virtual ~wxQTMediaBackend(); virtual bool CreateControl(wxControl* ctrl, wxWindow* parent, wxWindowID id, @@ -2133,7 +2133,7 @@ public: pGB->Release(); } - ~wxAMPlayTimer() + virtual ~wxAMPlayTimer() { SAFE_RELEASE(m_pME); } diff --git a/src/msw/urlmsw.cpp b/src/msw/urlmsw.cpp index 70eb9dfdde..e24bcbb90b 100644 --- a/src/msw/urlmsw.cpp +++ b/src/msw/urlmsw.cpp @@ -121,7 +121,7 @@ class /*WXDLLIMPEXP_NET */ wxWinINetInputStream : public wxInputStream { public: wxWinINetInputStream(HINTERNET hFile=0); - ~wxWinINetInputStream(); + virtual ~wxWinINetInputStream(); void Attach(HINTERNET hFile); diff --git a/src/os2/accel.cpp b/src/os2/accel.cpp index ff55bd2203..db62b9bf36 100644 --- a/src/os2/accel.cpp +++ b/src/os2/accel.cpp @@ -31,7 +31,7 @@ class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData friend class WXDLLEXPORT wxAcceleratorTable; public: wxAcceleratorRefData(); - ~wxAcceleratorRefData(); + virtual ~wxAcceleratorRefData(); inline HACCEL GetHACCEL() const { return m_hAccel; } protected: diff --git a/src/os2/region.cpp b/src/os2/region.cpp index 0bf37cdcc3..a312ff367d 100644 --- a/src/os2/region.cpp +++ b/src/os2/region.cpp @@ -70,7 +70,7 @@ public: } } - ~wxRegionRefData() + virtual ~wxRegionRefData() { ::GpiDestroyRegion(m_hPS, m_hRegion); } diff --git a/src/palmos/accel.cpp b/src/palmos/accel.cpp index 7cbf63352b..e2a28afb7f 100644 --- a/src/palmos/accel.cpp +++ b/src/palmos/accel.cpp @@ -33,7 +33,7 @@ class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData friend class WXDLLEXPORT wxAcceleratorTable; public: wxAcceleratorRefData(); - ~wxAcceleratorRefData(); + virtual ~wxAcceleratorRefData(); inline HACCEL GetHACCEL() const { return m_hAccel; } protected: diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp index c2b05dc3b5..e2e7f7ab8f 100644 --- a/src/univ/menu.cpp +++ b/src/univ/menu.cpp @@ -123,7 +123,7 @@ class wxPopupMenuWindow : public wxPopupTransientWindow public: wxPopupMenuWindow(wxWindow *parent, wxMenu *menu); - ~wxPopupMenuWindow(); + virtual ~wxPopupMenuWindow(); // override the base class version to select the first item initially virtual void Popup(wxWindow *focus = NULL); diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp index 2558a59fe1..5adb68e392 100644 --- a/src/univ/themes/win32.cpp +++ b/src/univ/themes/win32.cpp @@ -654,7 +654,7 @@ class wxWin32FrameInputHandler : public wxStdFrameInputHandler { public: wxWin32FrameInputHandler(wxInputHandler *handler); - ~wxWin32FrameInputHandler(); + virtual ~wxWin32FrameInputHandler(); virtual bool HandleMouse(wxInputConsumer *control, const wxMouseEvent& event); diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp index 2eabc7aa2e..0f187a106b 100644 --- a/src/unix/dialup.cpp +++ b/src/unix/dialup.cpp @@ -73,7 +73,7 @@ class WXDLLEXPORT wxDialUpManagerImpl : public wxDialUpManager { public: wxDialUpManagerImpl(); - ~wxDialUpManagerImpl(); + virtual ~wxDialUpManagerImpl(); /** Could the dialup manager be initialized correctly? If this function returns false, no other functions will work neither, so it's a good idea diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp index 81c9c35ba3..6a0f4d4786 100644 --- a/src/unix/mediactrl.cpp +++ b/src/unix/mediactrl.cpp @@ -166,7 +166,7 @@ class WXDLLIMPEXP_MEDIA public: wxGStreamerMediaBackend(); - ~wxGStreamerMediaBackend(); + virtual ~wxGStreamerMediaBackend(); virtual bool CreateControl(wxControl* ctrl, wxWindow* parent, wxWindowID id, diff --git a/src/unix/sound.cpp b/src/unix/sound.cpp index 66db273514..0afab5a47b 100644 --- a/src/unix/sound.cpp +++ b/src/unix/sound.cpp @@ -296,7 +296,7 @@ class wxSoundSyncOnlyAdaptor : public wxSoundBackend public: wxSoundSyncOnlyAdaptor(wxSoundBackend *backend) : m_backend(backend), m_playing(false) {} - ~wxSoundSyncOnlyAdaptor() + virtual ~wxSoundSyncOnlyAdaptor() { delete m_backend; } diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp index 7236c231b7..920910df87 100644 --- a/src/x11/bitmap.cpp +++ b/src/x11/bitmap.cpp @@ -231,7 +231,7 @@ class wxBitmapRefData: public wxObjectRefData { public: wxBitmapRefData(); - ~wxBitmapRefData(); + virtual ~wxBitmapRefData(); WXPixmap m_pixmap; WXPixmap m_bitmap; diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp index b894d933b2..84a183959b 100644 --- a/src/x11/colour.cpp +++ b/src/x11/colour.cpp @@ -45,7 +45,7 @@ public: m_hasPixel = data.m_hasPixel; } - ~wxColourRefData() + virtual ~wxColourRefData() { FreeColour(); } diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp index 03d92bd650..49e9f1c1d7 100644 --- a/src/x11/cursor.cpp +++ b/src/x11/cursor.cpp @@ -36,7 +36,7 @@ class wxCursorRefData: public wxObjectRefData public: wxCursorRefData(); - ~wxCursorRefData(); + virtual ~wxCursorRefData(); WXCursor m_cursor; WXDisplay *m_display; diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp index 2fbbbb421c..b62ce72440 100644 --- a/src/x11/evtloop.cpp +++ b/src/x11/evtloop.cpp @@ -80,7 +80,7 @@ class wxSocketTable: public wxHashTable wxSocketTable(): wxHashTable(wxKEY_INTEGER) { } - ~wxSocketTable() + virtual ~wxSocketTable() { WX_CLEAR_HASH_TABLE(*this) } diff --git a/src/x11/font.cpp b/src/x11/font.cpp index 9cbc28fa1e..b1cda1cf23 100644 --- a/src/x11/font.cpp +++ b/src/x11/font.cpp @@ -65,7 +65,7 @@ class wxXFont : public wxObject { public: wxXFont(); - ~wxXFont(); + virtual ~wxXFont(); WXFontStructPtr m_fontStruct; // XFontStruct WXDisplay* m_display; // XDisplay diff --git a/src/x11/region.cpp b/src/x11/region.cpp index d2f196d93f..02b26b1600 100644 --- a/src/x11/region.cpp +++ b/src/x11/region.cpp @@ -45,7 +45,7 @@ public: XUnionRegion( refData.m_region, m_region, m_region ); } - ~wxRegionRefData() + virtual ~wxRegionRefData() { if (m_region) XDestroyRegion( m_region ); @@ -432,7 +432,7 @@ class wxRIRefData: public wxObjectRefData public: wxRIRefData() : m_rects(0), m_numRects(0){} - ~wxRIRefData(); + virtual ~wxRIRefData(); wxRect *m_rects; size_t m_numRects; diff --git a/utils/HelpGen/src/docripper.h b/utils/HelpGen/src/docripper.h index 36bb95d0dd..976f4b8743 100644 --- a/utils/HelpGen/src/docripper.h +++ b/utils/HelpGen/src/docripper.h @@ -139,7 +139,7 @@ protected: public: RipperDocGen(); - ~RipperDocGen(); + virtual ~RipperDocGen(); // should be called onece to set user-code provided, // parser for specific source code language diff --git a/utils/HelpGen/src/ifcontext.h b/utils/HelpGen/src/ifcontext.h index 419d7006b1..c7182e7374 100644 --- a/utils/HelpGen/src/ifcontext.h +++ b/utils/HelpGen/src/ifcontext.h @@ -78,7 +78,7 @@ public: public: spInterFileContext(); - ~spInterFileContext(); + virtual ~spInterFileContext(); void AddFile( const wxString& fname, const wxString& content ); diff --git a/utils/configtool/src/appsettings.h b/utils/configtool/src/appsettings.h index 8e5328e9d5..e85996cb37 100644 --- a/utils/configtool/src/appsettings.h +++ b/utils/configtool/src/appsettings.h @@ -39,7 +39,7 @@ public: ctSettings(const ctSettings& settings); /// Destructor. - ~ctSettings(){}; + virtual ~ctSettings(){} // Operations diff --git a/utils/configtool/src/configitem.h b/utils/configtool/src/configitem.h index 89f51efe05..94430793d6 100644 --- a/utils/configtool/src/configitem.h +++ b/utils/configtool/src/configitem.h @@ -49,7 +49,7 @@ public: /// Ctor and dtor ctConfigItem(ctConfigItem* parent, ctConfigType type, const wxString& name); ctConfigItem(); - ~ctConfigItem(); + virtual ~ctConfigItem(); /// Copy constructor. ctConfigItem(const ctConfigItem& item) : wxObject() diff --git a/utils/configtool/src/configtooldoc.h b/utils/configtool/src/configtooldoc.h index 277dba3151..b62fb1793d 100644 --- a/utils/configtool/src/configtooldoc.h +++ b/utils/configtool/src/configtooldoc.h @@ -29,7 +29,7 @@ class ctConfigToolDoc: public wxDocument DECLARE_DYNAMIC_CLASS(ctConfigToolDoc) public: ctConfigToolDoc(); - ~ctConfigToolDoc(); + virtual ~ctConfigToolDoc(); //// Overrides virtual bool OnCreate(const wxString& path, long flags); @@ -120,7 +120,7 @@ public: /// Ctor and dtor ctConfiguration(ctConfiguration* parent, const wxString& name); ctConfiguration(); - ~ctConfiguration(); + virtual ~ctConfiguration(); /// Copy constructor. ctConfiguration(const ctConfiguration& configuration) : wxObject() @@ -260,7 +260,7 @@ public: ctConfigCommand(const wxString& name, int cmdId, ctConfigItem* activeState, ctProperties* properties, bool ignoreFirstTime = false); - ~ctConfigCommand(); + virtual ~ctConfigCommand(); bool Do(); bool Undo(); diff --git a/utils/configtool/src/configtree.h b/utils/configtool/src/configtree.h index ddc1eae341..19c107a5c0 100644 --- a/utils/configtool/src/configtree.h +++ b/utils/configtool/src/configtree.h @@ -28,7 +28,7 @@ class ctTreeItemData : public wxTreeItemData { public: ctTreeItemData(ctConfigItem* item) : m_configItem(item) { } - ~ctTreeItemData() ; + virtual ~ctTreeItemData() ; ctConfigItem *GetConfigItem() const { return m_configItem; } void SetConfigItem(ctConfigItem *item) { m_configItem = item; } @@ -49,7 +49,7 @@ class ctConfigTreeCtrl: public wxTreeCtrl public: ctConfigTreeCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pt = wxDefaultPosition, const wxSize& sz = wxDefaultSize, long style = wxTR_HAS_BUTTONS); - ~ctConfigTreeCtrl(); + virtual ~ctConfigTreeCtrl(); //// Event handlers void OnMouseEvent(wxMouseEvent& event); diff --git a/utils/configtool/src/htmlparser.h b/utils/configtool/src/htmlparser.h index de9ebc610c..8c05cb8c2e 100644 --- a/utils/configtool/src/htmlparser.h +++ b/utils/configtool/src/htmlparser.h @@ -142,7 +142,7 @@ class wxSimpleHtmlParser : public wxObject public: wxSimpleHtmlParser(); - ~wxSimpleHtmlParser(); + virtual ~wxSimpleHtmlParser(); //// Operations bool ParseFile(const wxString& filename); diff --git a/utils/configtool/src/mainframe.h b/utils/configtool/src/mainframe.h index 8567f116ae..108398035a 100644 --- a/utils/configtool/src/mainframe.h +++ b/utils/configtool/src/mainframe.h @@ -175,7 +175,7 @@ DECLARE_CLASS(ctOutputWindow) public: ctOutputWindow(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0); - ~ctOutputWindow(){}; + virtual ~ctOutputWindow(){} /// Initialise the windows. void CreateWindows(); diff --git a/utils/configtool/src/propeditor.h b/utils/configtool/src/propeditor.h index 5641b4efb7..caf5a2b806 100644 --- a/utils/configtool/src/propeditor.h +++ b/utils/configtool/src/propeditor.h @@ -31,7 +31,7 @@ class ctPropertyEditor: public wxPanel DECLARE_CLASS(ctPropertyEditor) public: ctPropertyEditor(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style); - ~ctPropertyEditor(){}; + virtual ~ctPropertyEditor(){} // Event handlers diff --git a/utils/configtool/src/property.h b/utils/configtool/src/property.h index fd980f0f28..2d7877e8e3 100644 --- a/utils/configtool/src/property.h +++ b/utils/configtool/src/property.h @@ -131,7 +131,7 @@ class ctProperties: public wxObject public: ctProperties() {} ctProperties(const ctProperties& properties) : wxObject() { Copy(properties); } - ~ctProperties() { Clear(); } + virtual ~ctProperties() { Clear(); } void operator = (const ctProperties& properties) { Clear(); Copy(properties); } void Copy(const ctProperties& properties); diff --git a/utils/configtool/src/wxconfigtool.h b/utils/configtool/src/wxconfigtool.h index 989c5c3b09..eec2c4a004 100644 --- a/utils/configtool/src/wxconfigtool.h +++ b/utils/configtool/src/wxconfigtool.h @@ -40,7 +40,7 @@ public: ctApp(); /// Destructor. - ~ctApp(){}; + virtual ~ctApp(){} // Accessors diff --git a/utils/helpview/src/helpview.h b/utils/helpview/src/helpview.h index 2dbf1cdadb..bd1de5fd6c 100644 --- a/utils/helpview/src/helpview.h +++ b/utils/helpview/src/helpview.h @@ -65,7 +65,7 @@ class hvConnection : public wxConnection { public: hvConnection(); - ~hvConnection(); + virtual ~hvConnection(); bool OnExecute(const wxString& topic, wxChar*data, int size, wxIPCFormat format); wxChar *OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format); diff --git a/utils/helpview/src/remhelp.h b/utils/helpview/src/remhelp.h index 8c143ced09..0c43f6a48f 100644 --- a/utils/helpview/src/remhelp.h +++ b/utils/helpview/src/remhelp.h @@ -22,7 +22,7 @@ class rhhcConnection : public wxConnection { public: rhhcConnection(bool *isconn_a); - ~rhhcConnection(); + virtual ~rhhcConnection(); bool OnAdvise(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format); bool OnDisconnect(); @@ -44,7 +44,7 @@ class wxRemoteHtmlHelpController : public wxHelpControllerBase DECLARE_CLASS(wxRemoteHtmlHelpController) public: wxRemoteHtmlHelpController(int style = wxHF_DEFAULT_STYLE); - ~wxRemoteHtmlHelpController(); + virtual ~wxRemoteHtmlHelpController(); void OnQuit(void); void SetService(wxString& a_service); diff --git a/utils/nplugin/src/npapp.h b/utils/nplugin/src/npapp.h index 238a612313..ebc11a7562 100644 --- a/utils/nplugin/src/npapp.h +++ b/utils/nplugin/src/npapp.h @@ -34,7 +34,7 @@ class WXDLLEXPORT wxPluginApp: public wxApp public: wxPluginApp(void); - ~wxPluginApp(void); + virtual ~wxPluginApp(void); // Find a frame given a NP instance wxPluginFrame *FindFrame(NPP instance); diff --git a/utils/nplugin/src/npframe.h b/utils/nplugin/src/npframe.h index 6cac54b828..ae13339b96 100644 --- a/utils/nplugin/src/npframe.h +++ b/utils/nplugin/src/npframe.h @@ -34,7 +34,7 @@ public: Create(data); } - ~wxPluginFrame(void); + virtual ~wxPluginFrame(void); bool Create(const wxPluginData& data); diff --git a/utils/tex2rtf/src/htmlutil.cpp b/utils/tex2rtf/src/htmlutil.cpp index b68d0b5b2f..de0409e8ce 100644 --- a/utils/tex2rtf/src/htmlutil.cpp +++ b/utils/tex2rtf/src/htmlutil.cpp @@ -114,7 +114,7 @@ class TexNextPage: public wxObject label = copystring(theLabel); filename = copystring(theFile); } - ~TexNextPage(void) + virtual ~TexNextPage(void) { delete[] label; delete[] filename; diff --git a/utils/tex2rtf/src/tex2any.h b/utils/tex2rtf/src/tex2any.h index cc13af3e14..9b78d397c9 100644 --- a/utils/tex2rtf/src/tex2any.h +++ b/utils/tex2rtf/src/tex2any.h @@ -53,7 +53,7 @@ class TexMacroDef: public wxObject int macroId; TexMacroDef(int the_id, const wxChar *the_name, int n, bool ig, bool forbidLevel = FORBID_OK); - ~TexMacroDef(void); + virtual ~TexMacroDef(void); }; #define CHUNK_TYPE_MACRO 1 @@ -135,7 +135,7 @@ class TexTopic: public wxObject wxChar *filename; wxStringList *keywords; TexTopic(wxChar *f = NULL); - ~TexTopic(void); + virtual ~TexTopic(void); }; extern wxHashTable TopicTable; void AddKeyWordForTopic(wxChar *topic, wxChar *entry, wxChar *filename = NULL); @@ -403,7 +403,7 @@ class TexRef: public wxObject wxChar *sectionNumber; // Section or figure number (as a string) wxChar *sectionName; // name e.g. 'section' TexRef(const wxChar *label, const wxChar *file, const wxChar *section, const wxChar *sectionN = NULL); - ~TexRef(void); + virtual ~TexRef(void); }; /* @@ -515,7 +515,7 @@ public: else macroBody = NULL; } - ~CustomMacro(); + virtual ~CustomMacro(); }; bool ReadCustomMacros(const wxString& filename); @@ -537,7 +537,7 @@ class ColourTableEntry: public wxObject unsigned int blue; ColourTableEntry(const wxChar *theName, unsigned int r, unsigned int g, unsigned int b); - ~ColourTableEntry(void); + virtual ~ColourTableEntry(void); }; extern wxList ColourTable; diff --git a/utils/tex2rtf/src/tex2rtf.h b/utils/tex2rtf/src/tex2rtf.h index 5ede4690a6..1ed4e198e2 100644 --- a/utils/tex2rtf/src/tex2rtf.h +++ b/utils/tex2rtf/src/tex2rtf.h @@ -73,7 +73,7 @@ class Tex2RTFConnection: public wxDDEConnection { public: Tex2RTFConnection(wxChar *buf, int size); - ~Tex2RTFConnection(void){}; + virtual ~Tex2RTFConnection(void){} bool OnExecute(const wxString& topic, wxChar *data, int size, wxIPCFormat format); wxChar *OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format); }; diff --git a/utils/wxOLE/gtk/wxole.cpp b/utils/wxOLE/gtk/wxole.cpp index 243dde4a03..6793d882d3 100644 --- a/utils/wxOLE/gtk/wxole.cpp +++ b/utils/wxOLE/gtk/wxole.cpp @@ -65,7 +65,7 @@ class wxOleInputStream : public wxInputStream public: wxOleInputStream( GNOME_Stream stream ); - ~wxOleInputStream(); + virtual ~wxOleInputStream(); bool Ok() const { return m_error; } diff --git a/utils/wxOLE/gtk/wxole.h b/utils/wxOLE/gtk/wxole.h index 4c20f03b19..b8264d6c31 100644 --- a/utils/wxOLE/gtk/wxole.h +++ b/utils/wxOLE/gtk/wxole.h @@ -44,7 +44,7 @@ class wxOleServerEnv : public wxObject public: wxOleServerEnv( const wxString &name, const wxString &version ); - ~wxOleServerEnv(); + virtual ~wxOleServerEnv(); private: @@ -68,7 +68,7 @@ class wxOleServer : public wxObject public: wxOleServer( const wxString &id ); - ~wxOleServer(); + virtual ~wxOleServer(); virtual wxOleControl *CreateOleControl(); @@ -91,7 +91,7 @@ class wxOleControl : public wxFrame public: wxOleControl( wxWindowID id, long style = 0, const wxString &name = wxOleNameStr ); - ~wxOleControl(); + virtual ~wxOleControl(); bool Create( wxWindowID id, long style = 0, const wxString &name = wxOleNameStr ); protected: diff --git a/utils/wxOLE/samples/servlet/servlet.cpp b/utils/wxOLE/samples/servlet/servlet.cpp index cbf5dfd47b..daaa45c168 100644 --- a/utils/wxOLE/samples/servlet/servlet.cpp +++ b/utils/wxOLE/samples/servlet/servlet.cpp @@ -65,7 +65,7 @@ class MyApp : public wxApp public: MyApp(); - ~MyApp(); + virtual ~MyApp(); virtual bool OnInit(); -- 2.45.2