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

24
include/wx/msw/bmpcbox.h
View File

@@ -82,9 +82,9 @@ public:
virtual ~wxBitmapComboBox();
// Sets the image for the given item.
virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap);
virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap) wxOVERRIDE;
virtual bool SetFont(const wxFont& font);
virtual bool SetFont(const wxFont& font) wxOVERRIDE;
// Adds item with image to the end of the combo box.
int Append(const wxString& item, const wxBitmap& bitmap = wxNullBitmap);
@@ -101,25 +101,25 @@ public:
protected:
WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item) wxOVERRIDE;
virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item) wxOVERRIDE;
// Event handlers
void OnSize(wxSizeEvent& event);
virtual wxItemContainer* GetItemContainer() { return this; }
virtual wxWindow* GetControl() { return this; }
virtual wxItemContainer* GetItemContainer() wxOVERRIDE { return this; }
virtual wxWindow* GetControl() wxOVERRIDE { return this; }
// wxItemContainer implementation
virtual int DoInsertItems(const wxArrayStringsAdapter & items,
unsigned int pos,
void **clientData, wxClientDataType type);
virtual void DoClear();
virtual void DoDeleteOneItem(unsigned int n);
void **clientData, wxClientDataType type) wxOVERRIDE;
virtual void DoClear() wxOVERRIDE;
virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
virtual bool OnAddBitmap(const wxBitmap& bitmap);
virtual wxSize DoGetBestSize() const;
virtual bool OnAddBitmap(const wxBitmap& bitmap) wxOVERRIDE;
virtual wxSize DoGetBestSize() const wxOVERRIDE;
void RecreateControl();
private: