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:
Vadim Zeitlin
2006-09-05 20:47:48 +00:00
parent 641d44aef5
commit d3c7fc996a
432 changed files with 642 additions and 636 deletions

View File

@@ -70,7 +70,7 @@ class WXDLLIMPEXP_ANIMATE wxAnimationPlayer : public wxObject
public: public:
wxAnimationPlayer(wxAnimationBase *animation = (wxAnimationBase *) NULL, bool destroyAnimation = false); wxAnimationPlayer(wxAnimationBase *animation = (wxAnimationBase *) NULL, bool destroyAnimation = false);
~wxAnimationPlayer(); virtual ~wxAnimationPlayer();
//// Accessors //// Accessors
@@ -226,8 +226,8 @@ class WXDLLIMPEXP_ANIMATE wxAnimationBase : public wxObject
DECLARE_ABSTRACT_CLASS(wxAnimationBase) DECLARE_ABSTRACT_CLASS(wxAnimationBase)
public: public:
wxAnimationBase() {}; wxAnimationBase() {}
~wxAnimationBase() {}; virtual ~wxAnimationBase() {}
//// Accessors. Should be overridden by each derived class. //// Accessors. Should be overridden by each derived class.
@@ -262,7 +262,7 @@ class WXDLLIMPEXP_ANIMATE wxGIFAnimation : public wxAnimationBase
public: public:
wxGIFAnimation(); wxGIFAnimation();
~wxGIFAnimation(); virtual ~wxGIFAnimation();
//// Accessors //// Accessors
@@ -308,7 +308,7 @@ public:
{ {
Create(parent, id, filename, pos, size, style, name); Create(parent, id, filename, pos, size, style, name);
} }
~wxAnimationCtrlBase(); virtual ~wxAnimationCtrlBase();
bool Create(wxWindow *parent, wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxString& filename = wxEmptyString, const wxString& filename = wxEmptyString,

View File

@@ -66,7 +66,7 @@ public:
wxLoadPageEvent(const wxString &hRef = "",wxHtmlAppletWindow *htmlWindow = NULL); wxLoadPageEvent(const wxString &hRef = "",wxHtmlAppletWindow *htmlWindow = NULL);
// Destructor // Destructor
~wxLoadPageEvent() {} virtual ~wxLoadPageEvent() {}
// Clone Virtual // Clone Virtual
virtual wxEvent *Clone() const { return new wxLoadPageEvent(m_hRef, m_htmlWindow); } virtual wxEvent *Clone() const { return new wxLoadPageEvent(m_hRef, m_htmlWindow); }
@@ -96,7 +96,7 @@ public:
wxPageLoadedEvent(); wxPageLoadedEvent();
// Destructor // Destructor
~wxPageLoadedEvent() {} virtual ~wxPageLoadedEvent() {}
// Clone Virtual // Clone Virtual
virtual wxEvent *Clone() const { virtual wxEvent *Clone() const {

View File

@@ -45,7 +45,7 @@ private:
public: public:
wxEchoPrep() : wxHtmlProcessor() {} wxEchoPrep() : wxHtmlProcessor() {}
~wxEchoPrep() {} virtual ~wxEchoPrep() {}
// Process input text and return processed result // Process input text and return processed result
wxString Process(const wxString& text) const; wxString Process(const wxString& text) const;

View File

@@ -45,7 +45,7 @@ private:
public: public:
wxIfElsePrep() : wxHtmlProcessor() {} wxIfElsePrep() : wxHtmlProcessor() {}
~wxIfElsePrep() {} virtual ~wxIfElsePrep() {}
// Process input text and return processed result // Process input text and return processed result
wxString Process(const wxString& text) const; wxString Process(const wxString& text) const;

View File

@@ -49,7 +49,7 @@ private:
wxFileSystem *m_FS; wxFileSystem *m_FS;
public: public:
wxIncludePrep() : wxHtmlProcessor() {} wxIncludePrep() : wxHtmlProcessor() {}
~wxIncludePrep() {} virtual ~wxIncludePrep() {}
// Process input text and return processed result // Process input text and return processed result
wxString Process(const wxString& text) const; wxString Process(const wxString& text) const;

View File

@@ -140,7 +140,7 @@ public:
const wxString& name = "htmlAppletWindow"); const wxString& name = "htmlAppletWindow");
// Destructor // Destructor
~wxHtmlAppletWindow(); virtual ~wxHtmlAppletWindow();
// Create an instance of an applet based on it's class name // Create an instance of an applet based on it's class name
wxApplet *CreateApplet( wxApplet *CreateApplet(

View File

@@ -88,7 +88,7 @@ public:
wxSize GetGridSizeInPixels() const; wxSize GetGridSizeInPixels() const;
~BombsCanvas(); virtual ~BombsCanvas();
private: private:

View File

@@ -14,7 +14,7 @@ class MainFrame: public wxFrame
{ {
public: public:
MainFrame(wxFrame *frame, wxChar *title, const wxPoint& pos, const wxSize& size); MainFrame(wxFrame *frame, wxChar *title, const wxPoint& pos, const wxSize& size);
~MainFrame(void); virtual ~MainFrame(void);
public: public:
// menu callbacks // menu callbacks

View File

@@ -16,8 +16,8 @@
class FortyApp: public wxApp class FortyApp: public wxApp
{ {
public: public:
FortyApp(){}; FortyApp(){}
~FortyApp(); virtual ~FortyApp();
bool OnInit(); bool OnInit();
static const wxColour& BackgroundColour(); static const wxColour& BackgroundColour();

View File

@@ -24,7 +24,7 @@ const int MaxMoves = 800;
class Pack : public Pile { class Pack : public Pile {
public: public:
Pack(int x, int y); Pack(int x, int y);
~Pack(); virtual ~Pack();
void Redraw(wxDC& dc); void Redraw(wxDC& dc);
void ResetPile() { m_topCard = NumCards - 1; } void ResetPile() { m_topCard = NumCards - 1; }
void Shuffle(); void Shuffle();
@@ -39,7 +39,7 @@ public:
class Base : public Pile { class Base : public Pile {
public: public:
Base(int x, int y); Base(int x, int y);
~Base(){}; virtual ~Base(){}
bool AcceptCard(Card* card); bool AcceptCard(Card* card);
}; };
@@ -50,7 +50,7 @@ public:
class Foundation : public Pile { class Foundation : public Pile {
public: public:
Foundation(int x, int y); Foundation(int x, int y);
~Foundation(){}; virtual ~Foundation(){}
bool AcceptCard(Card* card); bool AcceptCard(Card* card);
}; };
@@ -61,7 +61,7 @@ public:
class Discard : public Pile { class Discard : public Pile {
public: public:
Discard(int x, int y); Discard(int x, int y);
~Discard(){}; virtual ~Discard(){}
void Redraw(wxDC& dc); void Redraw(wxDC& dc);
void GetTopCardPos(int& x, int& y); void GetTopCardPos(int& x, int& y);
Card* RemoveTopCard(wxDC& dc, int m_xOffset, int m_yOffset); Card* RemoveTopCard(wxDC& dc, int m_xOffset, int m_yOffset);

View File

@@ -37,7 +37,7 @@ class LifeSamplesDialog : public wxDialog
public: public:
// ctor and dtor // ctor and dtor
LifeSamplesDialog(wxWindow *parent); LifeSamplesDialog(wxWindow *parent);
~LifeSamplesDialog(); virtual ~LifeSamplesDialog();
// members // members
const LifePattern& GetPattern(); const LifePattern& GetPattern();

View File

@@ -41,7 +41,7 @@ class LifeCanvas : public wxWindow
public: public:
// ctor and dtor // ctor and dtor
LifeCanvas(wxWindow* parent, Life* life, bool interactive = true); LifeCanvas(wxWindow* parent, Life* life, bool interactive = true);
~LifeCanvas(); virtual ~LifeCanvas();
// view management // view management
int GetCellSize() const { return m_cellsize; }; int GetCellSize() const { return m_cellsize; };
@@ -122,7 +122,7 @@ class LifeFrame : public wxFrame
public: public:
// ctor and dtor // ctor and dtor
LifeFrame(); LifeFrame();
~LifeFrame(); virtual ~LifeFrame();
// member functions // member functions
void UpdateInfoText(); void UpdateInfoText();

View File

@@ -29,7 +29,7 @@ class MyCanvas: public wxWindow
{ {
public: public:
MyCanvas(wxFrame *frame); MyCanvas(wxFrame *frame);
~MyCanvas(); virtual ~MyCanvas();
void OnPaint(wxPaintEvent& event); void OnPaint(wxPaintEvent& event);
void OnMouseEvent(wxMouseEvent& event); void OnMouseEvent(wxMouseEvent& event);
@@ -47,7 +47,7 @@ class MainWindow: public wxFrame
public: public:
MyCanvas *canvas; MyCanvas *canvas;
MainWindow(wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style); MainWindow(wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style);
~MainWindow(); virtual ~MainWindow();
void OnCloseWindow(wxCloseEvent& event); void OnCloseWindow(wxCloseEvent& event);
void OnChar(wxKeyEvent& event); void OnChar(wxKeyEvent& event);

View File

@@ -37,7 +37,7 @@ public:
const wxPaneInfo& pane, const wxPaneInfo& pane,
wxWindowID id = wxID_ANY wxWindowID id = wxID_ANY
); );
~wxFloatingPane(); virtual ~wxFloatingPane();
void SetPaneWindow(const wxPaneInfo& pane); void SetPaneWindow(const wxPaneInfo& pane);
private: private:
void OnSize(wxSizeEvent& event); void OnSize(wxSizeEvent& event);

View File

@@ -26,7 +26,7 @@ class WXDLLEXPORT wxCommand : public wxObject
{ {
public: public:
wxCommand(bool canUndoIt = false, const wxString& name = wxEmptyString); wxCommand(bool canUndoIt = false, const wxString& name = wxEmptyString);
~wxCommand(){} virtual ~wxCommand(){}
// Override this to perform a command // Override this to perform a command
virtual bool Do() = 0; virtual bool Do() = 0;

View File

@@ -31,7 +31,7 @@ class WXDLLEXPORT wxColourData: public wxObject
public: public:
wxColourData(); wxColourData();
wxColourData(const wxColourData& data); wxColourData(const wxColourData& data);
~wxColourData(); virtual ~wxColourData();
void SetChooseFull(bool flag) { m_chooseFull = flag; } void SetChooseFull(bool flag) { m_chooseFull = flag; }
bool GetChooseFull() const { return m_chooseFull; } bool GetChooseFull() const { return m_chooseFull; }
@@ -172,7 +172,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
public: public:
wxPrintData(); wxPrintData();
wxPrintData(const wxPrintData& printData); wxPrintData(const wxPrintData& printData);
~wxPrintData(); virtual ~wxPrintData();
int GetNoCopies() const { return m_printNoCopies; } int GetNoCopies() const { return m_printNoCopies; }
bool GetCollate() const { return m_printCollate; } bool GetCollate() const { return m_printCollate; }
@@ -282,7 +282,7 @@ public:
wxPrintDialogData(); wxPrintDialogData();
wxPrintDialogData(const wxPrintDialogData& dialogData); wxPrintDialogData(const wxPrintDialogData& dialogData);
wxPrintDialogData(const wxPrintData& printData); wxPrintDialogData(const wxPrintData& printData);
~wxPrintDialogData(); virtual ~wxPrintDialogData();
int GetFromPage() const { return m_printFromPage; }; int GetFromPage() const { return m_printFromPage; };
int GetToPage() const { return m_printToPage; }; int GetToPage() const { return m_printToPage; };
@@ -363,7 +363,7 @@ public:
wxPageSetupDialogData(); wxPageSetupDialogData();
wxPageSetupDialogData(const wxPageSetupDialogData& dialogData); wxPageSetupDialogData(const wxPageSetupDialogData& dialogData);
wxPageSetupDialogData(const wxPrintData& printData); wxPageSetupDialogData(const wxPrintData& printData);
~wxPageSetupDialogData(); virtual ~wxPageSetupDialogData();
wxSize GetPaperSize() const { return m_paperSize; }; wxSize GetPaperSize() const { return m_paperSize; };
wxPaperSize GetPaperId() const { return m_printData.GetPaperId(); }; wxPaperSize GetPaperId() const { return m_printData.GetPaperId(); };

View File

@@ -43,7 +43,7 @@ public:
// Construct a mask from a mono bitmap (copies the bitmap). // Construct a mask from a mono bitmap (copies the bitmap).
wxMask(const wxBitmap& bitmap); wxMask(const wxBitmap& bitmap);
~wxMask(); virtual ~wxMask();
bool Create(const wxBitmap& bitmap, const wxColour& colour); bool Create(const wxBitmap& bitmap, const wxColour& colour);
bool Create(const wxBitmap& bitmap, int paletteIndex); bool Create(const wxBitmap& bitmap, int paletteIndex);
@@ -86,7 +86,7 @@ public:
wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); } wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
// destructor // destructor
~wxBitmap(); virtual ~wxBitmap();
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Implementation // Implementation

View File

@@ -31,7 +31,7 @@ public:
wxBrush(); wxBrush();
wxBrush(const wxColour& col, int style = wxSOLID); wxBrush(const wxColour& col, int style = wxSOLID);
wxBrush(const wxBitmap& stipple); wxBrush(const wxBitmap& stipple);
~wxBrush(); virtual ~wxBrush();
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Implementation // Implementation

View File

@@ -22,7 +22,7 @@ class wxClipboard : public wxClipboardBase
DECLARE_DYNAMIC_CLASS(wxClipboard) DECLARE_DYNAMIC_CLASS(wxClipboard)
public: public:
wxClipboard(); wxClipboard();
~wxClipboard(); virtual ~wxClipboard();
// open the clipboard before SetData() and GetData() // open the clipboard before SetData() and GetData()
virtual bool Open(); virtual bool Open();

View File

@@ -22,7 +22,7 @@ class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
friend class WXDLLEXPORT wxCursor; friend class WXDLLEXPORT wxCursor;
public: public:
wxCursorRefData(); wxCursorRefData();
~wxCursorRefData(); virtual ~wxCursorRefData();
protected: protected:
int m_width, m_height; int m_width, m_height;
@@ -47,7 +47,7 @@ public:
int hotSpotX = 0, int hotSpotY = 0); int hotSpotX = 0, int hotSpotY = 0);
wxCursor(int cursor_type); wxCursor(int cursor_type);
~wxCursor(); virtual ~wxCursor();
virtual bool Ok() const { return m_refData ; } virtual bool Ok() const { return m_refData ; }

View File

@@ -23,7 +23,7 @@ public:
wxBitmapDataObject(const wxBitmap& bitmap); wxBitmapDataObject(const wxBitmap& bitmap);
// destr // destr
~wxBitmapDataObject(); virtual ~wxBitmapDataObject();
// override base class virtual to update PNG data too // override base class virtual to update PNG data too
virtual void SetBitmap(const wxBitmap& bitmap); virtual void SetBitmap(const wxBitmap& bitmap);

View File

@@ -29,7 +29,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
public: public:
wxDC(); wxDC();
~wxDC(); virtual ~wxDC();
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// wxCocoa specifics // wxCocoa specifics

View File

@@ -25,7 +25,7 @@ public:
wxWindowDC(void); wxWindowDC(void);
// Create a DC corresponding to a window // Create a DC corresponding to a window
wxWindowDC(wxWindow *win); wxWindowDC(wxWindow *win);
~wxWindowDC(void); virtual ~wxWindowDC(void);
protected: protected:
wxWindow *m_window; wxWindow *m_window;
@@ -45,7 +45,7 @@ public:
wxClientDC(void); wxClientDC(void);
// Create a DC corresponding to a window // Create a DC corresponding to a window
wxClientDC(wxWindow *win); wxClientDC(wxWindow *win);
~wxClientDC(void); virtual ~wxClientDC(void);
protected: protected:
// DC stack // DC stack
virtual bool CocoaLockFocus(); virtual bool CocoaLockFocus();
@@ -59,7 +59,7 @@ public:
wxPaintDC(void); wxPaintDC(void);
// Create a DC corresponding to a window // Create a DC corresponding to a window
wxPaintDC(wxWindow *win); wxPaintDC(wxWindow *win);
~wxPaintDC(void); virtual ~wxPaintDC(void);
protected: protected:
// DC stack // DC stack
virtual bool CocoaLockFocus(); virtual bool CocoaLockFocus();

View File

@@ -20,7 +20,7 @@ class WXDLLEXPORT wxMemoryDC: public wxDC
public: public:
wxMemoryDC(void); wxMemoryDC(void);
wxMemoryDC( wxDC *dc ); // Create compatible DC wxMemoryDC( wxDC *dc ); // Create compatible DC
~wxMemoryDC(void); virtual ~wxMemoryDC(void);
virtual void SelectObject(const wxBitmap& bitmap); virtual void SelectObject(const wxBitmap& bitmap);
virtual void DoGetSize(int *width, int *height) const; virtual void DoGetSize(int *width, int *height) const;
protected: protected:

View File

@@ -20,7 +20,7 @@ class WXDLLEXPORT wxScreenDC: public wxDC
public: public:
wxScreenDC(void); wxScreenDC(void);
wxScreenDC( wxDC *dc ); // Create compatible DC wxScreenDC( wxDC *dc ); // Create compatible DC
~wxScreenDC(void); virtual ~wxScreenDC(void);
// Compatibility with X's requirements for drawing on top of all windows // Compatibility with X's requirements for drawing on top of all windows
static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return true; } static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return true; }

View File

@@ -65,7 +65,7 @@ public:
long style = wxDEFAULT_DIALOG_STYLE, long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr); const wxString& name = wxDialogNameStr);
~wxDialog(); virtual ~wxDialog();
protected: protected:
void Init(); void Init();

View File

@@ -31,7 +31,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const wxString& name = wxDirDialogNameStr); const wxString& name = wxDirDialogNameStr);
~wxDirDialog(); virtual ~wxDirDialog();
virtual int ShowModal(); virtual int ShowModal();

View File

@@ -33,7 +33,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& sz = wxDefaultSize, const wxSize& sz = wxDefaultSize,
const wxString& name = wxFileDialogNameStr); const wxString& name = wxFileDialogNameStr);
~wxFileDialog(); virtual ~wxFileDialog();
virtual void SetPath(const wxString& path); virtual void SetPath(const wxString& path);
virtual void GetPaths(wxArrayString& paths) const; virtual void GetPaths(wxArrayString& paths) const;

View File

@@ -32,7 +32,7 @@ public:
const wxPalette& WXUNUSED(palette), const wxPalette& WXUNUSED(palette),
const wxGLContext *other /* for sharing display lists */ ); const wxGLContext *other /* for sharing display lists */ );
~wxGLContext(); virtual ~wxGLContext();
void SetCurrent(); void SetCurrent();

