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
This commit is contained in:
@@ -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
|
||||
|
@@ -31,7 +31,7 @@ public:
|
||||
wxBrush();
|
||||
wxBrush(const wxColour& col, int style = wxSOLID);
|
||||
wxBrush(const wxBitmap& stipple);
|
||||
~wxBrush();
|
||||
virtual ~wxBrush();
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
// Implementation
|
||||
|
@@ -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();
|
||||
|
@@ -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 ; }
|
||||
|
||||
|
@@ -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);
|
||||
|
@@ -29,7 +29,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
|
||||
//-------------------------------------------------------------------------
|
||||
public:
|
||||
wxDC();
|
||||
~wxDC();
|
||||
virtual ~wxDC();
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
// wxCocoa specifics
|
||||
|
@@ -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();
|
||||
|
@@ -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:
|
||||
|
@@ -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; }
|
||||
|
@@ -65,7 +65,7 @@ public:
|
||||
long style = wxDEFAULT_DIALOG_STYLE,
|
||||
const wxString& name = wxDialogNameStr);
|
||||
|
||||
~wxDialog();
|
||||
virtual ~wxDialog();
|
||||
protected:
|
||||
void Init();
|
||||
|
||||
|
@@ -31,7 +31,7 @@ public:
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
const wxString& name = wxDirDialogNameStr);
|
||||
~wxDirDialog();
|
||||
virtual ~wxDirDialog();
|
||||
|
||||
virtual int ShowModal();
|
||||
|
||||
|
@@ -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;
|
||||
|
@@ -32,7 +32,7 @@ public:
|
||||
const wxPalette& WXUNUSED(palette),
|
||||
const wxGLContext *other /* for sharing display lists */ );
|
||||
|
||||
~wxGLContext();
|
||||
virtual ~wxGLContext();
|
||||
|
||||
|
||||
void SetCurrent();
|
||||
|
@@ -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);
|
||||
|
@@ -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 );
|
||||
};
|
||||
|
||||
|
@@ -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;
|
||||
|
@@ -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)); }
|
||||
|
@@ -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);
|
||||
|
@@ -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();
|
||||
|
Reference in New Issue
Block a user