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:
@@ -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;
|
||||
|
@@ -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; }
|
||||
|
||||
|
@@ -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,
|
||||
|
@@ -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();
|
||||
|
@@ -41,7 +41,7 @@ public:
|
||||
wxColour() { }
|
||||
DEFINE_STD_WXCOLOUR_CONSTRUCTORS
|
||||
|
||||
~wxColour();
|
||||
virtual ~wxColour();
|
||||
|
||||
virtual bool FromString(const wxChar *str);
|
||||
|
||||
|
@@ -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,
|
||||
|
@@ -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;
|
||||
|
@@ -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);
|
||||
|
@@ -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); };
|
||||
|
@@ -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;
|
||||
|
||||
|
@@ -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 );
|
||||
|
@@ -62,7 +62,7 @@ public:
|
||||
// wxGTK-specific
|
||||
bool Create(const wxString& fontname);
|
||||
|
||||
~wxFont();
|
||||
virtual ~wxFont();
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual int GetPointSize() const;
|
||||
|
@@ -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);
|
||||
|
@@ -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:
|
||||
|
@@ -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 );
|
||||
|
@@ -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; };
|
||||
|
@@ -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; }
|
||||
|
||||
|
@@ -71,7 +71,7 @@ public:
|
||||
Union(bmp, transColour, tolerance);
|
||||
}
|
||||
|
||||
~wxRegion();
|
||||
virtual ~wxRegion();
|
||||
|
||||
bool Ok() const { return m_refData != NULL; }
|
||||
|
||||
|
@@ -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;
|
||||
|
@@ -28,7 +28,7 @@ public:
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString &name = wxTextCtrlNameStr);
|
||||
|
||||
~wxTextCtrl();
|
||||
virtual ~wxTextCtrl();
|
||||
|
||||
bool Create(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
|
@@ -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();
|
||||
|
Reference in New Issue
Block a user