View File

@@ -33,7 +33,7 @@ public:
{ {
LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON); LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);
} }
~wxIcon(); virtual ~wxIcon();
bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ , bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ ,
int desiredWidth /* = -1 */ , int desiredHeight = -1); int desiredWidth /* = -1 */ , int desiredHeight = -1);

View File

@@ -156,7 +156,7 @@ class wxMDIClientWindow: public wxWindow
public: public:
wxMDIClientWindow(); wxMDIClientWindow();
wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 ); wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
~wxMDIClientWindow(); virtual ~wxMDIClientWindow();
virtual bool CreateClient( wxMDIParentFrame *parent, long style = 0 ); virtual bool CreateClient( wxMDIParentFrame *parent, long style = 0 );
}; };

View File

@@ -28,7 +28,7 @@ public:
wxPen(); wxPen();
wxPen(const wxColour& col, int width = 1, int style = wxSOLID); wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
wxPen(const wxBitmap& stipple, int width); wxPen(const wxBitmap& stipple, int width);
~wxPen(); virtual ~wxPen();
// wxObjectRefData // wxObjectRefData
wxObjectRefData *CreateRefData() const; wxObjectRefData *CreateRefData() const;

View File

@@ -37,7 +37,7 @@ public:
const wxColour& transColour, int tolerance = 0) const wxColour& transColour, int tolerance = 0)
: wxRegionGeneric() : wxRegionGeneric()
{ Union(bmp, transColour, tolerance); } { Union(bmp, transColour, tolerance); }
~wxRegion() {} virtual ~wxRegion() {}
wxRegion(const wxRegion& r) wxRegion(const wxRegion& r)
: wxRegionGeneric(r) : wxRegionGeneric(r)
{} {}
@@ -82,7 +82,7 @@ public:
wxRegionIterator(const wxRegionIterator& iterator) wxRegionIterator(const wxRegionIterator& iterator)
: wxRegionIteratorGeneric(iterator) : wxRegionIteratorGeneric(iterator)
{} {}
~wxRegionIterator() {} virtual ~wxRegionIterator() {}
wxRegionIterator& operator=(const wxRegionIterator& iter) wxRegionIterator& operator=(const wxRegionIterator& iter)
{ return *(wxRegionIterator*)&(this->wxRegionIteratorGeneric::operator=(iter)); } { return *(wxRegionIterator*)&(this->wxRegionIteratorGeneric::operator=(iter)); }

