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

More use of wxOVERRIDE

Browse Source
This commit is contained in:
Paul Cornett
2019-04-05 11:08:53 -07:00
parent 794c1374b8
commit 9511ab08f1
116 changed files with 874 additions and 873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/wx/osx/nonownedwnd.h
View File

@@ -63,16 +63,16 @@ public:
virtual void SubclassWin(WXWindow nativeWindow);
virtual void UnsubclassWin();
virtual wxPoint GetClientAreaOrigin() const;
virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE;
// implement base class pure virtuals
virtual bool SetTransparent(wxByte alpha);
virtual bool CanSetTransparent();
virtual bool SetTransparent(wxByte alpha) wxOVERRIDE;
virtual bool CanSetTransparent() wxOVERRIDE;
virtual bool SetBackgroundStyle(wxBackgroundStyle style);
virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE;
virtual void Update();
virtual void Update() wxOVERRIDE;
WXWindow GetWXWindow() const ;
static wxNonOwnedWindow* GetFromWXWindow( WXWindow win );
@@ -90,21 +90,21 @@ public:
static void MacDelayedDeactivation(long timestamp);
virtual void MacActivate( long timestamp , bool inIsActivating ) ;
virtual void SetWindowStyleFlag(long flags);
virtual void SetWindowStyleFlag(long flags) wxOVERRIDE;
virtual void Raise();
virtual void Lower();
virtual bool Show( bool show = true );
virtual void Raise() wxOVERRIDE;
virtual void Lower() wxOVERRIDE;
virtual bool Show( bool show = true ) wxOVERRIDE;
virtual void SetExtraStyle(long exStyle) ;
virtual void SetExtraStyle(long exStyle) wxOVERRIDE;
virtual bool SetBackgroundColour( const wxColour &colour );
virtual bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE;
wxNonOwnedWindowImpl* GetNonOwnedPeer() const { return m_nowpeer; }
#if wxOSX_USE_COCOA_OR_IPHONE
// override the base class method to return an NSWindow instead of NSView
virtual void *OSXGetViewOrWindow() const;
virtual void *OSXGetViewOrWindow() const wxOVERRIDE;
#endif // Cocoa
// osx specific event handling common for all osx-ports
@@ -120,25 +120,25 @@ public:
void WindowWasPainted();
virtual bool Destroy();
virtual bool Destroy() wxOVERRIDE;
protected:
// common part of all ctors
void Init();
virtual void DoGetPosition( int *x, int *y ) const;
virtual void DoGetSize( int *width, int *height ) const;
virtual void DoMoveWindow(int x, int y, int width, int height);
virtual void DoGetClientSize(int *width, int *height) const;
virtual void DoGetPosition( int *x, int *y ) const wxOVERRIDE;
virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE;
virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
virtual bool OSXShowWithEffect(bool show,
wxShowEffect effect,
unsigned timeout);
unsigned timeout) wxOVERRIDE;
virtual bool DoClearShape();
virtual bool DoSetRegionShape(const wxRegion& region);
virtual bool DoClearShape() wxOVERRIDE;
virtual bool DoSetRegionShape(const wxRegion& region) wxOVERRIDE;
#if wxUSE_GRAPHICS_CONTEXT
virtual bool DoSetPathShape(const wxGraphicsPath& path);
virtual bool DoSetPathShape(const wxGraphicsPath& path) wxOVERRIDE;
#endif // wxUSE_GRAPHICS_CONTEXT
virtual void WillBeDestroyed();