More use of wxOVERRIDE

This commit is contained in:
Maarten Bent
2018-03-06 23:12:19 +01:00
parent 2881d9875a
commit 3b9aeaeb2f
17 changed files with 97 additions and 97 deletions

View File

@@ -1893,7 +1893,7 @@ public:
bool IsGestureEnd() const { return m_isEnd; } bool IsGestureEnd() const { return m_isEnd; }
void SetGestureEnd(bool isEnd = true) { m_isEnd = isEnd; } void SetGestureEnd(bool isEnd = true) { m_isEnd = isEnd; }
virtual wxEvent *Clone() const { return new wxGestureEvent(*this); } virtual wxEvent *Clone() const wxOVERRIDE { return new wxGestureEvent(*this); }
protected: protected:
wxPoint m_pos; wxPoint m_pos;
@@ -1926,7 +1926,7 @@ public:
wxPoint GetDelta() const { return m_delta; } wxPoint GetDelta() const { return m_delta; }
void SetDelta(const wxPoint& delta) { m_delta = delta; } void SetDelta(const wxPoint& delta) { m_delta = delta; }
virtual wxEvent *Clone() const { return new wxPanGestureEvent(*this); } virtual wxEvent *Clone() const wxOVERRIDE { return new wxPanGestureEvent(*this); }
private: private:
wxPoint m_delta; wxPoint m_delta;
@@ -1955,7 +1955,7 @@ public:
double GetZoomFactor() const { return m_zoomFactor; } double GetZoomFactor() const { return m_zoomFactor; }
void SetZoomFactor(double zoomFactor) { m_zoomFactor = zoomFactor; } void SetZoomFactor(double zoomFactor) { m_zoomFactor = zoomFactor; }
virtual wxEvent *Clone() const { return new wxZoomGestureEvent(*this); } virtual wxEvent *Clone() const wxOVERRIDE { return new wxZoomGestureEvent(*this); }
private: private:
double m_zoomFactor; double m_zoomFactor;
@@ -1984,7 +1984,7 @@ public:
double GetRotationAngle() const { return m_rotationAngle; } double GetRotationAngle() const { return m_rotationAngle; }
void SetRotationAngle(double rotationAngle) { m_rotationAngle = rotationAngle; } void SetRotationAngle(double rotationAngle) { m_rotationAngle = rotationAngle; }
virtual wxEvent *Clone() const { return new wxRotateGestureEvent(*this); } virtual wxEvent *Clone() const wxOVERRIDE { return new wxRotateGestureEvent(*this); }
private: private:
double m_rotationAngle; double m_rotationAngle;
@@ -2008,7 +2008,7 @@ public:
wxTwoFingerTapEvent(const wxTwoFingerTapEvent& event) : wxGestureEvent(event) wxTwoFingerTapEvent(const wxTwoFingerTapEvent& event) : wxGestureEvent(event)
{ } { }
virtual wxEvent *Clone() const { return new wxTwoFingerTapEvent(*this); } virtual wxEvent *Clone() const wxOVERRIDE { return new wxTwoFingerTapEvent(*this); }
private: private:
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTwoFingerTapEvent); wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTwoFingerTapEvent);
@@ -2030,7 +2030,7 @@ public:
wxLongPressEvent(const wxLongPressEvent& event) : wxGestureEvent(event) wxLongPressEvent(const wxLongPressEvent& event) : wxGestureEvent(event)
{ } { }
virtual wxEvent *Clone() const { return new wxLongPressEvent(*this); } virtual wxEvent *Clone() const wxOVERRIDE { return new wxLongPressEvent(*this); }
private: private:
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxLongPressEvent); wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxLongPressEvent);
}; };
@@ -2051,7 +2051,7 @@ public:
wxPressAndTapEvent(const wxPressAndTapEvent& event) : wxGestureEvent(event) wxPressAndTapEvent(const wxPressAndTapEvent& event) : wxGestureEvent(event)
{ } { }
virtual wxEvent *Clone() const { return new wxPressAndTapEvent(*this); } virtual wxEvent *Clone() const wxOVERRIDE { return new wxPressAndTapEvent(*this); }
private: private:
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPressAndTapEvent); wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPressAndTapEvent);
}; };

View File