View File

@@ -29,7 +29,7 @@ public:
: m_cocoaNSSound(NULL) : m_cocoaNSSound(NULL)
{ LoadWAV(data,size,true); } { LoadWAV(data,size,true); }
wxSound(const wxSound& sound); // why not? wxSound(const wxSound& sound); // why not?
~wxSound(); virtual ~wxSound();
public: public:
bool Create(const wxString& fileName, bool isResource = false); bool Create(const wxString& fileName, bool isResource = false);

View File

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

View File

@@ -257,7 +257,7 @@ class WXDLLIMPEXP_ADV wxDataViewColumnBase: public wxObject
public: public:
wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column, wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column,
int fixed_width = 80, wxDataViewColumnSizing sizing = wxDATAVIEW_COL_WIDTH_FIXED, int flags = 0 ); int fixed_width = 80, wxDataViewColumnSizing sizing = wxDATAVIEW_COL_WIDTH_FIXED, int flags = 0 );
~wxDataViewColumnBase(); virtual ~wxDataViewColumnBase();
virtual void SetTitle( const wxString &title ); virtual void SetTitle( const wxString &title );
virtual wxString GetTitle(); virtual wxString GetTitle();
@@ -297,7 +297,7 @@ class WXDLLIMPEXP_ADV wxDataViewCtrlBase: public wxControl
{ {
public: public:
wxDataViewCtrlBase(); wxDataViewCtrlBase();
~wxDataViewCtrlBase(); virtual ~wxDataViewCtrlBase();
virtual bool AssociateModel( wxDataViewListModel *model ); virtual bool AssociateModel( wxDataViewListModel *model );
wxDataViewListModel* GetModel(); wxDataViewListModel* GetModel();

View File

@@ -115,7 +115,7 @@ class WXDLLIMPEXP_DBGRID wxDbGridTableBase : public wxGridTableBase
public: public:
wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo, wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo,
int count = wxUSE_QUERY, bool takeOwnership = true); int count = wxUSE_QUERY, bool takeOwnership = true);
~wxDbGridTableBase(); virtual ~wxDbGridTableBase();
virtual int GetNumberRows() virtual int GetNumberRows()
{ {

View File

@@ -132,7 +132,7 @@ public:
ResetClipping(); ResetClipping();
} }
~wxDCBase() { } virtual ~wxDCBase() { }
#if WXWIN_COMPATIBILITY_2_6 #if WXWIN_COMPATIBILITY_2_6
wxDEPRECATED( virtual void BeginDrawing() ); wxDEPRECATED( virtual void BeginDrawing() );

