Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mark all dtors which are virtual because base class dtor is virtual explicitly virtual themselves

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-09-05 20:47:48 +00:00
parent 641d44aef5
commit d3c7fc996a
432 changed files with 642 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/generic/colour.h
View File

@@ -30,7 +30,7 @@ public:
wxColour& operator=(const wxColour& col);
// dtor
~wxColour();
virtual ~wxColour();
// accessors
bool Ok() const { return m_isInit; }

4
include/wx/generic/dataview.h
View File

@@ -32,7 +32,7 @@ class WXDLLIMPEXP_ADV wxDataViewCell: public wxDataViewCellBase
{
public:
wxDataViewCell( const wxString &varianttype, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
~wxDataViewCell();
virtual ~wxDataViewCell();
virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
virtual wxSize GetSize() = 0;
@@ -143,7 +143,7 @@ public:
wxDataViewProgressCell( const wxString &label = wxEmptyString,
const wxString &varianttype = wxT("long"),
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
~wxDataViewProgressCell();
virtual ~wxDataViewProgressCell();
bool SetValue( const wxVariant &value );

2
include/wx/generic/datectrl.h
View File

@@ -26,7 +26,7 @@ class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
public:
// creating the control
wxDatePickerCtrlGeneric() { Init(); }
~wxDatePickerCtrlGeneric() ;
virtual ~wxDatePickerCtrlGeneric() ;
wxDatePickerCtrlGeneric(wxWindow *parent,
wxWindowID id,
const wxDateTime& date = wxDefaultDateTime,

2
include/wx/generic/dcpsg.h
View File

@@ -43,7 +43,7 @@ public:
wxPostScriptDC(const wxPrintData& printData);
// Recommended destructor :-)
~wxPostScriptDC();
virtual ~wxPostScriptDC();
virtual bool Ok() const;

4
include/wx/generic/dirctrlg.h
View File

@@ -60,7 +60,7 @@ class WXDLLEXPORT wxDirItemData : public wxTreeItemData
{
public:
wxDirItemData(const wxString& path, const wxString& name, bool isDir);
~wxDirItemData(){}
virtual ~wxDirItemData(){}
void SetNewDirName(const wxString& path);
bool HasSubDirs() const;
@@ -225,7 +225,7 @@ public:
void Init();
~wxDirFilterListCtrl() {}
virtual ~wxDirFilterListCtrl() {}
//// Operations
void FillFilterList(const wxString& filter, int defaultFilter);

2
include/wx/generic/dragimgg.h
View File

@@ -151,7 +151,7 @@ public:
}
#endif
~wxGenericDragImage();
virtual ~wxGenericDragImage();
// Attributes
////////////////////////////////////////////////////////////////////////////

2
include/wx/generic/helpext.h
View File

@@ -37,7 +37,7 @@ class WXDLLIMPEXP_ADV wxExtHelpController : public wxHelpControllerBase
{
public:
wxExtHelpController(wxWindow* parentWindow = NULL);
~wxExtHelpController();
virtual ~wxExtHelpController();
/** Tell it which browser to use.
The Netscape support will check whether Netscape is already

2
include/wx/generic/imaglist.h
View File

@@ -55,7 +55,7 @@ class WXDLLEXPORT wxGenericImageList: public wxObject
public:
wxGenericImageList() { m_width = m_height = 0; }
wxGenericImageList( int width, int height, bool mask = true, int initialCount = 1 );
~wxGenericImageList();
virtual ~wxGenericImageList();
bool Create( int width, int height, bool mask = true, int initialCount = 1 );
bool Create();

2
include/wx/generic/listctrl.h
View File

@@ -77,7 +77,7 @@ public:
{
Create(parent, winid, pos, size, style, validator, name);
}
~wxGenericListCtrl();
virtual ~wxGenericListCtrl();
bool Create( wxWindow *parent,
wxWindowID winid = wxID_ANY,

2
include/wx/generic/logg.h
View File

@@ -90,7 +90,7 @@ public:
bool bShow = true, // show window immediately?
bool bPassToOld = true); // pass messages to the old target?
~wxLogWindow();
virtual ~wxLogWindow();
// window operations
// show/hide the log window

4
include/wx/generic/mdig.h
View File

@@ -48,7 +48,7 @@ public:
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr);
~wxGenericMDIParentFrame();
virtual ~wxGenericMDIParentFrame();
bool Create( wxWindow *parent,
wxWindowID winid,
const wxString& title,
@@ -230,7 +230,7 @@ class WXDLLEXPORT wxGenericMDIClientWindow: public wxNotebook
public:
wxGenericMDIClientWindow();
wxGenericMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 );
~wxGenericMDIClientWindow();
virtual ~wxGenericMDIClientWindow();
virtual bool CreateClient( wxGenericMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
virtual int SetSelection(size_t nPage);

2
include/wx/generic/notebook.h
View File

@@ -52,7 +52,7 @@ public:
long style = 0,
const wxString& name = wxNotebookNameStr);
// dtor
~wxNotebook();
virtual ~wxNotebook();
// accessors
// ---------

2
include/wx/generic/paletteg.h
View File

@@ -35,7 +35,7 @@ class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase
wxPalette();
wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue );
~wxPalette();
virtual ~wxPalette();
bool operator == ( const wxPalette& palette ) const;
bool operator != ( const wxPalette& palette ) const;
virtual bool Ok() const;

2
include/wx/generic/progdlgg.h
View File

@@ -44,7 +44,7 @@ public:
/* Destructor.
Re-enables event handling for other windows.
*/
~wxProgressDialog();
virtual ~wxProgressDialog();
/* Update the status bar to the new value.
@param value new value

4
include/wx/generic/region.h
View File

@@ -27,7 +27,7 @@ public:
wxRegionGeneric(const wxPoint& topLeft, const wxPoint& bottomRight);
wxRegionGeneric(const wxRect& rect);
wxRegionGeneric();
~wxRegionGeneric();
virtual ~wxRegionGeneric();
bool Ok() const { return m_refData != NULL; }
@@ -109,7 +109,7 @@ public:
wxRegionIteratorGeneric();
wxRegionIteratorGeneric(const wxRegionGeneric& region);
wxRegionIteratorGeneric(const wxRegionIteratorGeneric& iterator);
~wxRegionIteratorGeneric();
virtual ~wxRegionIteratorGeneric();
wxRegionIteratorGeneric& operator=(const wxRegionIteratorGeneric& iterator);

2
include/wx/generic/sashwin.h
View File

@@ -87,7 +87,7 @@ public:
Create(parent, id, pos, size, style, name);
}
~wxSashWindow();
virtual ~wxSashWindow();
bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = wxT("sashWindow"));

2
include/wx/generic/splash.h
View File

@@ -43,7 +43,7 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP);
~wxSplashScreen();
virtual ~wxSplashScreen();
void OnCloseWindow(wxCloseEvent& event);
void OnNotify(wxTimerEvent& event);

104
include/wx/generic/tabg.h
View File

@@ -32,7 +32,7 @@ class WXDLLEXPORT wxTabControl: public wxObject
DECLARE_DYNAMIC_CLASS(wxTabControl)
public:
wxTabControl(wxTabView *v = (wxTabView *) NULL);
~wxTabControl(void);
virtual ~wxTabControl(void);
virtual void OnDraw(wxDC& dc, bool lastInRow);
void SetLabel(const wxString& str) { m_controlLabel = str; }
@@ -99,7 +99,7 @@ class WXDLLEXPORT wxTabView: public wxObject
DECLARE_DYNAMIC_CLASS(wxTabView)
public:
wxTabView(long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);
~wxTabView();
virtual ~wxTabView();
inline int GetNumberOfLayers() const { return m_layers.GetCount(); }
#if WXWIN_COMPATIBILITY_2_4
@@ -270,87 +270,93 @@ protected:
* A dialog box class that is tab-friendly
*/
class WXDLLEXPORT wxTabbedDialog: public wxDialog
class WXDLLEXPORT wxTabbedDialog : public wxDialog
{
DECLARE_DYNAMIC_CLASS(wxTabbedDialog)
DECLARE_DYNAMIC_CLASS(wxTabbedDialog)
public:
wxTabbedDialog(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long windowStyle = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr);
virtual ~wxTabbedDialog();
wxTabbedDialog(wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long windowStyle = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr);
~wxTabbedDialog(void);
wxTabView *GetTabView() const { return m_tabView; }
void SetTabView(wxTabView *v) { m_tabView = v; }
inline wxTabView *GetTabView() const { return m_tabView; }
inline void SetTabView(wxTabView *v) { m_tabView = v; }
void OnCloseWindow(wxCloseEvent& event);
void OnMouseEvent(wxMouseEvent& event);
void OnPaint(wxPaintEvent& event);
void OnCloseWindow(wxCloseEvent& event);
void OnMouseEvent(wxMouseEvent& event);
void OnPaint(wxPaintEvent& event);
protected:
wxTabView* m_tabView;
wxTabView* m_tabView;
DECLARE_EVENT_TABLE()
private:
DECLARE_EVENT_TABLE()
};
/*
* A panel class that is tab-friendly
*/
class WXDLLEXPORT wxTabbedPanel: public wxPanel
class WXDLLEXPORT wxTabbedPanel : public wxPanel
{
DECLARE_DYNAMIC_CLASS(wxTabbedPanel)
DECLARE_DYNAMIC_CLASS(wxTabbedPanel)
public:
wxTabbedPanel(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long windowStyle = 0,
const wxString& name = wxPanelNameStr);
virtual ~wxTabbedPanel();
wxTabbedPanel(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long windowStyle = 0, const wxString& name = wxPanelNameStr);
~wxTabbedPanel(void);
wxTabView *GetTabView() const { return m_tabView; }
void SetTabView(wxTabView *v) { m_tabView = v; }
inline wxTabView *GetTabView() const { return m_tabView; }
inline void SetTabView(wxTabView *v) { m_tabView = v; }
void OnMouseEvent(wxMouseEvent& event);
void OnPaint(wxPaintEvent& event);
void OnMouseEvent(wxMouseEvent& event);
void OnPaint(wxPaintEvent& event);
protected:
wxTabView* m_tabView;
wxTabView* m_tabView;
DECLARE_EVENT_TABLE()
private:
DECLARE_EVENT_TABLE()
};
WX_DECLARE_HASH_MAP(int, wxWindow*, wxIntegerHash, wxIntegerEqual,
wxIntToWindowHashMap);
class WXDLLEXPORT wxPanelTabView: public wxTabView
class WXDLLEXPORT wxPanelTabView : public wxTabView
{
DECLARE_DYNAMIC_CLASS(wxPanelTabView)
DECLARE_DYNAMIC_CLASS(wxPanelTabView)
public:
wxPanelTabView(wxPanel *pan, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);
~wxPanelTabView(void);
wxPanelTabView(wxPanel *pan, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);
virtual ~wxPanelTabView(void);
// Called when a tab is activated
virtual void OnTabActivate(int activateId, int deactivateId);
// Called when a tab is activated
virtual void OnTabActivate(int activateId, int deactivateId);
// Specific to this class
void AddTabWindow(int id, wxWindow *window);
wxWindow *GetTabWindow(int id) const ;
void ClearWindows(bool deleteWindows = true);
inline wxWindow *GetCurrentWindow() const { return m_currentWindow; }
// Specific to this class
void AddTabWindow(int id, wxWindow *window);
wxWindow *GetTabWindow(int id) const ;
void ClearWindows(bool deleteWindows = true);
wxWindow *GetCurrentWindow() const { return m_currentWindow; }
void ShowWindowForTab(int id);
// inline wxList& GetWindows() const { return (wxList&) m_tabWindows; }
void ShowWindowForTab(int id);
// wxList& GetWindows() const { return (wxList&) m_tabWindows; }
protected:
// List of panels, one for each tab. Indexed
// by tab ID.
wxIntToWindowHashMap m_tabWindows;
wxWindow* m_currentWindow;
wxPanel* m_panel;
// List of panels, one for each tab. Indexed
// by tab ID.
wxIntToWindowHashMap m_tabWindows;
wxWindow* m_currentWindow;
wxPanel* m_panel;
};
#endif

2
include/wx/generic/timer.h
View File

@@ -23,7 +23,7 @@ public:
wxTimer() { Init(); }
wxTimer(wxEvtHandler *owner, int timerid = -1) : wxTimerBase(owner, timerid)
{ Init(); }
~wxTimer();
virtual ~wxTimer();
virtual bool Start(int millisecs = -1, bool oneShot = false);
virtual void Stop();