@@ -746,9 +746,9 @@ public: \
const wxArrayString& value = wxArrayString() ); \ const wxArrayString& value = wxArrayString() ); \
~PROPNAME(); \ ~PROPNAME(); \
virtual bool OnEvent( wxPropertyGrid* propgrid, \ virtual bool OnEvent( wxPropertyGrid* propgrid, \
wxWindow* primary, wxEvent& event ); \ wxWindow* primary, wxEvent& event ) wxOVERRIDE; \
virtual bool OnCustomStringEdit( wxWindow* parent, wxString& value ); \ virtual bool OnCustomStringEdit( wxWindow* parent, wxString& value ) wxOVERRIDE; \
virtual wxValidator* DoGetValidator() const; \ virtual wxValidator* DoGetValidator() const wxOVERRIDE; \
}; };
#define WX_PG_DECLARE_ARRAYSTRING_PROPERTY_WITH_VALIDATOR(PROPNAM) \ #define WX_PG_DECLARE_ARRAYSTRING_PROPERTY_WITH_VALIDATOR(PROPNAM) \

View File

@@ -159,14 +159,14 @@ public:
wxIPV6address(const wxIPV6address& other) : wxIPaddress(other) { } wxIPV6address(const wxIPV6address& other) : wxIPaddress(other) { }
// implement wxSockAddress pure virtuals: // implement wxSockAddress pure virtuals:
virtual Family Type() { return IPV6; } virtual Family Type() wxOVERRIDE { return IPV6; }
virtual wxSockAddress *Clone() const { return new wxIPV6address(*this); } virtual wxSockAddress *Clone() const wxOVERRIDE { return new wxIPV6address(*this); }
// implement wxIPaddress pure virtuals: // implement wxIPaddress pure virtuals:
virtual bool IsLocalHost() const; virtual bool IsLocalHost() const wxOVERRIDE;
virtual wxString IPAddress() const; virtual wxString IPAddress() const wxOVERRIDE;
// IPv6-specific methods: // IPv6-specific methods:
bool Hostname(unsigned char addr[16]); bool Hostname(unsigned char addr[16]);
@@ -174,7 +174,7 @@ public:
using wxIPaddress::Hostname; using wxIPaddress::Hostname;
private: private:
virtual void DoInitImpl(); virtual void DoInitImpl() wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxIPV6address); wxDECLARE_DYNAMIC_CLASS(wxIPV6address);
}; };

View File

@@ -2079,35 +2079,35 @@ public:
// Can return either a child object, or an integer // Can return either a child object, or an integer
// representing the child element, starting from 1. // representing the child element, starting from 1.
virtual wxAccStatus HitTest(const wxPoint& pt, int* childId, wxAccessible** childObject); virtual wxAccStatus HitTest(const wxPoint& pt, int* childId, wxAccessible** childObject) wxOVERRIDE;
// Returns the rectangle for this object (id = 0) or a child element (id > 0). // Returns the rectangle for this object (id = 0) or a child element (id > 0).
virtual wxAccStatus GetLocation(wxRect& rect, int elementId); virtual wxAccStatus GetLocation(wxRect& rect, int elementId) wxOVERRIDE;
// Navigates from fromId to toId/toObject. // Navigates from fromId to toId/toObject.
virtual wxAccStatus Navigate(wxNavDir navDir, int fromId, virtual wxAccStatus Navigate(wxNavDir navDir, int fromId,
int* toId, wxAccessible** toObject); int* toId, wxAccessible** toObject) wxOVERRIDE;
// Gets the name of the specified object. // Gets the name of the specified object.
virtual wxAccStatus GetName(int childId, wxString* name); virtual wxAccStatus GetName(int childId, wxString* name) wxOVERRIDE;
// Gets the number of children. // Gets the number of children.
virtual wxAccStatus GetChildCount(int* childCount); virtual wxAccStatus GetChildCount(int* childCount) wxOVERRIDE;
// Gets the specified child (starting from 1). // Gets the specified child (starting from 1).
// If *child is NULL and return value is wxACC_OK, // If *child is NULL and return value is wxACC_OK,
// this means that the child is a simple element and // this means that the child is a simple element and
// not an accessible object. // not an accessible object.
virtual wxAccStatus GetChild(int childId, wxAccessible** child); virtual wxAccStatus GetChild(int childId, wxAccessible** child) wxOVERRIDE;
// Gets the parent, or NULL. // Gets the parent, or NULL.
virtual wxAccStatus GetParent(wxAccessible** parent); virtual wxAccStatus GetParent(wxAccessible** parent) wxOVERRIDE;
// Performs the default action. childId is 0 (the action for this object) // Performs the default action. childId is 0 (the action for this object)
// or > 0 (the action for a child). // or > 0 (the action for a child).
// Return wxACC_NOT_SUPPORTED if there is no default action for this // Return wxACC_NOT_SUPPORTED if there is no default action for this
// window (e.g. an edit control). // window (e.g. an edit control).
virtual wxAccStatus DoDefaultAction(int childId); virtual wxAccStatus DoDefaultAction(int childId) wxOVERRIDE;
// Gets the default action for this object (0) or > 0 (the action for a child). // Gets the default action for this object (0) or > 0 (the action for a child).
// Return wxACC_OK even if there is no action. actionName is the action, or the empty // Return wxACC_OK even if there is no action. actionName is the action, or the empty
@@ -2115,36 +2115,36 @@ public:
// The retrieved string describes the action that is performed on an object, // The retrieved string describes the action that is performed on an object,
// not what the object does as a result. For example, a toolbar button that prints // not what the object does as a result. For example, a toolbar button that prints
// a document has a default action of "Press" rather than "Prints the current document." // a document has a default action of "Press" rather than "Prints the current document."
virtual wxAccStatus GetDefaultAction(int childId, wxString* actionName); virtual wxAccStatus GetDefaultAction(int childId, wxString* actionName) wxOVERRIDE;
// Returns the description for this object or a child. // Returns the description for this object or a child.
virtual wxAccStatus GetDescription(int childId, wxString* description); virtual wxAccStatus GetDescription(int childId, wxString* description) wxOVERRIDE;
// Returns help text for this object or a child, similar to tooltip text. // Returns help text for this object or a child, similar to tooltip text.
virtual wxAccStatus GetHelpText(int childId, wxString* helpText); virtual wxAccStatus GetHelpText(int childId, wxString* helpText) wxOVERRIDE;
// Returns the keyboard shortcut for this object or child. // Returns the keyboard shortcut for this object or child.
// Return e.g. ALT+K // Return e.g. ALT+K
virtual wxAccStatus GetKeyboardShortcut(int childId, wxString* shortcut); virtual wxAccStatus GetKeyboardShortcut(int childId, wxString* shortcut) wxOVERRIDE;
// Returns a role constant. // Returns a role constant.
virtual wxAccStatus GetRole(int childId, wxAccRole* role); virtual wxAccStatus GetRole(int childId, wxAccRole* role) wxOVERRIDE;
// Returns a state constant. // Returns a state constant.
virtual wxAccStatus GetState(int childId, long* state); virtual wxAccStatus GetState(int childId, long* state) wxOVERRIDE;
// Returns a localized string representing the value for the object // Returns a localized string representing the value for the object
// or child. // or child.
virtual wxAccStatus GetValue(int childId, wxString* strValue); virtual wxAccStatus GetValue(int childId, wxString* strValue) wxOVERRIDE;
// Selects the object or child. // Selects the object or child.
virtual wxAccStatus Select(int childId, wxAccSelectionFlags selectFlags); virtual wxAccStatus Select(int childId, wxAccSelectionFlags selectFlags) wxOVERRIDE;
// Gets the window with the keyboard focus. // Gets the window with the keyboard focus.
// If childId is 0 and child is NULL, no object in // If childId is 0 and child is NULL, no object in
// this subhierarchy has the focus. // this subhierarchy has the focus.
// If this object has the focus, child should be 'this'. // If this object has the focus, child should be 'this'.
virtual wxAccStatus GetFocus(int* childId, wxAccessible** child); virtual wxAccStatus GetFocus(int* childId, wxAccessible** child) wxOVERRIDE;
#if wxUSE_VARIANT #if wxUSE_VARIANT
// Gets a variant representing the selected children // Gets a variant representing the selected children
@@ -2155,7 +2155,7 @@ public:
// - an integer representing the selected child element, // - an integer representing the selected child element,
// or 0 if this object is selected (GetType() == wxT("long") // or 0 if this object is selected (GetType() == wxT("long")
// - a "void*" pointer to a wxAccessible child object // - a "void*" pointer to a wxAccessible child object
virtual wxAccStatus GetSelections(wxVariant* selections); virtual wxAccStatus GetSelections(wxVariant* selections) wxOVERRIDE;
#endif // wxUSE_VARIANT #endif // wxUSE_VARIANT
}; };