View File

@@ -65,7 +65,7 @@ public:
wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID id, wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID id,
const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame")); long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame"));
~wxDocMDIChildFrame(); virtual ~wxDocMDIChildFrame();
bool Create(wxDocument *doc, bool Create(wxDocument *doc,
wxView *view, wxView *view,

View File

@@ -65,7 +65,7 @@ class WXDLLEXPORT wxDocument : public wxEvtHandler
{ {
public: public:
wxDocument(wxDocument *parent = (wxDocument *) NULL); wxDocument(wxDocument *parent = (wxDocument *) NULL);
~wxDocument(); virtual ~wxDocument();
// accessors // accessors
void SetFilename(const wxString& filename, bool notifyViews = false); void SetFilename(const wxString& filename, bool notifyViews = false);
@@ -175,7 +175,7 @@ class WXDLLEXPORT wxView: public wxEvtHandler
public: public:
// wxView(wxDocument *doc = (wxDocument *) NULL); // wxView(wxDocument *doc = (wxDocument *) NULL);
wxView(); wxView();
~wxView(); virtual ~wxView();
wxDocument *GetDocument() const { return m_viewDocument; } wxDocument *GetDocument() const { return m_viewDocument; }
virtual void SetDocument(wxDocument *doc); virtual void SetDocument(wxDocument *doc);
@@ -249,7 +249,7 @@ public:
wxClassInfo *viewClassInfo = (wxClassInfo *)NULL, wxClassInfo *viewClassInfo = (wxClassInfo *)NULL,
long flags = wxDEFAULT_TEMPLATE_FLAGS); long flags = wxDEFAULT_TEMPLATE_FLAGS);
~wxDocTemplate(); virtual ~wxDocTemplate();
// By default, these two member functions dynamically creates document and // By default, these two member functions dynamically creates document and
// view using dynamic instance construction. Override these if you need a // view using dynamic instance construction. Override these if you need a
@@ -315,7 +315,7 @@ class WXDLLEXPORT wxDocManager: public wxEvtHandler
{ {
public: public:
wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = true); wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = true);
~wxDocManager(); virtual ~wxDocManager();
virtual bool Initialize(); virtual bool Initialize();
@@ -468,7 +468,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long type = wxDEFAULT_FRAME_STYLE, long type = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxT("frame")); const wxString& name = wxT("frame"));
~wxDocChildFrame(){} virtual ~wxDocChildFrame(){}
// Extend event processing to search the view's event table // Extend event processing to search the view's event table
virtual bool ProcessEvent(wxEvent& event); virtual bool ProcessEvent(wxEvent& event);
@@ -559,7 +559,7 @@ class WXDLLEXPORT wxFileHistory : public wxObject
{ {
public: public:
wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1); wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1);
~wxFileHistory(); virtual ~wxFileHistory();
// Operations // Operations
virtual void AddFileToHistory(const wxString& file); virtual void AddFileToHistory(const wxString& file);

