More use of wxOVERRIDE
This commit is contained in:
@@ -1193,8 +1193,8 @@ bool wxThread::IsPaused() const
|
||||
class wxThreadModule : public wxModule
|
||||
{
|
||||
public:
|
||||
virtual bool OnInit();
|
||||
virtual void OnExit();
|
||||
virtual bool OnInit() wxOVERRIDE;
|
||||
virtual void OnExit() wxOVERRIDE;
|
||||
|
||||
private:
|
||||
wxDECLARE_DYNAMIC_CLASS(wxThreadModule);
|
||||
|
||||
@@ -55,7 +55,7 @@ public:
|
||||
|
||||
virtual ~wxBitmapRefData();
|
||||
|
||||
bool IsOk() const;
|
||||
bool IsOk() const wxOVERRIDE;
|
||||
|
||||
void Free();
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ class wxQtIdleTimer : public QTimer, public wxRefCounter
|
||||
public:
|
||||
wxQtIdleTimer();
|
||||
~wxQtIdleTimer();
|
||||
virtual bool eventFilter( QObject * watched, QEvent * event );
|
||||
virtual bool eventFilter( QObject * watched, QEvent * event ) wxOVERRIDE;
|
||||
|
||||
private:
|
||||
void idle();
|
||||
@@ -239,7 +239,7 @@ class wxQtEventLoopSourcesManager : public wxEventLoopSourcesManagerBase
|
||||
{
|
||||
public:
|
||||
wxEventLoopSource*
|
||||
AddSourceForFD(int fd, wxEventLoopSourceHandler* handler, int flags)
|
||||
AddSourceForFD(int fd, wxEventLoopSourceHandler* handler, int flags) wxOVERRIDE
|
||||
{
|
||||
return new wxQtEventLoopSource(fd, handler, flags);
|
||||
}
|
||||
|
||||
@@ -25,13 +25,13 @@ public:
|
||||
}
|
||||
|
||||
protected:
|
||||
virtual void showEvent ( QShowEvent * event );
|
||||
virtual void hideEvent ( QHideEvent * event );
|
||||
virtual void resizeEvent ( QResizeEvent * event );
|
||||
virtual void paintEvent ( QPaintEvent * event );
|
||||
virtual void showEvent ( QShowEvent * event ) wxOVERRIDE;
|
||||
virtual void hideEvent ( QHideEvent * event ) wxOVERRIDE;
|
||||
virtual void resizeEvent ( QResizeEvent * event ) wxOVERRIDE;
|
||||
virtual void paintEvent ( QPaintEvent * event ) wxOVERRIDE;
|
||||
|
||||
virtual void resizeGL(int w, int h);
|
||||
virtual void paintGL();
|
||||
virtual void resizeGL(int w, int h) wxOVERRIDE;
|
||||
virtual void paintGL() wxOVERRIDE;
|
||||
};
|
||||
|
||||
void wxQtGLWidget::showEvent ( QShowEvent * event )
|
||||
|
||||
@@ -54,7 +54,7 @@ public:
|
||||
class QtFDIOManager : public wxFDIOManager
|
||||
{
|
||||
public:
|
||||
virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d)
|
||||
virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d) wxOVERRIDE
|
||||
{
|
||||
QSocketNotifier::Type type;
|
||||
switch (d)
|
||||
@@ -73,7 +73,7 @@ public:
|
||||
}
|
||||
|
||||
virtual void
|
||||
RemoveInput(wxFDIOHandler* handler, int fd, Direction d)
|
||||
RemoveInput(wxFDIOHandler* handler, int fd, Direction d) wxOVERRIDE
|
||||
{
|
||||
QSocketNotifier::Type type = d == INPUT ? QSocketNotifier::Read :
|
||||
QSocketNotifier::Write;
|
||||
|
||||
@@ -46,8 +46,8 @@ public:
|
||||
m_qtToolButton = NULL;
|
||||
}
|
||||
|
||||
virtual void SetLabel( const wxString &label );
|
||||
virtual void SetDropdownMenu(wxMenu* menu);
|
||||
virtual void SetLabel( const wxString &label ) wxOVERRIDE;
|
||||
virtual void SetDropdownMenu(wxMenu* menu) wxOVERRIDE;
|
||||
|
||||
void SetIcon();
|
||||
void ClearToolTip();
|
||||
@@ -67,9 +67,9 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
void mouseReleaseEvent( QMouseEvent *event );
|
||||
void mousePressEvent( QMouseEvent *event );
|
||||
void enterEvent( QEvent *event );
|
||||
void mouseReleaseEvent( QMouseEvent *event ) wxOVERRIDE;
|
||||
void mousePressEvent( QMouseEvent *event ) wxOVERRIDE;
|
||||
void enterEvent( QEvent *event ) wxOVERRIDE;
|
||||
};
|
||||
|
||||
void wxQtToolButton::mouseReleaseEvent( QMouseEvent *event )
|
||||
|
||||
@@ -185,10 +185,10 @@ public:
|
||||
virtual bool Start( int millisecs = -1 )
|
||||
{ m_started = true; return wxTimer::Start(millisecs, false); }
|
||||
|
||||
virtual void Notify()
|
||||
virtual void Notify() wxOVERRIDE
|
||||
{ wxLogTrace("Checking dial up network status."); m_dupman->CheckStatus(); }
|
||||
|
||||
virtual void Stop()
|
||||
virtual void Stop() wxOVERRIDE
|
||||
{ if ( m_started ) wxTimer::Stop(); }
|
||||
public:
|
||||
bool m_started;
|
||||
|
||||
Reference in New Issue
Block a user