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

110
include/wx/osx/cocoa/private.h
View File

@@ -56,8 +56,8 @@ public :
void Init();
virtual bool IsVisible() const ;
virtual void SetVisibility(bool);
virtual bool IsVisible() const wxOVERRIDE;
virtual void SetVisibility(bool) wxOVERRIDE;
// we provide a static function which can be reused from
// wxNonOwnedWindowCocoaImpl too
@@ -68,70 +68,70 @@ public :
virtual bool ShowWithEffect(bool show,
wxShowEffect effect,
unsigned timeout);
unsigned timeout) wxOVERRIDE;
virtual void Raise();
virtual void Raise() wxOVERRIDE;
virtual void Lower();
virtual void Lower() wxOVERRIDE;
virtual void ScrollRect( const wxRect *rect, int dx, int dy );
virtual void ScrollRect( const wxRect *rect, int dx, int dy ) wxOVERRIDE;
virtual WXWidget GetWXWidget() const { return m_osxView; }
virtual WXWidget GetWXWidget() const wxOVERRIDE { return m_osxView; }
virtual void SetBackgroundColour(const wxColour&);
virtual bool SetBackgroundStyle(wxBackgroundStyle style);
virtual void SetBackgroundColour(const wxColour&) wxOVERRIDE;
virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE;
virtual void GetContentArea( int &left , int &top , int &width , int &height ) const;
virtual void Move(int x, int y, int width, int height);
virtual void GetPosition( int &x, int &y ) const;
virtual void GetSize( int &width, int &height ) const;
virtual void SetControlSize( wxWindowVariant variant );
virtual void GetContentArea( int &left, int &top, int &width, int &height ) const wxOVERRIDE;
virtual void Move(int x, int y, int width, int height) wxOVERRIDE;
virtual void GetPosition( int &x, int &y ) const wxOVERRIDE;
virtual void GetSize( int &width, int &height ) const wxOVERRIDE;
virtual void SetControlSize( wxWindowVariant variant ) wxOVERRIDE;
virtual void SetNeedsDisplay( const wxRect* where = NULL );
virtual bool GetNeedsDisplay() const;
virtual void SetNeedsDisplay( const wxRect* where = NULL ) wxOVERRIDE;
virtual bool GetNeedsDisplay() const wxOVERRIDE;
virtual void SetDrawingEnabled(bool enabled);
virtual void SetDrawingEnabled(bool enabled) wxOVERRIDE;
virtual bool CanFocus() const;
virtual bool CanFocus() const wxOVERRIDE;
// return true if successful
virtual bool SetFocus();
virtual bool HasFocus() const;
virtual bool SetFocus() wxOVERRIDE;
virtual bool HasFocus() const wxOVERRIDE;
void RemoveFromParent();
void Embed( wxWidgetImpl *parent );
void RemoveFromParent() wxOVERRIDE;
void Embed( wxWidgetImpl *parent ) wxOVERRIDE;
void SetDefaultButton( bool isDefault );
void PerformClick();
virtual void SetLabel(const wxString& title, wxFontEncoding encoding);
void SetDefaultButton( bool isDefault ) wxOVERRIDE;
void PerformClick() wxOVERRIDE;
virtual void SetLabel(const wxString& title, wxFontEncoding encoding) wxOVERRIDE;
void SetCursor( const wxCursor & cursor );
void CaptureMouse();
void ReleaseMouse();
void SetCursor( const wxCursor & cursor ) wxOVERRIDE;
void CaptureMouse() wxOVERRIDE;
void ReleaseMouse() wxOVERRIDE;
#if wxUSE_DRAG_AND_DROP
void SetDropTarget(wxDropTarget* target);
void SetDropTarget(wxDropTarget* target) wxOVERRIDE;
#endif
wxInt32 GetValue() const;
void SetValue( wxInt32 v );
wxBitmap GetBitmap() const;
void SetBitmap( const wxBitmap& bitmap );
void SetBitmapPosition( wxDirection dir );
void SetupTabs( const wxNotebook &notebook );
void GetBestRect( wxRect *r ) const;
bool IsEnabled() const;
void Enable( bool enable );
bool ButtonClickDidStateChange() { return true ;}
void SetMinimum( wxInt32 v );
void SetMaximum( wxInt32 v );
wxInt32 GetMinimum() const;
wxInt32 GetMaximum() const;
void PulseGauge();
void SetScrollThumb( wxInt32 value, wxInt32 thumbSize );
wxInt32 GetValue() const wxOVERRIDE;
void SetValue( wxInt32 v ) wxOVERRIDE;
wxBitmap GetBitmap() const wxOVERRIDE;
void SetBitmap( const wxBitmap& bitmap ) wxOVERRIDE;
void SetBitmapPosition( wxDirection dir ) wxOVERRIDE;
void SetupTabs( const wxNotebook &notebook ) wxOVERRIDE;
void GetBestRect( wxRect *r ) const wxOVERRIDE;
bool IsEnabled() const wxOVERRIDE;
void Enable( bool enable ) wxOVERRIDE;
bool ButtonClickDidStateChange() wxOVERRIDE { return true; }
void SetMinimum( wxInt32 v ) wxOVERRIDE;
void SetMaximum( wxInt32 v ) wxOVERRIDE;
wxInt32 GetMinimum() const wxOVERRIDE;
wxInt32 GetMaximum() const wxOVERRIDE;
void PulseGauge() wxOVERRIDE;
void SetScrollThumb( wxInt32 value, wxInt32 thumbSize ) wxOVERRIDE;
void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
void SetToolTip( wxToolTip* tooltip );
void SetFont( const wxFont & font, const wxColour& foreground, long windowStyle, bool ignoreBlack = true ) wxOVERRIDE;
void SetToolTip( wxToolTip* tooltip ) wxOVERRIDE;
void InstallEventHandler( WXWidget control = NULL );
bool EnableTouchEvents(int eventsMask);
void InstallEventHandler( WXWidget control = NULL ) wxOVERRIDE;
bool EnableTouchEvents(int eventsMask) wxOVERRIDE;
virtual bool ShouldHandleKeyNavigation(const wxKeyEvent &event) const;
bool DoHandleKeyNavigation(const wxKeyEvent &event);
@@ -162,7 +162,7 @@ public :
virtual bool IsFlipped() const { return m_isFlipped; }
#endif
virtual double GetContentScaleFactor() const;
virtual double GetContentScaleFactor() const wxOVERRIDE;
// cocoa thunk connected calls
@@ -242,7 +242,7 @@ public :
void GetPosition( int &x, int &y ) const wxOVERRIDE;
void GetSize( int &width, int &height ) const wxOVERRIDE;
void GetContentArea( int &left , int &top , int &width , int &height ) const wxOVERRIDE;
void GetContentArea( int &left, int &top, int &width, int &height ) const wxOVERRIDE;
bool SetShape(const wxRegion& region) wxOVERRIDE;
virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) wxOVERRIDE;
@@ -304,13 +304,13 @@ class wxButtonCocoaImpl : public wxWidgetCocoaImpl, public wxButtonImpl
{
public:
wxButtonCocoaImpl(wxWindowMac *wxpeer, wxNSButton *v);
virtual void SetBitmap(const wxBitmap& bitmap);
virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE;
#if wxUSE_MARKUP
virtual void SetLabelMarkup(const wxString& markup);
virtual void SetLabelMarkup(const wxString& markup) wxOVERRIDE;
#endif // wxUSE_MARKUP
void SetPressedBitmap( const wxBitmap& bitmap );
void GetLayoutInset(int &left , int &top , int &right, int &bottom) const;
void SetPressedBitmap( const wxBitmap& bitmap ) wxOVERRIDE;
void GetLayoutInset(int &left, int &top, int &right, int &bottom) const wxOVERRIDE;
void SetAcceleratorFromLabel(const wxString& label);
NSButton *GetNSButton() const;