View File

@@ -54,7 +54,7 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
public: public:
wxEncodingConverter(); wxEncodingConverter();
~wxEncodingConverter() { if (m_Table) delete[] m_Table; } virtual ~wxEncodingConverter() { if (m_Table) delete[] m_Table; }
// Initialize conversion. Both output or input encoding may // Initialize conversion. Both output or input encoding may
// be wxFONTENCODING_UNICODE, but only if wxUSE_WCHAR_T is set to 1. // be wxFONTENCODING_UNICODE, but only if wxUSE_WCHAR_T is set to 1.

View File

@@ -1185,7 +1185,7 @@ public:
g_isPainting++; g_isPainting++;
} }
~wxPaintEvent() virtual ~wxPaintEvent()
{ {
g_isPainting--; g_isPainting--;
} }

View File

@@ -28,7 +28,7 @@ class WXDLLIMPEXP_BASE wxMemoryFSHandlerBase : public wxFileSystemHandler
{ {
public: public:
wxMemoryFSHandlerBase(); wxMemoryFSHandlerBase();
~wxMemoryFSHandlerBase(); virtual ~wxMemoryFSHandlerBase();
// Add file to list of files stored in memory. Stored data (bitmap, text or // Add file to list of files stored in memory. Stored data (bitmap, text or
// raw data) will be copied into private memory stream and available under // raw data) will be copied into private memory stream and available under

View File

@@ -34,7 +34,7 @@ class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler
virtual wxString FindFirst(const wxString& spec, int flags = 0); virtual wxString FindFirst(const wxString& spec, int flags = 0);
virtual wxString FindNext(); virtual wxString FindNext();
void Cleanup(); void Cleanup();
~wxZipFSHandler(); virtual ~wxZipFSHandler();
private: private:
// these vars are used by FindFirst/Next: // these vars are used by FindFirst/Next:

View File

@@ -541,7 +541,7 @@ public:
#if !wxUSE_STL #if !wxUSE_STL
wxResourceCache(const unsigned int keyType) : wxList(keyType) { } wxResourceCache(const unsigned int keyType) : wxList(keyType) { }
#endif #endif
~wxResourceCache(); virtual ~wxResourceCache();
}; };
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -55,7 +55,7 @@ class WXDLLEXPORT wxGenericImageList: public wxObject
public: public:
wxGenericImageList() { m_width = m_height = 0; } wxGenericImageList() { m_width = m_height = 0; }
wxGenericImageList( int width, int height, bool mask = true, int initialCount = 1 ); 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( int width, int height, bool mask = true, int initialCount = 1 );
bool Create(); bool Create();

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -26,7 +26,7 @@ public:
wxMask( const wxBitmap& bitmap, int paletteIndex ); wxMask( const wxBitmap& bitmap, int paletteIndex );
#endif // wxUSE_PALETTE #endif // wxUSE_PALETTE
wxMask( const wxBitmap& bitmap ); wxMask( const wxBitmap& bitmap );
~wxMask(); virtual ~wxMask();
bool Create( const wxBitmap& bitmap, const wxColour& colour ); bool Create( const wxBitmap& bitmap, const wxColour& colour );
#if wxUSE_PALETTE #if wxUSE_PALETTE
@@ -57,7 +57,7 @@ public:
wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); } wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }
wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); } 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 operator != ( const wxBitmap& bmp ) const; bool operator != ( const wxBitmap& bmp ) const;
bool Ok() const; bool Ok() const;

