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

Addition of overrides in anybutton.h, collpaneg.h, notebook.h, spinctlg.h, srchctrl.h and radiobox.h

Browse Source
This commit is contained in:
Hartwig
2015-11-22 10:15:41 +01:00
parent 5e39dd361f
commit 308de8b69d
6 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
include/wx/osx/notebook.h
View File

@@ -57,44 +57,44 @@ public:
// set the currently selected page, return the index of the previously
// selected one (or wxNOT_FOUND on error)
// NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); }
int SetSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage, SetSelection_SendEvent); }
// changes selected page without sending events
int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); }
int ChangeSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage); }
// set/get the title of a page
bool SetPageText(size_t nPage, const wxString& strText);
wxString GetPageText(size_t nPage) const;
bool SetPageText(size_t nPage, const wxString& strText) wxOVERRIDE;
wxString GetPageText(size_t nPage) const wxOVERRIDE;
// sets/returns item's image index in the current image list
int GetPageImage(size_t nPage) const;
bool SetPageImage(size_t nPage, int nImage);
int GetPageImage(size_t nPage) const wxOVERRIDE;
bool SetPageImage(size_t nPage, int nImage) wxOVERRIDE;
// control the appearance of the notebook pages
// set the size (the same for all pages)
virtual void SetPageSize(const wxSize& size);
virtual void SetPageSize(const wxSize& size) wxOVERRIDE;
// set the padding between tabs (in pixels)
virtual void SetPadding(const wxSize& padding);
virtual void SetPadding(const wxSize& padding) wxOVERRIDE;
// sets the size of the tabs (assumes all tabs are the same size)
virtual void SetTabSize(const wxSize& sz);
virtual void SetTabSize(const wxSize& sz) wxOVERRIDE;
// hit test
virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE;
// calculate size for wxNotebookSizer
wxSize CalcSizeFromPage(const wxSize& sizePage) const;
wxRect GetPageRect() const ;
wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE;
wxRect GetPageRect() const wxOVERRIDE;
// operations
// ----------
// remove all pages
bool DeleteAllPages();
bool DeleteAllPages() wxOVERRIDE;
// the same as AddPage(), but adds it at the specified position
bool InsertPage(size_t nPage,
wxNotebookPage *pPage,
const wxString& strText,
bool bSelect = false,
int imageId = NO_IMAGE);
int imageId = NO_IMAGE) wxOVERRIDE;
// callbacks
// ---------
@@ -106,20 +106,20 @@ public:
// --------------
#if wxUSE_CONSTRAINTS
virtual void SetConstraintSizes(bool recurse = true);
virtual bool DoPhase(int nPhase);
virtual void SetConstraintSizes(bool recurse = true) wxOVERRIDE;
virtual bool DoPhase(int nPhase) wxOVERRIDE;
#endif
// base class virtuals
// -------------------
virtual void Command(wxCommandEvent& event);
virtual void Command(wxCommandEvent& event) wxOVERRIDE;
// osx specific event handling common for all osx-ports
virtual bool OSXHandleClicked( double timestampsec );
virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE;
protected:
virtual wxNotebookPage *DoRemovePage(size_t page) ;
virtual wxNotebookPage *DoRemovePage(size_t page) wxOVERRIDE;
// common part of all ctors
void Init();
@@ -127,7 +127,7 @@ protected:
void ChangePage(int nOldSel, int nSel); // change pages
void MacSetupTabs();
int DoSetSelection(size_t nPage, int flags = 0);
int DoSetSelection(size_t nPage, int flags = 0) wxOVERRIDE;
// the icon indices
wxArrayInt m_images;