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

use more wxOVERRIDE (#329)

Browse Source
This commit is contained in:
Maarten
2016-09-25 22:21:28 +02:00
committed by paulcor
parent d0c57dbef0
commit 977a826639
66 changed files with 456 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/aui/dockart.h
View File

@@ -89,45 +89,45 @@ public:
wxAuiDefaultDockArt(); wxAuiDefaultDockArt();
int GetMetric(int metricId); int GetMetric(int metricId) wxOVERRIDE;
void SetMetric(int metricId, int newVal); void SetMetric(int metricId, int newVal) wxOVERRIDE;
wxColour GetColour(int id); wxColour GetColour(int id) wxOVERRIDE;
void SetColour(int id, const wxColor& colour); void SetColour(int id, const wxColor& colour) wxOVERRIDE;
void SetFont(int id, const wxFont& font); void SetFont(int id, const wxFont& font) wxOVERRIDE;
wxFont GetFont(int id); wxFont GetFont(int id) wxOVERRIDE;
void DrawSash(wxDC& dc, void DrawSash(wxDC& dc,
wxWindow *window, wxWindow *window,
int orientation, int orientation,
const wxRect& rect); const wxRect& rect) wxOVERRIDE;
void DrawBackground(wxDC& dc, void DrawBackground(wxDC& dc,
wxWindow *window, wxWindow *window,
int orientation, int orientation,
const wxRect& rect); const wxRect& rect) wxOVERRIDE;
void DrawCaption(wxDC& dc, void DrawCaption(wxDC& dc,
wxWindow *window, wxWindow *window,
const wxString& text, const wxString& text,
const wxRect& rect, const wxRect& rect,
wxAuiPaneInfo& pane); wxAuiPaneInfo& pane) wxOVERRIDE;
void DrawGripper(wxDC& dc, void DrawGripper(wxDC& dc,
wxWindow *window, wxWindow *window,
const wxRect& rect, const wxRect& rect,
wxAuiPaneInfo& pane); wxAuiPaneInfo& pane) wxOVERRIDE;
void DrawBorder(wxDC& dc, void DrawBorder(wxDC& dc,
wxWindow *window, wxWindow *window,
const wxRect& rect, const wxRect& rect,
wxAuiPaneInfo& pane); wxAuiPaneInfo& pane) wxOVERRIDE;
void DrawPaneButton(wxDC& dc, void DrawPaneButton(wxDC& dc,
wxWindow *window, wxWindow *window,
int button, int button,
int buttonState, int buttonState,
const wxRect& rect, const wxRect& rect,
wxAuiPaneInfo& pane); wxAuiPaneInfo& pane) wxOVERRIDE;
void DrawIcon(wxDC& dc, void DrawIcon(wxDC& dc,
const wxRect& rect, const wxRect& rect,

4
include/wx/collpane.h
View File

@@ -41,8 +41,8 @@ public:
virtual wxWindow *GetPane() const = 0; virtual wxWindow *GetPane() const = 0;
virtual wxString GetLabel() const = 0; virtual wxString GetLabel() const wxOVERRIDE = 0;
virtual void SetLabel(const wxString& label) = 0; virtual void SetLabel(const wxString& label) wxOVERRIDE = 0;
}; };

16
include/wx/compositewin.h
View File

@@ -54,7 +54,7 @@ public:
// it non-virtually and we need to do this to avoid infinite recursion, // it non-virtually and we need to do this to avoid infinite recursion,
// so we work around this by calling the method of this object itself // so we work around this by calling the method of this object itself
// manually in each function. // manually in each function.
virtual bool SetForegroundColour(const wxColour& colour) virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE
{ {
if ( !BaseWindowClass::SetForegroundColour(colour) ) if ( !BaseWindowClass::SetForegroundColour(colour) )
return false; return false;
@@ -64,7 +64,7 @@ public:
return true; return true;
} }
virtual bool SetBackgroundColour(const wxColour& colour) virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE
{ {
if ( !BaseWindowClass::SetBackgroundColour(colour) ) if ( !BaseWindowClass::SetBackgroundColour(colour) )
return false; return false;
@@ -74,7 +74,7 @@ public:
return true; return true;
} }
virtual bool SetFont(const wxFont& font) virtual bool SetFont(const wxFont& font) wxOVERRIDE
{ {
if ( !BaseWindowClass::SetFont(font) ) if ( !BaseWindowClass::SetFont(font) )
return false; return false;
@@ -84,7 +84,7 @@ public:
return true; return true;
} }
virtual bool SetCursor(const wxCursor& cursor) virtual bool SetCursor(const wxCursor& cursor) wxOVERRIDE
{ {
if ( !BaseWindowClass::SetCursor(cursor) ) if ( !BaseWindowClass::SetCursor(cursor) )
return false; return false;
@@ -94,7 +94,7 @@ public:
return true; return true;
} }
virtual void SetLayoutDirection(wxLayoutDirection dir) virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE
{ {
BaseWindowClass::SetLayoutDirection(dir); BaseWindowClass::SetLayoutDirection(dir);
@@ -113,7 +113,7 @@ public:
} }
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
virtual void DoSetToolTipText(const wxString &tip) virtual void DoSetToolTipText(const wxString &tip) wxOVERRIDE
{ {
BaseWindowClass::DoSetToolTipText(tip); BaseWindowClass::DoSetToolTipText(tip);
@@ -123,7 +123,7 @@ public:
SetForAllParts(func, tip); SetForAllParts(func, tip);
} }
virtual void DoSetToolTip(wxToolTip *tip) virtual void DoSetToolTip(wxToolTip *tip) wxOVERRIDE
{ {
BaseWindowClass::DoSetToolTip(tip); BaseWindowClass::DoSetToolTip(tip);
@@ -131,7 +131,7 @@ public:
} }
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
virtual void SetFocus() virtual void SetFocus() wxOVERRIDE
{ {
wxSetFocusToChild(this, NULL); wxSetFocusToChild(this, NULL);
} }

12
include/wx/containr.h
View File

@@ -210,22 +210,22 @@ public:
#endif // !wxHAS_NATIVE_TAB_TRAVERSAL #endif // !wxHAS_NATIVE_TAB_TRAVERSAL
} }
WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocus() const WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocus() const wxOVERRIDE
{ {
return m_container.AcceptsFocus(); return m_container.AcceptsFocus();
} }
WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusRecursively() const WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusRecursively() const wxOVERRIDE
{ {
return m_container.AcceptsFocusRecursively(); return m_container.AcceptsFocusRecursively();
} }
WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusFromKeyboard() const WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusFromKeyboard() const wxOVERRIDE
{ {
return m_container.AcceptsFocusFromKeyboard(); return m_container.AcceptsFocusFromKeyboard();
} }
WXDLLIMPEXP_INLINE_CORE virtual void AddChild(wxWindowBase *child) WXDLLIMPEXP_INLINE_CORE virtual void AddChild(wxWindowBase *child) wxOVERRIDE
{ {
BaseWindowClass::AddChild(child); BaseWindowClass::AddChild(child);
@@ -238,7 +238,7 @@ public:
} }
} }
WXDLLIMPEXP_INLINE_CORE virtual void RemoveChild(wxWindowBase *child) WXDLLIMPEXP_INLINE_CORE virtual void RemoveChild(wxWindowBase *child) wxOVERRIDE
{ {
#ifndef wxHAS_NATIVE_TAB_TRAVERSAL #ifndef wxHAS_NATIVE_TAB_TRAVERSAL
m_container.HandleOnWindowDestroy(child); m_container.HandleOnWindowDestroy(child);
@@ -251,7 +251,7 @@ public:
m_container.UpdateCanFocusChildren(); m_container.UpdateCanFocusChildren();
} }
WXDLLIMPEXP_INLINE_CORE virtual void SetFocus() WXDLLIMPEXP_INLINE_CORE virtual void SetFocus() wxOVERRIDE
{ {
if ( !m_container.DoSetFocus() ) if ( !m_container.DoSetFocus() )
BaseWindowClass::SetFocus(); BaseWindowClass::SetFocus();

18
include/wx/dataobj.h
View File

@@ -290,10 +290,10 @@ public:
virtual bool SetData(const wxDataFormat& format, size_t len, const void *buf) wxOVERRIDE; virtual bool SetData(const wxDataFormat& format, size_t len, const void *buf) wxOVERRIDE;
#if defined(__WXMSW__) #if defined(__WXMSW__)
virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size, virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size,
const wxDataFormat& format ); const wxDataFormat& format ) wxOVERRIDE;
virtual void* SetSizeInBuffer( void* buffer, size_t size, virtual void* SetSizeInBuffer( void* buffer, size_t size,
const wxDataFormat& format ); const wxDataFormat& format ) wxOVERRIDE;
virtual size_t GetBufferOffset( const wxDataFormat& format ); virtual size_t GetBufferOffset( const wxDataFormat& format ) wxOVERRIDE;
#endif #endif
private: private:
@@ -408,19 +408,19 @@ public:
bool GetDataHere(const wxDataFormat& format, void *pBuf) const wxOVERRIDE; bool GetDataHere(const wxDataFormat& format, void *pBuf) const wxOVERRIDE;
bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf) wxOVERRIDE; bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf) wxOVERRIDE;
#else // !wxNEEDS_UTF{8,16}_FOR_TEXT_DATAOBJ #else // !wxNEEDS_UTF{8,16}_FOR_TEXT_DATAOBJ
virtual size_t GetDataSize() const; virtual size_t GetDataSize() const wxOVERRIDE;
virtual bool GetDataHere(void *buf) const; virtual bool GetDataHere(void *buf) const wxOVERRIDE;
virtual bool SetData(size_t len, const void *buf); virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
// Must provide overloads to avoid hiding them (and warnings about it) // Must provide overloads to avoid hiding them (and warnings about it)
virtual size_t GetDataSize(const wxDataFormat&) const virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE
{ {
return GetDataSize(); return GetDataSize();
} }
virtual bool GetDataHere(const wxDataFormat&, void *buf) const virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE
{ {
return GetDataHere(buf); return GetDataHere(buf);
} }
virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE
{ {
return SetData(len, buf); return SetData(len, buf);
} }

6
include/wx/dcgraph.h
View File

@@ -39,8 +39,8 @@ public:
#ifdef __WXMSW__ #ifdef __WXMSW__
// override wxDC virtual functions to provide access to HDC associated with // override wxDC virtual functions to provide access to HDC associated with
// this Graphics object (implemented in src/msw/graphics.cpp) // this Graphics object (implemented in src/msw/graphics.cpp)
virtual WXHDC AcquireHDC(); virtual WXHDC AcquireHDC() wxOVERRIDE;
virtual void ReleaseHDC(WXHDC hdc); virtual void ReleaseHDC(WXHDC hdc) wxOVERRIDE;
#endif // __WXMSW__ #endif // __WXMSW__
private: private:
@@ -204,7 +204,7 @@ public:
virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const wxOVERRIDE; virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const wxOVERRIDE;
#ifdef __WXMSW__ #ifdef __WXMSW__
virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const; virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const wxOVERRIDE;
#endif // __WXMSW__ #endif // __WXMSW__
// update the internal clip box variables // update the internal clip box variables

2
include/wx/dialup.h
View File

@@ -176,7 +176,7 @@ public:
bool IsOwnEvent() const { return m_id != 0; } bool IsOwnEvent() const { return m_id != 0; }
// implement the base class pure virtual // implement the base class pure virtual
virtual wxEvent *Clone() const { return new wxDialUpEvent(*this); } virtual wxEvent *Clone() const wxOVERRIDE { return new wxDialUpEvent(*this); }
private: private:
wxDECLARE_NO_ASSIGN_CLASS(wxDialUpEvent); wxDECLARE_NO_ASSIGN_CLASS(wxDialUpEvent);

6
include/wx/display_impl.h
View File

@@ -100,9 +100,9 @@ protected:
class WXDLLIMPEXP_CORE wxDisplayFactorySingle : public wxDisplayFactory class WXDLLIMPEXP_CORE wxDisplayFactorySingle : public wxDisplayFactory
{ {
public: public:
virtual wxDisplayImpl *CreateDisplay(unsigned n); virtual wxDisplayImpl *CreateDisplay(unsigned n) wxOVERRIDE;
virtual unsigned GetCount() { return 1; } virtual unsigned GetCount() wxOVERRIDE { return 1; }
virtual int GetFromPoint(const wxPoint& pt); virtual int GetFromPoint(const wxPoint& pt) wxOVERRIDE;
}; };
#endif // _WX_DISPLAY_IMPL_H_BASE_ #endif // _WX_DISPLAY_IMPL_H_BASE_

6
include/wx/docview.h
View File

@@ -717,7 +717,7 @@ public:
return true; return true;
} }
virtual bool Destroy() virtual bool Destroy() wxOVERRIDE
{ {
// FIXME: why exactly do we do this? to avoid activation events during // FIXME: why exactly do we do this? to avoid activation events during
// destructions maybe? // destructions maybe?
@@ -727,7 +727,7 @@ public:
protected: protected:
// hook the child view into event handlers chain here // hook the child view into event handlers chain here
virtual bool TryBefore(wxEvent& event) virtual bool TryBefore(wxEvent& event) wxOVERRIDE
{ {
return TryProcessEvent(event) || BaseClass::TryBefore(event); return TryProcessEvent(event) || BaseClass::TryBefore(event);
} }
@@ -882,7 +882,7 @@ public:
protected: protected:
// hook the document manager into event handling chain here // hook the document manager into event handling chain here
virtual bool TryBefore(wxEvent& event) virtual bool TryBefore(wxEvent& event) wxOVERRIDE
{ {
// It is important to send the event to the base class first as // It is important to send the event to the base class first as
// wxMDIParentFrame overrides its TryBefore() to send the menu events // wxMDIParentFrame overrides its TryBefore() to send the menu events

22
include/wx/dvrenderers.h
View File

@@ -400,13 +400,13 @@ public:
wxDataViewChoiceRenderer( const wxArrayString &choices, wxDataViewChoiceRenderer( const wxArrayString &choices,
wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
int alignment = wxDVR_DEFAULT_ALIGNMENT ); int alignment = wxDVR_DEFAULT_ALIGNMENT );
virtual bool HasEditorCtrl() const { return true; } virtual bool HasEditorCtrl() const wxOVERRIDE { return true; }
virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ); virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) wxOVERRIDE;
virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ); virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) wxOVERRIDE;
virtual bool Render( wxRect rect, wxDC *dc, int state ); virtual bool Render( wxRect rect, wxDC *dc, int state ) wxOVERRIDE;
virtual wxSize GetSize() const; virtual wxSize GetSize() const wxOVERRIDE;
virtual bool SetValue( const wxVariant &value ); virtual bool SetValue( const wxVariant &value ) wxOVERRIDE;
virtual bool GetValue( wxVariant &value ) const; virtual bool GetValue( wxVariant &value ) const wxOVERRIDE;
wxString GetChoice(size_t index) const { return m_choices[index]; } wxString GetChoice(size_t index) const { return m_choices[index]; }
const wxArrayString& GetChoices() const { return m_choices; } const wxArrayString& GetChoices() const { return m_choices; }
@@ -427,11 +427,11 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
int alignment = wxDVR_DEFAULT_ALIGNMENT ); int alignment = wxDVR_DEFAULT_ALIGNMENT );
virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ); virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) wxOVERRIDE;
virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ); virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) wxOVERRIDE;
virtual bool SetValue( const wxVariant &value ); virtual bool SetValue( const wxVariant &value ) wxOVERRIDE;
virtual bool GetValue( wxVariant &value ) const; virtual bool GetValue( wxVariant &value ) const wxOVERRIDE;
}; };

8
include/wx/event.h
View File