View File

@@ -24,7 +24,7 @@ public:
wxBrush( const wxColour &colour, int style = wxSOLID ); wxBrush( const wxColour &colour, int style = wxSOLID );
wxBrush( const wxBitmap &stippleBitmap ); wxBrush( const wxBitmap &stippleBitmap );
~wxBrush(); virtual ~wxBrush();
bool Ok() const { return m_refData != NULL; } bool Ok() const { return m_refData != NULL; }

View File

@@ -45,7 +45,7 @@ public:
Create(parent, id, pos, size, choices, style, validator, name); Create(parent, id, pos, size, choices, style, validator, name);
} }
~wxChoice(); virtual ~wxChoice();
bool Create( wxWindow *parent, wxWindowID id, bool Create( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,

View File

@@ -18,7 +18,7 @@ class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
{ {
public: public:
wxClipboard(); wxClipboard();
~wxClipboard(); virtual ~wxClipboard();
// open the clipboard before SetData() and GetData() // open the clipboard before SetData() and GetData()
virtual bool Open(); virtual bool Open();

View File

@@ -25,7 +25,7 @@ public:
DEFINE_STD_WXCOLOUR_CONSTRUCTORS DEFINE_STD_WXCOLOUR_CONSTRUCTORS
wxColour(const GdkColor& gdkColor); wxColour(const GdkColor& gdkColor);
~wxColour(); virtual ~wxColour();
bool Ok() const { return m_refData != NULL; } bool Ok() const { return m_refData != NULL; }

View File

@@ -42,7 +42,7 @@ public:
Create(parent, id, value, pos, size, choices, style, validator, name); Create(parent, id, value, pos, size, choices, style, validator, name);
} }
~wxComboBox(); virtual ~wxComboBox();
bool Create(wxWindow *parent, wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxString& value = wxEmptyString, const wxString& value = wxEmptyString,

View File

@@ -31,7 +31,7 @@ public:
wxCursor( const char bits[], int width, int height, wxCursor( const char bits[], int width, int height,
int hotSpotX=-1, int hotSpotY=-1, int hotSpotX=-1, int hotSpotY=-1,
const char maskBits[] = NULL, const wxColour *fg = NULL, const wxColour *bg = NULL ); 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 operator != ( const wxCursor& cursor ) const; bool operator != ( const wxCursor& cursor ) const;
bool Ok() const; bool Ok() const;

View File

@@ -23,7 +23,7 @@ public:
wxBitmapDataObject(const wxBitmap& bitmap); wxBitmapDataObject(const wxBitmap& bitmap);
// destr // destr
~wxBitmapDataObject(); virtual ~wxBitmapDataObject();
// override base class virtual to update PNG data too // override base class virtual to update PNG data too
virtual void SetBitmap(const wxBitmap& bitmap); virtual void SetBitmap(const wxBitmap& bitmap);

View File

@@ -85,7 +85,7 @@ public:
wxDataViewCustomCell( const wxString &varianttype = wxT("string"), wxDataViewCustomCell( const wxString &varianttype = wxT("string"),
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
bool no_init = false ); bool no_init = false );
~wxDataViewCustomCell(); virtual ~wxDataViewCustomCell();
bool Init(); bool Init();
virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0; virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
@@ -125,7 +125,7 @@ public:
wxDataViewProgressCell( const wxString &label = wxEmptyString, wxDataViewProgressCell( const wxString &label = wxEmptyString,
const wxString &varianttype = wxT("long"), const wxString &varianttype = wxT("long"),
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT ); wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
~wxDataViewProgressCell(); virtual ~wxDataViewProgressCell();
bool SetValue( const wxVariant &value ); bool SetValue( const wxVariant &value );

View File

@@ -70,7 +70,7 @@ class WXDLLIMPEXP_CORE wxDC : public wxDCBase
{ {
public: public:
wxDC(); wxDC();
~wxDC() { } virtual ~wxDC() { }
#if wxUSE_PALETTE #if wxUSE_PALETTE
void SetColourMap( const wxPalette& palette ) { SetPalette(palette); }; void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };

View File

@@ -28,7 +28,7 @@ class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC
public: public:
wxMemoryDC(); wxMemoryDC();
wxMemoryDC( wxDC *dc ); // Create compatible DC wxMemoryDC( wxDC *dc ); // Create compatible DC
~wxMemoryDC(); virtual ~wxMemoryDC();
virtual void SelectObject( const wxBitmap& bitmap ); virtual void SelectObject( const wxBitmap& bitmap );
// these get reimplemented for mono-bitmaps to behave // these get reimplemented for mono-bitmaps to behave

View File

@@ -45,7 +45,7 @@ public:
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE, long style = wxDEFAULT_DIALOG_STYLE,
const wxString &name = wxDialogNameStr ); const wxString &name = wxDialogNameStr );
~wxDialog() {} virtual ~wxDialog() {}
virtual bool Show( bool show = TRUE ); virtual bool Show( bool show = TRUE );
virtual int ShowModal(); virtual int ShowModal();

View File

@@ -49,7 +49,7 @@ public:
// wxGTK-specific // wxGTK-specific
bool Create(const wxString& fontname); bool Create(const wxString& fontname);
~wxFont(); virtual ~wxFont();
// implement base class pure virtuals // implement base class pure virtuals
virtual int GetPointSize() const; virtual int GetPointSize() const;

View File

@@ -66,7 +66,7 @@ public:
const wxPalette& WXUNUSED(palette), const wxPalette& WXUNUSED(palette),
const wxGLContext *other /* for sharing display lists */ const wxGLContext *other /* for sharing display lists */
); );
~wxGLContext(); virtual ~wxGLContext();
void SetCurrent(); void SetCurrent();
void SetColour(const wxChar *colour); void SetColour(const wxChar *colour);
@@ -138,7 +138,7 @@ public:
int *attribList = (int*) NULL, int *attribList = (int*) NULL,
const wxPalette& palette = wxNullPalette ); const wxPalette& palette = wxNullPalette );
~wxGLCanvas(); virtual ~wxGLCanvas();
void SetCurrent(); void SetCurrent();
void SetColour(const wxChar *colour); void SetColour(const wxChar *colour);

