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

Addition of missing overrides in statusbr.h and toolbar.h

Browse Source
This commit is contained in:
Hartwig
2015-11-22 09:52:21 +01:00
parent f659422405
commit c09ff65f7e
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/osx/statusbr.h
View File

@@ -27,13 +27,13 @@ public:
const wxString& name = wxStatusBarNameStr); const wxString& name = wxStatusBarNameStr);
// Implementation // Implementation
virtual void MacHiliteChanged(); virtual void MacHiliteChanged() wxOVERRIDE;
void OnPaint(wxPaintEvent& event); void OnPaint(wxPaintEvent& event);
protected: protected:
virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight); virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight) wxOVERRIDE;
virtual void DrawField(wxDC& dc, int i, int textHeight); virtual void DrawField(wxDC& dc, int i, int textHeight) wxOVERRIDE;
virtual void DoUpdateStatusText(int number = 0); virtual void DoUpdateStatusText(int number = 0) wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxStatusBarMac); wxDECLARE_DYNAMIC_CLASS(wxStatusBarMac);
wxDECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();

48
include/wx/osx/toolbar.h
View File

@@ -40,34 +40,34 @@ public:
long style = wxTB_DEFAULT_STYLE, long style = wxTB_DEFAULT_STYLE,
const wxString& name = wxToolBarNameStr); const wxString& name = wxToolBarNameStr);
virtual void SetWindowStyleFlag(long style); virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
virtual bool Destroy(); virtual bool Destroy() wxOVERRIDE;
// override/implement base class virtuals // override/implement base class virtuals
virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const; virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE;
#ifndef __WXOSX_IPHONE__ #ifndef __WXOSX_IPHONE__
virtual bool Show(bool show = true); virtual bool Show(bool show = true) wxOVERRIDE;
virtual bool IsShown() const; virtual bool IsShown() const wxOVERRIDE;
#endif #endif
virtual bool Realize(); virtual bool Realize() wxOVERRIDE;
virtual void SetToolBitmapSize(const wxSize& size); virtual void SetToolBitmapSize(const wxSize& size) wxOVERRIDE;
virtual wxSize GetToolSize() const; virtual wxSize GetToolSize() const wxOVERRIDE;
virtual void SetRows(int nRows); virtual void SetRows(int nRows) wxOVERRIDE;
virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap); virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap) wxOVERRIDE;
virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap); virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap) wxOVERRIDE;
#ifndef __WXOSX_IPHONE__ #ifndef __WXOSX_IPHONE__
// Add all the buttons // Add all the buttons
virtual wxString MacGetToolTipString( wxPoint &where ) ; virtual wxString MacGetToolTipString( wxPoint &where ) wxOVERRIDE;
void OnPaint(wxPaintEvent& event) ; void OnPaint(wxPaintEvent& event) ;
void OnMouse(wxMouseEvent& event) ; void OnMouse(wxMouseEvent& event) ;
virtual void MacSuperChangedPosition() ; virtual void MacSuperChangedPosition() wxOVERRIDE;
#endif #endif
#if wxOSX_USE_NATIVE_TOOLBAR #if wxOSX_USE_NATIVE_TOOLBAR
@@ -88,9 +88,9 @@ public:
wxItemKind kind = wxITEM_NORMAL, wxItemKind kind = wxITEM_NORMAL,
wxObject *clientData = NULL, wxObject *clientData = NULL,
const wxString& shortHelp = wxEmptyString, const wxString& shortHelp = wxEmptyString,
const wxString& longHelp = wxEmptyString); const wxString& longHelp = wxEmptyString) wxOVERRIDE;
virtual wxToolBarToolBase *CreateTool(wxControl *control, virtual wxToolBarToolBase *CreateTool(wxControl *control,
const wxString& label); const wxString& label) wxOVERRIDE;
protected: protected:
// common part of all ctors // common part of all ctors
@@ -98,21 +98,21 @@ protected:
void DoLayout(); void DoLayout();
void DoSetSize(int x, int y, int width, int height, int sizeFlags); void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE;
#ifndef __WXOSX_IPHONE__ #ifndef __WXOSX_IPHONE__
virtual void DoGetSize(int *width, int *height) const; virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
#endif #endif
#ifdef __WXOSX_COCOA__ #ifdef __WXOSX_COCOA__
virtual void DoGetPosition(int*x, int *y) const; virtual void DoGetPosition(int*x, int *y) const wxOVERRIDE;
#endif #endif
virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE;
virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool); virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE;
virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable); virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable) wxOVERRIDE;
virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle); virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE;
virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE;
wxDECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
#if wxOSX_USE_NATIVE_TOOLBAR #if wxOSX_USE_NATIVE_TOOLBAR