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 @@ class WXDLLEXPORT wxApp : public wxAppBase
|
||||
|
||||
public:
|
||||
wxApp();
|
||||
~wxApp();
|
||||
virtual ~wxApp();
|
||||
|
||||
// override base class (pure) virtuals
|
||||
// -----------------------------------
|
||||
|
@@ -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 );
|
||||
|
@@ -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; }
|
||||
|
||||
|
@@ -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();
|
||||
|
@@ -42,7 +42,7 @@ public:
|
||||
wxColour() {}
|
||||
DEFINE_STD_WXCOLOUR_CONSTRUCTORS
|
||||
|
||||
~wxColour();
|
||||
virtual ~wxColour();
|
||||
|
||||
bool Ok() const { return m_refData != NULL; }
|
||||
|
||||
|
@@ -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;
|
||||
|
@@ -20,7 +20,7 @@ public:
|
||||
wxDataObject();
|
||||
|
||||
#ifdef __DARWIN__
|
||||
~wxDataObject() { }
|
||||
virtual ~wxDataObject() { }
|
||||
#endif
|
||||
|
||||
virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) 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);
|
||||
|
@@ -41,7 +41,7 @@ class WXDLLEXPORT wxDC : public wxDCBase
|
||||
{
|
||||
public:
|
||||
wxDC();
|
||||
~wxDC() { }
|
||||
virtual ~wxDC() { }
|
||||
|
||||
// implement base class pure virtuals
|
||||
// ----------------------------------
|
||||
|
@@ -35,7 +35,7 @@ public:
|
||||
wxWindowDC();
|
||||
wxWindowDC( wxWindow *win );
|
||||
|
||||
~wxWindowDC();
|
||||
virtual ~wxWindowDC();
|
||||
|
||||
virtual bool CanDrawBitmap() const { return true; }
|
||||
virtual bool CanGetTextExtent() const { return true; }
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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);
|
||||
|
@@ -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);
|
||||
|
@@ -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;
|
||||
|
@@ -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; }
|
||||
|
||||
|
@@ -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();
|
||||
|
@@ -73,7 +73,7 @@ public:
|
||||
Union(bmp, transColour, tolerance);
|
||||
}
|
||||
|
||||
~wxRegion();
|
||||
virtual ~wxRegion();
|
||||
|
||||
bool Ok() const { return m_refData != NULL; }
|
||||
|
||||
|
@@ -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(); }
|
||||
|
Reference in New Issue
Block a user