View File

@@ -98,7 +98,7 @@ public:
wxGnomePrintDialog( wxWindow *parent, wxGnomePrintDialog( wxWindow *parent,
wxPrintDialogData* data = NULL ); wxPrintDialogData* data = NULL );
wxGnomePrintDialog( wxWindow *parent, wxPrintData* data); wxGnomePrintDialog( wxWindow *parent, wxPrintData* data);
~wxGnomePrintDialog(); virtual ~wxGnomePrintDialog();
wxPrintData& GetPrintData() wxPrintData& GetPrintData()
{ return m_printDialogData.GetPrintData(); } { return m_printDialogData.GetPrintData(); }
@@ -138,7 +138,7 @@ class wxGnomePageSetupDialog: public wxPageSetupDialogBase
public: public:
wxGnomePageSetupDialog( wxWindow *parent, wxGnomePageSetupDialog( wxWindow *parent,
wxPageSetupDialogData* data = NULL ); wxPageSetupDialogData* data = NULL );
~wxGnomePageSetupDialog(); virtual ~wxGnomePageSetupDialog();
virtual wxPageSetupDialogData& GetPageSetupDialogData(); virtual wxPageSetupDialogData& GetPageSetupDialogData();
@@ -198,7 +198,7 @@ class wxGnomePrintDC: public wxDC
{ {
public: public:
wxGnomePrintDC( wxGnomePrinter *printer ); wxGnomePrintDC( wxGnomePrinter *printer );
~wxGnomePrintDC(); virtual ~wxGnomePrintDC();
bool Ok() const; bool Ok() const;

View File

@@ -33,7 +33,7 @@ public:
(void)Create(parent, id, title, pos, size, style, name); (void)Create(parent, id, title, pos, size, style, name);
} }
~wxMDIParentFrame(); virtual ~wxMDIParentFrame();
bool Create( wxWindow *parent, bool Create( wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxString& title, const wxString& title,
@@ -183,7 +183,7 @@ class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow
public: public:
wxMDIClientWindow(); wxMDIClientWindow();
wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 ); wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
~wxMDIClientWindow(); virtual ~wxMDIClientWindow();
virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL ); virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
private: private:

View File

@@ -25,7 +25,7 @@ public:
const wxString& help = wxEmptyString, const wxString& help = wxEmptyString,
wxItemKind kind = wxITEM_NORMAL, wxItemKind kind = wxITEM_NORMAL,
wxMenu *subMenu = (wxMenu *)NULL); wxMenu *subMenu = (wxMenu *)NULL);
~wxMenuItem(); virtual ~wxMenuItem();
// implement base class virtuals // implement base class virtuals
virtual void SetText( const wxString& str ); virtual void SetText( const wxString& str );

View File

@@ -27,7 +27,7 @@ public:
const wxString& caption = wxMessageBoxCaptionStr, const wxString& caption = wxMessageBoxCaptionStr,
long style = wxOK|wxCENTRE, long style = wxOK|wxCENTRE,
const wxPoint& pos = wxDefaultPosition); const wxPoint& pos = wxDefaultPosition);
~wxMessageDialog(); virtual ~wxMessageDialog();
int ShowModal(); int ShowModal();
virtual bool Show( bool WXUNUSED(show) = true ) { return false; }; virtual bool Show( bool WXUNUSED(show) = true ) { return false; };

View File

@@ -25,7 +25,7 @@ public:
wxPen() { } wxPen() { }
wxPen( const wxColour &colour, int width = 1, int style = wxSOLID ); wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
~wxPen(); virtual ~wxPen();
bool Ok() const { return m_refData != NULL; } bool Ok() const { return m_refData != NULL; }

View File

@@ -64,7 +64,7 @@ public:
Union(bmp, transColour, tolerance); Union(bmp, transColour, tolerance);
} }
~wxRegion(); virtual ~wxRegion();
bool Ok() const { return m_refData != NULL; } bool Ok() const { return m_refData != NULL; }

View File

@@ -41,7 +41,7 @@ public:
long style = wxSB_HORIZONTAL, long style = wxSB_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxScrollBarNameStr ); const wxString& name = wxScrollBarNameStr );
~wxScrollBar(); virtual ~wxScrollBar();
int GetThumbPosition() const; int GetThumbPosition() const;
int GetThumbSize() const; int GetThumbSize() const;
int GetPageSize() const; int GetPageSize() const;

View File

@@ -28,7 +28,7 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString &name = wxTextCtrlNameStr); const wxString &name = wxTextCtrlNameStr);
~wxTextCtrl(); virtual ~wxTextCtrl();
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,

View File

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

View File

