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

use wxOVERRIDE in wxMSW sources

Browse Source
This commit is contained in:
Paul Cornett
2016-09-23 07:59:11 -07:00
parent 9b477e46e5
commit 9b19a6e529
121 changed files with 1454 additions and 1454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/msw/combo.h
View File

@@ -64,8 +64,8 @@ public:
virtual ~wxComboCtrl();
virtual void PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const;
virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const;
virtual void PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const wxOVERRIDE;
virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const wxOVERRIDE;
static int GetFeatures() { return wxComboCtrlFeatures::All; }
@@ -75,23 +75,23 @@ public:
protected:
void DoTimerEvent();
virtual bool AnimateShow( const wxRect& rect, int flags );
virtual bool AnimateShow( const wxRect& rect, int flags ) wxOVERRIDE;
#endif // wxUSE_COMBOCTRL_POPUP_ANIMATION
protected:
// Dummy method - we override all functions that call this
virtual WXHWND GetEditHWND() const { return NULL; }
virtual WXHWND GetEditHWND() const wxOVERRIDE { return NULL; }
// customization
virtual void OnResize();
virtual wxCoord GetNativeTextIndent() const;
virtual void OnResize() wxOVERRIDE;
virtual wxCoord GetNativeTextIndent() const wxOVERRIDE;
// event handlers
void OnPaintEvent( wxPaintEvent& event );
void OnMouseEvent( wxMouseEvent& event );
virtual bool HasTransparentBackground() { return IsDoubleBuffered(); }
virtual bool HasTransparentBackground() wxOVERRIDE { return IsDoubleBuffered(); }
private:
void Init();