View File

@@ -14,7 +14,7 @@
class MyApp : public wxApp class MyApp : public wxApp
{ {
public: public:
bool OnInit(); bool OnInit() wxOVERRIDE;
}; };
// Define a new frame // Define a new frame

View File

@@ -141,7 +141,7 @@ class wxMediaPlayerApp : public wxApp
{ {
public: public:
#ifdef __WXMAC__ #ifdef __WXMAC__
virtual void MacOpenFiles(const wxArrayString & fileNames ); virtual void MacOpenFiles(const wxArrayString & fileNames ) wxOVERRIDE;
#endif #endif
#if wxUSE_CMDLINE_PARSER #if wxUSE_CMDLINE_PARSER

View File

@@ -38,7 +38,7 @@
// Define a new application type // Define a new application type
class MyApp: public wxApp class MyApp: public wxApp
{ public: { public:
bool OnInit(void); bool OnInit(void) wxOVERRIDE;
}; };
// Define a new frame type // Define a new frame type

View File

@@ -57,7 +57,7 @@ public:
// this one is called on application startup and is a good place for the app // this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error // initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates) // return: if OnInit() returns false, the application terminates)
virtual bool OnInit(); virtual bool OnInit() wxOVERRIDE;
}; };
// Define a new frame type: this is going to be our main frame // Define a new frame type: this is going to be our main frame

View File

