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:
@@ -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; };
|
||||
|
@@ -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; }
|
||||
|
@@ -57,7 +57,7 @@ class WXDLLEXPORT wxClipboard : public wxClipboardBase
|
||||
|
||||
public:
|
||||
wxClipboard();
|
||||
~wxClipboard();
|
||||
virtual ~wxClipboard();
|
||||
|
||||
// open the clipboard before SetData() and GetData()
|
||||
virtual bool Open();
|
||||
|
@@ -31,7 +31,7 @@ public:
|
||||
wxColour&operator = (const wxColour& rCol);
|
||||
|
||||
// Dtor
|
||||
~wxColour();
|
||||
virtual ~wxColour();
|
||||
|
||||
// Accessors
|
||||
bool Ok(void) const {return m_bIsInit; }
|
||||
|
@@ -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
|
||||
|
@@ -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);
|
||||
|
@@ -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
|
||||
// ----------------------------------
|
||||
|
@@ -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);
|
||||
|
@@ -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
|
||||
|
@@ -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,
|
||||
|
@@ -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);
|
||||
|
@@ -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
|
||||
|
@@ -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; }
|
||||
|
@@ -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();
|
||||
|
@@ -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();
|
||||
|
@@ -72,7 +72,7 @@ public:
|
||||
);
|
||||
}
|
||||
|
||||
~wxRadioBox();
|
||||
virtual ~wxRadioBox();
|
||||
|
||||
bool Create( wxWindow* pParent
|
||||
,wxWindowID vId
|
||||
|
@@ -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);
|
||||
|
@@ -46,7 +46,7 @@ public:
|
||||
,rsName
|
||||
);
|
||||
}
|
||||
~wxScrollBar();
|
||||
virtual ~wxScrollBar();
|
||||
|
||||
bool Create( wxWindow* pParent
|
||||
,wxWindowID vId
|
||||
|
@@ -43,7 +43,7 @@ public:
|
||||
,rsName
|
||||
);
|
||||
}
|
||||
~wxSlider();
|
||||
virtual ~wxSlider();
|
||||
|
||||
bool Create( wxWindow* pParent
|
||||
,wxWindowID vId
|
||||
|
@@ -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
|
||||
|
@@ -38,7 +38,7 @@ class WXDLLEXPORT wxTabCtrl: public wxControl
|
||||
{
|
||||
Create(parent, id, pos, size, style, name);
|
||||
}
|
||||
~wxTabCtrl();
|
||||
virtual ~wxTabCtrl();
|
||||
|
||||
// Accessors
|
||||
|
||||
|
@@ -30,7 +30,7 @@ public:
|
||||
{
|
||||
Create(pParent, vId, rsValue, rPos, rSize, lStyle, rValidator, rsName);
|
||||
}
|
||||
~wxTextCtrl();
|
||||
virtual ~wxTextCtrl();
|
||||
|
||||
bool Create( wxWindow* pParent
|
||||
,wxWindowID vId
|
||||
|
@@ -27,7 +27,7 @@ public:
|
||||
,nId
|
||||
)
|
||||
{ Init(); }
|
||||
~wxTimer();
|
||||
virtual ~wxTimer();
|
||||
|
||||
virtual void Notify(void);
|
||||
virtual bool Start( int nMilliseconds = -1
|
||||
|
Reference in New Issue
Block a user