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:
@@ -22,7 +22,7 @@ public:
|
||||
wxAcceleratorTable();
|
||||
wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
|
||||
|
||||
~wxAcceleratorTable();
|
||||
virtual ~wxAcceleratorTable();
|
||||
|
||||
bool operator == (const wxAcceleratorTable& accel) const
|
||||
{ return m_refData == accel.m_refData; }
|
||||
|
@@ -49,7 +49,7 @@ public:
|
||||
// implementation helper only : construct a mask from a 32 bit memory buffer
|
||||
wxMask(const wxMemoryBuffer& buf, int width , int height , int bytesPerRow ) ;
|
||||
|
||||
~wxMask();
|
||||
virtual ~wxMask();
|
||||
|
||||
bool Create(const wxBitmap& bitmap, const wxColour& colour);
|
||||
bool Create(const wxBitmap& bitmap);
|
||||
@@ -127,7 +127,7 @@ public:
|
||||
// Convert from wxIcon
|
||||
wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
|
||||
|
||||
~wxBitmap();
|
||||
virtual ~wxBitmap();
|
||||
|
||||
wxImage ConvertToImage() const;
|
||||
|
||||
|
@@ -35,7 +35,7 @@ public:
|
||||
wxBrush(short macThemeBrush ) ;
|
||||
wxBrush(const wxColour& col, int style = wxSOLID);
|
||||
wxBrush(const wxBitmap& stipple);
|
||||
~wxBrush();
|
||||
virtual ~wxBrush();
|
||||
|
||||
virtual void SetColour(const wxColour& col) ;
|
||||
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
|
||||
|
@@ -32,7 +32,7 @@ class WXDLLEXPORT wxClipboard : public wxClipboardBase
|
||||
|
||||
public:
|
||||
wxClipboard();
|
||||
~wxClipboard();
|
||||
virtual ~wxClipboard();
|
||||
|
||||
// open the clipboard before SetData() and GetData()
|
||||
virtual bool Open();
|
||||
|
@@ -27,7 +27,7 @@ public:
|
||||
DEFINE_STD_WXCOLOUR_CONSTRUCTORS
|
||||
|
||||
// dtor
|
||||
~wxColour();
|
||||
virtual ~wxColour();
|
||||
|
||||
// accessors
|
||||
bool Ok() const {return m_isInit; }
|
||||
|
@@ -32,7 +32,7 @@ public:
|
||||
int hotSpotX = 0, int hotSpotY = 0);
|
||||
|
||||
wxCursor(int cursor_type);
|
||||
~wxCursor();
|
||||
virtual ~wxCursor();
|
||||
|
||||
bool CreateFromXpm(const char **bits) ;
|
||||
virtual bool Ok() const ;
|
||||
|
@@ -21,7 +21,7 @@ class WXDLLEXPORT wxDataObject : public wxDataObjectBase
|
||||
public:
|
||||
wxDataObject();
|
||||
#ifdef __DARWIN__
|
||||
~wxDataObject() { }
|
||||
virtual ~wxDataObject() { }
|
||||
#endif
|
||||
|
||||
virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const;
|
||||
|
@@ -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);
|
||||
|
@@ -81,7 +81,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
|
||||
|
||||
public:
|
||||
wxDC();
|
||||
~wxDC();
|
||||
virtual ~wxDC();
|
||||
|
||||
// implement base class pure virtuals
|
||||
// ----------------------------------
|
||||
|
@@ -31,7 +31,7 @@ class WXDLLEXPORT wxWindowDC: public wxDC
|
||||
// Create a DC corresponding to a canvas
|
||||
wxWindowDC(wxWindow *win);
|
||||
|
||||
~wxWindowDC(void);
|
||||
virtual ~wxWindowDC(void);
|
||||
protected :
|
||||
virtual void DoGetSize( int *width, int *height ) const;
|
||||
wxWindow *m_window;
|
||||
@@ -48,7 +48,7 @@ class WXDLLEXPORT wxClientDC: public wxWindowDC
|
||||
// Create a DC corresponding to a canvas
|
||||
wxClientDC(wxWindow *win);
|
||||
|
||||
~wxClientDC(void);
|
||||
virtual ~wxClientDC(void);
|
||||
|
||||
protected:
|
||||
virtual void DoGetSize( int *width, int *height ) const;
|
||||
@@ -64,7 +64,7 @@ class WXDLLEXPORT wxPaintDC: public wxWindowDC
|
||||
// Create a DC corresponding to a canvas
|
||||
wxPaintDC(wxWindow *win);
|
||||
|
||||
~wxPaintDC(void);
|
||||
virtual ~wxPaintDC(void);
|
||||
|
||||
protected:
|
||||
virtual void DoGetSize( int *width, int *height ) const;
|
||||
|
@@ -21,7 +21,7 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC
|
||||
public:
|
||||
wxMemoryDC(void);
|
||||
wxMemoryDC( wxDC *dc ); // Create compatible DC
|
||||
~wxMemoryDC(void);
|
||||
virtual ~wxMemoryDC(void);
|
||||
virtual void SelectObject( const wxBitmap& bitmap );
|
||||
wxBitmap GetSelectedObject() { return m_selected ; }
|
||||
|
||||
|
@@ -25,7 +25,7 @@ class WXDLLEXPORT wxPrinterDC: public wxDC
|
||||
|
||||
// Create a printer DC
|
||||
wxPrinterDC(const wxPrintData& printdata );
|
||||
~wxPrinterDC();
|
||||
virtual ~wxPrinterDC();
|
||||
|
||||
virtual bool StartDoc( const wxString& WXUNUSED(message) ) ;
|
||||
virtual void EndDoc(void) ;
|
||||
|
@@ -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
|
||||
|
@@ -58,7 +58,7 @@ public:
|
||||
long style = wxDEFAULT_DIALOG_STYLE,
|
||||
const wxString& name = wxDialogNameStr);
|
||||
|
||||
~wxDialog();
|
||||
virtual ~wxDialog();
|
||||
|
||||
// virtual bool Destroy();
|
||||
virtual bool Show(bool show = true);
|
||||
|
@@ -86,7 +86,7 @@ public:
|
||||
const wxCursor &cursorMove = wxNullCursor,
|
||||
const wxCursor &cursorStop = wxNullCursor);
|
||||
|
||||
~wxDropSource();
|
||||
virtual ~wxDropSource();
|
||||
|
||||
// do it (call this in response to a mouse button press, for example)
|
||||
// params: if bAllowMove is false, data can be only copied
|
||||
|
@@ -43,7 +43,7 @@ public:
|
||||
this->Create(parent, id, title, size, edge, name);
|
||||
}
|
||||
|
||||
~wxDrawerWindow();
|
||||
virtual ~wxDrawerWindow();
|
||||
|
||||
// Create a drawer window.
|
||||
// If parent is NULL, create as a tool window.
|
||||
|
@@ -30,7 +30,7 @@ class WXDLLEXPORT wxFontDialog : public wxDialog
|
||||
public:
|
||||
wxFontDialog();
|
||||
wxFontDialog(wxWindow *parent, const wxFontData& data);
|
||||
~wxFontDialog();
|
||||
virtual ~wxFontDialog();
|
||||
|
||||
bool Create(wxWindow *parent, const wxFontData& data);
|
||||
|
||||
@@ -89,7 +89,7 @@ DECLARE_EVENT_TABLE()
|
||||
public:
|
||||
wxFontDialog();
|
||||
wxFontDialog(wxWindow *parent, const wxFontData& data);
|
||||
~wxFontDialog();
|
||||
virtual ~wxFontDialog();
|
||||
|
||||
bool Create(wxWindow *parent, const wxFontData& data);
|
||||
|
||||
|
@@ -61,7 +61,7 @@ public:
|
||||
const wxPalette& WXUNUSED(palette),
|
||||
const wxGLContext *other /* for sharing display lists */
|
||||
);
|
||||
~wxGLContext();
|
||||
virtual ~wxGLContext();
|
||||
|
||||
void SetCurrent();
|
||||
void Update(); // must be called after window drag/grows/zoom or clut change
|
||||
@@ -94,7 +94,7 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow
|
||||
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0,
|
||||
const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette );
|
||||
|
||||
~wxGLCanvas();
|
||||
virtual ~wxGLCanvas();
|
||||
|
||||
bool Create(wxWindow *parent, const wxGLContext *shared, wxWindowID id,
|
||||
const wxPoint& pos, const wxSize& size, long style, const wxString& name,
|
||||
|
@@ -23,7 +23,7 @@ class WXDLLEXPORT wxXXXXHelpController: public wxHelpControllerBase
|
||||
|
||||
public:
|
||||
wxXXXXHelpController();
|
||||
~wxXXXXHelpController();
|
||||
virtual ~wxXXXXHelpController();
|
||||
|
||||
// Must call this to set the filename and server name
|
||||
virtual bool Initialize(const wxString& file);
|
||||
|
@@ -29,7 +29,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);
|
||||
|
@@ -55,7 +55,7 @@ class WXDLLEXPORT wxImageList: public wxObject
|
||||
public:
|
||||
wxImageList() { m_width = m_height = 0; }
|
||||
wxImageList( int width, int height, bool mask = true, int initialCount = 1 );
|
||||
~wxImageList();
|
||||
virtual ~wxImageList();
|
||||
bool Create( int width, int height, bool mask = true, int initialCount = 1 );
|
||||
bool Create();
|
||||
|
||||
|
@@ -176,7 +176,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
|
||||
{
|
||||
Create(parent, id, pos, size, style, validator, name);
|
||||
}
|
||||
~wxListCtrl();
|
||||
virtual ~wxListCtrl();
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
||||
long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListCtrlNameStr);
|
||||
|
@@ -41,7 +41,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,
|
||||
@@ -174,7 +174,7 @@ class WXDLLEXPORT wxMDIClientWindow: public wxWindow
|
||||
CreateClient(parent, style);
|
||||
}
|
||||
|
||||
~wxMDIClientWindow();
|
||||
virtual ~wxMDIClientWindow();
|
||||
|
||||
// Note: this is virtual, to allow overridden behaviour.
|
||||
virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
|
||||
|
@@ -40,7 +40,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.
|
||||
@@ -75,7 +75,7 @@ class WXDLLEXPORT wxMetafileDC: public wxDC
|
||||
int width = 0, int height = 0,
|
||||
const wxString& description = wxEmptyString);
|
||||
|
||||
~wxMetafileDC(void);
|
||||
virtual ~wxMetafileDC(void);
|
||||
|
||||
// Should be called at end of drawing
|
||||
virtual wxMetafile *Close(void);
|
||||
|
@@ -34,7 +34,7 @@ public:
|
||||
Create(parent, id, title, pos, size, style | wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT , name);
|
||||
}
|
||||
|
||||
~wxMiniFrame() {}
|
||||
virtual ~wxMiniFrame() {}
|
||||
protected:
|
||||
};
|
||||
|
||||
|
@@ -50,7 +50,7 @@ public:
|
||||
long style = 0,
|
||||
const wxString& name = wxNotebookNameStr);
|
||||
// dtor
|
||||
~wxNotebook();
|
||||
virtual ~wxNotebook();
|
||||
|
||||
// accessors
|
||||
// ---------
|
||||
|
@@ -24,7 +24,7 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
|
||||
friend class WXDLLEXPORT wxPalette;
|
||||
public:
|
||||
wxPaletteRefData();
|
||||
~wxPaletteRefData();
|
||||
virtual ~wxPaletteRefData();
|
||||
protected:
|
||||
wxColour* m_palette;
|
||||
wxInt32 m_count ;
|
||||
@@ -40,7 +40,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 wxPenRefData: public wxGDIRefData
|
||||
public:
|
||||
wxPenRefData();
|
||||
wxPenRefData(const wxPenRefData& data);
|
||||
~wxPenRefData();
|
||||
virtual ~wxPenRefData();
|
||||
|
||||
wxPenRefData& operator=(const wxPenRefData& data);
|
||||
|
||||
@@ -52,7 +52,7 @@ public:
|
||||
wxPen();
|
||||
wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
|
||||
wxPen(const wxBitmap& stipple, int width);
|
||||
~wxPen();
|
||||
virtual ~wxPen();
|
||||
|
||||
inline bool operator == (const wxPen& pen) const { return m_refData == pen.m_refData; }
|
||||
inline bool operator != (const wxPen& pen) const { return m_refData != pen.m_refData; }
|
||||
|
@@ -31,7 +31,7 @@ public:
|
||||
wxMacPrintDialog();
|
||||
wxMacPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
|
||||
wxMacPrintDialog(wxWindow *parent, wxPrintData* data );
|
||||
~wxMacPrintDialog();
|
||||
virtual ~wxMacPrintDialog();
|
||||
|
||||
bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);
|
||||
virtual int ShowModal();
|
||||
@@ -59,7 +59,7 @@ class WXDLLEXPORT wxMacPageSetupDialog: public wxPageSetupDialogBase
|
||||
{
|
||||
public:
|
||||
wxMacPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL);
|
||||
~wxMacPageSetupDialog();
|
||||
virtual ~wxMacPageSetupDialog();
|
||||
|
||||
virtual wxPageSetupData& GetPageSetupDialogData();
|
||||
|
||||
|
@@ -951,7 +951,7 @@ class wxMacDataBrowserListControl : public wxMacDataItemBrowserControl , public
|
||||
{
|
||||
public:
|
||||
wxMacDataBrowserListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style );
|
||||
~wxMacDataBrowserListControl();
|
||||
virtual ~wxMacDataBrowserListControl();
|
||||
|
||||
// create a list item (can be a subclass of wxMacListBoxItem)
|
||||
|
||||
@@ -1034,7 +1034,7 @@ public:
|
||||
wxMacCGContext( CGrafPtr port );
|
||||
wxMacCGContext( CGContextRef cgcontext );
|
||||
wxMacCGContext();
|
||||
~wxMacCGContext();
|
||||
virtual ~wxMacCGContext();
|
||||
|
||||
virtual void Clip( const wxRegion ®ion );
|
||||
virtual void StrokePath( const wxGraphicPath *p );
|
||||
@@ -1073,7 +1073,7 @@ class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
|
||||
public:
|
||||
wxBitmapRefData(int width , int height , int depth);
|
||||
wxBitmapRefData();
|
||||
~wxBitmapRefData();
|
||||
virtual ~wxBitmapRefData();
|
||||
|
||||
void Free();
|
||||
bool Ok() const { return m_ok; }
|
||||
|
@@ -41,7 +41,7 @@ public:
|
||||
Create(parent, id, title, pos, size, choices,
|
||||
majorDim, style, val, name);
|
||||
}
|
||||
~wxRadioBox();
|
||||
virtual ~wxRadioBox();
|
||||
bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
|
||||
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
||||
int n = 0, const wxString choices[] = NULL,
|
||||
|
@@ -27,7 +27,7 @@ public:
|
||||
{
|
||||
Create(parent, id, label, pos, size, style, validator, name);
|
||||
}
|
||||
~wxRadioButton();
|
||||
virtual ~wxRadioButton();
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id,
|
||||
const wxString& label,
|
||||
|
@@ -48,7 +48,7 @@ public:
|
||||
Union(bmp, transColour, tolerance);
|
||||
}
|
||||
|
||||
~wxRegion();
|
||||
virtual ~wxRegion();
|
||||
|
||||
//# Modify region
|
||||
// Clear current region
|
||||
@@ -137,7 +137,7 @@ public:
|
||||
wxRegionIterator();
|
||||
wxRegionIterator(const wxRegion& region);
|
||||
wxRegionIterator(const wxRegionIterator& iterator);
|
||||
~wxRegionIterator();
|
||||
virtual ~wxRegionIterator();
|
||||
|
||||
wxRegionIterator& operator=(const wxRegionIterator& iterator);
|
||||
|
||||
|
@@ -23,7 +23,7 @@ class WXDLLEXPORT wxScrollBar: public wxControl
|
||||
|
||||
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,
|
||||
|
@@ -37,7 +37,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,
|
||||
|
@@ -23,7 +23,7 @@ public:
|
||||
wxSound();
|
||||
wxSound(const wxString& fileName, bool isResource = FALSE);
|
||||
wxSound(int size, const wxByte* data);
|
||||
~wxSound();
|
||||
virtual ~wxSound();
|
||||
|
||||
public:
|
||||
bool Create(const wxString& fileName, bool isResource = FALSE);
|
||||
|
@@ -22,7 +22,7 @@ class WXDLLEXPORT wxStatusBarMac : public wxStatusBarGeneric
|
||||
long style = 0,
|
||||
const wxString& name = wxPanelNameStr);
|
||||
|
||||
~wxStatusBarMac();
|
||||
virtual ~wxStatusBarMac();
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id,
|
||||
long style ,
|
||||
|
@@ -40,7 +40,7 @@ class WXDLLEXPORT wxTabCtrl: public wxControl
|
||||
{
|
||||
Create(parent, id, pos, size, style, name);
|
||||
}
|
||||
~wxTabCtrl();
|
||||
virtual ~wxTabCtrl();
|
||||
|
||||
// Accessors
|
||||
|
||||
|
@@ -47,7 +47,7 @@ public:
|
||||
Create(parent, id, value, pos, size, style, validator, name);
|
||||
}
|
||||
|
||||
~wxTextCtrl();
|
||||
virtual ~wxTextCtrl();
|
||||
|
||||
bool Create(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
|
@@ -24,7 +24,7 @@ class WXDLLEXPORT wxTimer: public wxTimerBase
|
||||
public:
|
||||
wxTimer() { Init(); }
|
||||
wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id) { Init(); }
|
||||
~wxTimer();
|
||||
virtual ~wxTimer();
|
||||
|
||||
virtual bool Start(int milliseconds = -1,
|
||||
bool one_shot = FALSE); // Start timer
|
||||
|
@@ -37,7 +37,7 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
|
||||
Init();
|
||||
Create(parent, id, pos, size, style, name);
|
||||
}
|
||||
~wxToolBar();
|
||||
virtual ~wxToolBar();
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
||||
long style = wxNO_BORDER|wxTB_HORIZONTAL,
|
||||
|
@@ -129,7 +129,7 @@ public:
|
||||
{
|
||||
Create(parent, id, pos, size, style, validator, name);
|
||||
}
|
||||
~wxTreeCtrl();
|
||||
virtual ~wxTreeCtrl();
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
|
@@ -22,7 +22,7 @@ public:
|
||||
wxAcceleratorTable();
|
||||
wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
|
||||
|
||||
~wxAcceleratorTable();
|
||||
virtual ~wxAcceleratorTable();
|
||||
|
||||
bool operator == (const wxAcceleratorTable& accel) const
|
||||
{ return m_refData == accel.m_refData; }
|
||||
|
@@ -46,7 +46,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);
|
||||
@@ -74,7 +74,7 @@ class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
|
||||
friend class WXDLLEXPORT wxCursor;
|
||||
public:
|
||||
wxBitmapRefData();
|
||||
~wxBitmapRefData();
|
||||
virtual ~wxBitmapRefData();
|
||||
|
||||
public:
|
||||
int m_width;
|
||||
@@ -153,7 +153,7 @@ public:
|
||||
// Convert from wxImage:
|
||||
wxBitmap(const wxImage& image, int depth = -1);
|
||||
|
||||
~wxBitmap();
|
||||
virtual ~wxBitmap();
|
||||
|
||||
wxImage ConvertToImage() const;
|
||||
|
||||
|
@@ -35,7 +35,7 @@ public:
|
||||
wxBrush(short macThemeBrush ) ;
|
||||
wxBrush(const wxColour& col, int style = wxSOLID);
|
||||
wxBrush(const wxBitmap& stipple);
|
||||
~wxBrush();
|
||||
virtual ~wxBrush();
|
||||
|
||||
virtual void SetColour(const wxColour& col) ;
|
||||
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
|
||||
|
@@ -32,7 +32,7 @@ class WXDLLEXPORT 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
|
||||
bool Ok() const {return m_isInit; }
|
||||
|
@@ -22,7 +22,7 @@ class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
|
||||
friend class WXDLLEXPORT wxCursor;
|
||||
public:
|
||||
wxCursorRefData();
|
||||
~wxCursorRefData();
|
||||
virtual ~wxCursorRefData();
|
||||
|
||||
protected:
|
||||
WXHCURSOR m_hCursor;
|
||||
@@ -53,7 +53,7 @@ public:
|
||||
int hotSpotX = 0, int hotSpotY = 0);
|
||||
|
||||
wxCursor(int cursor_type);
|
||||
~wxCursor();
|
||||
virtual ~wxCursor();
|
||||
|
||||
bool CreateFromXpm(const char **bits) ;
|
||||
virtual bool Ok() const { return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ; }
|
||||
|
@@ -21,7 +21,7 @@ class WXDLLEXPORT wxDataObject : public wxDataObjectBase
|
||||
public:
|
||||
wxDataObject();
|
||||
#ifdef __DARWIN__
|
||||
~wxDataObject() { }
|
||||
virtual ~wxDataObject() { }
|
||||
#endif
|
||||
|
||||
virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const;
|
||||
|
@@ -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);
|
||||
|
@@ -50,7 +50,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
|
||||
public:
|
||||
|
||||
wxDC();
|
||||
~wxDC();
|
||||
virtual ~wxDC();
|
||||
|
||||
|
||||
// implement base class pure virtuals
|
||||
|
@@ -31,7 +31,7 @@ class WXDLLEXPORT wxWindowDC: public wxDC
|
||||
// Create a DC corresponding to a canvas
|
||||
wxWindowDC(wxWindow *win);
|
||||
|
||||
~wxWindowDC(void);
|
||||
virtual ~wxWindowDC(void);
|
||||
virtual void DoGetSize( int *width, int *height ) const;
|
||||
protected :
|
||||
wxWindow *m_window;
|
||||
@@ -48,7 +48,7 @@ class WXDLLEXPORT wxClientDC: public wxWindowDC
|
||||
// Create a DC corresponding to a canvas
|
||||
wxClientDC(wxWindow *win);
|
||||
|
||||
~wxClientDC(void);
|
||||
virtual ~wxClientDC(void);
|
||||
virtual void DoGetSize( int *width, int *height ) const;
|
||||
};
|
||||
|
||||
@@ -62,7 +62,7 @@ class WXDLLEXPORT wxPaintDC: public wxWindowDC
|
||||
// Create a DC corresponding to a canvas
|
||||
wxPaintDC(wxWindow *win);
|
||||
|
||||
~wxPaintDC(void);
|
||||
virtual ~wxPaintDC(void);
|
||||
virtual void DoGetSize( int *width, int *height ) const;
|
||||
};
|
||||
|
||||
|
@@ -21,7 +21,7 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC
|
||||
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;
|
||||
wxBitmap GetSelectedObject() { return m_selected ; }
|
||||
|
@@ -25,7 +25,7 @@ class WXDLLEXPORT wxPrinterDC: public wxDC
|
||||
#if wxUSE_PRINTING_ARCHITECTURE
|
||||
// Create a printer DC
|
||||
wxPrinterDC(const wxPrintData& printdata );
|
||||
~wxPrinterDC();
|
||||
virtual ~wxPrinterDC();
|
||||
|
||||
virtual bool StartDoc( const wxString& WXUNUSED(message) ) ;
|
||||
virtual void EndDoc(void) ;
|
||||
|
@@ -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
|
||||
|
@@ -58,7 +58,7 @@ public:
|
||||
long style = wxDEFAULT_DIALOG_STYLE,
|
||||
const wxString& name = wxDialogNameStr);
|
||||
|
||||
~wxDialog();
|
||||
virtual ~wxDialog();
|
||||
|
||||
// virtual bool Destroy();
|
||||
virtual bool Show(bool show = true);
|
||||
|
@@ -86,7 +86,7 @@ public:
|
||||
const wxCursor &cursorMove = wxNullCursor,
|
||||
const wxCursor &cursorStop = wxNullCursor);
|
||||
|
||||
~wxDropSource();
|
||||
virtual ~wxDropSource();
|
||||
|
||||
// do it (call this in response to a mouse button press, for example)
|
||||
// params: if bAllowMove is false, data can be only copied
|
||||
|
@@ -61,7 +61,7 @@ public:
|
||||
const wxPalette& WXUNUSED(palette),
|
||||
const wxGLContext *other /* for sharing display lists */
|
||||
);
|
||||
~wxGLContext();
|
||||
virtual ~wxGLContext();
|
||||
|
||||
void SetCurrent();
|
||||
void Update(); // must be called after window drag/grows/zoom or clut change
|
||||
@@ -94,7 +94,7 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow
|
||||
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0,
|
||||
const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette );
|
||||
|
||||
~wxGLCanvas();
|
||||
virtual ~wxGLCanvas();
|
||||
|
||||
bool Create(wxWindow *parent, const wxGLContext *shared, wxWindowID id,
|
||||
const wxPoint& pos, const wxSize& size, long style, const wxString& name,
|
||||
|
@@ -23,7 +23,7 @@ class WXDLLEXPORT wxXXXXHelpController: public wxHelpControllerBase
|
||||
|
||||
public:
|
||||
wxXXXXHelpController();
|
||||
~wxXXXXHelpController();
|
||||
virtual ~wxXXXXHelpController();
|
||||
|
||||
// Must call this to set the filename and server name
|
||||
virtual bool Initialize(const wxString& file);
|
||||
|
@@ -29,7 +29,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);
|
||||
|
@@ -60,7 +60,7 @@ class WXDLLEXPORT wxImageList: public wxObject
|
||||
{
|
||||
Create(width, height, mask, initialCount);
|
||||
}
|
||||
~wxImageList();
|
||||
virtual ~wxImageList();
|
||||
|
||||
|
||||
// Attributes
|
||||
|
@@ -176,7 +176,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
|
||||
{
|
||||
Create(parent, id, pos, size, style, validator, name);
|
||||
}
|
||||
~wxListCtrl();
|
||||
virtual ~wxListCtrl();
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
||||
long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListCtrlNameStr);
|
||||
|
@@ -40,7 +40,7 @@ public:
|
||||
Create(parent, id, title, pos, size, style, name);
|
||||
}
|
||||
|
||||
~wxMDIParentFrame();
|
||||
virtual ~wxMDIParentFrame();
|
||||
|
||||
bool Create(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
@@ -109,7 +109,7 @@ public:
|
||||
Create(parent, id, title, pos, size, style, name);
|
||||
}
|
||||
|
||||
~wxMDIChildFrame();
|
||||
virtual ~wxMDIChildFrame();
|
||||
|
||||
bool Create(wxMDIParentFrame *parent,
|
||||
wxWindowID id,
|
||||
@@ -154,7 +154,7 @@ class WXDLLEXPORT wxMDIClientWindow: public wxWindow
|
||||
CreateClient(parent, style);
|
||||
}
|
||||
|
||||
~wxMDIClientWindow();
|
||||
virtual ~wxMDIClientWindow();
|
||||
|
||||
// Note: this is virtual, to allow overridden behaviour.
|
||||
virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
|
||||
|
@@ -38,7 +38,7 @@ class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData
|
||||
friend class WXDLLEXPORT wxMetafile;
|
||||
public:
|
||||
wxMetafileRefData(void);
|
||||
~wxMetafileRefData(void);
|
||||
virtual ~wxMetafileRefData(void);
|
||||
|
||||
public:
|
||||
WXHMETAFILE 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 @@ class WXDLLEXPORT wxMetafileDC: public wxDC
|
||||
int width = 0, int height = 0,
|
||||
const wxString& description = wxEmptyString);
|
||||
|
||||
~wxMetafileDC(void);
|
||||
virtual ~wxMetafileDC(void);
|
||||
|
||||
// Should be called at end of drawing
|
||||
virtual wxMetafile *Close(void);
|
||||
|
@@ -34,7 +34,7 @@ public:
|
||||
Create(parent, id, title, pos, size, style | wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT , name);
|
||||
}
|
||||
|
||||
~wxMiniFrame() {}
|
||||
virtual ~wxMiniFrame() {}
|
||||
protected:
|
||||
};
|
||||
|
||||
|
@@ -50,7 +50,7 @@ public:
|
||||
long style = 0,
|
||||
const wxString& name = wxNotebookNameStr);
|
||||
// dtor
|
||||
~wxNotebook();
|
||||
virtual ~wxNotebook();
|
||||
|
||||
// accessors
|
||||
// ---------
|
||||
|
@@ -24,7 +24,7 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
|
||||
friend class WXDLLEXPORT wxPalette;
|
||||
public:
|
||||
wxPaletteRefData();
|
||||
~wxPaletteRefData();
|
||||
virtual ~wxPaletteRefData();
|
||||
protected:
|
||||
wxColour* m_palette;
|
||||
wxInt32 m_count ;
|
||||
@@ -40,7 +40,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 wxPenRefData: public wxGDIRefData
|
||||
public:
|
||||
wxPenRefData();
|
||||
wxPenRefData(const wxPenRefData& data);
|
||||
~wxPenRefData();
|
||||
virtual ~wxPenRefData();
|
||||
|
||||
wxPenRefData& operator=(const wxPenRefData& data);
|
||||
|
||||
@@ -52,7 +52,7 @@ public:
|
||||
wxPen();
|
||||
wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
|
||||
wxPen(const wxBitmap& stipple, int width);
|
||||
~wxPen();
|
||||
virtual ~wxPen();
|
||||
|
||||
inline bool operator == (const wxPen& pen) const { return m_refData == pen.m_refData; }
|
||||
inline bool operator != (const wxPen& pen) const { return m_refData != pen.m_refData; }
|
||||
|
@@ -31,7 +31,7 @@ class WXDLLEXPORT wxPrintDialog: public wxDialog
|
||||
wxPrintDialog();
|
||||
wxPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
|
||||
wxPrintDialog(wxWindow *parent, wxPrintData* data );
|
||||
~wxPrintDialog();
|
||||
virtual ~wxPrintDialog();
|
||||
|
||||
bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);
|
||||
virtual int ShowModal();
|
||||
@@ -54,7 +54,7 @@ class WXDLLEXPORT wxPageSetupDialog: public wxDialog
|
||||
public:
|
||||
wxPageSetupDialog();
|
||||
wxPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL);
|
||||
~wxPageSetupDialog();
|
||||
virtual ~wxPageSetupDialog();
|
||||
|
||||
bool Create(wxWindow *parent, wxPageSetupData *data = NULL);
|
||||
virtual int ShowModal();
|
||||
|
@@ -41,7 +41,7 @@ public:
|
||||
Create(parent, id, title, pos, size, choices,
|
||||
majorDim, style, val, name);
|
||||
}
|
||||
~wxRadioBox();
|
||||
virtual ~wxRadioBox();
|
||||
bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
|
||||
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
||||
int n = 0, const wxString choices[] = NULL,
|
||||
|
@@ -47,7 +47,7 @@ public:
|
||||
Union(bmp, transColour, tolerance);
|
||||
}
|
||||
|
||||
~wxRegion();
|
||||
virtual ~wxRegion();
|
||||
|
||||
//# Modify region
|
||||
// Clear current region
|
||||
@@ -133,7 +133,7 @@ public:
|
||||
wxRegionIterator();
|
||||
wxRegionIterator(const wxRegion& region);
|
||||
wxRegionIterator(const wxRegionIterator& iterator);
|
||||
~wxRegionIterator();
|
||||
virtual ~wxRegionIterator();
|
||||
|
||||
wxRegionIterator& operator=(const wxRegionIterator& iterator);
|
||||
|
||||
|
@@ -23,7 +23,7 @@ class WXDLLEXPORT wxScrollBar: public wxControl
|
||||
|
||||
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,
|
||||
|
@@ -37,7 +37,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,
|
||||
|
@@ -23,7 +23,7 @@ public:
|
||||
wxSound();
|
||||
wxSound(const wxString& fileName, bool isResource = FALSE);
|
||||
wxSound(int size, const wxByte* data);
|
||||
~wxSound();
|
||||
virtual ~wxSound();
|
||||
|
||||
public:
|
||||
bool Create(const wxString& fileName, bool isResource = FALSE);
|
||||
|
@@ -25,7 +25,7 @@ class WXDLLEXPORT wxStatusBarMac : public wxStatusBarGeneric
|
||||
Create(parent, id, style, name);
|
||||
}
|
||||
|
||||
~wxStatusBarMac();
|
||||
virtual ~wxStatusBarMac();
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id,
|
||||
long style ,
|
||||
|
@@ -38,7 +38,7 @@ class WXDLLEXPORT wxTabCtrl: public wxControl
|
||||
{
|
||||
Create(parent, id, pos, size, style, name);
|
||||
}
|
||||
~wxTabCtrl();
|
||||
virtual ~wxTabCtrl();
|
||||
|
||||
// Accessors
|
||||
|
||||
|
@@ -25,7 +25,7 @@ public:
|
||||
// creation
|
||||
// --------
|
||||
wxTextCtrl() { Init(); }
|
||||
~wxTextCtrl();
|
||||
virtual ~wxTextCtrl();
|
||||
wxTextCtrl(wxWindow *parent, wxWindowID id,
|
||||
const wxString& value = wxEmptyString,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
|
@@ -24,7 +24,7 @@ class WXDLLEXPORT wxTimer: public wxTimerBase
|
||||
public:
|
||||
wxTimer() { Init(); }
|
||||
wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id) { Init(); }
|
||||
~wxTimer();
|
||||
virtual ~wxTimer();
|
||||
|
||||
virtual bool Start(int milliseconds = -1,
|
||||
bool one_shot = FALSE); // Start timer
|
||||
|
@@ -38,7 +38,7 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
|
||||
Init();
|
||||
Create(parent, id, pos, size, style, name);
|
||||
}
|
||||
~wxToolBar();
|
||||
virtual ~wxToolBar();
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
||||
long style = wxNO_BORDER|wxTB_HORIZONTAL,
|
||||
|
@@ -127,7 +127,7 @@ public:
|
||||
{
|
||||
Create(parent, id, pos, size, style, validator, name);
|
||||
}
|
||||
~wxTreeCtrl();
|
||||
virtual ~wxTreeCtrl();
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
|
@@ -26,7 +26,7 @@ class WXDLLIMPEXP_BASE wxStandardPathsCF : public wxStandardPathsBase
|
||||
{
|
||||
public:
|
||||
wxStandardPathsCF();
|
||||
~wxStandardPathsCF();
|
||||
virtual ~wxStandardPathsCF();
|
||||
|
||||
// wxMac specific: allow user to specify a different bundle
|
||||
wxStandardPathsCF(wxCFBundleRef bundle);
|
||||
|
Reference in New Issue
Block a user