use wxOVERRIDE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -100,13 +100,13 @@ public:
|
||||
|
||||
// register handler for the given descriptor with the dispatcher, return
|
||||
// true on success or false on error
|
||||
virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags);
|
||||
virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags) wxOVERRIDE;
|
||||
|
||||
// modify descriptor flags or handler, return true on success
|
||||
virtual bool ModifyFD(int fd, wxFDIOHandler *handler, int flags);
|
||||
virtual bool ModifyFD(int fd, wxFDIOHandler *handler, int flags) wxOVERRIDE;
|
||||
|
||||
// unregister descriptor previously registered with RegisterFD()
|
||||
virtual bool UnregisterFD(int fd);
|
||||
virtual bool UnregisterFD(int fd) wxOVERRIDE;
|
||||
|
||||
virtual ~wxMappedFDIODispatcher() { }
|
||||
|
||||
|
@@ -25,9 +25,9 @@ public:
|
||||
}
|
||||
|
||||
// Just forward to the real handler.
|
||||
virtual void OnReadWaiting() { m_handler->OnReadWaiting(); }
|
||||
virtual void OnWriteWaiting() { m_handler->OnWriteWaiting(); }
|
||||
virtual void OnExceptionWaiting() { m_handler->OnExceptionWaiting(); }
|
||||
virtual void OnReadWaiting() wxOVERRIDE { m_handler->OnReadWaiting(); }
|
||||
virtual void OnWriteWaiting() wxOVERRIDE { m_handler->OnWriteWaiting(); }
|
||||
virtual void OnExceptionWaiting() wxOVERRIDE { m_handler->OnExceptionWaiting(); }
|
||||
|
||||
protected:
|
||||
wxEventLoopSourceHandler* const m_handler;
|
||||
|
@@ -58,17 +58,17 @@ public:
|
||||
|
||||
// If the length of the backer's parent stream is unknown then GetLength()
|
||||
// returns wxInvalidOffset until the parent has been read to the end.
|
||||
wxFileOffset GetLength() const;
|
||||
wxFileOffset GetLength() const wxOVERRIDE;
|
||||
|
||||
// Returns the length, reading the parent stream to the end if necessary.
|
||||
wxFileOffset FindLength() const;
|
||||
|
||||
bool IsSeekable() const { return true; }
|
||||
bool IsSeekable() const wxOVERRIDE { return true; }
|
||||
|
||||
protected:
|
||||
size_t OnSysRead(void *buffer, size_t size);
|
||||
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
|
||||
wxFileOffset OnSysTell() const;
|
||||
size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE;
|
||||
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE;
|
||||
wxFileOffset OnSysTell() const wxOVERRIDE;
|
||||
|
||||
private:
|
||||
wxBackingFile m_backer;
|
||||
|
@@ -68,33 +68,33 @@ public:
|
||||
|
||||
// Implement all pure virtual methods inherited from the base class in
|
||||
// terms of our own ones.
|
||||
virtual void OnBoldStart() { DoChangeFont(&wxFont::Bold); }
|
||||
virtual void OnBoldEnd() { DoEndAttr(); }
|
||||
virtual void OnBoldStart() wxOVERRIDE { DoChangeFont(&wxFont::Bold); }
|
||||
virtual void OnBoldEnd() wxOVERRIDE { DoEndAttr(); }
|
||||
|
||||
virtual void OnItalicStart() { DoChangeFont(&wxFont::Italic); }
|
||||
virtual void OnItalicEnd() { DoEndAttr(); }
|
||||
virtual void OnItalicStart() wxOVERRIDE { DoChangeFont(&wxFont::Italic); }
|
||||
virtual void OnItalicEnd() wxOVERRIDE { DoEndAttr(); }
|
||||
|
||||
virtual void OnUnderlinedStart() { DoChangeFont(&wxFont::Underlined); }
|
||||
virtual void OnUnderlinedEnd() { DoEndAttr(); }
|
||||
virtual void OnUnderlinedStart() wxOVERRIDE { DoChangeFont(&wxFont::Underlined); }
|
||||
virtual void OnUnderlinedEnd() wxOVERRIDE { DoEndAttr(); }
|
||||
|
||||
virtual void OnStrikethroughStart() { DoChangeFont(&wxFont::Strikethrough); }
|
||||
virtual void OnStrikethroughEnd() { DoEndAttr(); }
|
||||
virtual void OnStrikethroughStart() wxOVERRIDE { DoChangeFont(&wxFont::Strikethrough); }
|
||||
virtual void OnStrikethroughEnd() wxOVERRIDE { DoEndAttr(); }
|
||||
|
||||
virtual void OnBigStart() { DoChangeFont(&wxFont::Larger); }
|
||||
virtual void OnBigEnd() { DoEndAttr(); }
|
||||
virtual void OnBigStart() wxOVERRIDE { DoChangeFont(&wxFont::Larger); }
|
||||
virtual void OnBigEnd() wxOVERRIDE { DoEndAttr(); }
|
||||
|
||||
virtual void OnSmallStart() { DoChangeFont(&wxFont::Smaller); }
|
||||
virtual void OnSmallEnd() { DoEndAttr(); }
|
||||
virtual void OnSmallStart() wxOVERRIDE { DoChangeFont(&wxFont::Smaller); }
|
||||
virtual void OnSmallEnd() wxOVERRIDE { DoEndAttr(); }
|
||||
|
||||
virtual void OnTeletypeStart()
|
||||
virtual void OnTeletypeStart() wxOVERRIDE
|
||||
{
|
||||
wxFont font(GetFont());
|
||||
font.SetFamily(wxFONTFAMILY_TELETYPE);
|
||||
DoSetFont(font);
|
||||
}
|
||||
virtual void OnTeletypeEnd() { DoEndAttr(); }
|
||||
virtual void OnTeletypeEnd() wxOVERRIDE { DoEndAttr(); }
|
||||
|
||||
virtual void OnSpanStart(const wxMarkupSpanAttributes& spanAttr)
|
||||
virtual void OnSpanStart(const wxMarkupSpanAttributes& spanAttr) wxOVERRIDE
|
||||
{
|
||||
wxFont font(GetFont());
|
||||
if ( !spanAttr.m_fontFace.empty() )
|
||||
@@ -147,7 +147,7 @@ public:
|
||||
m_attrs.push(attr);
|
||||
}
|
||||
|
||||
virtual void OnSpanEnd(const wxMarkupSpanAttributes& WXUNUSED(spanAttr))
|
||||
virtual void OnSpanEnd(const wxMarkupSpanAttributes& WXUNUSED(spanAttr)) wxOVERRIDE
|
||||
{
|
||||
DoEndAttr();
|
||||
}
|
||||
|
@@ -91,11 +91,11 @@ public:
|
||||
wxSelectDispatcher() { m_maxFD = -1; }
|
||||
|
||||
// implement pure virtual methods of the base class
|
||||
virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags = wxFDIO_ALL);
|
||||
virtual bool ModifyFD(int fd, wxFDIOHandler *handler, int flags = wxFDIO_ALL);
|
||||
virtual bool UnregisterFD(int fd);
|
||||
virtual bool HasPending() const;
|
||||
virtual int Dispatch(int timeout = TIMEOUT_INFINITE);
|
||||
virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags = wxFDIO_ALL) wxOVERRIDE;
|
||||
virtual bool ModifyFD(int fd, wxFDIOHandler *handler, int flags = wxFDIO_ALL) wxOVERRIDE;
|
||||
virtual bool UnregisterFD(int fd) wxOVERRIDE;
|
||||
virtual bool HasPending() const wxOVERRIDE;
|
||||
virtual int Dispatch(int timeout = TIMEOUT_INFINITE) wxOVERRIDE;
|
||||
|
||||
private:
|
||||
// common part of RegisterFD() and ModifyFD()
|
||||
|
Reference in New Issue
Block a user