@@ -356,7 +356,7 @@ public:
CheckHandlerArgument(static_cast<EventClass *>(NULL)); CheckHandlerArgument(static_cast<EventClass *>(NULL));
} }
virtual void operator()(wxEvtHandler *handler, wxEvent& event) virtual void operator()(wxEvtHandler *handler, wxEvent& event) wxOVERRIDE
{ {
Class * realHandler = m_handler; Class * realHandler = m_handler;
if ( !realHandler ) if ( !realHandler )
@@ -373,7 +373,7 @@ public:
(realHandler->*m_method)(static_cast<EventArg&>(event)); (realHandler->*m_method)(static_cast<EventArg&>(event));
} }
virtual bool IsMatching(const wxEventFunctor& functor) const virtual bool IsMatching(const wxEventFunctor& functor) const wxOVERRIDE
{ {
if ( wxTypeId(functor) != wxTypeId(*this) ) if ( wxTypeId(functor) != wxTypeId(*this) )
return false; return false;
@@ -388,10 +388,10 @@ public:
(m_handler == other.m_handler || other.m_handler == NULL); (m_handler == other.m_handler || other.m_handler == NULL);
} }
virtual wxEvtHandler *GetEvtHandler() const virtual wxEvtHandler *GetEvtHandler() const wxOVERRIDE
{ return this->ConvertToEvtHandler(m_handler); } { return this->ConvertToEvtHandler(m_handler); }
virtual wxEventFunction GetEvtMethod() const virtual wxEventFunction GetEvtMethod() const wxOVERRIDE
{ return this->ConvertToEvtMethod(m_method); } { return this->ConvertToEvtMethod(m_method); }
private: private:

4
include/wx/fontmap.h
View File

@@ -202,7 +202,7 @@ public:
// returns the encoding for the given charset (in the form of RFC 2046) or // returns the encoding for the given charset (in the form of RFC 2046) or
// wxFONTENCODING_SYSTEM if couldn't decode it // wxFONTENCODING_SYSTEM if couldn't decode it
virtual wxFontEncoding CharsetToEncoding(const wxString& charset, virtual wxFontEncoding CharsetToEncoding(const wxString& charset,
bool interactive = true); bool interactive = true) wxOVERRIDE;
// find an alternative for the given encoding (which is supposed to not be // find an alternative for the given encoding (which is supposed to not be
// available on this system). If successful, return true and fill info // available on this system). If successful, return true and fill info
@@ -242,7 +242,7 @@ public:
static wxFontMapper *Get(); static wxFontMapper *Get();
// pseudo-RTTI since we aren't a wxObject. // pseudo-RTTI since we aren't a wxObject.
virtual bool IsDummy() { return false; } virtual bool IsDummy() wxOVERRIDE { return false; }
protected: protected:
// GetAltForEncoding() helper: tests for the existence of the given // GetAltForEncoding() helper: tests for the existence of the given

14
include/wx/generic/animate.h
View File

@@ -26,18 +26,18 @@ public:
wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY) wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY)
{ LoadFile(name, type); } { LoadFile(name, type); }
virtual bool IsOk() const virtual bool IsOk() const wxOVERRIDE
{ return m_refData != NULL; } { return m_refData != NULL; }
virtual unsigned int GetFrameCount() const; virtual unsigned int GetFrameCount() const wxOVERRIDE;
virtual int GetDelay(unsigned int i) const; virtual int GetDelay(unsigned int i) const wxOVERRIDE;
virtual wxImage GetFrame(unsigned int i) const; virtual wxImage GetFrame(unsigned int i) const wxOVERRIDE;
virtual wxSize GetSize() const; virtual wxSize GetSize() const wxOVERRIDE;
virtual bool LoadFile(const wxString& filename, virtual bool LoadFile(const wxString& filename,
wxAnimationType type = wxANIMATION_TYPE_ANY); wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE;
virtual bool Load(wxInputStream& stream, virtual bool Load(wxInputStream& stream,
wxAnimationType type = wxANIMATION_TYPE_ANY); wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE;
// extended interface used by the generic implementation of wxAnimationCtrl // extended interface used by the generic implementation of wxAnimationCtrl
wxPoint GetFramePosition(unsigned int frame) const; wxPoint GetFramePosition(unsigned int frame) const;

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

@@ -65,9 +65,9 @@ public:
protected: protected:
wxBitmap m_bitmap; wxBitmap m_bitmap;
wxSize DoGetBestSize() const; wxSize DoGetBestSize() const wxOVERRIDE;
void UpdateColour(); void UpdateColour() wxOVERRIDE;
// the colour data shown in wxColourPickerCtrlGeneric // the colour data shown in wxColourPickerCtrlGeneric
// controls. This member is static so that all colour pickers // controls. This member is static so that all colour pickers

14
include/wx/generic/dvrenderer.h
View File

@@ -23,19 +23,19 @@ public:
int align = wxDVR_DEFAULT_ALIGNMENT ); int align = wxDVR_DEFAULT_ALIGNMENT );
virtual ~wxDataViewRenderer(); virtual ~wxDataViewRenderer();
virtual wxDC *GetDC(); virtual wxDC *GetDC() wxOVERRIDE;
virtual void SetAlignment( int align ); virtual void SetAlignment( int align ) wxOVERRIDE;
virtual int GetAlignment() const; virtual int GetAlignment() const wxOVERRIDE;
virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE) virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE) wxOVERRIDE
{ m_ellipsizeMode = mode; } { m_ellipsizeMode = mode; }
virtual wxEllipsizeMode GetEllipsizeMode() const virtual wxEllipsizeMode GetEllipsizeMode() const wxOVERRIDE
{ return m_ellipsizeMode; } { return m_ellipsizeMode; }
virtual void SetMode( wxDataViewCellMode mode ) virtual void SetMode( wxDataViewCellMode mode ) wxOVERRIDE
{ m_mode = mode; } { m_mode = mode; }
virtual wxDataViewCellMode GetMode() const virtual wxDataViewCellMode GetMode() const wxOVERRIDE
{ return m_mode; } { return m_mode; }
// implementation // implementation

56
include/wx/generic/dvrenderers.h
View File

@@ -31,7 +31,7 @@ public:
wxDataViewModel *model, wxDataViewModel *model,
const wxDataViewItem& item, const wxDataViewItem& item,
unsigned int col, unsigned int col,
const wxMouseEvent *mouseEvent) const wxMouseEvent *mouseEvent) wxOVERRIDE
{ {
return ActivateCell(cell, model, item, col, mouseEvent); return ActivateCell(cell, model, item, col, mouseEvent);
} }
@@ -59,17 +59,17 @@ public:
void EnableMarkup(bool enable = true); void EnableMarkup(bool enable = true);
#endif // wxUSE_MARKUP #endif // wxUSE_MARKUP
virtual bool SetValue( const wxVariant &value ); virtual bool SetValue( const wxVariant &value ) wxOVERRIDE;
virtual bool GetValue( wxVariant &value ) const; virtual bool GetValue( wxVariant &value ) const wxOVERRIDE;
virtual bool Render(wxRect cell, wxDC *dc, int state); virtual bool Render(wxRect cell, wxDC *dc, int state) wxOVERRIDE;
virtual wxSize GetSize() const; virtual wxSize GetSize() const wxOVERRIDE;
// in-place editing // in-place editing
virtual bool HasEditorCtrl() const; virtual bool HasEditorCtrl() const wxOVERRIDE;
virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect,
const wxVariant &value ); const wxVariant &value ) wxOVERRIDE;
virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ); virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) wxOVERRIDE;
protected: protected:
wxString m_text; wxString m_text;
@@ -95,11 +95,11 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT ); int align = wxDVR_DEFAULT_ALIGNMENT );
virtual bool SetValue( const wxVariant &value ); virtual bool SetValue( const wxVariant &value ) wxOVERRIDE;
virtual bool GetValue( wxVariant &value ) const; virtual bool GetValue( wxVariant &value ) const wxOVERRIDE;
virtual bool Render( wxRect cell, wxDC *dc, int state ); virtual bool Render( wxRect cell, wxDC *dc, int state ) wxOVERRIDE;
virtual wxSize GetSize() const; virtual wxSize GetSize() const wxOVERRIDE;
private: private:
wxIcon m_icon; wxIcon m_icon;
@@ -122,18 +122,18 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT ); int align = wxDVR_DEFAULT_ALIGNMENT );
virtual bool SetValue( const wxVariant &value ); virtual bool SetValue( const wxVariant &value ) wxOVERRIDE;
virtual bool GetValue( wxVariant &value ) const; virtual bool GetValue( wxVariant &value ) const wxOVERRIDE;
virtual bool Render( wxRect cell, wxDC *dc, int state ); virtual bool Render( wxRect cell, wxDC *dc, int state ) wxOVERRIDE;
virtual wxSize GetSize() const; virtual wxSize GetSize() const wxOVERRIDE;
// Implementation only, don't use nor override // Implementation only, don't use nor override
virtual bool WXActivateCell(const wxRect& cell, virtual bool WXActivateCell(const wxRect& cell,
wxDataViewModel *model, wxDataViewModel *model,
const wxDataViewItem& item, const wxDataViewItem& item,
unsigned int col, unsigned int col,
const wxMouseEvent *mouseEvent); const wxMouseEvent *mouseEvent) wxOVERRIDE;
private: private:
bool m_toggle; bool m_toggle;
@@ -155,11 +155,11 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT ); int align = wxDVR_DEFAULT_ALIGNMENT );
virtual bool SetValue( const wxVariant &value ); virtual bool SetValue( const wxVariant &value ) wxOVERRIDE;
virtual bool GetValue( wxVariant& value ) const; virtual bool GetValue( wxVariant& value ) const wxOVERRIDE;
virtual bool Render(wxRect cell, wxDC *dc, int state); virtual bool Render(wxRect cell, wxDC *dc, int state) wxOVERRIDE;
virtual wxSize GetSize() const; virtual wxSize GetSize() const wxOVERRIDE;
private: private:
wxString m_label; wxString m_label;
@@ -182,16 +182,16 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT ); int align = wxDVR_DEFAULT_ALIGNMENT );
virtual bool SetValue( const wxVariant &value ); virtual bool SetValue( const wxVariant &value ) wxOVERRIDE;
virtual bool GetValue( wxVariant &value ) const; virtual bool GetValue( wxVariant &value ) const wxOVERRIDE;
virtual bool Render(wxRect cell, wxDC *dc, int state); virtual bool Render(wxRect cell, wxDC *dc, int state) wxOVERRIDE;
virtual wxSize GetSize() const; virtual wxSize GetSize() const wxOVERRIDE;
virtual bool HasEditorCtrl() const { return true; } virtual bool HasEditorCtrl() const wxOVERRIDE { return true; }
virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect,
const wxVariant &value ); const wxVariant &value ) wxOVERRIDE;
virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ); virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) wxOVERRIDE;
private: private:
wxDataViewIconText m_value; wxDataViewIconText m_value;

6
include/wx/generic/fontpickerg.h
View File

@@ -35,10 +35,10 @@ public:
Create(parent, id, initial, pos, size, style, validator, name); Create(parent, id, initial, pos, size, style, validator, name);
} }
virtual wxColour GetSelectedColour() const virtual wxColour GetSelectedColour() const wxOVERRIDE
{ return m_data.GetColour(); } { return m_data.GetColour(); }
virtual void SetSelectedColour(const wxColour &colour) virtual void SetSelectedColour(const wxColour &colour) wxOVERRIDE
{ m_data.SetColour(colour); UpdateFont(); } { m_data.SetColour(colour); UpdateFont(); }
virtual ~wxGenericFontButton() {} virtual ~wxGenericFontButton() {}
@@ -69,7 +69,7 @@ public:
protected: protected:
void UpdateFont(); void UpdateFont() wxOVERRIDE;
wxFontData m_data; wxFontData m_data;

22
include/wx/generic/hyperlink.h
View File

@@ -45,20 +45,20 @@ public:
// get/set // get/set
wxColour GetHoverColour() const { return m_hoverColour; } wxColour GetHoverColour() const wxOVERRIDE { return m_hoverColour; }
void SetHoverColour(const wxColour &colour) { m_hoverColour = colour; } void SetHoverColour(const wxColour &colour) wxOVERRIDE { m_hoverColour = colour; }
wxColour GetNormalColour() const { return m_normalColour; } wxColour GetNormalColour() const wxOVERRIDE { return m_normalColour; }
void SetNormalColour(const wxColour &colour); void SetNormalColour(const wxColour &colour) wxOVERRIDE;
wxColour GetVisitedColour() const { return m_visitedColour; } wxColour GetVisitedColour() const wxOVERRIDE { return m_visitedColour; }
void SetVisitedColour(const wxColour &colour); void SetVisitedColour(const wxColour &colour) wxOVERRIDE;
wxString GetURL() const { return m_url; } wxString GetURL() const wxOVERRIDE { return m_url; }
void SetURL (const wxString &url) { m_url=url; } void SetURL (const wxString &url) wxOVERRIDE { m_url=url; }
void SetVisited(bool visited = true) { m_visited=visited; } void SetVisited(bool visited = true) wxOVERRIDE { m_visited=visited; }
bool GetVisited() const { return m_visited; } bool GetVisited() const wxOVERRIDE { return m_visited; }
// NOTE: also wxWindow::Set/GetLabel, wxWindow::Set/GetBackgroundColour, // NOTE: also wxWindow::Set/GetLabel, wxWindow::Set/GetBackgroundColour,
// wxWindow::Get/SetFont, wxWindow::Get/SetCursor are important ! // wxWindow::Get/SetFont, wxWindow::Get/SetCursor are important !
@@ -110,7 +110,7 @@ protected:
// Returns the best size for the window, which is the size needed // Returns the best size for the window, which is the size needed
// to display the text label. // to display the text label.
virtual wxSize DoGetBestClientSize() const; virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
// creates a context menu with "Copy URL" menuitem // creates a context menu with "Copy URL" menuitem
virtual void DoContextMenu(const wxPoint &); virtual void DoContextMenu(const wxPoint &);

14
include/wx/generic/private/richtooltip.h
View File

@@ -33,15 +33,15 @@ public:
} }
virtual void SetBackgroundColour(const wxColour& col, virtual void SetBackgroundColour(const wxColour& col,
const wxColour& colEnd); const wxColour& colEnd) wxOVERRIDE;
virtual void SetCustomIcon(const wxIcon& icon); virtual void SetCustomIcon(const wxIcon& icon) wxOVERRIDE;
virtual void SetStandardIcon(int icon); virtual void SetStandardIcon(int icon) wxOVERRIDE;
virtual void SetTimeout(unsigned milliseconds, virtual void SetTimeout(unsigned milliseconds,
unsigned millisecondsDelay = 0); unsigned millisecondsDelay = 0) wxOVERRIDE;
virtual void SetTipKind(wxTipKind tipKind); virtual void SetTipKind(wxTipKind tipKind) wxOVERRIDE;
virtual void SetTitleFont(const wxFont& font); virtual void SetTitleFont(const wxFont& font) wxOVERRIDE;
virtual void ShowFor(wxWindow* win, const wxRect* rect = NULL); virtual void ShowFor(wxWindow* win, const wxRect* rect = NULL) wxOVERRIDE;
protected: protected:
wxString m_title, wxString m_title,

8
include/wx/generic/scrolwin.h
View File

@@ -22,13 +22,13 @@ public:
wxScrollHelper(wxWindow *winToScroll); wxScrollHelper(wxWindow *winToScroll);
// implement base class pure virtuals // implement base class pure virtuals
virtual void AdjustScrollbars(); virtual void AdjustScrollbars() wxOVERRIDE;
virtual bool IsScrollbarShown(int orient) const; virtual bool IsScrollbarShown(int orient) const wxOVERRIDE;
protected: protected:
virtual void DoScroll(int x, int y); virtual void DoScroll(int x, int y) wxOVERRIDE;
virtual void DoShowScrollbars(wxScrollbarVisibility horz, virtual void DoShowScrollbars(wxScrollbarVisibility horz,
wxScrollbarVisibility vert); wxScrollbarVisibility vert) wxOVERRIDE;
private: private:
// helper of AdjustScrollbars(): does the work for the single scrollbar // helper of AdjustScrollbars(): does the work for the single scrollbar

14
include/wx/generic/spinctlg.h
View File

@@ -111,7 +111,7 @@ protected:
#ifdef __WXMSW__ #ifdef __WXMSW__
// and, for MSW, enabling this window itself // and, for MSW, enabling this window itself
virtual void DoEnable(bool enable); virtual void DoEnable(bool enable) wxOVERRIDE;
#endif // __WXMSW__ #endif // __WXMSW__
enum SendEvent enum SendEvent
@@ -393,7 +393,7 @@ public:
unsigned GetDigits() const { return m_digits; } unsigned GetDigits() const { return m_digits; }
// operations // operations
void SetValue(const wxString& value) void SetValue(const wxString& value) wxOVERRIDE
{ wxSpinCtrlGenericBase::SetValue(value); } { wxSpinCtrlGenericBase::SetValue(value); }
void SetValue(double value) { DoSetValue(value, SendEvent_None); } void SetValue(double value) { DoSetValue(value, SendEvent_None); }
void SetRange(double minVal, double maxVal) { DoSetRange(minVal, maxVal); } void SetRange(double minVal, double maxVal) { DoSetRange(minVal, maxVal); }
@@ -402,14 +402,14 @@ public:
// We don't implement bases support for floating point numbers, this is not // We don't implement bases support for floating point numbers, this is not
// very useful in practice. // very useful in practice.
virtual int GetBase() const { return 10; } virtual int GetBase() const wxOVERRIDE { return 10; }
virtual bool SetBase(int WXUNUSED(base)) { return 0; } virtual bool SetBase(int WXUNUSED(base)) wxOVERRIDE { return 0; }
protected: protected:
virtual void DoSendEvent(); virtual void DoSendEvent() wxOVERRIDE;
virtual bool DoTextToValue(const wxString& text, double *val); virtual bool DoTextToValue(const wxString& text, double *val) wxOVERRIDE;
virtual wxString DoValueToText(double val); virtual wxString DoValueToText(double val) wxOVERRIDE;
unsigned m_digits; unsigned m_digits;

2
include/wx/glcanvas.h
View File

@@ -339,7 +339,7 @@ class WXDLLIMPEXP_GL wxGLApp : public wxGLAppBase
public: public:
wxGLApp() : wxGLAppBase() { } wxGLApp() : wxGLAppBase() { }
virtual bool InitGLVisual(const int *attribList); virtual bool InitGLVisual(const int *attribList) wxOVERRIDE;
private: private:
wxDECLARE_DYNAMIC_CLASS(wxGLApp); wxDECLARE_DYNAMIC_CLASS(wxGLApp);

4
include/wx/html/m_templ.h
View File

@@ -31,7 +31,7 @@ I STRONGLY recommend reading and understanding these macros!!
class wxHTML_Handler_##name : public wxHtmlWinTagHandler \ class wxHTML_Handler_##name : public wxHtmlWinTagHandler \
{ \ { \
public: \ public: \
wxString GetSupportedTags() {return wxT(tags);} wxString GetSupportedTags() wxOVERRIDE {return wxT(tags);}
@@ -45,7 +45,7 @@ I STRONGLY recommend reading and understanding these macros!!
#define TAG_HANDLER_PROC(varib) \ #define TAG_HANDLER_PROC(varib) \
public: \ public: \
bool HandleTag(const wxHtmlTag& varib) bool HandleTag(const wxHtmlTag& varib) wxOVERRIDE

3
include/wx/list.h
View File

@@ -652,7 +652,7 @@ private:
{ wxNodeBase::SetData(data); } \ { wxNodeBase::SetData(data); } \
\ \
protected: \ protected: \
virtual void DeleteData(); \ virtual void DeleteData() wxOVERRIDE; \
\ \
wxDECLARE_NO_COPY_CLASS(nodetype); \ wxDECLARE_NO_COPY_CLASS(nodetype); \
}; \ }; \
@@ -742,6 +742,7 @@ private:
virtual wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next, \ virtual wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next, \
void *data, \ void *data, \
const wxListKey& key = wxDefaultListKey) \ const wxListKey& key = wxDefaultListKey) \
wxOVERRIDE \
{ \ { \
return new nodetype(this, \ return new nodetype(this, \
(nodetype *)prev, (nodetype *)next, \ (nodetype *)prev, (nodetype *)next, \

6
include/wx/mdi.h
View File

@@ -279,17 +279,17 @@ public:
// extra platform-specific hacks // extra platform-specific hacks
#ifdef __WXMSW__ #ifdef __WXMSW__
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const wxOVERRIDE
{ {
return wxWindow::MSWGetStyle(flags, exstyle); return wxWindow::MSWGetStyle(flags, exstyle);
} }
virtual WXHWND MSWGetParent() const virtual WXHWND MSWGetParent() const wxOVERRIDE
{ {
return wxWindow::MSWGetParent(); return wxWindow::MSWGetParent();
} }
WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE
{ {
return wxWindow::MSWWindowProc(message, wParam, lParam); return wxWindow::MSWWindowProc(message, wParam, lParam);
} }

10
include/wx/memtext.h
View File

@@ -27,21 +27,21 @@ public:
wxMemoryText(const wxString& name) : wxTextBuffer(name) { } wxMemoryText(const wxString& name) : wxTextBuffer(name) { }
protected: protected:
virtual bool OnExists() const virtual bool OnExists() const wxOVERRIDE
{ return false; } { return false; }
virtual bool OnOpen(const wxString & WXUNUSED(strBufferName), virtual bool OnOpen(const wxString & WXUNUSED(strBufferName),
wxTextBufferOpenMode WXUNUSED(OpenMode)) wxTextBufferOpenMode WXUNUSED(OpenMode)) wxOVERRIDE
{ return true; } { return true; }
virtual bool OnClose() virtual bool OnClose() wxOVERRIDE
{ return true; } { return true; }
virtual bool OnRead(const wxMBConv& WXUNUSED(conv)) virtual bool OnRead(const wxMBConv& WXUNUSED(conv)) wxOVERRIDE
{ return true; } { return true; }
virtual bool OnWrite(wxTextFileType WXUNUSED(typeNew), virtual bool OnWrite(wxTextFileType WXUNUSED(typeNew),
const wxMBConv& WXUNUSED(conv) = wxMBConvUTF8()) const wxMBConv& WXUNUSED(conv) = wxMBConvUTF8()) wxOVERRIDE
{ return true; } { return true; }
private: private:

4
include/wx/msw/custombgwin.h
View File

@@ -29,7 +29,7 @@ public:
virtual ~wxCustomBackgroundWindow() { delete m_backgroundBrush; } virtual ~wxCustomBackgroundWindow() { delete m_backgroundBrush; }
protected: protected:
virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) wxOVERRIDE
{ {
delete m_backgroundBrush; delete m_backgroundBrush;
m_backgroundBrush = bmp.IsOk() ? new wxBrush(bmp) : NULL; m_backgroundBrush = bmp.IsOk() ? new wxBrush(bmp) : NULL;
@@ -41,7 +41,7 @@ protected:
|| BaseWindowClass::UseBgCol(); || BaseWindowClass::UseBgCol();
} }
virtual WXHBRUSH MSWGetCustomBgBrush() virtual WXHBRUSH MSWGetCustomBgBrush() wxOVERRIDE
{ {
if ( m_backgroundBrush ) if ( m_backgroundBrush )
return (WXHBRUSH)m_backgroundBrush->GetResourceHandle(); return (WXHBRUSH)m_backgroundBrush->GetResourceHandle();

4
include/wx/msw/ole/activex.h
View File

@@ -165,7 +165,7 @@ public:
void OnPaint(wxPaintEvent&); void OnPaint(wxPaintEvent&);
void OnSetFocus(wxFocusEvent&); void OnSetFocus(wxFocusEvent&);
void OnKillFocus(wxFocusEvent&); void OnKillFocus(wxFocusEvent&);
virtual bool MSWTranslateMessage(WXMSG* pMsg); virtual bool MSWTranslateMessage(WXMSG* pMsg) wxOVERRIDE;
virtual bool QueryClientSiteInterface(REFIID iid, void **_interface, const char *&desc); virtual bool QueryClientSiteInterface(REFIID iid, void **_interface, const char *&desc);
protected: protected:
@@ -220,7 +220,7 @@ private:
DISPID m_dispid; DISPID m_dispid;
public: public:
virtual wxEvent *Clone() const virtual wxEvent *Clone() const wxOVERRIDE
{ return new wxActiveXEvent(*this); } { return new wxActiveXEvent(*this); }
size_t ParamCount() const; size_t ParamCount() const;

38
include/wx/msw/ole/dataobj2.h
View File

@@ -33,17 +33,17 @@ public:
} }
// implement base class pure virtuals // implement base class pure virtuals
virtual size_t GetDataSize() const; virtual size_t GetDataSize() const wxOVERRIDE;
virtual bool GetDataHere(void *buf) const; virtual bool GetDataHere(void *buf) const wxOVERRIDE;
virtual bool SetData(size_t len, const void *buf); virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const wxOVERRIDE
{ return GetDataSize(); } { return GetDataSize(); }
virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
void *buf) const void *buf) const wxOVERRIDE
{ return GetDataHere(buf); } { return GetDataHere(buf); }
virtual bool SetData(const wxDataFormat& WXUNUSED(format), virtual bool SetData(const wxDataFormat& WXUNUSED(format),
size_t len, const void *buf) size_t len, const void *buf) wxOVERRIDE
{ return SetData(len, buf); } { return SetData(len, buf); }
private: private:
@@ -69,17 +69,17 @@ public:
} }
// implement base class pure virtuals // implement base class pure virtuals
virtual size_t GetDataSize() const; virtual size_t GetDataSize() const wxOVERRIDE;
virtual bool GetDataHere(void *buf) const; virtual bool GetDataHere(void *buf) const wxOVERRIDE;
virtual bool SetData(size_t len, const void *buf); virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const wxOVERRIDE
{ return GetDataSize(); } { return GetDataSize(); }
virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
void *buf) const void *buf) const wxOVERRIDE
{ return GetDataHere(buf); } { return GetDataHere(buf); }
virtual bool SetData(const wxDataFormat& WXUNUSED(format), virtual bool SetData(const wxDataFormat& WXUNUSED(format),
size_t len, const void *buf) size_t len, const void *buf) wxOVERRIDE
{ return SetData(len, buf); } { return SetData(len, buf); }
private: private:
@@ -96,18 +96,18 @@ public:
wxFileDataObject() { } wxFileDataObject() { }
// implement base class pure virtuals // implement base class pure virtuals
virtual bool SetData(size_t len, const void *buf); virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
virtual size_t GetDataSize() const; virtual size_t GetDataSize() const wxOVERRIDE;
virtual bool GetDataHere(void *pData) const; virtual bool GetDataHere(void *pData) const wxOVERRIDE;
virtual void AddFile(const wxString& file); virtual void AddFile(const wxString& file);
virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const wxOVERRIDE
{ return GetDataSize(); } { return GetDataSize(); }
virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
void *buf) const void *buf) const wxOVERRIDE
{ return GetDataHere(buf); } { return GetDataHere(buf); }
virtual bool SetData(const wxDataFormat& WXUNUSED(format), virtual bool SetData(const wxDataFormat& WXUNUSED(format),
size_t len, const void *buf) size_t len, const void *buf) wxOVERRIDE
{ return SetData(len, buf); } { return SetData(len, buf); }
private: private:
@@ -133,7 +133,7 @@ public:
// override to set m_textFormat // override to set m_textFormat
virtual bool SetData(const wxDataFormat& format, virtual bool SetData(const wxDataFormat& format,
size_t len, size_t len,
const void *buf); const void *buf) wxOVERRIDE;
private: private:
// last data object we got data in // last data object we got data in

4
include/wx/msw/ole/dropsrc.h
View File

@@ -57,12 +57,12 @@ public:
// do it (call this in response to a mouse button press, for example) // do it (call this in response to a mouse button press, for example)
// params: if bAllowMove is false, data can be only copied // params: if bAllowMove is false, data can be only copied
virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) wxOVERRIDE;
// overridable: you may give some custom UI feedback during d&d operation // overridable: you may give some custom UI feedback during d&d operation
// in this function (it's called on each mouse move, so it shouldn't be // in this function (it's called on each mouse move, so it shouldn't be
// too slow). Just return false if you want default feedback. // too slow). Just return false if you want default feedback.
virtual bool GiveFeedback(wxDragResult effect); virtual bool GiveFeedback(wxDragResult effect) wxOVERRIDE;
protected: protected:
void Init(); void Init();

4
include/wx/msw/ole/droptgt.h
View File

@@ -44,8 +44,8 @@ public:
void Revoke(WXHWND hwnd); void Revoke(WXHWND hwnd);
// provide default implementation for base class pure virtuals // provide default implementation for base class pure virtuals
virtual bool OnDrop(wxCoord x, wxCoord y); virtual bool OnDrop(wxCoord x, wxCoord y) wxOVERRIDE;
virtual bool GetData(); virtual bool GetData() wxOVERRIDE;
// Can only be called during OnXXX methods. // Can only be called during OnXXX methods.
wxDataFormat GetMatchingPair(); wxDataFormat GetMatchingPair();

36
include/wx/msw/ole/oleutils.h
View File

@@ -124,9 +124,9 @@ private:
#define DECLARE_IUNKNOWN_METHODS \ #define DECLARE_IUNKNOWN_METHODS \
public: \ public: \
STDMETHODIMP QueryInterface(REFIID, void **); \ STDMETHODIMP QueryInterface(REFIID, void **) wxOVERRIDE; \
STDMETHODIMP_(ULONG) AddRef(); \ STDMETHODIMP_(ULONG) AddRef() wxOVERRIDE; \
STDMETHODIMP_(ULONG) Release(); \ STDMETHODIMP_(ULONG) Release() wxOVERRIDE; \
private: \ private: \
static const IID *ms_aIids[]; \ static const IID *ms_aIids[]; \
wxAutoULong m_cRef wxAutoULong m_cRef
@@ -239,15 +239,15 @@ public:
CURRENCY GetValue() const { return m_value; } CURRENCY GetValue() const { return m_value; }
void SetValue(CURRENCY value) { m_value = value; } void SetValue(CURRENCY value) { m_value = value; }
virtual bool Eq(wxVariantData& data) const; virtual bool Eq(wxVariantData& data) const wxOVERRIDE;
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
virtual bool Write(wxSTD ostream& str) const; virtual bool Write(wxSTD ostream& str) const wxOVERRIDE;
#endif #endif
virtual bool Write(wxString& str) const; virtual bool Write(wxString& str) const wxOVERRIDE;
wxVariantData* Clone() const { return new wxVariantDataCurrency(m_value); } wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataCurrency(m_value); }
virtual wxString GetType() const { return wxS("currency"); } virtual wxString GetType() const wxOVERRIDE { return wxS("currency"); }
DECLARE_WXANY_CONVERSION() DECLARE_WXANY_CONVERSION()
@@ -265,15 +265,15 @@ public:
SCODE GetValue() const { return m_value; } SCODE GetValue() const { return m_value; }
void SetValue(SCODE value) { m_value = value; } void SetValue(SCODE value) { m_value = value; }
virtual bool Eq(wxVariantData& data) const; virtual bool Eq(wxVariantData& data) const wxOVERRIDE;
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
virtual bool Write(wxSTD ostream& str) const; virtual bool Write(wxSTD ostream& str) const wxOVERRIDE;
#endif #endif
virtual bool Write(wxString& str) const; virtual bool Write(wxString& str) const wxOVERRIDE;
wxVariantData* Clone() const { return new wxVariantDataErrorCode(m_value); } wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataErrorCode(m_value); }
virtual wxString GetType() const { return wxS("errorcode"); } virtual wxString GetType() const wxOVERRIDE { return wxS("errorcode"); }
DECLARE_WXANY_CONVERSION() DECLARE_WXANY_CONVERSION()
@@ -293,15 +293,15 @@ public:
SAFEARRAY* GetValue() const { return m_value; } SAFEARRAY* GetValue() const { return m_value; }
void SetValue(SAFEARRAY* value) { m_value = value; } void SetValue(SAFEARRAY* value) { m_value = value; }
virtual bool Eq(wxVariantData& data) const; virtual bool Eq(wxVariantData& data) const wxOVERRIDE;
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
virtual bool Write(wxSTD ostream& str) const; virtual bool Write(wxSTD ostream& str) const wxOVERRIDE;
#endif #endif
virtual bool Write(wxString& str) const; virtual bool Write(wxString& str) const wxOVERRIDE;
wxVariantData* Clone() const { return new wxVariantDataSafeArray(m_value); } wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataSafeArray(m_value); }
virtual wxString GetType() const { return wxS("safearray"); } virtual wxString GetType() const wxOVERRIDE { return wxS("safearray"); }
DECLARE_WXANY_CONVERSION() DECLARE_WXANY_CONVERSION()