@@ -40,7 +40,7 @@ public:
wxMask( const wxBitmap& bitmap, int paletteIndex ); wxMask( const wxBitmap& bitmap, int paletteIndex );
#endif // wxUSE_PALETTE #endif // wxUSE_PALETTE
wxMask( const wxBitmap& bitmap ); wxMask( const wxBitmap& bitmap );
~wxMask(); virtual ~wxMask();
bool Create( const wxBitmap& bitmap, const wxColour& colour ); bool Create( const wxBitmap& bitmap, const wxColour& colour );
#if wxUSE_PALETTE #if wxUSE_PALETTE
@@ -71,7 +71,7 @@ public:
wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); } wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }
wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); } 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 operator != ( const wxBitmap& bmp ) const; bool operator != ( const wxBitmap& bmp ) const;
bool Ok() const; bool Ok() const;

View File

@@ -34,7 +34,7 @@ public:
wxBrush( const wxColour &colour, int style = wxSOLID ); wxBrush( const wxColour &colour, int style = wxSOLID );
wxBrush( const wxBitmap &stippleBitmap ); wxBrush( const wxBitmap &stippleBitmap );
~wxBrush(); virtual ~wxBrush();
bool Ok() const { return m_refData != NULL; } bool Ok() const { return m_refData != NULL; }

View File

@@ -45,7 +45,7 @@ public:
Create(parent, id, pos, size, choices, style, validator, name); Create(parent, id, pos, size, choices, style, validator, name);
} }
~wxChoice(); virtual ~wxChoice();
bool Create( wxWindow *parent, wxWindowID id, bool Create( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,

View File

@@ -27,7 +27,7 @@ class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
{ {
public: public:
wxClipboard(); wxClipboard();
~wxClipboard(); virtual ~wxClipboard();
// open the clipboard before SetData() and GetData() // open the clipboard before SetData() and GetData()
virtual bool Open(); virtual bool Open();

View File

@@ -41,7 +41,7 @@ public:
wxColour() { } wxColour() { }
DEFINE_STD_WXCOLOUR_CONSTRUCTORS DEFINE_STD_WXCOLOUR_CONSTRUCTORS
~wxColour(); virtual ~wxColour();
virtual bool FromString(const wxChar *str); virtual bool FromString(const wxChar *str);

View File

@@ -61,7 +61,7 @@ public:
Create(parent, id, value, pos, size, choices, style, validator, name); Create(parent, id, value, pos, size, choices, style, validator, name);
} }
~wxComboBox(); virtual ~wxComboBox();
bool Create(wxWindow *parent, wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxString& value = wxEmptyString, const wxString& value = wxEmptyString,

View File

@@ -34,7 +34,7 @@ public:
wxCursor( const char bits[], int width, int height, wxCursor( const char bits[], int width, int height,
int hotSpotX=-1, int hotSpotY=-1, int hotSpotX=-1, int hotSpotY=-1,
const char maskBits[] = NULL, const wxColour *fg = NULL, const wxColour *bg = NULL ); 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 operator != ( const wxCursor& cursor ) const; bool operator != ( const wxCursor& cursor ) const;
bool Ok() const; bool Ok() const;

View File

@@ -23,7 +23,7 @@ public:
wxBitmapDataObject(const wxBitmap& bitmap); wxBitmapDataObject(const wxBitmap& bitmap);
// destr // destr
~wxBitmapDataObject(); virtual ~wxBitmapDataObject();
// override base class virtual to update PNG data too // override base class virtual to update PNG data too
virtual void SetBitmap(const wxBitmap& bitmap); virtual void SetBitmap(const wxBitmap& bitmap);

View File

@@ -39,7 +39,7 @@ class WXDLLIMPEXP_CORE wxDC : public wxDCBase
{ {
public: public:
wxDC(); wxDC();
~wxDC() { } virtual ~wxDC() { }
#if wxUSE_PALETTE #if wxUSE_PALETTE
void SetColourMap( const wxPalette& palette ) { SetPalette(palette); }; void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };

View File

@@ -28,7 +28,7 @@ class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC
public: public:
wxMemoryDC(); wxMemoryDC();
wxMemoryDC( wxDC *dc ); // Create compatible DC wxMemoryDC( wxDC *dc ); // Create compatible DC
~wxMemoryDC(); virtual ~wxMemoryDC();
virtual void SelectObject( const wxBitmap& bitmap ); virtual void SelectObject( const wxBitmap& bitmap );
void DoGetSize( int *width, int *height ) const; void DoGetSize( int *width, int *height ) const;

View File

@@ -45,7 +45,7 @@ public:
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE, long style = wxDEFAULT_DIALOG_STYLE,
const wxString &name = wxDialogNameStr ); const wxString &name = wxDialogNameStr );
~wxDialog() {} virtual ~wxDialog() {}
void OnApply( wxCommandEvent &event ); void OnApply( wxCommandEvent &event );
void OnCancel( wxCommandEvent &event ); void OnCancel( wxCommandEvent &event );

View File

@@ -62,7 +62,7 @@ public:
// wxGTK-specific // wxGTK-specific
bool Create(const wxString& fontname); bool Create(const wxString& fontname);
~wxFont(); virtual ~wxFont();
// implement base class pure virtuals // implement base class pure virtuals
virtual int GetPointSize() const; virtual int GetPointSize() const;

View File

@@ -66,7 +66,7 @@ public:
const wxPalette& WXUNUSED(palette), const wxPalette& WXUNUSED(palette),
const wxGLContext *other /* for sharing display lists */ const wxGLContext *other /* for sharing display lists */
); );
~wxGLContext(); virtual ~wxGLContext();
void SetCurrent(); void SetCurrent();
void SetColour(const wxChar *colour); void SetColour(const wxChar *colour);
@@ -138,7 +138,7 @@ public:
int *attribList = (int*) NULL, int *attribList = (int*) NULL,
const wxPalette& palette = wxNullPalette ); const wxPalette& palette = wxNullPalette );
~wxGLCanvas(); virtual ~wxGLCanvas();
void SetCurrent(); void SetCurrent();
void SetColour(const wxChar *colour); void SetColour(const wxChar *colour);

Some files were not shown because too many files have changed in this diff Show More