@@ -266,7 +266,7 @@ wxEND_EVENT_TABLE()
class MyApp : public wxApp class MyApp : public wxApp
{ {
public: public:
virtual bool OnInit() virtual bool OnInit() wxOVERRIDE
{ {
new MyFrame; new MyFrame;

View File

@@ -50,7 +50,7 @@ struct MySettings
class MyApp : public wxApp class MyApp : public wxApp
{ {
public: public:
virtual bool OnInit(); virtual bool OnInit() wxOVERRIDE;
void ShowPreferencesEditor(wxWindow* parent); void ShowPreferencesEditor(wxWindow* parent);
void DismissPreferencesEditor(); void DismissPreferencesEditor();
@@ -156,7 +156,7 @@ public:
this); this);
} }
virtual bool TransferDataToWindow() virtual bool TransferDataToWindow() wxOVERRIDE
{ {
m_settingsCurrent = wxGetApp().GetSettings(); m_settingsCurrent = wxGetApp().GetSettings();
m_useMarkdown->SetValue(m_settingsCurrent.m_useMarkdown); m_useMarkdown->SetValue(m_settingsCurrent.m_useMarkdown);
@@ -164,7 +164,7 @@ public:
return true; return true;
} }
virtual bool TransferDataFromWindow() virtual bool TransferDataFromWindow() wxOVERRIDE
{ {
// Called on platforms with modal preferences dialog to save and apply // Called on platforms with modal preferences dialog to save and apply
// the changes. // the changes.
@@ -211,7 +211,7 @@ class PrefsPageGeneral : public wxStockPreferencesPage
{ {
public: public:
PrefsPageGeneral() : wxStockPreferencesPage(Kind_General) {} PrefsPageGeneral() : wxStockPreferencesPage(Kind_General) {}
virtual wxWindow *CreateWindow(wxWindow *parent) virtual wxWindow *CreateWindow(wxWindow *parent) wxOVERRIDE
{ return new PrefsPageGeneralPanel(parent); } { return new PrefsPageGeneralPanel(parent); }
}; };
@@ -239,7 +239,7 @@ public:
} }
} }
virtual bool TransferDataToWindow() virtual bool TransferDataToWindow() wxOVERRIDE
{ {
// This is the place where you can initialize values, e.g. from wxConfig. // This is the place where you can initialize values, e.g. from wxConfig.
// For demonstration purposes, we just set hardcoded values. // For demonstration purposes, we just set hardcoded values.
@@ -248,7 +248,7 @@ public:
return true; return true;
} }
virtual bool TransferDataFromWindow() virtual bool TransferDataFromWindow() wxOVERRIDE
{ {
// Called on platforms with modal preferences dialog to save and apply // Called on platforms with modal preferences dialog to save and apply
// the changes. // the changes.
@@ -270,10 +270,10 @@ private:
class PrefsPageTopics : public wxPreferencesPage class PrefsPageTopics : public wxPreferencesPage
{ {
public: public:
virtual wxString GetName() const { return "Topics"; } virtual wxString GetName() const wxOVERRIDE { return "Topics"; }
virtual wxBitmap GetLargeIcon() const virtual wxBitmap GetLargeIcon() const wxOVERRIDE
{ return wxArtProvider::GetBitmap(wxART_HELP, wxART_TOOLBAR); } { return wxArtProvider::GetBitmap(wxART_HELP, wxART_TOOLBAR); }
virtual wxWindow *CreateWindow(wxWindow *parent) virtual wxWindow *CreateWindow(wxWindow *parent) wxOVERRIDE
{ return new PrefsPageTopicsPanel(parent); } { return new PrefsPageTopicsPanel(parent); }
}; };

View File

@@ -95,10 +95,10 @@ class App: public wxApp {
public: public:
//! the main function called during application start //! the main function called during application start
virtual bool OnInit (); virtual bool OnInit () wxOVERRIDE;
//! application exit function //! application exit function
virtual int OnExit (); virtual int OnExit () wxOVERRIDE;
private: private:
//! frame window //! frame window
@@ -762,7 +762,7 @@ public:
SetWrapMode(wxSTC_WRAP_WORD); SetWrapMode(wxSTC_WRAP_WORD);
SetWrapVisualFlags(wxSTC_WRAPVISUALFLAG_END); SetWrapVisualFlags(wxSTC_WRAPVISUALFLAG_END);
} }
virtual bool SetFont(const wxFont& font) virtual bool SetFont(const wxFont& font) wxOVERRIDE
{ {
StyleSetFont(wxSTC_STYLE_DEFAULT, (wxFont&)font); StyleSetFont(wxSTC_STYLE_DEFAULT, (wxFont&)font);
return wxStyledTextCtrl::SetFont(font); return wxStyledTextCtrl::SetFont(font);

View File

@@ -98,7 +98,7 @@ wxIcon CreateRandomIcon()
class MyApp : public wxApp class MyApp : public wxApp
{ {
public: public:
virtual bool OnInit(); virtual bool OnInit() wxOVERRIDE;
}; };
class MyFrame : public wxFrame class MyFrame : public wxFrame

View File

@@ -34,7 +34,7 @@ public:
// for the app initialization (doing it here and not in the ctor // for the app initialization (doing it here and not in the ctor
// allows to have an error return: if OnInit() returns false, the // allows to have an error return: if OnInit() returns false, the
// application terminates) // application terminates)
virtual bool OnInit(); virtual bool OnInit() wxOVERRIDE;
}; };

View File

@@ -140,8 +140,8 @@ class wxEventTableEntryModule: public wxModule
{ {
public: public:
wxEventTableEntryModule() { } wxEventTableEntryModule() { }
virtual bool OnInit() { return true; } virtual bool OnInit() wxOVERRIDE { return true; }
virtual void OnExit() { wxEventHashTable::ClearAll(); } virtual void OnExit() wxOVERRIDE { wxEventHashTable::ClearAll(); }
wxDECLARE_DYNAMIC_CLASS(wxEventTableEntryModule); wxDECLARE_DYNAMIC_CLASS(wxEventTableEntryModule);
}; };

View File

@@ -366,19 +366,19 @@ public:
virtual ~wxChmInputStream(); virtual ~wxChmInputStream();
/// Return the size of the accessed file in archive /// Return the size of the accessed file in archive
virtual size_t GetSize() const { return m_size; } virtual size_t GetSize() const wxOVERRIDE { return m_size; }
/// End of Stream? /// End of Stream?
virtual bool Eof() const; virtual bool Eof() const wxOVERRIDE;
/// Set simulation-mode of HHP-File (if non is found) /// Set simulation-mode of HHP-File (if non is found)
void SimulateHHP(bool sim) { m_simulateHHP = sim; } void SimulateHHP(bool sim) { m_simulateHHP = sim; }
protected: protected:
/// See wxInputStream /// See wxInputStream
virtual size_t OnSysRead(void *buffer, size_t bufsize); virtual size_t OnSysRead(void *buffer, size_t bufsize) wxOVERRIDE;
/// See wxInputStream /// See wxInputStream
virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode); virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode) wxOVERRIDE;
/// See wxInputStream /// See wxInputStream
virtual wxFileOffset OnSysTell() const { return m_pos; } virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; }
private: private:
size_t m_size; size_t m_size;
@@ -761,16 +761,16 @@ class wxChmFSHandler : public wxFileSystemHandler
public: public:
/// Constructor and Destructor /// Constructor and Destructor
wxChmFSHandler(); wxChmFSHandler();
virtual ~wxChmFSHandler(); virtual ~wxChmFSHandler() wxOVERRIDE;
/// Is able to open location? /// Is able to open location?
virtual bool CanOpen(const wxString& location); virtual bool CanOpen(const wxString& location) wxOVERRIDE;
/// Open a file /// Open a file
virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location); virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE;
/// Find first occurrence of spec /// Find first occurrence of spec
virtual wxString FindFirst(const wxString& spec, int flags = 0); virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE;
/// Find next occurrence of spec /// Find next occurrence of spec
virtual wxString FindNext(); virtual wxString FindNext() wxOVERRIDE;
private: private:
int m_lasterror; int m_lasterror;
@@ -912,12 +912,12 @@ class wxChmSupportModule : public wxModule
wxDECLARE_DYNAMIC_CLASS(wxChmSupportModule); wxDECLARE_DYNAMIC_CLASS(wxChmSupportModule);
public: public:
virtual bool OnInit() virtual bool OnInit() wxOVERRIDE
{ {
wxFileSystem::AddHandler(new wxChmFSHandler); wxFileSystem::AddHandler(new wxChmFSHandler);
return true; return true;
} }
virtual void OnExit() {} virtual void OnExit() wxOVERRIDE {}
} }
; ;