2
include/wx/msw/private/fswatcher.h
View File

@@ -309,7 +309,7 @@ protected:
const wxFSWatchEntryMSW* watch; const wxFSWatchEntryMSW* watch;
}; };
virtual ExitCode Entry(); virtual ExitCode Entry() wxOVERRIDE;
// wait for events to occur, read them and send to interested parties // wait for events to occur, read them and send to interested parties
// returns false it empty status was read, which means we would exit // returns false it empty status was read, which means we would exit

8
include/wx/msw/private/pipestream.h
View File

@@ -20,10 +20,10 @@ public:
bool IsOpened() const { return m_hInput != INVALID_HANDLE_VALUE; } bool IsOpened() const { return m_hInput != INVALID_HANDLE_VALUE; }
// returns true if there is any data to be read from the pipe // returns true if there is any data to be read from the pipe
virtual bool CanRead() const; virtual bool CanRead() const wxOVERRIDE;
protected: protected:
virtual size_t OnSysRead(void *buffer, size_t len); virtual size_t OnSysRead(void *buffer, size_t len) wxOVERRIDE;
protected: protected:
HANDLE m_hInput; HANDLE m_hInput;
@@ -36,10 +36,10 @@ class wxPipeOutputStream: public wxOutputStream
public: public:
explicit wxPipeOutputStream(HANDLE hOutput); explicit wxPipeOutputStream(HANDLE hOutput);
virtual ~wxPipeOutputStream() { Close(); } virtual ~wxPipeOutputStream() { Close(); }
bool Close(); bool Close() wxOVERRIDE;
protected: protected:
size_t OnSysWrite(const void *buffer, size_t len); size_t OnSysWrite(const void *buffer, size_t len) wxOVERRIDE;
protected: protected:
HANDLE m_hOutput; HANDLE m_hOutput;

8
include/wx/msw/private/sockmsw.h
View File

@@ -36,9 +36,9 @@ public:
virtual ~wxSocketImplMSW(); virtual ~wxSocketImplMSW();
virtual wxSocketError GetLastError() const; virtual wxSocketError GetLastError() const wxOVERRIDE;
virtual void ReenableEvents(wxSocketEventFlags WXUNUSED(flags)) virtual void ReenableEvents(wxSocketEventFlags WXUNUSED(flags)) wxOVERRIDE
{ {
// notifications are never disabled in this implementation, there is no // notifications are never disabled in this implementation, there is no
// need for this as WSAAsyncSelect() only sends notification once when // need for this as WSAAsyncSelect() only sends notification once when
@@ -47,9 +47,9 @@ public:
} }
private: private:
virtual void DoClose(); virtual void DoClose() wxOVERRIDE;
virtual void UnblockAndRegisterWithEventLoop() virtual void UnblockAndRegisterWithEventLoop() wxOVERRIDE
{ {
// no need to make the socket non-blocking, Install_Callback() will do // no need to make the socket non-blocking, Install_Callback() will do
// it // it

8
include/wx/msw/private/textmeasure.h
View File

@@ -34,18 +34,18 @@ public:
protected: protected:
void Init(); void Init();
virtual void BeginMeasuring(); virtual void BeginMeasuring() wxOVERRIDE;
virtual void EndMeasuring(); virtual void EndMeasuring() wxOVERRIDE;
virtual void DoGetTextExtent(const wxString& string, virtual void DoGetTextExtent(const wxString& string,
wxCoord *width, wxCoord *width,
wxCoord *height, wxCoord *height,
wxCoord *descent = NULL, wxCoord *descent = NULL,
wxCoord *externalLeading = NULL); wxCoord *externalLeading = NULL) wxOVERRIDE;
virtual bool DoGetPartialTextExtents(const wxString& text, virtual bool DoGetPartialTextExtents(const wxString& text,
wxArrayInt& widths, wxArrayInt& widths,
double scaleX); double scaleX) wxOVERRIDE;

6
include/wx/msw/private/timer.h
View File

@@ -20,10 +20,10 @@ class WXDLLIMPEXP_BASE wxMSWTimerImpl : public wxTimerImpl
public: public:
wxMSWTimerImpl(wxTimer *timer) : wxTimerImpl(timer) { m_id = 0; } wxMSWTimerImpl(wxTimer *timer) : wxTimerImpl(timer) { m_id = 0; }
virtual bool Start(int milliseconds = -1, bool oneShot = false); virtual bool Start(int milliseconds = -1, bool oneShot = false) wxOVERRIDE;
virtual void Stop(); virtual void Stop() wxOVERRIDE;
virtual bool IsRunning() const { return m_id != 0; } virtual bool IsRunning() const wxOVERRIDE { return m_id != 0; }
protected: protected:
// this must be 64 bit under Win64 as WPARAM (storing timer ids) is 64 bit // this must be 64 bit under Win64 as WPARAM (storing timer ids) is 64 bit

2
include/wx/msw/richmsgdlg.h
View File

@@ -21,7 +21,7 @@ public:
{ } { }
// overridden base class method showing the native task dialog if possible // overridden base class method showing the native task dialog if possible
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
private: private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxRichMessageDialog); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxRichMessageDialog);

2
include/wx/nativewin.h
View File

@@ -238,7 +238,7 @@ public:
protected: protected:
#ifdef __WXMSW__ #ifdef __WXMSW__
virtual WXLRESULT virtual WXLRESULT
MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
#endif // __WXMSW__ #endif // __WXMSW__
private: private:

2
include/wx/power.h
View File

@@ -64,7 +64,7 @@ public:
// default copy ctor, assignment operator and dtor are ok // default copy ctor, assignment operator and dtor are ok
virtual wxEvent *Clone() const { return new wxPowerEvent(*this); } virtual wxEvent *Clone() const wxOVERRIDE { return new wxPowerEvent(*this); }
private: private:
bool m_veto; bool m_veto;

10
include/wx/region.h
View File

@@ -201,11 +201,11 @@ protected:
virtual bool DoCombine(const wxRegion& region, wxRegionOp op) = 0; virtual bool DoCombine(const wxRegion& region, wxRegionOp op) = 0;
// implement some wxRegionBase pure virtuals in terms of Combine() // implement some wxRegionBase pure virtuals in terms of Combine()
virtual bool DoUnionWithRect(const wxRect& rect); virtual bool DoUnionWithRect(const wxRect& rect) wxOVERRIDE;
virtual bool DoUnionWithRegion(const wxRegion& region); virtual bool DoUnionWithRegion(const wxRegion& region) wxOVERRIDE;
virtual bool DoIntersect(const wxRegion& region); virtual bool DoIntersect(const wxRegion& region) wxOVERRIDE;
virtual bool DoSubtract(const wxRegion& region); virtual bool DoSubtract(const wxRegion& region) wxOVERRIDE;
virtual bool DoXor(const wxRegion& region); virtual bool DoXor(const wxRegion& region) wxOVERRIDE;
}; };
#endif // ports with wxRegion::Combine() #endif // ports with wxRegion::Combine()

50
include/wx/renderer.h
View File

@@ -418,7 +418,7 @@ public:
const wxRect& rect, const wxRect& rect,
int flags = 0, int flags = 0,
wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
wxHeaderButtonParams* params = NULL) wxHeaderButtonParams* params = NULL) wxOVERRIDE
{ return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params); } { return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params); }
virtual int DrawHeaderButtonContents(wxWindow *win, virtual int DrawHeaderButtonContents(wxWindow *win,
@@ -426,25 +426,25 @@ public:
const wxRect& rect, const wxRect& rect,
int flags = 0, int flags = 0,
wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
wxHeaderButtonParams* params = NULL) wxHeaderButtonParams* params = NULL) wxOVERRIDE
{ return m_rendererNative.DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params); } { return m_rendererNative.DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params); }
virtual int GetHeaderButtonHeight(wxWindow *win) virtual int GetHeaderButtonHeight(wxWindow *win) wxOVERRIDE
{ return m_rendererNative.GetHeaderButtonHeight(win); } { return m_rendererNative.GetHeaderButtonHeight(win); }
virtual int GetHeaderButtonMargin(wxWindow *win) virtual int GetHeaderButtonMargin(wxWindow *win) wxOVERRIDE
{ return m_rendererNative.GetHeaderButtonMargin(win); } { return m_rendererNative.GetHeaderButtonMargin(win); }
virtual void DrawTreeItemButton(wxWindow *win, virtual void DrawTreeItemButton(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0) int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawTreeItemButton(win, dc, rect, flags); } { m_rendererNative.DrawTreeItemButton(win, dc, rect, flags); }
virtual void DrawSplitterBorder(wxWindow *win, virtual void DrawSplitterBorder(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0) int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawSplitterBorder(win, dc, rect, flags); } { m_rendererNative.DrawSplitterBorder(win, dc, rect, flags); }
virtual void DrawSplitterSash(wxWindow *win, virtual void DrawSplitterSash(wxWindow *win,
@@ -452,80 +452,80 @@ public:
const wxSize& size, const wxSize& size,
wxCoord position, wxCoord position,
wxOrientation orient, wxOrientation orient,
int flags = 0) int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawSplitterSash(win, dc, size, { m_rendererNative.DrawSplitterSash(win, dc, size,
position, orient, flags); } position, orient, flags); }
virtual void DrawComboBoxDropButton(wxWindow *win, virtual void DrawComboBoxDropButton(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0) int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawComboBoxDropButton(win, dc, rect, flags); } { m_rendererNative.DrawComboBoxDropButton(win, dc, rect, flags); }
virtual void DrawDropArrow(wxWindow *win, virtual void DrawDropArrow(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0) int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawDropArrow(win, dc, rect, flags); } { m_rendererNative.DrawDropArrow(win, dc, rect, flags); }
virtual void DrawCheckBox(wxWindow *win, virtual void DrawCheckBox(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0) int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawCheckBox( win, dc, rect, flags ); } { m_rendererNative.DrawCheckBox( win, dc, rect, flags ); }
virtual wxSize GetCheckBoxSize(wxWindow *win) virtual wxSize GetCheckBoxSize(wxWindow *win) wxOVERRIDE
{ return m_rendererNative.GetCheckBoxSize(win); } { return m_rendererNative.GetCheckBoxSize(win); }
virtual void DrawPushButton(wxWindow *win, virtual void DrawPushButton(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0) int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawPushButton( win, dc, rect, flags ); } { m_rendererNative.DrawPushButton( win, dc, rect, flags ); }
virtual void DrawCollapseButton(wxWindow *win, virtual void DrawCollapseButton(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0) int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawCollapseButton(win, dc, rect, flags); } { m_rendererNative.DrawCollapseButton(win, dc, rect, flags); }
virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc) virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc) wxOVERRIDE
{ return m_rendererNative.GetCollapseButtonSize(win, dc); } { return m_rendererNative.GetCollapseButtonSize(win, dc); }
virtual void DrawItemSelectionRect(wxWindow *win, virtual void DrawItemSelectionRect(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0) int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawItemSelectionRect( win, dc, rect, flags ); } { m_rendererNative.DrawItemSelectionRect( win, dc, rect, flags ); }
virtual void DrawFocusRect(wxWindow* win, virtual void DrawFocusRect(wxWindow* win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0) int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawFocusRect( win, dc, rect, flags ); } { m_rendererNative.DrawFocusRect( win, dc, rect, flags ); }
virtual void DrawChoice(wxWindow* win, virtual void DrawChoice(wxWindow* win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0) int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawChoice( win, dc, rect, flags); } { m_rendererNative.DrawChoice( win, dc, rect, flags); }
virtual void DrawComboBox(wxWindow* win, virtual void DrawComboBox(wxWindow* win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0) int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawComboBox( win, dc, rect, flags); } { m_rendererNative.DrawComboBox( win, dc, rect, flags); }
virtual void DrawTextCtrl(wxWindow* win, virtual void DrawTextCtrl(wxWindow* win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0) int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawTextCtrl( win, dc, rect, flags); } { m_rendererNative.DrawTextCtrl( win, dc, rect, flags); }
virtual void DrawRadioBitmap(wxWindow* win, virtual void DrawRadioBitmap(wxWindow* win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0) int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawRadioBitmap(win, dc, rect, flags); } { m_rendererNative.DrawRadioBitmap(win, dc, rect, flags); }
#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP #ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
@@ -533,7 +533,7 @@ public:
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
wxTitleBarButton button, wxTitleBarButton button,
int flags = 0) int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawTitleBarBitmap(win, dc, rect, button, flags); } { m_rendererNative.DrawTitleBarBitmap(win, dc, rect, button, flags); }
#endif // wxHAS_DRAW_TITLE_BAR_BITMAP #endif // wxHAS_DRAW_TITLE_BAR_BITMAP
@@ -542,7 +542,7 @@ public:
const wxRect& rect, const wxRect& rect,
int value, int value,
int max, int max,
int flags = 0) int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawGauge(win, dc, rect, value, max, flags); } { m_rendererNative.DrawGauge(win, dc, rect, value, max, flags); }
virtual void DrawItemText(wxWindow* win, virtual void DrawItemText(wxWindow* win,
@@ -551,13 +551,13 @@ public:
const wxRect& rect, const wxRect& rect,
int align = wxALIGN_LEFT | wxALIGN_TOP, int align = wxALIGN_LEFT | wxALIGN_TOP,
int flags = 0, int flags = 0,
wxEllipsizeMode ellipsizeMode = wxELLIPSIZE_END) wxEllipsizeMode ellipsizeMode = wxELLIPSIZE_END) wxOVERRIDE
{ m_rendererNative.DrawItemText(win, dc, text, rect, align, flags, ellipsizeMode); } { m_rendererNative.DrawItemText(win, dc, text, rect, align, flags, ellipsizeMode); }
virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) wxOVERRIDE
{ return m_rendererNative.GetSplitterParams(win); } { return m_rendererNative.GetSplitterParams(win); }
virtual wxRendererVersion GetVersion() const virtual wxRendererVersion GetVersion() const wxOVERRIDE
{ return m_rendererNative.GetVersion(); } { return m_rendererNative.GetVersion(); }
protected: protected:

10
include/wx/richtext/richtextprint.h
View File

@@ -124,11 +124,11 @@ public:
void CalculateScaling(wxDC* dc, wxRect& textRect, wxRect& headerRect, wxRect& footerRect); void CalculateScaling(wxDC* dc, wxRect& textRect, wxRect& headerRect, wxRect& footerRect);
// wxPrintout virtual functions // wxPrintout virtual functions
virtual bool OnPrintPage(int page); virtual bool OnPrintPage(int page) wxOVERRIDE;
virtual bool HasPage(int page); virtual bool HasPage(int page) wxOVERRIDE;
virtual void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo); virtual void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) wxOVERRIDE;
virtual bool OnBeginDocument(int startPage, int endPage); virtual bool OnBeginDocument(int startPage, int endPage) wxOVERRIDE;
virtual void OnPreparePrinting(); virtual void OnPreparePrinting() wxOVERRIDE;
private: private:

2
include/wx/scrolbar.h
View File

@@ -53,7 +53,7 @@ public:
virtual void SetThumbPosition(int viewStart) = 0; virtual void SetThumbPosition(int viewStart) = 0;
virtual void SetScrollbar(int position, int thumbSize, virtual void SetScrollbar(int position, int thumbSize,
int range, int pageSize, int range, int pageSize,
bool refresh = true) = 0; bool refresh = true) wxOVERRIDE = 0;
// implementation-only // implementation-only
bool IsNeeded() const { return GetRange() > GetThumbSize(); } bool IsNeeded() const { return GetRange() > GetThumbSize(); }

4
include/wx/scrolwin.h
View File

@@ -431,13 +431,13 @@ public:
#ifdef __WXMSW__ #ifdef __WXMSW__
// we need to return a special WM_GETDLGCODE value to process just the // we need to return a special WM_GETDLGCODE value to process just the
// arrows but let the other navigation characters through // arrows but let the other navigation characters through
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE
{ {
return FilterMSWWindowProc(nMsg, T::MSWWindowProc(nMsg, wParam, lParam)); return FilterMSWWindowProc(nMsg, T::MSWWindowProc(nMsg, wParam, lParam));
} }
// Take into account the scroll origin. // Take into account the scroll origin.
virtual void MSWAdjustBrushOrg(int* xOrg, int* yOrg) const virtual void MSWAdjustBrushOrg(int* xOrg, int* yOrg) const wxOVERRIDE
{ {
CalcUnscrolledPosition(*xOrg, *yOrg, xOrg, yOrg); CalcUnscrolledPosition(*xOrg, *yOrg, xOrg, yOrg);
} }

2
include/wx/stc/stc.h
View File

@@ -5356,7 +5356,7 @@ public:
bool GetControl() const; bool GetControl() const;
bool GetAlt() const; bool GetAlt() const;
virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); } virtual wxEvent* Clone() const wxOVERRIDE { return new wxStyledTextEvent(*this); }
#ifndef SWIG #ifndef SWIG
private: private:

6
include/wx/textcompleter.h
View File

@@ -44,8 +44,8 @@ public:
// Must be implemented to return all the completions for the given prefix. // Must be implemented to return all the completions for the given prefix.
virtual void GetCompletions(const wxString& prefix, wxArrayString& res) = 0; virtual void GetCompletions(const wxString& prefix, wxArrayString& res) = 0;
virtual bool Start(const wxString& prefix); virtual bool Start(const wxString& prefix) wxOVERRIDE;
virtual wxString GetNext(); virtual wxString GetNext() wxOVERRIDE;
private: private:
wxArrayString m_completions; wxArrayString m_completions;
@@ -72,7 +72,7 @@ public:
} }
virtual void GetCompletions(const wxString& WXUNUSED(prefix), virtual void GetCompletions(const wxString& WXUNUSED(prefix),
wxArrayString& res) wxArrayString& res) wxOVERRIDE
{ {
res = m_strings; res = m_strings;
} }

4
include/wx/translation.h
View File

