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:
@@ -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; }
|
||||
|
@@ -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,
|
||||
|
@@ -28,7 +28,7 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
|
||||
|
||||
public:
|
||||
wxChoice();
|
||||
~wxChoice();
|
||||
virtual ~wxChoice();
|
||||
|
||||
wxChoice(wxWindow *parent, wxWindowID id,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
|
@@ -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();
|
||||
|
@@ -32,7 +32,7 @@ public:
|
||||
wxColour& operator = ( const wxColour& col );
|
||||
|
||||
// dtor
|
||||
~wxColour();
|
||||
virtual ~wxColour();
|
||||
|
||||
|
||||
// accessors
|
||||
|
@@ -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,
|
||||
|
@@ -37,7 +37,7 @@ public:
|
||||
#endif
|
||||
|
||||
wxCursor(wxStockCursor id);
|
||||
~wxCursor();
|
||||
virtual ~wxCursor();
|
||||
|
||||
virtual bool Ok() const;
|
||||
|
||||
|
@@ -43,7 +43,7 @@ class WXDLLEXPORT wxDC : public wxDCBase
|
||||
|
||||
public:
|
||||
wxDC();
|
||||
~wxDC() { }
|
||||
virtual ~wxDC() { }
|
||||
|
||||
// implement base class pure virtuals
|
||||
// ----------------------------------
|
||||
|
@@ -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
|
||||
|
@@ -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 );
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -37,7 +37,7 @@ public:
|
||||
long style = wxDEFAULT_DIALOG_STYLE,
|
||||
const wxString& name = wxDialogNameStr);
|
||||
|
||||
~wxDialog();
|
||||
virtual ~wxDialog();
|
||||
|
||||
virtual bool Destroy();
|
||||
|
||||
|
@@ -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);
|
||||
|
@@ -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);
|
||||
|
@@ -63,7 +63,7 @@ public:
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxListBoxNameStr);
|
||||
|
||||
~wxListBox();
|
||||
virtual ~wxListBox();
|
||||
|
||||
// implementation of wxControlWithItems
|
||||
virtual unsigned int GetCount() const;
|
||||
|
@@ -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);
|
||||
|
@@ -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);
|
||||
|
@@ -34,7 +34,7 @@ public:
|
||||
Create(parent, id, title, pos, size, style, name);
|
||||
}
|
||||
|
||||
~wxMiniFrame() {}
|
||||
virtual ~wxMiniFrame() {}
|
||||
protected:
|
||||
};
|
||||
|
||||
|
@@ -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;
|
||||
|
@@ -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();
|
||||
|
@@ -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,
|
||||
|
@@ -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,
|
||||
|
@@ -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,
|
||||
|
@@ -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,
|
||||
|
@@ -33,7 +33,7 @@ public:
|
||||
{
|
||||
Create(parent, id, pos, size, style, name);
|
||||
}
|
||||
~wxSpinButton();
|
||||
virtual ~wxSpinButton();
|
||||
|
||||
bool Create(wxWindow *parent,
|
||||
wxWindowID id = wxID_ANY,
|
||||
|
@@ -21,7 +21,7 @@ class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
|
||||
|
||||
public:
|
||||
wxStaticBitmap() { }
|
||||
~wxStaticBitmap();
|
||||
virtual ~wxStaticBitmap();
|
||||
|
||||
wxStaticBitmap(wxWindow *parent, wxWindowID id,
|
||||
const wxBitmap& label,
|
||||
|
@@ -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,
|
||||
|
@@ -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();
|
||||
|
Reference in New Issue
Block a user