View File

@@ -69,10 +69,10 @@ public:
DECLARE_IUNKNOWN_METHODS; DECLARE_IUNKNOWN_METHODS;
// IEnumVARIANT // IEnumVARIANT
STDMETHODIMP Next(ULONG celt, VARIANT *rgelt, ULONG *pceltFetched); STDMETHODIMP Next(ULONG celt, VARIANT *rgelt, ULONG *pceltFetched) wxOVERRIDE;
STDMETHODIMP Skip(ULONG celt); STDMETHODIMP Skip(ULONG celt) wxOVERRIDE;
STDMETHODIMP Reset(); STDMETHODIMP Reset() wxOVERRIDE;
STDMETHODIMP Clone(IEnumVARIANT **ppenum); STDMETHODIMP Clone(IEnumVARIANT **ppenum) wxOVERRIDE;
private: private:
wxVariant m_variant; // List of further variants wxVariant m_variant; // List of further variants
@@ -191,86 +191,86 @@ public:
// Retrieves the child element or child object at a given point on the screen. // Retrieves the child element or child object at a given point on the screen.
// All visual objects support this method; sound objects do not support it. // All visual objects support this method; sound objects do not support it.
STDMETHODIMP accHitTest(LONG xLeft, LONG yLeft, VARIANT* pVarID); STDMETHODIMP accHitTest(LONG xLeft, LONG yLeft, VARIANT* pVarID) wxOVERRIDE;
// Retrieves the specified object's current screen location. All visual objects must // Retrieves the specified object's current screen location. All visual objects must
// support this method; sound objects do not support it. // support this method; sound objects do not support it.
STDMETHODIMP accLocation ( LONG* pxLeft, LONG* pyTop, LONG* pcxWidth, LONG* pcyHeight, VARIANT varID); STDMETHODIMP accLocation ( LONG* pxLeft, LONG* pyTop, LONG* pcxWidth, LONG* pcyHeight, VARIANT varID) wxOVERRIDE;
// Traverses to another user interface element within a container and retrieves the object. // Traverses to another user interface element within a container and retrieves the object.
// All visual objects must support this method. // All visual objects must support this method.
STDMETHODIMP accNavigate ( LONG navDir, VARIANT varStart, VARIANT* pVarEnd); STDMETHODIMP accNavigate ( LONG navDir, VARIANT varStart, VARIANT* pVarEnd) wxOVERRIDE;
// Retrieves the address of an IDispatch interface for the specified child. // Retrieves the address of an IDispatch interface for the specified child.
// All objects must support this property. // All objects must support this property.
STDMETHODIMP get_accChild ( VARIANT varChildID, IDispatch** ppDispChild); STDMETHODIMP get_accChild ( VARIANT varChildID, IDispatch** ppDispChild) wxOVERRIDE;
// Retrieves the number of children that belong to this object. // Retrieves the number of children that belong to this object.
// All objects must support this property. // All objects must support this property.
STDMETHODIMP get_accChildCount ( LONG* pCountChildren); STDMETHODIMP get_accChildCount ( LONG* pCountChildren) wxOVERRIDE;
// Retrieves the IDispatch interface of the object's parent. // Retrieves the IDispatch interface of the object's parent.
// All objects support this property. // All objects support this property.
STDMETHODIMP get_accParent ( IDispatch** ppDispParent); STDMETHODIMP get_accParent ( IDispatch** ppDispParent) wxOVERRIDE;
// Descriptive Properties and Methods // Descriptive Properties and Methods
// Performs the object's default action. Not all objects have a default // Performs the object's default action. Not all objects have a default
// action. // action.
STDMETHODIMP accDoDefaultAction(VARIANT varID); STDMETHODIMP accDoDefaultAction(VARIANT varID) wxOVERRIDE;
// Retrieves a string that describes the object's default action. // Retrieves a string that describes the object's default action.
// Not all objects have a default action. // Not all objects have a default action.
STDMETHODIMP get_accDefaultAction ( VARIANT varID, BSTR* pszDefaultAction); STDMETHODIMP get_accDefaultAction ( VARIANT varID, BSTR* pszDefaultAction) wxOVERRIDE;
// Retrieves a string that describes the visual appearance of the specified object. // Retrieves a string that describes the visual appearance of the specified object.
// Not all objects have a description. // Not all objects have a description.
STDMETHODIMP get_accDescription ( VARIANT varID, BSTR* pszDescription); STDMETHODIMP get_accDescription ( VARIANT varID, BSTR* pszDescription) wxOVERRIDE;
// Retrieves an object's Help property string. // Retrieves an object's Help property string.
// Not all objects support this property. // Not all objects support this property.
STDMETHODIMP get_accHelp ( VARIANT varID, BSTR* pszHelp); STDMETHODIMP get_accHelp ( VARIANT varID, BSTR* pszHelp) wxOVERRIDE;
// Retrieves the full path of the WinHelp file associated with the specified // Retrieves the full path of the WinHelp file associated with the specified
// object and the identifier of the appropriate topic within that file. // object and the identifier of the appropriate topic within that file.
// Not all objects support this property. // Not all objects support this property.
STDMETHODIMP get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, LONG* pidTopic); STDMETHODIMP get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, LONG* pidTopic) wxOVERRIDE;
// Retrieves the specified object's shortcut key or access key, also known as // Retrieves the specified object's shortcut key or access key, also known as
// the mnemonic. All objects that have a shortcut key or access key support // the mnemonic. All objects that have a shortcut key or access key support
// this property. // this property.
STDMETHODIMP get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKeyboardShortcut); STDMETHODIMP get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKeyboardShortcut) wxOVERRIDE;
// Retrieves the name of the specified object. // Retrieves the name of the specified object.
// All objects support this property. // All objects support this property.
STDMETHODIMP get_accName ( VARIANT varID, BSTR* pszName); STDMETHODIMP get_accName ( VARIANT varID, BSTR* pszName) wxOVERRIDE;
// Retrieves information that describes the role of the specified object. // Retrieves information that describes the role of the specified object.
// All objects support this property. // All objects support this property.
STDMETHODIMP get_accRole ( VARIANT varID, VARIANT* pVarRole); STDMETHODIMP get_accRole ( VARIANT varID, VARIANT* pVarRole) wxOVERRIDE;
// Retrieves the current state of the specified object. // Retrieves the current state of the specified object.
// All objects support this property. // All objects support this property.
STDMETHODIMP get_accState ( VARIANT varID, VARIANT* pVarState); STDMETHODIMP get_accState ( VARIANT varID, VARIANT* pVarState) wxOVERRIDE;
// Retrieves the value of the specified object. // Retrieves the value of the specified object.
// Not all objects have a value. // Not all objects have a value.
STDMETHODIMP get_accValue ( VARIANT varID, BSTR* pszValue); STDMETHODIMP get_accValue ( VARIANT varID, BSTR* pszValue) wxOVERRIDE;
// Selection and Focus // Selection and Focus
@@ -278,44 +278,44 @@ public:
// specified object. All objects that select or receive the // specified object. All objects that select or receive the
// keyboard focus must support this method. // keyboard focus must support this method.
STDMETHODIMP accSelect ( LONG flagsSelect, VARIANT varID ); STDMETHODIMP accSelect ( LONG flagsSelect, VARIANT varID ) wxOVERRIDE;
// Retrieves the object that has the keyboard focus. All objects // Retrieves the object that has the keyboard focus. All objects
// that receive the keyboard focus must support this property. // that receive the keyboard focus must support this property.
STDMETHODIMP get_accFocus ( VARIANT* pVarID); STDMETHODIMP get_accFocus ( VARIANT* pVarID) wxOVERRIDE;
// Retrieves the selected children of this object. All objects // Retrieves the selected children of this object. All objects
// selected must support this property. // selected must support this property.
STDMETHODIMP get_accSelection ( VARIANT * pVarChildren); STDMETHODIMP get_accSelection ( VARIANT * pVarChildren) wxOVERRIDE;
// Obsolete // Obsolete
STDMETHODIMP put_accName(VARIANT WXUNUSED(varChild), BSTR WXUNUSED(szName)) { return E_FAIL; } STDMETHODIMP put_accName(VARIANT WXUNUSED(varChild), BSTR WXUNUSED(szName)) wxOVERRIDE { return E_FAIL; }
STDMETHODIMP put_accValue(VARIANT WXUNUSED(varChild), BSTR WXUNUSED(szName)) { return E_FAIL; } STDMETHODIMP put_accValue(VARIANT WXUNUSED(varChild), BSTR WXUNUSED(szName)) wxOVERRIDE { return E_FAIL; }
// IDispatch // IDispatch
// Get type info // Get type info
STDMETHODIMP GetTypeInfo(unsigned int typeInfo, LCID lcid, ITypeInfo** ppTypeInfo); STDMETHODIMP GetTypeInfo(unsigned int typeInfo, LCID lcid, ITypeInfo** ppTypeInfo) wxOVERRIDE;
// Get type info count // Get type info count
STDMETHODIMP GetTypeInfoCount(unsigned int* typeInfoCount); STDMETHODIMP GetTypeInfoCount(unsigned int* typeInfoCount) wxOVERRIDE;
// Get ids of names // Get ids of names
STDMETHODIMP GetIDsOfNames(REFIID riid, OLECHAR** names, unsigned int cNames, STDMETHODIMP GetIDsOfNames(REFIID riid, OLECHAR** names, unsigned int cNames,
LCID lcid, DISPID* dispId); LCID lcid, DISPID* dispId) wxOVERRIDE;
// Invoke // Invoke
STDMETHODIMP Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, STDMETHODIMP Invoke(DISPID dispIdMember, REFIID riid, 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;
// Helpers // Helpers

View File

@@ -164,7 +164,7 @@ public:
private: private:
wxProgressDialogSharedData m_sharedData; wxProgressDialogSharedData m_sharedData;
virtual void* Entry(); virtual void* Entry() wxOVERRIDE;
static HRESULT CALLBACK TaskDialogCallbackProc(HWND hwnd, static HRESULT CALLBACK TaskDialogCallbackProc(HWND hwnd,
UINT uNotification, UINT uNotification,
@@ -187,7 +187,7 @@ public:
} }
protected: protected:
virtual void OnNextIteration() virtual void OnNextIteration() wxOVERRIDE
{ {
wxCriticalSectionLocker locker(m_data.m_cs); wxCriticalSectionLocker locker(m_data.m_cs);