@@ -227,9 +227,9 @@ class WXDLLIMPEXP_BASE wxResourceTranslationsLoader
{ {
public: public:
virtual wxMsgCatalog *LoadCatalog(const wxString& domain, virtual wxMsgCatalog *LoadCatalog(const wxString& domain,
const wxString& lang); const wxString& lang) wxOVERRIDE;
virtual wxArrayString GetAvailableTranslations(const wxString& domain) const; virtual wxArrayString GetAvailableTranslations(const wxString& domain) const wxOVERRIDE;
protected: protected:
// returns resource type to use for translations // returns resource type to use for translations

10
include/wx/valnum.h
View File

@@ -157,7 +157,7 @@ public:
SetMax(max); SetMax(max);
} }
virtual bool TransferToWindow() virtual bool TransferToWindow() wxOVERRIDE
{ {
if ( m_value ) if ( m_value )
{ {
@@ -171,7 +171,7 @@ public:
return true; return true;
} }
virtual bool TransferFromWindow() virtual bool TransferFromWindow() wxOVERRIDE
{ {
if ( m_value ) if ( m_value )
{ {
@@ -204,7 +204,7 @@ protected:
// Implement wxNumValidatorBase virtual method which is the same for // Implement wxNumValidatorBase virtual method which is the same for
// both integer and floating point numbers. // both integer and floating point numbers.
virtual wxString NormalizeString(const wxString& s) const virtual wxString NormalizeString(const wxString& s) const wxOVERRIDE
{ {
LongestValueType value; LongestValueType value;
return BaseValidator::FromString(s, &value) ? NormalizeValue(value) return BaseValidator::FromString(s, &value) ? NormalizeValue(value)
@@ -312,7 +312,7 @@ public:
this->DoSetMax(std::numeric_limits<ValueType>::max()); this->DoSetMax(std::numeric_limits<ValueType>::max());
} }
virtual wxObject *Clone() const { return new wxIntegerValidator(*this); } virtual wxObject *Clone() const wxOVERRIDE { return new wxIntegerValidator(*this); }
private: private:
wxDECLARE_NO_ASSIGN_CLASS(wxIntegerValidator); wxDECLARE_NO_ASSIGN_CLASS(wxIntegerValidator);
@@ -417,7 +417,7 @@ public:
this->SetPrecision(precision); this->SetPrecision(precision);
} }
virtual wxObject *Clone() const virtual wxObject *Clone() const wxOVERRIDE
{ {
return new wxFloatingPointValidator(*this); return new wxFloatingPointValidator(*this);
} }

8
src/common/strconv.cpp
View File

@@ -2569,7 +2569,7 @@ public:
} }
#endif // wxUSE_FONTMAP #endif // wxUSE_FONTMAP
virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const wxOVERRIDE
{ {
// note that we have to use MB_ERR_INVALID_CHARS flag as it without it // note that we have to use MB_ERR_INVALID_CHARS flag as it without it
// the behaviour is not compatible with the Unix version (using iconv) // the behaviour is not compatible with the Unix version (using iconv)
@@ -2608,7 +2608,7 @@ public:
return len - 1; return len - 1;
} }
virtual size_t WC2MB(char *buf, const wchar_t *pwz, size_t n) const virtual size_t WC2MB(char *buf, const wchar_t *pwz, size_t n) const wxOVERRIDE
{ {
/* /*
We need to WC_NO_BEST_FIT_CHARS to prevent WideCharToMultiByte() We need to WC_NO_BEST_FIT_CHARS to prevent WideCharToMultiByte()
@@ -2693,7 +2693,7 @@ public:
return len - 1; return len - 1;
} }
virtual size_t GetMBNulLen() const virtual size_t GetMBNulLen() const wxOVERRIDE
{ {
if ( m_minMBCharWidth == 0 ) if ( m_minMBCharWidth == 0 )
{ {
@@ -2732,7 +2732,7 @@ public:
return m_minMBCharWidth; return m_minMBCharWidth;
} }
virtual wxMBConv *Clone() const { return new wxMBConv_win32(*this); } virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConv_win32(*this); }
bool IsOk() const { return m_CodePage != -1; } bool IsOk() const { return m_CodePage != -1; }

38
src/generic/datavgen.cpp
View File

@@ -273,12 +273,12 @@ public:
protected: protected:
// implement/override wxHeaderCtrl functions by forwarding them to the main // implement/override wxHeaderCtrl functions by forwarding them to the main
// control // control
virtual const wxHeaderColumn& GetColumn(unsigned int idx) const virtual const wxHeaderColumn& GetColumn(unsigned int idx) const wxOVERRIDE
{ {
return *(GetOwner()->GetColumn(idx)); return *(GetOwner()->GetColumn(idx));
} }
virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle) virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle) wxOVERRIDE
{ {
wxDataViewCtrl * const owner = GetOwner(); wxDataViewCtrl * const owner = GetOwner();
@@ -402,7 +402,7 @@ private:
public: public:
wxDataViewRenameTimer( wxDataViewMainWindow *owner ); wxDataViewRenameTimer( wxDataViewMainWindow *owner );
void Notify(); void Notify() wxOVERRIDE;
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -648,7 +648,7 @@ public:
// Override the base class method to resort if needed, i.e. if // Override the base class method to resort if needed, i.e. if
// SortPrepare() was called -- and ignored -- while we were frozen. // SortPrepare() was called -- and ignored -- while we were frozen.
virtual void DoThaw() virtual void DoThaw() wxOVERRIDE
{ {
if ( m_sortColumn == SortColumn_OnThaw ) if ( m_sortColumn == SortColumn_OnThaw )
{ {
@@ -716,11 +716,11 @@ public:
void UpdateDisplay(); void UpdateDisplay();
void RecalculateDisplay(); void RecalculateDisplay();
void OnInternalIdle(); void OnInternalIdle() wxOVERRIDE;
void OnRenameTimer(); void OnRenameTimer();
void ScrollWindow( int dx, int dy, const wxRect *rect = NULL ); void ScrollWindow( int dx, int dy, const wxRect *rect = NULL ) wxOVERRIDE;
void ScrollTo( int rows, int column ); void ScrollTo( int rows, int column );
unsigned GetCurrentRow() const { return m_currentRow; } unsigned GetCurrentRow() const { return m_currentRow; }
@@ -921,17 +921,17 @@ public:
wxGenericDataViewModelNotifier( wxDataViewMainWindow *mainWindow ) wxGenericDataViewModelNotifier( wxDataViewMainWindow *mainWindow )
{ m_mainWindow = mainWindow; } { m_mainWindow = mainWindow; }
virtual bool ItemAdded( const wxDataViewItem & parent, const wxDataViewItem & item ) virtual bool ItemAdded( const wxDataViewItem & parent, const wxDataViewItem & item ) wxOVERRIDE
{ return m_mainWindow->ItemAdded( parent , item ); } { return m_mainWindow->ItemAdded( parent , item ); }
virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) wxOVERRIDE
{ return m_mainWindow->ItemDeleted( parent, item ); } { return m_mainWindow->ItemDeleted( parent, item ); }
virtual bool ItemChanged( const wxDataViewItem & item ) virtual bool ItemChanged( const wxDataViewItem & item ) wxOVERRIDE
{ return m_mainWindow->ItemChanged(item); } { return m_mainWindow->ItemChanged(item); }
virtual bool ValueChanged( const wxDataViewItem & item , unsigned int col ) virtual bool ValueChanged( const wxDataViewItem & item , unsigned int col ) wxOVERRIDE
{ return m_mainWindow->ValueChanged( item, col ); } { return m_mainWindow->ValueChanged( item, col ); }
virtual bool Cleared() virtual bool Cleared() wxOVERRIDE
{ return m_mainWindow->Cleared(); } { return m_mainWindow->Cleared(); }
virtual void Resort() virtual void Resort() wxOVERRIDE
{ m_mainWindow->Resort(); } { m_mainWindow->Resort(); }
wxDataViewMainWindow *m_mainWindow; wxDataViewMainWindow *m_mainWindow;
@@ -1417,7 +1417,7 @@ public:
delete m_hint; delete m_hint;
} }
virtual bool GiveFeedback( wxDragResult WXUNUSED(effect) ) virtual bool GiveFeedback( wxDragResult WXUNUSED(effect) ) wxOVERRIDE
{ {
wxPoint pos = wxGetMousePosition(); wxPoint pos = wxGetMousePosition();
@@ -1468,7 +1468,7 @@ public:
m_win = win; m_win = win;
} }
virtual wxDragResult OnDragOver( wxCoord x, wxCoord y, wxDragResult def ) virtual wxDragResult OnDragOver( wxCoord x, wxCoord y, wxDragResult def ) wxOVERRIDE
{ {
wxDataFormat format = GetMatchingPair(); wxDataFormat format = GetMatchingPair();
if (format == wxDF_INVALID) if (format == wxDF_INVALID)
@@ -1476,7 +1476,7 @@ public:
return m_win->OnDragOver( format, x, y, def); return m_win->OnDragOver( format, x, y, def);
} }
virtual bool OnDrop( wxCoord x, wxCoord y ) virtual bool OnDrop( wxCoord x, wxCoord y ) wxOVERRIDE
{ {
wxDataFormat format = GetMatchingPair(); wxDataFormat format = GetMatchingPair();
if (format == wxDF_INVALID) if (format == wxDF_INVALID)
@@ -1484,7 +1484,7 @@ public:
return m_win->OnDrop( format, x, y ); return m_win->OnDrop( format, x, y );
} }
virtual wxDragResult OnData( wxCoord x, wxCoord y, wxDragResult def ) virtual wxDragResult OnData( wxCoord x, wxCoord y, wxDragResult def ) wxOVERRIDE
{ {
wxDataFormat format = GetMatchingPair(); wxDataFormat format = GetMatchingPair();
if (format == wxDF_INVALID) if (format == wxDF_INVALID)
@@ -1494,7 +1494,7 @@ public:
return m_win->OnData( format, x, y, def ); return m_win->OnData( format, x, y, def );
} }
virtual void OnLeave() virtual void OnLeave() wxOVERRIDE
{ m_win->OnLeave(); } { m_win->OnLeave(); }
wxDataViewMainWindow *m_win; wxDataViewMainWindow *m_win;
@@ -3071,7 +3071,7 @@ public:
parent = node; parent = node;
} }
virtual int operator() ( wxDataViewTreeNode * node ) virtual int operator() ( wxDataViewTreeNode * node ) wxOVERRIDE
{ {
current ++; current ++;
if( current == static_cast<int>(row)) if( current == static_cast<int>(row))
@@ -3456,7 +3456,7 @@ public:
} }
// Maybe binary search will help to speed up this process // Maybe binary search will help to speed up this process
virtual int operator() ( wxDataViewTreeNode * node) virtual int operator() ( wxDataViewTreeNode * node) wxOVERRIDE
{ {
ret ++; ret ++;
if( node->GetItem() == item ) if( node->GetItem() == item )

6
src/generic/preferencesg.cpp
View File

@@ -97,7 +97,7 @@ public:
m_title = title; m_title = title;
} }
virtual void AddPage(wxPreferencesPage* page) virtual void AddPage(wxPreferencesPage* page) wxOVERRIDE
{ {
m_pages.push_back(wxSharedPtr<wxPreferencesPage>(page)); m_pages.push_back(wxSharedPtr<wxPreferencesPage>(page));
} }
@@ -204,7 +204,7 @@ public:
m_currentPage = -1; m_currentPage = -1;
} }
virtual void Show(wxWindow* parent) virtual void Show(wxWindow* parent) wxOVERRIDE
{ {
wxScopedPtr<wxGenericPrefsDialog> dlg(CreateDialog(parent)); wxScopedPtr<wxGenericPrefsDialog> dlg(CreateDialog(parent));
@@ -222,7 +222,7 @@ public:
m_currentPage = dlg->GetSelectedPage(); m_currentPage = dlg->GetSelectedPage();
} }
virtual void Dismiss() virtual void Dismiss() wxOVERRIDE
{ {
if ( m_dlg ) if ( m_dlg )
{ {

2
src/generic/srchctlg.cpp
View File

@@ -120,7 +120,7 @@ protected:
// to do this easily and as there is much in that code I don't understand // to do this easily and as there is much in that code I don't understand
// (notably what is the logic for buttons sizing?) I prefer to not touch it // (notably what is the logic for buttons sizing?) I prefer to not touch it
// at all. // at all.
virtual wxSize DoGetBestSize() const virtual wxSize DoGetBestSize() const wxOVERRIDE
{ {
const long flags = GetWindowStyleFlag(); const long flags = GetWindowStyleFlag();
wxSearchTextCtrl* const self = const_cast<wxSearchTextCtrl*>(this); wxSearchTextCtrl* const self = const_cast<wxSearchTextCtrl*>(this);

2
src/generic/tipdlg.cpp
View File

@@ -78,7 +78,7 @@ class WXDLLIMPEXP_ADV wxRegTipProvider : public wxTipProvider
public: public:
wxRegTipProvider(const wxString& keyname); wxRegTipProvider(const wxString& keyname);
virtual wxString GetTip(); virtual wxString GetTip() wxOVERRIDE;
}; };
// Empty implementation for now to keep the linker happy // Empty implementation for now to keep the linker happy

32
src/msw/dialup.cpp
View File

@@ -166,23 +166,23 @@ public:
virtual ~wxDialUpManagerMSW(); virtual ~wxDialUpManagerMSW();
// implement base class pure virtuals // implement base class pure virtuals
virtual bool IsOk() const; virtual bool IsOk() const wxOVERRIDE;
virtual size_t GetISPNames(wxArrayString& names) const; virtual size_t GetISPNames(wxArrayString& names) const wxOVERRIDE;
virtual bool Dial(const wxString& nameOfISP, virtual bool Dial(const wxString& nameOfISP,
const wxString& username, const wxString& username,
const wxString& password, const wxString& password,
bool async); bool async) wxOVERRIDE;
virtual bool IsDialing() const; virtual bool IsDialing() const wxOVERRIDE;
virtual bool CancelDialing(); virtual bool CancelDialing() wxOVERRIDE;
virtual bool HangUp(); virtual bool HangUp() wxOVERRIDE;
virtual bool IsAlwaysOnline() const; virtual bool IsAlwaysOnline() const wxOVERRIDE;
virtual bool IsOnline() const; virtual bool IsOnline() const wxOVERRIDE;
virtual void SetOnlineStatus(bool isOnline = true); virtual void SetOnlineStatus(bool isOnline = true) wxOVERRIDE;
virtual bool EnableAutoCheckOnlineStatus(size_t nSeconds); virtual bool EnableAutoCheckOnlineStatus(size_t nSeconds) wxOVERRIDE;
virtual void DisableAutoCheckOnlineStatus(); virtual void DisableAutoCheckOnlineStatus() wxOVERRIDE;
virtual void SetWellKnownHost(const wxString& hostname, int port); virtual void SetWellKnownHost(const wxString& hostname, int port) wxOVERRIDE;
virtual void SetConnectCommand(const wxString& commandDial, virtual void SetConnectCommand(const wxString& commandDial,
const wxString& commandHangup); const wxString& commandHangup) wxOVERRIDE;
// for RasTimer // for RasTimer
void CheckRasStatus(); void CheckRasStatus();
@@ -220,7 +220,7 @@ private:
RasTimer(wxDialUpManagerMSW *dialUpManager) RasTimer(wxDialUpManagerMSW *dialUpManager)
{ m_dialUpManager = dialUpManager; } { m_dialUpManager = dialUpManager; }
virtual void Notify() { m_dialUpManager->CheckRasStatus(); } virtual void Notify() wxOVERRIDE { m_dialUpManager->CheckRasStatus(); }
private: private:
wxDialUpManagerMSW *m_dialUpManager; wxDialUpManagerMSW *m_dialUpManager;
@@ -283,8 +283,8 @@ private:
class wxDialUpManagerModule : public wxModule class wxDialUpManagerModule : public wxModule
{ {
public: public:
bool OnInit() { return true; } bool OnInit() wxOVERRIDE { return true; }
void OnExit() void OnExit() wxOVERRIDE
{ {
HWND hwnd = wxDialUpManagerMSW::GetRasWindow(); HWND hwnd = wxDialUpManagerMSW::GetRasWindow();
if ( hwnd ) if ( hwnd )

40
src/msw/mediactrl_am.cpp
View File

@@ -839,44 +839,44 @@ public:
const wxSize& size, const wxSize& size,
long style, long style,
const wxValidator& validator, const wxValidator& validator,
const wxString& name); const wxString& name) wxOVERRIDE;
virtual bool Play(); virtual bool Play() wxOVERRIDE;
virtual bool Pause(); virtual bool Pause() wxOVERRIDE;
virtual bool Stop(); virtual bool Stop() wxOVERRIDE;
virtual bool Load(const wxString& fileName); virtual bool Load(const wxString& fileName) wxOVERRIDE;
virtual bool Load(const wxURI& location); virtual bool Load(const wxURI& location) wxOVERRIDE;
virtual bool Load(const wxURI& location, const wxURI& proxy); virtual bool Load(const wxURI& location, const wxURI& proxy) wxOVERRIDE;
bool DoLoad(const wxString& location); bool DoLoad(const wxString& location);
void FinishLoad(); void FinishLoad();
virtual wxMediaState GetState(); virtual wxMediaState GetState() wxOVERRIDE;
virtual bool SetPosition(wxLongLong where); virtual bool SetPosition(wxLongLong where) wxOVERRIDE;
virtual wxLongLong GetPosition(); virtual wxLongLong GetPosition() wxOVERRIDE;
virtual wxLongLong GetDuration(); virtual wxLongLong GetDuration() wxOVERRIDE;
virtual void Move(int x, int y, int w, int h); virtual void Move(int x, int y, int w, int h) wxOVERRIDE;
wxSize GetVideoSize() const; wxSize GetVideoSize() const wxOVERRIDE;
virtual double GetPlaybackRate(); virtual double GetPlaybackRate() wxOVERRIDE;
virtual bool SetPlaybackRate(double); virtual bool SetPlaybackRate(double) wxOVERRIDE;
virtual double GetVolume(); virtual double GetVolume() wxOVERRIDE;
virtual bool SetVolume(double); virtual bool SetVolume(double) wxOVERRIDE;
virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags); virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags) wxOVERRIDE;
void DoGetDownloadProgress(wxLongLong*, wxLongLong*); void DoGetDownloadProgress(wxLongLong*, wxLongLong*);
virtual wxLongLong GetDownloadProgress() virtual wxLongLong GetDownloadProgress() wxOVERRIDE
{ {
wxLongLong progress, total; wxLongLong progress, total;
DoGetDownloadProgress(&progress, &total); DoGetDownloadProgress(&progress, &total);
return progress; return progress;
} }
virtual wxLongLong GetDownloadTotal() virtual wxLongLong GetDownloadTotal() wxOVERRIDE
{ {
wxLongLong progress, total; wxLongLong progress, total;
DoGetDownloadProgress(&progress, &total); DoGetDownloadProgress(&progress, &total);

40
src/msw/mediactrl_qt.cpp
View File

@@ -355,33 +355,33 @@ public:
const wxSize& size, const wxSize& size,
long style, long style,
const wxValidator& validator, const wxValidator& validator,
const wxString& name); const wxString& name) wxOVERRIDE;
virtual bool Play(); virtual bool Play() wxOVERRIDE;
virtual bool Pause(); virtual bool Pause() wxOVERRIDE;
virtual bool Stop(); virtual bool Stop() wxOVERRIDE;
virtual bool Load(const wxURI& location, virtual bool Load(const wxURI& location,
const wxURI& proxy) const wxURI& proxy) wxOVERRIDE
{ return wxMediaBackend::Load(location, proxy); } { return wxMediaBackend::Load(location, proxy); }
virtual bool Load(const wxString& fileName); virtual bool Load(const wxString& fileName) wxOVERRIDE;
virtual bool Load(const wxURI& location); virtual bool Load(const wxURI& location) wxOVERRIDE;
virtual wxMediaState GetState(); virtual wxMediaState GetState() wxOVERRIDE;
virtual bool SetPosition(wxLongLong where); virtual bool SetPosition(wxLongLong where) wxOVERRIDE;
virtual wxLongLong GetPosition(); virtual wxLongLong GetPosition() wxOVERRIDE;
virtual wxLongLong GetDuration(); virtual wxLongLong GetDuration() wxOVERRIDE;
virtual void Move(int x, int y, int w, int h); virtual void Move(int x, int y, int w, int h) wxOVERRIDE;
wxSize GetVideoSize() const; wxSize GetVideoSize() const wxOVERRIDE;
virtual double GetPlaybackRate(); virtual double GetPlaybackRate() wxOVERRIDE;
virtual bool SetPlaybackRate(double dRate); virtual bool SetPlaybackRate(double dRate) wxOVERRIDE;
virtual double GetVolume(); virtual double GetVolume() wxOVERRIDE;
virtual bool SetVolume(double); virtual bool SetVolume(double) wxOVERRIDE;
void Cleanup(); void Cleanup();
void FinishLoad(); void FinishLoad();
@@ -394,7 +394,7 @@ public:
static LRESULT CALLBACK QTWndProc(HWND, UINT, WPARAM, LPARAM); static LRESULT CALLBACK QTWndProc(HWND, UINT, WPARAM, LPARAM);
virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags); virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags) wxOVERRIDE;
wxSize m_bestSize; // Original movie size wxSize m_bestSize; // Original movie size
Movie m_movie; // QT Movie handle/instance Movie m_movie; // QT Movie handle/instance
@@ -469,7 +469,7 @@ public:
wxQTLoadTimer(Movie movie, wxQTMediaBackend* parent, wxQuickTimeLibrary* pLib) : wxQTLoadTimer(Movie movie, wxQTMediaBackend* parent, wxQuickTimeLibrary* pLib) :
m_movie(movie), m_parent(parent), m_pLib(pLib) {} m_movie(movie), m_parent(parent), m_pLib(pLib) {}
void Notify() void Notify() wxOVERRIDE
{ {
m_pLib->MoviesTask(m_movie, 0); m_pLib->MoviesTask(m_movie, 0);
// kMovieLoadStatePlayable // kMovieLoadStatePlayable
@@ -502,7 +502,7 @@ public:
wxQuickTimeLibrary* pLib) : wxQuickTimeLibrary* pLib) :
m_movie(movie), m_parent(parent), m_pLib(pLib) {} m_movie(movie), m_parent(parent), m_pLib(pLib) {}
void Notify() void Notify() wxOVERRIDE
{ {
// //
// OK, a little explaining - basically originally // OK, a little explaining - basically originally

126
src/msw/ole/activex.cpp
View File

@@ -59,9 +59,9 @@ wxDEFINE_EVENT( wxEVT_ACTIVEX, wxActiveXEvent );
static void _GetInterface(cls *self, REFIID iid, void **_interface, const char *&desc);\ static void _GetInterface(cls *self, REFIID iid, void **_interface, const char *&desc);\
public:\ public:\
LONG GetRefCount();\ LONG GetRefCount();\
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void ** ppvObject);\ HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void ** ppvObject) wxOVERRIDE;\
ULONG STDMETHODCALLTYPE AddRef();\ ULONG STDMETHODCALLTYPE AddRef() wxOVERRIDE;\
ULONG STDMETHODCALLTYPE Release();\ ULONG STDMETHODCALLTYPE Release() wxOVERRIDE;\
ULONG STDMETHODCALLTYPE AddLock();\ ULONG STDMETHODCALLTYPE AddLock();\
ULONG STDMETHODCALLTYPE ReleaseLock() ULONG STDMETHODCALLTYPE ReleaseLock()
@@ -228,16 +228,16 @@ public:
//***************************IDispatch***************************** //***************************IDispatch*****************************
HRESULT STDMETHODCALLTYPE GetIDsOfNames(REFIID, OLECHAR ** , HRESULT STDMETHODCALLTYPE GetIDsOfNames(REFIID, OLECHAR ** ,
unsigned int , LCID , unsigned int , LCID ,
DISPID * ) DISPID * ) wxOVERRIDE
{ return E_NOTIMPL; } { return E_NOTIMPL; }
STDMETHOD(GetTypeInfo)(unsigned int, LCID, ITypeInfo **) STDMETHOD(GetTypeInfo)(unsigned int, LCID, ITypeInfo **) wxOVERRIDE
{ return E_NOTIMPL; } { return E_NOTIMPL; }
HRESULT STDMETHODCALLTYPE GetTypeInfoCount(unsigned int *) HRESULT STDMETHODCALLTYPE GetTypeInfoCount(unsigned int *) wxOVERRIDE
{ return E_NOTIMPL; } { return E_NOTIMPL; }
HRESULT STDMETHODCALLTYPE Invoke(DISPID dispIdMember, REFIID, LCID, HRESULT STDMETHODCALLTYPE Invoke(DISPID dispIdMember, REFIID, LCID,
WORD wFlags, DISPPARAMS *, WORD wFlags, DISPPARAMS *,
VARIANT * pVarResult, EXCEPINFO *, VARIANT * pVarResult, EXCEPINFO *,
unsigned int *) unsigned int *) wxOVERRIDE
{ {
if (!(wFlags & DISPATCH_PROPERTYGET)) if (!(wFlags & DISPATCH_PROPERTYGET))
return S_OK; return S_OK;
@@ -309,32 +309,32 @@ public:
} }
//**************************IOleWindow*************************** //**************************IOleWindow***************************
HRESULT STDMETHODCALLTYPE GetWindow(HWND * phwnd) HRESULT STDMETHODCALLTYPE GetWindow(HWND * phwnd) wxOVERRIDE
{ {
if (phwnd == NULL) if (phwnd == NULL)
return E_INVALIDARG; return E_INVALIDARG;
(*phwnd) = m_hWndParent; (*phwnd) = m_hWndParent;
return S_OK; return S_OK;
} }
HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL) HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL) wxOVERRIDE
{return S_OK;} {return S_OK;}
//**************************IOleInPlaceUIWindow***************** //**************************IOleInPlaceUIWindow*****************
HRESULT STDMETHODCALLTYPE GetBorder(LPRECT lprectBorder) HRESULT STDMETHODCALLTYPE GetBorder(LPRECT lprectBorder) wxOVERRIDE
{ {
if (lprectBorder == NULL) if (lprectBorder == NULL)
return E_INVALIDARG; return E_INVALIDARG;
return INPLACE_E_NOTOOLSPACE; return INPLACE_E_NOTOOLSPACE;
} }
HRESULT STDMETHODCALLTYPE RequestBorderSpace(LPCBORDERWIDTHS pborderwidths) HRESULT STDMETHODCALLTYPE RequestBorderSpace(LPCBORDERWIDTHS pborderwidths) wxOVERRIDE
{ {
if (pborderwidths == NULL) if (pborderwidths == NULL)
return E_INVALIDARG; return E_INVALIDARG;
return INPLACE_E_NOTOOLSPACE; return INPLACE_E_NOTOOLSPACE;
} }
HRESULT STDMETHODCALLTYPE SetBorderSpace(LPCBORDERWIDTHS) HRESULT STDMETHODCALLTYPE SetBorderSpace(LPCBORDERWIDTHS) wxOVERRIDE
{return S_OK;} {return S_OK;}
HRESULT STDMETHODCALLTYPE SetActiveObject( HRESULT STDMETHODCALLTYPE SetActiveObject(
IOleInPlaceActiveObject *pActiveObject, LPCOLESTR) IOleInPlaceActiveObject *pActiveObject, LPCOLESTR) wxOVERRIDE
{ {
if (pActiveObject) if (pActiveObject)
pActiveObject->AddRef(); pActiveObject->AddRef();
@@ -345,12 +345,12 @@ public:
//********************IOleInPlaceFrame************************ //********************IOleInPlaceFrame************************
STDMETHOD(InsertMenus)(HMENU, LPOLEMENUGROUPWIDTHS){return S_OK;} STDMETHOD(InsertMenus)(HMENU, LPOLEMENUGROUPWIDTHS) wxOVERRIDE {return S_OK;}
STDMETHOD(SetMenu)(HMENU, HOLEMENU, HWND){ return S_OK;} STDMETHOD(SetMenu)(HMENU, HOLEMENU, HWND) wxOVERRIDE {return S_OK;}
STDMETHOD(RemoveMenus)(HMENU){return S_OK;} STDMETHOD(RemoveMenus)(HMENU) wxOVERRIDE {return S_OK;}
STDMETHOD(SetStatusText)(LPCOLESTR){ return S_OK;} STDMETHOD(SetStatusText)(LPCOLESTR) wxOVERRIDE {return S_OK;}
HRESULT STDMETHODCALLTYPE EnableModeless(BOOL){return S_OK;} HRESULT STDMETHODCALLTYPE EnableModeless(BOOL) wxOVERRIDE {return S_OK;}
HRESULT STDMETHODCALLTYPE TranslateAccelerator(LPMSG lpmsg, WORD) HRESULT STDMETHODCALLTYPE TranslateAccelerator(LPMSG lpmsg, WORD) wxOVERRIDE
{ {
// TODO: send an event with this id // TODO: send an event with this id
if (m_window->m_oleInPlaceActiveObject.IsOk()) if (m_window->m_oleInPlaceActiveObject.IsOk())
@@ -359,16 +359,16 @@ public:
} }
//*******************IOleInPlaceSite************************** //*******************IOleInPlaceSite**************************
HRESULT STDMETHODCALLTYPE CanInPlaceActivate(){return S_OK;} HRESULT STDMETHODCALLTYPE CanInPlaceActivate() wxOVERRIDE {return S_OK;}
HRESULT STDMETHODCALLTYPE OnInPlaceActivate() HRESULT STDMETHODCALLTYPE OnInPlaceActivate() wxOVERRIDE
{ m_bInPlaceActive = true; return S_OK; } { m_bInPlaceActive = true; return S_OK; }
HRESULT STDMETHODCALLTYPE OnUIActivate() HRESULT STDMETHODCALLTYPE OnUIActivate() wxOVERRIDE
{ m_bUIActive = true; return S_OK; } { m_bUIActive = true; return S_OK; }
HRESULT STDMETHODCALLTYPE GetWindowContext(IOleInPlaceFrame **ppFrame, HRESULT STDMETHODCALLTYPE GetWindowContext(IOleInPlaceFrame **ppFrame,
IOleInPlaceUIWindow **ppDoc, IOleInPlaceUIWindow **ppDoc,
LPRECT lprcPosRect, LPRECT lprcPosRect,
LPRECT lprcClipRect, LPRECT lprcClipRect,
LPOLEINPLACEFRAMEINFO lpFrameInfo) LPOLEINPLACEFRAMEINFO lpFrameInfo) wxOVERRIDE
{ {
if (ppFrame == NULL || ppDoc == NULL || lprcPosRect == NULL || if (ppFrame == NULL || ppDoc == NULL || lprcPosRect == NULL ||
lprcClipRect == NULL || lpFrameInfo == NULL) lprcClipRect == NULL || lpFrameInfo == NULL)
@@ -415,14 +415,14 @@ public:
return S_OK; return S_OK;
} }
HRESULT STDMETHODCALLTYPE Scroll(SIZE){return S_OK;} HRESULT STDMETHODCALLTYPE Scroll(SIZE) wxOVERRIDE {return S_OK;}
HRESULT STDMETHODCALLTYPE OnUIDeactivate(BOOL) HRESULT STDMETHODCALLTYPE OnUIDeactivate(BOOL) wxOVERRIDE
{ m_bUIActive = false; return S_OK; } { m_bUIActive = false; return S_OK; }
HRESULT STDMETHODCALLTYPE OnInPlaceDeactivate() HRESULT STDMETHODCALLTYPE OnInPlaceDeactivate() wxOVERRIDE
{ m_bInPlaceActive = false; return S_OK; } { m_bInPlaceActive = false; return S_OK; }
HRESULT STDMETHODCALLTYPE DiscardUndoState(){return S_OK;} HRESULT STDMETHODCALLTYPE DiscardUndoState() wxOVERRIDE {return S_OK;}
HRESULT STDMETHODCALLTYPE DeactivateAndUndo(){return S_OK; } HRESULT STDMETHODCALLTYPE DeactivateAndUndo() wxOVERRIDE {return S_OK; }
HRESULT STDMETHODCALLTYPE OnPosRectChange(LPCRECT lprcPosRect) HRESULT STDMETHODCALLTYPE OnPosRectChange(LPCRECT lprcPosRect) wxOVERRIDE
{ {
if (m_window->m_oleInPlaceObject.IsOk() && lprcPosRect) if (m_window->m_oleInPlaceObject.IsOk() && lprcPosRect)
{ {
@@ -442,7 +442,7 @@ public:
return S_OK; return S_OK;
} }
//*************************IOleInPlaceSiteEx*********************** //*************************IOleInPlaceSiteEx***********************
HRESULT STDMETHODCALLTYPE OnInPlaceActivateEx(BOOL * pfNoRedraw, DWORD) HRESULT STDMETHODCALLTYPE OnInPlaceActivateEx(BOOL * pfNoRedraw, DWORD) wxOVERRIDE
{ {
OleLockRunning(m_window->m_ActiveX, TRUE, FALSE); OleLockRunning(m_window->m_ActiveX, TRUE, FALSE);
if (pfNoRedraw) if (pfNoRedraw)
@@ -450,14 +450,14 @@ public:
return S_OK; return S_OK;
} }
HRESULT STDMETHODCALLTYPE OnInPlaceDeactivateEx(BOOL) HRESULT STDMETHODCALLTYPE OnInPlaceDeactivateEx(BOOL) wxOVERRIDE
{ {
OleLockRunning(m_window->m_ActiveX, FALSE, FALSE); OleLockRunning(m_window->m_ActiveX, FALSE, FALSE);
return S_OK; return S_OK;
} }
STDMETHOD(RequestUIActivate)(){ return S_OK;} STDMETHOD(RequestUIActivate)() wxOVERRIDE { return S_OK;}
//*************************IOleClientSite************************** //*************************IOleClientSite**************************
HRESULT STDMETHODCALLTYPE SaveObject(){return S_OK;} HRESULT STDMETHODCALLTYPE SaveObject() wxOVERRIDE {return S_OK;}
const char *OleGetMonikerToStr(DWORD dwAssign) const char *OleGetMonikerToStr(DWORD dwAssign)
{ {
switch (dwAssign) switch (dwAssign)
@@ -480,8 +480,8 @@ public:
default : return "Bad Enum"; default : return "Bad Enum";
} }
} }
STDMETHOD(GetMoniker)(DWORD, DWORD, IMoniker **){return E_FAIL;} STDMETHOD(GetMoniker)(DWORD, DWORD, IMoniker **) wxOVERRIDE {return E_FAIL;}
HRESULT STDMETHODCALLTYPE GetContainer(LPOLECONTAINER * ppContainer) HRESULT STDMETHODCALLTYPE GetContainer(LPOLECONTAINER * ppContainer) wxOVERRIDE
{ {
if (ppContainer == NULL) if (ppContainer == NULL)
return E_INVALIDARG; return E_INVALIDARG;
@@ -490,20 +490,20 @@ public:
wxASSERT(SUCCEEDED(hr)); wxASSERT(SUCCEEDED(hr));
return hr; return hr;
} }
HRESULT STDMETHODCALLTYPE ShowObject() HRESULT STDMETHODCALLTYPE ShowObject() wxOVERRIDE
{ {
if (m_window->m_oleObjectHWND) if (m_window->m_oleObjectHWND)
::ShowWindow(m_window->m_oleObjectHWND, SW_SHOW); ::ShowWindow(m_window->m_oleObjectHWND, SW_SHOW);
return S_OK; return S_OK;
} }
STDMETHOD(OnShowWindow)(BOOL){return S_OK;} STDMETHOD(OnShowWindow)(BOOL) wxOVERRIDE {return S_OK;}
STDMETHOD(RequestNewObjectLayout)(){return E_NOTIMPL;} STDMETHOD(RequestNewObjectLayout)() wxOVERRIDE {return E_NOTIMPL;}
//********************IParseDisplayName*************************** //********************IParseDisplayName***************************
HRESULT STDMETHODCALLTYPE ParseDisplayName( HRESULT STDMETHODCALLTYPE ParseDisplayName(
IBindCtx *, LPOLESTR, ULONG *, IMoniker **){return E_NOTIMPL;} IBindCtx *, LPOLESTR, ULONG *, IMoniker **) wxOVERRIDE {return E_NOTIMPL;}
//********************IOleContainer******************************* //********************IOleContainer*******************************
STDMETHOD(EnumObjects)(DWORD, IEnumUnknown **){return E_NOTIMPL;} STDMETHOD(EnumObjects)(DWORD, IEnumUnknown **) wxOVERRIDE {return E_NOTIMPL;}
HRESULT STDMETHODCALLTYPE LockContainer(BOOL){return S_OK;} HRESULT STDMETHODCALLTYPE LockContainer(BOOL) wxOVERRIDE {return S_OK;}
//********************IOleItemContainer*************************** //********************IOleItemContainer***************************
HRESULT STDMETHODCALLTYPE HRESULT STDMETHODCALLTYPE
#if defined(_UNICODE) #if defined(_UNICODE)
@@ -511,7 +511,7 @@ public:
#else #else
GetObjectA GetObjectA
#endif #endif
(LPOLESTR pszItem, DWORD, IBindCtx *, REFIID, void ** ppvObject) (LPOLESTR pszItem, DWORD, IBindCtx *, REFIID, void ** ppvObject) wxOVERRIDE
{ {
if (pszItem == NULL || ppvObject == NULL) if (pszItem == NULL || ppvObject == NULL)
return E_INVALIDARG; return E_INVALIDARG;
@@ -519,43 +519,43 @@ public:
return MK_E_NOOBJECT; return MK_E_NOOBJECT;
} }
HRESULT STDMETHODCALLTYPE GetObjectStorage( HRESULT STDMETHODCALLTYPE GetObjectStorage(
LPOLESTR pszItem, IBindCtx * , REFIID, void ** ppvStorage) LPOLESTR pszItem, IBindCtx * , REFIID, void ** ppvStorage) wxOVERRIDE
{ {
if (pszItem == NULL || ppvStorage == NULL) if (pszItem == NULL || ppvStorage == NULL)
return E_INVALIDARG; return E_INVALIDARG;
*ppvStorage = NULL; *ppvStorage = NULL;
return MK_E_NOOBJECT; return MK_E_NOOBJECT;
} }
HRESULT STDMETHODCALLTYPE IsRunning(LPOLESTR pszItem) HRESULT STDMETHODCALLTYPE IsRunning(LPOLESTR pszItem) wxOVERRIDE
{ {
if (pszItem == NULL) if (pszItem == NULL)
return E_INVALIDARG; return E_INVALIDARG;
return MK_E_NOOBJECT; return MK_E_NOOBJECT;
} }
//***********************IOleControlSite***************************** //***********************IOleControlSite*****************************
HRESULT STDMETHODCALLTYPE OnControlInfoChanged() HRESULT STDMETHODCALLTYPE OnControlInfoChanged() wxOVERRIDE
{return S_OK;} {return S_OK;}
HRESULT STDMETHODCALLTYPE LockInPlaceActive(BOOL fLock) HRESULT STDMETHODCALLTYPE LockInPlaceActive(BOOL fLock) wxOVERRIDE
{ {
m_bInPlaceLocked = (fLock) ? true : false; m_bInPlaceLocked = (fLock) ? true : false;
return S_OK; return S_OK;
} }
HRESULT STDMETHODCALLTYPE GetExtendedControl(IDispatch **) HRESULT STDMETHODCALLTYPE GetExtendedControl(IDispatch **) wxOVERRIDE
{return E_NOTIMPL;} {return E_NOTIMPL;}
HRESULT STDMETHODCALLTYPE TransformCoords( HRESULT STDMETHODCALLTYPE TransformCoords(
POINTL * pPtlHimetric, POINTF * pPtfContainer, DWORD) POINTL * pPtlHimetric, POINTF * pPtfContainer, DWORD) wxOVERRIDE
{ {
if (pPtlHimetric == NULL || pPtfContainer == NULL) if (pPtlHimetric == NULL || pPtfContainer == NULL)
return E_INVALIDARG; return E_INVALIDARG;
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT STDMETHODCALLTYPE TranslateAccelerator(LPMSG, DWORD) HRESULT STDMETHODCALLTYPE TranslateAccelerator(LPMSG, DWORD) wxOVERRIDE
{return E_NOTIMPL;} {return E_NOTIMPL;}
HRESULT STDMETHODCALLTYPE OnFocus(BOOL){return S_OK;} HRESULT STDMETHODCALLTYPE OnFocus(BOOL) wxOVERRIDE {return S_OK;}
HRESULT STDMETHODCALLTYPE ShowPropertyFrame(){return E_NOTIMPL;} HRESULT STDMETHODCALLTYPE ShowPropertyFrame() wxOVERRIDE {return E_NOTIMPL;}
//**************************IOleCommandTarget*********************** //**************************IOleCommandTarget***********************
HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *, ULONG cCmds, HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *, ULONG cCmds,
OLECMD prgCmds[], OLECMDTEXT *) OLECMD prgCmds[], OLECMDTEXT *) wxOVERRIDE
{ {
if (prgCmds == NULL) return E_INVALIDARG; if (prgCmds == NULL) return E_INVALIDARG;
for (ULONG nCmd = 0; nCmd < cCmds; nCmd++) for (ULONG nCmd = 0; nCmd < cCmds; nCmd++)
@@ -567,19 +567,19 @@ public:
} }
HRESULT STDMETHODCALLTYPE Exec(const GUID *, DWORD, HRESULT STDMETHODCALLTYPE Exec(const GUID *, DWORD,
DWORD, VARIANTARG *, VARIANTARG *) DWORD, VARIANTARG *, VARIANTARG *) wxOVERRIDE
{return OLECMDERR_E_NOTSUPPORTED;} {return OLECMDERR_E_NOTSUPPORTED;}
//**********************IAdviseSink************************************ //**********************IAdviseSink************************************
void STDMETHODCALLTYPE OnDataChange(FORMATETC *, STGMEDIUM *) {} void STDMETHODCALLTYPE OnDataChange(FORMATETC *, STGMEDIUM *) wxOVERRIDE {}
void STDMETHODCALLTYPE OnViewChange(DWORD, LONG) {} void STDMETHODCALLTYPE OnViewChange(DWORD, LONG) wxOVERRIDE {}
void STDMETHODCALLTYPE OnRename(IMoniker *){} void STDMETHODCALLTYPE OnRename(IMoniker *) wxOVERRIDE {}
void STDMETHODCALLTYPE OnSave(){} void STDMETHODCALLTYPE OnSave() wxOVERRIDE {}
void STDMETHODCALLTYPE OnClose(){} void STDMETHODCALLTYPE OnClose() wxOVERRIDE {}
//**********************IOleDocumentSite*************************** //**********************IOleDocumentSite***************************
HRESULT STDMETHODCALLTYPE ActivateMe( HRESULT STDMETHODCALLTYPE ActivateMe(
IOleDocumentView __RPC_FAR *pViewToActivate) IOleDocumentView __RPC_FAR *pViewToActivate) wxOVERRIDE
{ {
wxAutoIOleInPlaceSite inPlaceSite( wxAutoIOleInPlaceSite inPlaceSite(
IID_IOleInPlaceSite, (IDispatch *) this); IID_IOleInPlaceSite, (IDispatch *) this);
@@ -690,17 +690,17 @@ public:
} }
// IDispatch // IDispatch
STDMETHODIMP GetIDsOfNames(REFIID, OLECHAR**, unsigned int, LCID, DISPID*) STDMETHODIMP GetIDsOfNames(REFIID, OLECHAR**, unsigned int, LCID, DISPID*) wxOVERRIDE
{ {
return E_NOTIMPL; return E_NOTIMPL;
} }
STDMETHODIMP GetTypeInfo(unsigned int, LCID, ITypeInfo**) STDMETHODIMP GetTypeInfo(unsigned int, LCID, ITypeInfo**) wxOVERRIDE
{ {
return E_NOTIMPL; return E_NOTIMPL;
} }
STDMETHODIMP GetTypeInfoCount(unsigned int*) STDMETHODIMP GetTypeInfoCount(unsigned int*) wxOVERRIDE
{ {
return E_NOTIMPL; return E_NOTIMPL;
} }
@@ -710,7 +710,7 @@ public:
LCID lcid, LCID lcid,
WORD wFlags, DISPPARAMS * pDispParams, WORD wFlags, DISPPARAMS * pDispParams,
VARIANT * pVarResult, EXCEPINFO * pExcepInfo, VARIANT * pVarResult, EXCEPINFO * pExcepInfo,
unsigned int * puArgErr) unsigned int * puArgErr) wxOVERRIDE
{ {
if (wFlags & (DISPATCH_PROPERTYGET | DISPATCH_PROPERTYPUT | DISPATCH_PROPERTYPUTREF)) if (wFlags & (DISPATCH_PROPERTYGET | DISPATCH_PROPERTYPUT | DISPATCH_PROPERTYPUTREF))
return E_NOTIMPL; return E_NOTIMPL;

32
src/msw/ole/dataobj.cpp
View File

@@ -167,10 +167,10 @@ public:
virtual ~wxIEnumFORMATETC() { delete [] m_formats; } virtual ~wxIEnumFORMATETC() { delete [] m_formats; }
// IEnumFORMATETC // IEnumFORMATETC
STDMETHODIMP Next(ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched); STDMETHODIMP Next(ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched) wxOVERRIDE;
STDMETHODIMP Skip(ULONG celt); STDMETHODIMP Skip(ULONG celt) wxOVERRIDE;
STDMETHODIMP Reset(); STDMETHODIMP Reset() wxOVERRIDE;
STDMETHODIMP Clone(IEnumFORMATETC **ppenum); STDMETHODIMP Clone(IEnumFORMATETC **ppenum) wxOVERRIDE;
DECLARE_IUNKNOWN_METHODS; DECLARE_IUNKNOWN_METHODS;
@@ -198,15 +198,15 @@ public:
void SetDeleteFlag() { m_mustDelete = true; } void SetDeleteFlag() { m_mustDelete = true; }
// IDataObject // IDataObject
STDMETHODIMP GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium); STDMETHODIMP GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium) wxOVERRIDE;
STDMETHODIMP GetDataHere(FORMATETC *pformatetc, STGMEDIUM *pmedium); STDMETHODIMP GetDataHere(FORMATETC *pformatetc, STGMEDIUM *pmedium) wxOVERRIDE;
STDMETHODIMP QueryGetData(FORMATETC *pformatetc); STDMETHODIMP QueryGetData(FORMATETC *pformatetc) wxOVERRIDE;
STDMETHODIMP GetCanonicalFormatEtc(FORMATETC *In, FORMATETC *pOut); STDMETHODIMP GetCanonicalFormatEtc(FORMATETC *In, FORMATETC *pOut) wxOVERRIDE;
STDMETHODIMP SetData(FORMATETC *pfetc, STGMEDIUM *pmedium, BOOL fRelease); STDMETHODIMP SetData(FORMATETC *pfetc, STGMEDIUM *pmedium, BOOL fRelease) wxOVERRIDE;
STDMETHODIMP EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppenumFEtc); STDMETHODIMP EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppenumFEtc) wxOVERRIDE;
STDMETHODIMP DAdvise(FORMATETC *pfetc, DWORD ad, IAdviseSink *p, DWORD *pdw); STDMETHODIMP DAdvise(FORMATETC *pfetc, DWORD ad, IAdviseSink *p, DWORD *pdw) wxOVERRIDE;
STDMETHODIMP DUnadvise(DWORD dwConnection); STDMETHODIMP DUnadvise(DWORD dwConnection) wxOVERRIDE;
STDMETHODIMP EnumDAdvise(IEnumSTATDATA **ppenumAdvise); STDMETHODIMP EnumDAdvise(IEnumSTATDATA **ppenumAdvise) wxOVERRIDE;
DECLARE_IUNKNOWN_METHODS; DECLARE_IUNKNOWN_METHODS;
@@ -1376,13 +1376,13 @@ class CFSTR_SHELLURLDataObject : public wxCustomDataObject
public: public:
CFSTR_SHELLURLDataObject() : wxCustomDataObject(CFSTR_SHELLURL) {} CFSTR_SHELLURLDataObject() : wxCustomDataObject(CFSTR_SHELLURL) {}
virtual size_t GetBufferOffset( const wxDataFormat& WXUNUSED(format) ) virtual size_t GetBufferOffset( const wxDataFormat& WXUNUSED(format) ) wxOVERRIDE
{ {
return 0; return 0;
} }
virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size, virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size,
const wxDataFormat& WXUNUSED(format) ) const wxDataFormat& WXUNUSED(format) ) wxOVERRIDE
{ {
// CFSTR_SHELLURL is _always_ ANSI text // CFSTR_SHELLURL is _always_ ANSI text
*size = strlen( (const char*)buffer ); *size = strlen( (const char*)buffer );
@@ -1391,7 +1391,7 @@ public:
} }
virtual void* SetSizeInBuffer( void* buffer, size_t WXUNUSED(size), virtual void* SetSizeInBuffer( void* buffer, size_t WXUNUSED(size),
const wxDataFormat& WXUNUSED(format) ) const wxDataFormat& WXUNUSED(format) ) wxOVERRIDE
{ {
return buffer; return buffer;
} }

4
src/msw/ole/dropsrc.cpp
View File

@@ -49,8 +49,8 @@ public:
virtual ~wxIDropSource() { } virtual ~wxIDropSource() { }
// IDropSource // IDropSource
STDMETHODIMP QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState); STDMETHODIMP QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState) wxOVERRIDE;
STDMETHODIMP GiveFeedback(DWORD dwEffect); STDMETHODIMP GiveFeedback(DWORD dwEffect) wxOVERRIDE;
DECLARE_IUNKNOWN_METHODS; DECLARE_IUNKNOWN_METHODS;

8
src/msw/ole/droptgt.cpp
View File

@@ -81,10 +81,10 @@ public:
void SetHwnd(HWND hwnd) { m_hwnd = hwnd; } void SetHwnd(HWND hwnd) { m_hwnd = hwnd; }
// IDropTarget methods // IDropTarget methods
STDMETHODIMP DragEnter(LPDATAOBJECT, DWORD, POINTL, LPDWORD); STDMETHODIMP DragEnter(LPDATAOBJECT, DWORD, POINTL, LPDWORD) wxOVERRIDE;
STDMETHODIMP DragOver(DWORD, POINTL, LPDWORD); STDMETHODIMP DragOver(DWORD, POINTL, LPDWORD) wxOVERRIDE;
STDMETHODIMP DragLeave(); STDMETHODIMP DragLeave() wxOVERRIDE;
STDMETHODIMP Drop(LPDATAOBJECT, DWORD, POINTL, LPDWORD); STDMETHODIMP Drop(LPDATAOBJECT, DWORD, POINTL, LPDWORD) wxOVERRIDE;
DECLARE_IUNKNOWN_METHODS; DECLARE_IUNKNOWN_METHODS;

2
src/msw/renderer.cpp
View File

@@ -164,7 +164,7 @@ public:
virtual void DrawComboBoxDropButton(wxWindow *win, virtual void DrawComboBoxDropButton(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0) = 0; int flags = 0) wxOVERRIDE = 0;
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

14
src/msw/richtooltip.cpp
View File

@@ -76,7 +76,7 @@ public:
} }
virtual void SetBackgroundColour(const wxColour& col, virtual void SetBackgroundColour(const wxColour& col,
const wxColour& colEnd) const wxColour& colEnd) wxOVERRIDE
{ {
// Setting background colour is not supported neither. // Setting background colour is not supported neither.
m_canUseNative = false; m_canUseNative = false;
@@ -84,7 +84,7 @@ public:
wxRichToolTipGenericImpl::SetBackgroundColour(col, colEnd); wxRichToolTipGenericImpl::SetBackgroundColour(col, colEnd);
} }
virtual void SetCustomIcon(const wxIcon& icon) virtual void SetCustomIcon(const wxIcon& icon) wxOVERRIDE
{ {
// Custom icons are not supported by EM_SHOWBALLOONTIP. // Custom icons are not supported by EM_SHOWBALLOONTIP.
m_canUseNative = false; m_canUseNative = false;
@@ -92,7 +92,7 @@ public:
wxRichToolTipGenericImpl::SetCustomIcon(icon); wxRichToolTipGenericImpl::SetCustomIcon(icon);
} }
virtual void SetStandardIcon(int icon) virtual void SetStandardIcon(int icon) wxOVERRIDE
{ {
wxRichToolTipGenericImpl::SetStandardIcon(icon); wxRichToolTipGenericImpl::SetStandardIcon(icon);
if ( !m_canUseNative ) if ( !m_canUseNative )
@@ -123,7 +123,7 @@ public:
} }
virtual void SetTimeout(unsigned millisecondsTimeout, virtual void SetTimeout(unsigned millisecondsTimeout,
unsigned millisecondsDelay) unsigned millisecondsDelay) wxOVERRIDE
{ {
// We don't support changing the timeout or the delay // We don't support changing the timeout or the delay
// (maybe TTM_SETDELAYTIME could be used for this?). // (maybe TTM_SETDELAYTIME could be used for this?).
@@ -133,7 +133,7 @@ public:
millisecondsDelay); millisecondsDelay);
} }
virtual void SetTipKind(wxTipKind tipKind) virtual void SetTipKind(wxTipKind tipKind) wxOVERRIDE
{ {
// Setting non-default tip is not supported. // Setting non-default tip is not supported.
if ( tipKind != wxTipKind_Auto ) if ( tipKind != wxTipKind_Auto )
@@ -142,7 +142,7 @@ public:
wxRichToolTipGenericImpl::SetTipKind(tipKind); wxRichToolTipGenericImpl::SetTipKind(tipKind);
} }
virtual void SetTitleFont(const wxFont& font) virtual void SetTitleFont(const wxFont& font) wxOVERRIDE
{ {
// Setting non-default font is not supported. // Setting non-default font is not supported.
m_canUseNative = false; m_canUseNative = false;
@@ -150,7 +150,7 @@ public:
wxRichToolTipGenericImpl::SetTitleFont(font); wxRichToolTipGenericImpl::SetTitleFont(font);
} }
virtual void ShowFor(wxWindow* win, const wxRect* rect) virtual void ShowFor(wxWindow* win, const wxRect* rect) wxOVERRIDE
{ {
// TODO: We could use native tooltip control to show native balloon // TODO: We could use native tooltip control to show native balloon
// tooltips for any window but right now we use the simple // tooltips for any window but right now we use the simple

20
src/msw/textctrl.cpp
View File

@@ -168,17 +168,17 @@ public:
wxTextCtrlOleCallback(wxTextCtrl *text) : m_textCtrl(text), m_menu(NULL) {} wxTextCtrlOleCallback(wxTextCtrl *text) : m_textCtrl(text), m_menu(NULL) {}
virtual ~wxTextCtrlOleCallback() { DeleteContextMenuObject(); } virtual ~wxTextCtrlOleCallback() { DeleteContextMenuObject(); }
STDMETHODIMP ContextSensitiveHelp(BOOL WXUNUSED(enterMode)) { return E_NOTIMPL; } STDMETHODIMP ContextSensitiveHelp(BOOL WXUNUSED(enterMode)) wxOVERRIDE { return E_NOTIMPL; }
STDMETHODIMP DeleteObject(LPOLEOBJECT WXUNUSED(oleobj)) { return E_NOTIMPL; } STDMETHODIMP DeleteObject(LPOLEOBJECT WXUNUSED(oleobj)) wxOVERRIDE { return E_NOTIMPL; }
STDMETHODIMP GetClipboardData(CHARRANGE* WXUNUSED(chrg), DWORD WXUNUSED(reco), LPDATAOBJECT* WXUNUSED(dataobj)) { return E_NOTIMPL; } STDMETHODIMP GetClipboardData(CHARRANGE* WXUNUSED(chrg), DWORD WXUNUSED(reco), LPDATAOBJECT* WXUNUSED(dataobj)) wxOVERRIDE { return E_NOTIMPL; }
STDMETHODIMP GetDragDropEffect(BOOL WXUNUSED(drag), DWORD WXUNUSED(grfKeyState), LPDWORD WXUNUSED(effect)) { return E_NOTIMPL; } STDMETHODIMP GetDragDropEffect(BOOL WXUNUSED(drag), DWORD WXUNUSED(grfKeyState), LPDWORD WXUNUSED(effect)) wxOVERRIDE { return E_NOTIMPL; }
STDMETHODIMP GetInPlaceContext(LPOLEINPLACEFRAME* WXUNUSED(frame), LPOLEINPLACEUIWINDOW* WXUNUSED(doc), LPOLEINPLACEFRAMEINFO WXUNUSED(frameInfo)) { return E_NOTIMPL; } STDMETHODIMP GetInPlaceContext(LPOLEINPLACEFRAME* WXUNUSED(frame), LPOLEINPLACEUIWINDOW* WXUNUSED(doc), LPOLEINPLACEFRAMEINFO WXUNUSED(frameInfo)) wxOVERRIDE { return E_NOTIMPL; }
STDMETHODIMP GetNewStorage(LPSTORAGE *WXUNUSED(stg)) { return E_NOTIMPL; } STDMETHODIMP GetNewStorage(LPSTORAGE *WXUNUSED(stg)) wxOVERRIDE { return E_NOTIMPL; }
STDMETHODIMP QueryAcceptData(LPDATAOBJECT WXUNUSED(dataobj), CLIPFORMAT* WXUNUSED(format), DWORD WXUNUSED(reco), BOOL WXUNUSED(really), HGLOBAL WXUNUSED(hMetaPict)) { return E_NOTIMPL; } STDMETHODIMP QueryAcceptData(LPDATAOBJECT WXUNUSED(dataobj), CLIPFORMAT* WXUNUSED(format), DWORD WXUNUSED(reco), BOOL WXUNUSED(really), HGLOBAL WXUNUSED(hMetaPict)) wxOVERRIDE { return E_NOTIMPL; }
STDMETHODIMP QueryInsertObject(LPCLSID WXUNUSED(clsid), LPSTORAGE WXUNUSED(stg), LONG WXUNUSED(cp)) { return E_NOTIMPL; } STDMETHODIMP QueryInsertObject(LPCLSID WXUNUSED(clsid), LPSTORAGE WXUNUSED(stg), LONG WXUNUSED(cp)) wxOVERRIDE { return E_NOTIMPL; }
STDMETHODIMP ShowContainerUI(BOOL WXUNUSED(show)) { return E_NOTIMPL; } STDMETHODIMP ShowContainerUI(BOOL WXUNUSED(show)) wxOVERRIDE { return E_NOTIMPL; }
STDMETHODIMP GetContextMenu(WORD WXUNUSED(seltype), LPOLEOBJECT WXUNUSED(oleobj), CHARRANGE* WXUNUSED(chrg), HMENU *menu) STDMETHODIMP GetContextMenu(WORD WXUNUSED(seltype), LPOLEOBJECT WXUNUSED(oleobj), CHARRANGE* WXUNUSED(chrg), HMENU *menu) wxOVERRIDE
{ {
// 'menu' will be shown and destroyed by the caller. We need to keep // 'menu' will be shown and destroyed by the caller. We need to keep
// its wx counterpart, the wxMenu instance, around until it is // its wx counterpart, the wxMenu instance, around until it is

4
src/msw/utilsexc.cpp
View File

@@ -135,8 +135,8 @@ public:
class wxExecuteModule : public wxModule class wxExecuteModule : public wxModule
{ {
public: public:
virtual bool OnInit() { return true; } virtual bool OnInit() wxOVERRIDE { return true; }
virtual void OnExit() virtual void OnExit() wxOVERRIDE
{ {
if ( gs_heventShutdown.IsOk() ) if ( gs_heventShutdown.IsOk() )
{ {

2
src/stc/stc.h.in
View File

@@ -609,7 +609,7 @@ public:
bool GetControl() const; bool GetControl() const;
bool GetAlt() const; bool GetAlt() const;
virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); } virtual wxEvent* Clone() const wxOVERRIDE { return new wxStyledTextEvent(*this); }
#ifndef SWIG #ifndef SWIG
private: private: