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

use wxOVERRIDE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-03-30 00:02:23 +00:00
parent ddd7ce624a
commit 8b4ae731d3
460 changed files with 4103 additions and 4107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/aui/tabartgtk.h
View File

@@ -31,9 +31,9 @@ class WXDLLIMPEXP_AUI wxAuiGtkTabArt : public wxAuiGenericTabArt
public:
wxAuiGtkTabArt();
virtual wxAuiTabArt* Clone();
virtual void DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect);
virtual void DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect);
virtual wxAuiTabArt* Clone() wxOVERRIDE;
virtual void DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect) wxOVERRIDE;
virtual void DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect) wxOVERRIDE;
virtual void DrawTab(wxDC& dc,
wxWindow* wnd,
const wxAuiNotebookPage& page,
@@ -41,16 +41,16 @@ public:
int close_button_state,
wxRect* out_tab_rect,
wxRect* out_button_rect,
int* x_extent);
int* x_extent) wxOVERRIDE;
void DrawButton(wxDC& dc, wxWindow* wnd, const wxRect& in_rect, int bitmap_id,
int button_state, int orientation, wxRect* out_rect);
int button_state, int orientation, wxRect* out_rect) wxOVERRIDE;
int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages,
const wxSize& required_bmp_size);
int GetBorderWidth(wxWindow* wnd);
int GetAdditionalBorderSpace(wxWindow* wnd);
const wxSize& required_bmp_size) wxOVERRIDE;
int GetBorderWidth(wxWindow* wnd) wxOVERRIDE;
int GetAdditionalBorderSpace(wxWindow* wnd) wxOVERRIDE;
virtual wxSize GetTabSize(wxDC& dc, wxWindow* wnd, const wxString& caption,
const wxBitmap& bitmap, bool active,
int close_button_state, int* x_extent);
int close_button_state, int* x_extent) wxOVERRIDE;
};
#endif // wxUSE_AUI