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

2
include/wx/univ/anybutton.h
View File

@@ -23,7 +23,7 @@ public:
protected:
// choose the default border for this window
virtual wxBorder GetDefaultBorder() const { return wxBORDER_STATIC; }
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_STATIC; }
private:
wxDECLARE_NO_COPY_CLASS(wxAnyButton);

12
include/wx/univ/bmpbuttn.h
View File

@@ -37,26 +37,26 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr);
virtual void SetMargins(int x, int y)
virtual void SetMargins(int x, int y) wxOVERRIDE
{
SetBitmapMargins(x, y);
wxBitmapButtonBase::SetMargins(x, y);
}
virtual bool Enable(bool enable = true);
virtual bool Enable(bool enable = true) wxOVERRIDE;
virtual bool SetCurrent(bool doit = true);
virtual bool SetCurrent(bool doit = true) wxOVERRIDE;
virtual void Press();
virtual void Release();
virtual void Press() wxOVERRIDE;
virtual void Release() wxOVERRIDE;
protected:
void OnSetFocus(wxFocusEvent& event);
void OnKillFocus(wxFocusEvent& event);
// called when one of the bitmap is changed by user
virtual void OnSetBitmap();
virtual void OnSetBitmap() wxOVERRIDE;
// set bitmap to the given one if it's ok or to the normal bitmap and
// return true if the bitmap really changed

22
include/wx/univ/button.h
View File

@@ -86,10 +86,10 @@ public:
virtual ~wxButton();
virtual wxWindow *SetDefault();
virtual wxWindow *SetDefault() wxOVERRIDE;
virtual bool IsPressed() const { return m_isPressed; }
virtual bool IsDefault() const { return m_isDefault; }
virtual bool IsPressed() const wxOVERRIDE { return m_isPressed; }
virtual bool IsDefault() const wxOVERRIDE { return m_isDefault; }
// wxButton actions
virtual void Toggle();
@@ -99,25 +99,25 @@ public:
virtual bool PerformAction(const wxControlAction& action,
long numArg = -1,
const wxString& strArg = wxEmptyString);
const wxString& strArg = wxEmptyString) wxOVERRIDE;
virtual bool CanBeHighlighted() const { return true; }
virtual bool CanBeHighlighted() const wxOVERRIDE { return true; }
static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE
{
return GetStdInputHandler(handlerDef);
}
protected:
virtual wxSize DoGetBestClientSize() const;
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
virtual bool DoDrawBackground(wxDC& dc);
virtual void DoDraw(wxControlRenderer *renderer);
virtual bool DoDrawBackground(wxDC& dc) wxOVERRIDE;
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
virtual void DoSetBitmapMargins(wxCoord x, wxCoord y);
virtual void DoSetBitmap(const wxBitmap& bitmap, State which) wxOVERRIDE;
virtual void DoSetBitmapMargins(wxCoord x, wxCoord y) wxOVERRIDE;
// common part of all ctors
void Init();

20
include/wx/univ/checkbox.h
View File

@@ -75,8 +75,8 @@ public:
const wxString& name = wxCheckBoxNameStr);
// implement the checkbox interface
virtual void SetValue(bool value);
virtual bool GetValue() const;
virtual void SetValue(bool value) wxOVERRIDE;
virtual bool GetValue() const wxOVERRIDE;
// set/get the bitmaps to use for the checkbox indicator
void SetBitmap(const wxBitmap& bmp, State state, Status status);
@@ -89,25 +89,25 @@ public:
virtual void ChangeValue(bool value);
// overridden base class virtuals
virtual bool IsPressed() const { return m_isPressed; }
virtual bool IsPressed() const wxOVERRIDE { return m_isPressed; }
virtual bool PerformAction(const wxControlAction& action,
long numArg = -1,
const wxString& strArg = wxEmptyString);
const wxString& strArg = wxEmptyString) wxOVERRIDE;
virtual bool CanBeHighlighted() const { return true; }
virtual bool CanBeHighlighted() const wxOVERRIDE { return true; }
virtual wxInputHandler *CreateStdInputHandler(wxInputHandler *handlerDef);
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE
{
return CreateStdInputHandler(handlerDef);
}
protected:
virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state));
virtual wxCheckBoxState DoGet3StateValue() const;
virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) wxOVERRIDE;
virtual wxCheckBoxState DoGet3StateValue() const wxOVERRIDE;
virtual void DoDraw(wxControlRenderer *renderer);
virtual wxSize DoGetBestClientSize() const;
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
// get the size of the bitmap using either the current one or the default
// one (query renderer then)

18
include/wx/univ/checklst.h
View File

@@ -69,16 +69,16 @@ public:
const wxString& name = wxListBoxNameStr);
// implement check list box methods
virtual bool IsChecked(unsigned int item) const;
virtual void Check(unsigned int item, bool check = true);
virtual bool IsChecked(unsigned int item) const wxOVERRIDE;
virtual void Check(unsigned int item, bool check = true) wxOVERRIDE;
// and input handling
virtual bool PerformAction(const wxControlAction& action,
long numArg = -1l,
const wxString& strArg = wxEmptyString);
const wxString& strArg = wxEmptyString) wxOVERRIDE;
static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE
{
return GetStdInputHandler(handlerDef);
}
@@ -86,16 +86,16 @@ public:
protected:
// override all methods which add/delete items to update m_checks array as
// well
virtual void OnItemInserted(unsigned int pos);
virtual void DoDeleteOneItem(unsigned int n);
virtual void DoClear();
virtual void OnItemInserted(unsigned int pos) wxOVERRIDE;
virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
virtual void DoClear() wxOVERRIDE;
// draw the check items instead of the usual ones
virtual void DoDrawRange(wxControlRenderer *renderer,
int itemFirst, int itemLast);
int itemFirst, int itemLast) wxOVERRIDE;
// take them also into account for size calculation
virtual wxSize DoGetBestClientSize() const;
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
// common part of all ctors
void Init();

84
include/wx/univ/combobox.h
View File

@@ -94,35 +94,35 @@ public:
// implement the combobox interface
// wxTextCtrl methods
virtual wxString GetValue() const { return DoGetValue(); }
virtual void SetValue(const wxString& value);
virtual void WriteText(const wxString& value);
virtual void Copy();
virtual void Cut();
virtual void Paste();
virtual void SetInsertionPoint(long pos);
virtual void SetInsertionPointEnd();
virtual long GetInsertionPoint() const;
virtual wxTextPos GetLastPosition() const;
virtual void Replace(long from, long to, const wxString& value);
virtual void Remove(long from, long to);
virtual void SetSelection(long from, long to);
virtual void GetSelection(long *from, long *to) const;
virtual void SetEditable(bool editable);
virtual bool IsEditable() const;
virtual wxString GetValue() const wxOVERRIDE { return DoGetValue(); }
virtual void SetValue(const wxString& value) wxOVERRIDE;
virtual void WriteText(const wxString& value) wxOVERRIDE;
virtual void Copy() wxOVERRIDE;
virtual void Cut() wxOVERRIDE;
virtual void Paste() wxOVERRIDE;
virtual void SetInsertionPoint(long pos) wxOVERRIDE;
virtual void SetInsertionPointEnd() wxOVERRIDE;
virtual long GetInsertionPoint() const wxOVERRIDE;
virtual wxTextPos GetLastPosition() const wxOVERRIDE;
virtual void Replace(long from, long to, const wxString& value) wxOVERRIDE;
virtual void Remove(long from, long to) wxOVERRIDE;
virtual void SetSelection(long from, long to) wxOVERRIDE;
virtual void GetSelection(long *from, long *to) const wxOVERRIDE;
virtual void SetEditable(bool editable) wxOVERRIDE;
virtual bool IsEditable() const wxOVERRIDE;
virtual void Undo();
virtual void Redo();
virtual void SelectAll();
virtual void Undo() wxOVERRIDE;
virtual void Redo() wxOVERRIDE;
virtual void SelectAll() wxOVERRIDE;
virtual bool CanCopy() const;
virtual bool CanCut() const;
virtual bool CanPaste() const;
virtual bool CanUndo() const;
virtual bool CanRedo() const;
virtual bool CanCopy() const wxOVERRIDE;
virtual bool CanCut() const wxOVERRIDE;
virtual bool CanPaste() const wxOVERRIDE;
virtual bool CanUndo() const wxOVERRIDE;
virtual bool CanRedo() const wxOVERRIDE;
// override these methods to disambiguate between two base classes versions
virtual void Clear()
virtual void Clear() wxOVERRIDE
{
wxComboCtrl::Clear();
wxItemContainer::Clear();
@@ -133,15 +133,15 @@ public:
bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
// wxControlWithItems methods
virtual void DoClear();
virtual void DoDeleteOneItem(unsigned int n);
virtual unsigned int GetCount() const;
virtual wxString GetString(unsigned int n) const;
virtual void SetString(unsigned int n, const wxString& s);
virtual int FindString(const wxString& s, bool bCase = false) const;
virtual void SetSelection(int n);
virtual int GetSelection() const;
virtual wxString GetStringSelection() const;
virtual void DoClear() wxOVERRIDE;
virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
virtual unsigned int GetCount() const wxOVERRIDE;
virtual wxString GetString(unsigned int n) const wxOVERRIDE;
virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE;
virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE;
virtual void SetSelection(int n) wxOVERRIDE;
virtual int GetSelection() const wxOVERRIDE;
virtual wxString GetStringSelection() const wxOVERRIDE;
// we have our own input handler and our own actions
// (but wxComboCtrl already handled Popup/Dismiss)
@@ -152,25 +152,25 @@ public:
*/
static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE
{
return GetStdInputHandler(handlerDef);
}
// we delegate our client data handling to wxListBox which we use for the
// items, so override this and other methods dealing with the client data
virtual wxClientDataType GetClientDataType() const;
virtual void SetClientDataType(wxClientDataType clientDataItemsType);
virtual wxClientDataType GetClientDataType() const wxOVERRIDE;
virtual void SetClientDataType(wxClientDataType clientDataItemsType) wxOVERRIDE;
protected:
virtual wxString DoGetValue() const;
virtual wxString DoGetValue() const wxOVERRIDE;
virtual int DoInsertItems(const wxArrayStringsAdapter& items,
unsigned int pos,
void **clientData, wxClientDataType type);
void **clientData, wxClientDataType type) wxOVERRIDE;
virtual void DoSetItemClientData(unsigned int n, void* clientData);
virtual void* DoGetItemClientData(unsigned int n) const;
virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE;
virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE;
// common part of all ctors
@@ -181,7 +181,7 @@ protected:
private:
// implement wxTextEntry pure virtual method
virtual wxWindow *GetEditableWindow() { return this; }
virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; }
// the popup listbox
wxListBox *m_lbox;

6
include/wx/univ/control.h
View File

@@ -63,10 +63,10 @@ public:
// this function will filter out '&' characters and will put the
// accelerator char (the one immediately after '&') into m_chAccel
virtual void SetLabel(const wxString& label);
virtual void SetLabel(const wxString& label) wxOVERRIDE;
// return the current label
virtual wxString GetLabel() const { return m_label; }
virtual wxString GetLabel() const wxOVERRIDE { return m_label; }
// wxUniversal-specific methods
@@ -79,7 +79,7 @@ public:
return m_indexAccel == -1 ? wxT('\0') : (wxChar)m_label[m_indexAccel];
}
virtual wxWindow *GetInputWindow() const { return (wxWindow*)this; }
virtual wxWindow *GetInputWindow() const wxOVERRIDE { return (wxWindow*)this; }
protected:
// common part of all ctors

2
include/wx/univ/custombgwin.h
View File

@@ -24,7 +24,7 @@ public:
wxCustomBackgroundWindow() { }
protected:
virtual void DoSetBackgroundBitmap(const wxBitmap& bmp)
virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) wxOVERRIDE
{
// We have support for background bitmap even at the base class level.
BaseWindowClass::SetBackground(bmp, wxALIGN_NOT, wxTILE);

8
include/wx/univ/dialog.h
View File

@@ -42,18 +42,18 @@ public:
virtual ~wxDialog();
// is the dialog in modal state right now?
virtual bool IsModal() const;
virtual bool IsModal() const wxOVERRIDE;
// For now, same as Show(true) but returns return code
virtual int ShowModal();
virtual int ShowModal() wxOVERRIDE;
// may be called to terminate the dialog with the given return code
virtual void EndModal(int retCode);
virtual void EndModal(int retCode) wxOVERRIDE;
// returns true if we're in a modal loop
bool IsModalShowing() const;
virtual bool Show(bool show = true);
virtual bool Show(bool show = true) wxOVERRIDE;
// implementation only from now on
// -------------------------------

24
include/wx/univ/frame.h
View File

@@ -38,47 +38,47 @@ public:
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr);
virtual wxPoint GetClientAreaOrigin() const;
virtual bool Enable(bool enable = true);
virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE;
virtual bool Enable(bool enable = true) wxOVERRIDE;
#if wxUSE_STATUSBAR
virtual wxStatusBar* CreateStatusBar(int number = 1,
long style = wxSTB_DEFAULT_STYLE,
wxWindowID id = 0,
const wxString& name = wxStatusLineNameStr);
const wxString& name = wxStatusLineNameStr) wxOVERRIDE;
#endif // wxUSE_STATUSBAR
#if wxUSE_TOOLBAR
// create main toolbar bycalling OnCreateToolBar()
virtual wxToolBar* CreateToolBar(long style = -1,
wxWindowID id = wxID_ANY,
const wxString& name = wxToolBarNameStr);
const wxString& name = wxToolBarNameStr) wxOVERRIDE;
#endif // wxUSE_TOOLBAR
virtual wxSize GetMinSize() const;
virtual wxSize GetMinSize() const wxOVERRIDE;
protected:
void OnSize(wxSizeEvent& event);
void OnSysColourChanged(wxSysColourChangedEvent& event);
virtual void DoGetClientSize(int *width, int *height) const;
virtual void DoSetClientSize(int width, int height);
virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
virtual void DoSetClientSize(int width, int height) wxOVERRIDE;
#if wxUSE_MENUS
// override to update menu bar position when the frame size changes
virtual void PositionMenuBar();
virtual void DetachMenuBar();
virtual void AttachMenuBar(wxMenuBar *menubar);
virtual void PositionMenuBar() wxOVERRIDE;
virtual void DetachMenuBar() wxOVERRIDE;
virtual void AttachMenuBar(wxMenuBar *menubar) wxOVERRIDE;
#endif // wxUSE_MENUS
#if wxUSE_STATUSBAR
// override to update statusbar position when the frame size changes
virtual void PositionStatusBar();
virtual void PositionStatusBar() wxOVERRIDE;
#endif // wxUSE_MENUS
protected:
#if wxUSE_TOOLBAR
virtual void PositionToolBar();
virtual void PositionToolBar() wxOVERRIDE;
#endif // wxUSE_TOOLBAR
DECLARE_EVENT_TABLE()

10
include/wx/univ/gauge.h
View File

@@ -44,8 +44,8 @@ public:
const wxString& name = wxGaugeNameStr);
// implement base class virtuals
virtual void SetRange(int range);
virtual void SetValue(int pos);
virtual void SetRange(int range) wxOVERRIDE;
virtual void SetValue(int pos) wxOVERRIDE;
// wxUniv-specific methods
@@ -60,13 +60,13 @@ protected:
void Init();
// return the def border for a progress bar
virtual wxBorder GetDefaultBorder() const;
virtual wxBorder GetDefaultBorder() const wxOVERRIDE;
// return the default size
virtual wxSize DoGetBestClientSize() const;
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
// draw the control
virtual void DoDraw(wxControlRenderer *renderer);
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
DECLARE_DYNAMIC_CLASS(wxGauge)
};

8
include/wx/univ/inphand.h
View File

@@ -86,24 +86,24 @@ public:
virtual bool HandleKey(wxInputConsumer *consumer,
const wxKeyEvent& event,
bool pressed)
bool pressed) wxOVERRIDE
{
return m_handler ? m_handler->HandleKey(consumer, event, pressed)
: false;
}
virtual bool HandleMouse(wxInputConsumer *consumer,
const wxMouseEvent& event)
const wxMouseEvent& event) wxOVERRIDE
{
return m_handler ? m_handler->HandleMouse(consumer, event) : false;
}
virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event)
virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event) wxOVERRIDE
{
return m_handler ? m_handler->HandleMouseMove(consumer, event) : false;
}
virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event)
virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event) wxOVERRIDE
{
return m_handler ? m_handler->HandleFocus(consumer, event) : false;
}

46
include/wx/univ/listbox.h
View File

@@ -95,38 +95,38 @@ public:
const wxString& name = wxListBoxNameStr);
// implement the listbox interface defined by wxListBoxBase
virtual void DoClear();
virtual void DoDeleteOneItem(unsigned int n);
virtual void DoClear() wxOVERRIDE;
virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
virtual unsigned int GetCount() const;
virtual wxString GetString(unsigned int n) const;
virtual void SetString(unsigned int n, const wxString& s);
virtual int FindString(const wxString& s, bool bCase = false) const;
virtual unsigned int GetCount() const wxOVERRIDE;
virtual wxString GetString(unsigned int n) const wxOVERRIDE;
virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE;
virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE;
virtual bool IsSelected(int n) const
virtual bool IsSelected(int n) const wxOVERRIDE
{ return m_selections.Index(n) != wxNOT_FOUND; }
virtual int GetSelection() const;
virtual int GetSelections(wxArrayInt& aSelections) const;
virtual int GetSelection() const wxOVERRIDE;
virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE;
protected:
virtual void DoSetSelection(int n, bool select);
virtual void DoSetSelection(int n, bool select) wxOVERRIDE;
virtual int DoInsertItems(const wxArrayStringsAdapter& items,
unsigned int pos,
void **clientData,
wxClientDataType type);
wxClientDataType type) wxOVERRIDE;
// universal wxComboBox implementation internally uses wxListBox
friend class WXDLLIMPEXP_FWD_CORE wxComboBox;
virtual void DoSetFirstItem(int n);
virtual void DoSetFirstItem(int n) wxOVERRIDE;
virtual void DoSetItemClientData(unsigned int n, void* clientData);
virtual void* DoGetItemClientData(unsigned int n) const;
virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE;
virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE;
public:
// override some more base class methods
virtual bool SetFont(const wxFont& font);
virtual bool SetFont(const wxFont& font) wxOVERRIDE;
// the wxUniversal-specific methods
// --------------------------------
@@ -154,7 +154,7 @@ public:
void SelectAndNotify(int item);
// ensure that the given item is visible by scrolling it into view
virtual void EnsureVisible(int n);
virtual void EnsureVisible(int n) wxOVERRIDE;
// find the first item [strictly] after the current one which starts with
// the given string and make it the current one, return true if the current
@@ -179,26 +179,26 @@ public:
// override the wxControl virtual methods
virtual bool PerformAction(const wxControlAction& action,
long numArg = 0l,
const wxString& strArg = wxEmptyString);
const wxString& strArg = wxEmptyString) wxOVERRIDE;
static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE
{
return GetStdInputHandler(handlerDef);
}
// idle processing
virtual void OnInternalIdle();
virtual void OnInternalIdle() wxOVERRIDE;
protected:
// geometry
virtual wxSize DoGetBestClientSize() const;
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
virtual void DoDraw(wxControlRenderer *renderer);
virtual wxBorder GetDefaultBorder() const;
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
virtual wxBorder GetDefaultBorder() const wxOVERRIDE;
// special hook for wxCheckListBox which allows it to update its internal
// data when a new item is inserted into the listbox

34
include/wx/univ/menu.h
View File

@@ -55,8 +55,8 @@ public:
void Dismiss();
// override the base class methods to connect/disconnect event handlers
virtual void Attach(wxMenuBarBase *menubar);
virtual void Detach();
virtual void Attach(wxMenuBarBase *menubar) wxOVERRIDE;
virtual void Detach() wxOVERRIDE;
// implementation only from here
@@ -74,9 +74,9 @@ public:
protected:
// implement base class virtuals
virtual wxMenuItem* DoAppend(wxMenuItem *item);
virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
virtual wxMenuItem* DoRemove(wxMenuItem *item);
virtual wxMenuItem* DoAppend(wxMenuItem *item) wxOVERRIDE;
virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item) wxOVERRIDE;
virtual wxMenuItem* DoRemove(wxMenuItem *item) wxOVERRIDE;
// common part of DoAppend and DoInsert
void OnItemAdded(wxMenuItem *item);
@@ -146,19 +146,19 @@ public:
virtual ~wxMenuBar();
// implement base class virtuals
virtual bool Append( wxMenu *menu, const wxString &title );
virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title);
virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);
virtual wxMenu *Remove(size_t pos);
virtual bool Append( wxMenu *menu, const wxString &title ) wxOVERRIDE;
virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title) wxOVERRIDE;
virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title) wxOVERRIDE;
virtual wxMenu *Remove(size_t pos) wxOVERRIDE;
virtual void EnableTop(size_t pos, bool enable);
virtual bool IsEnabledTop(size_t pos) const;
virtual void EnableTop(size_t pos, bool enable) wxOVERRIDE;
virtual bool IsEnabledTop(size_t pos) const wxOVERRIDE;
virtual void SetMenuLabel(size_t pos, const wxString& label);
virtual wxString GetMenuLabel(size_t pos) const;
virtual void SetMenuLabel(size_t pos, const wxString& label) wxOVERRIDE;
virtual wxString GetMenuLabel(size_t pos) const wxOVERRIDE;
virtual void Attach(wxFrame *frame);
virtual void Detach();
virtual void Attach(wxFrame *frame) wxOVERRIDE;
virtual void Detach() wxOVERRIDE;
// get the next item for the givan accel letter (used by wxFrame), return
// -1 if none
@@ -202,10 +202,10 @@ protected:
void OnDismiss();
// draw the menubar
virtual void DoDraw(wxControlRenderer *renderer);
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
// menubar geometry
virtual wxSize DoGetBestClientSize() const;
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
// has the menubar been created already?
bool IsCreated() const { return m_frameLast != NULL; }

8
include/wx/univ/menuitem.h
View File

@@ -28,11 +28,11 @@ public:
virtual ~wxMenuItem();
// override base class virtuals to update the item appearance on screen
virtual void SetItemLabel(const wxString& text);
virtual void SetCheckable(bool checkable);
virtual void SetItemLabel(const wxString& text) wxOVERRIDE;
virtual void SetCheckable(bool checkable) wxOVERRIDE;
virtual void Enable(bool enable = true);
virtual void Check(bool check = true);
virtual void Enable(bool enable = true) wxOVERRIDE;
virtual void Check(bool check = true) wxOVERRIDE;
// we add some extra functions which are also available under MSW from
// wxOwnerDrawn class - they will be moved to wxMenuItemBase later

42
include/wx/univ/notebook.h
View File

@@ -62,30 +62,30 @@ public:
// implement wxNotebookBase pure virtuals
// --------------------------------------
virtual int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); }
virtual 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); }
virtual bool SetPageText(size_t nPage, const wxString& strText);
virtual wxString GetPageText(size_t nPage) const;
virtual bool SetPageText(size_t nPage, const wxString& strText) wxOVERRIDE;
virtual wxString GetPageText(size_t nPage) const wxOVERRIDE;
virtual int GetPageImage(size_t nPage) const;
virtual bool SetPageImage(size_t nPage, int nImage);
virtual int GetPageImage(size_t nPage) const wxOVERRIDE;
virtual bool SetPageImage(size_t nPage, int nImage) wxOVERRIDE;
virtual void SetPageSize(const wxSize& size);
virtual void SetPadding(const wxSize& padding);
virtual void SetTabSize(const wxSize& sz);
virtual void SetPageSize(const wxSize& size) wxOVERRIDE;
virtual void SetPadding(const wxSize& padding) wxOVERRIDE;
virtual void SetTabSize(const wxSize& sz) wxOVERRIDE;
virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE;
virtual bool DeleteAllPages();
virtual bool DeleteAllPages() wxOVERRIDE;
virtual bool InsertPage(size_t nPage,
wxNotebookPage *pPage,
const wxString& strText,
bool bSelect = false,
int imageId = NO_IMAGE);
int imageId = NO_IMAGE) wxOVERRIDE;
// style tests
// -----------
@@ -103,17 +103,17 @@ public:
// hit testing
// -----------
virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE;
// input handling
// --------------
virtual bool PerformAction(const wxControlAction& action,
long numArg = 0l,
const wxString& strArg = wxEmptyString);
const wxString& strArg = wxEmptyString) wxOVERRIDE;
static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE
{
return GetStdInputHandler(handlerDef);
}
@@ -122,19 +122,19 @@ public:
void RefreshCurrent();
protected:
virtual wxNotebookPage *DoRemovePage(size_t nPage);
virtual wxNotebookPage *DoRemovePage(size_t nPage) wxOVERRIDE;
// drawing
virtual void DoDraw(wxControlRenderer *renderer);
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
void DoDrawTab(wxDC& dc, const wxRect& rect, size_t n);
// resizing
virtual void DoMoveWindow(int x, int y, int width, int height);
virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
int DoSetSelection(size_t nPage, int flags = 0);
int DoSetSelection(size_t nPage, int flags = 0) wxOVERRIDE;
// common part of all ctors
void Init();
@@ -193,7 +193,7 @@ protected:
wxRect GetPagePart() const;
// get the page rect in our client coords
wxRect GetPageRect() const;
wxRect GetPageRect() const wxOVERRIDE;
// get our client size from the page size
wxSize GetSizeForPage(const wxSize& size) const;

34
include/wx/univ/radiobox.h
View File

@@ -80,30 +80,30 @@ public:
virtual ~wxRadioBox();
// implement wxRadioBox interface
virtual void SetSelection(int n);
virtual int GetSelection() const;
virtual void SetSelection(int n) wxOVERRIDE;
virtual int GetSelection() const wxOVERRIDE;
virtual unsigned int GetCount() const
virtual unsigned int GetCount() const wxOVERRIDE
{ return (unsigned int)m_buttons.GetCount(); }
virtual wxString GetString(unsigned int n) const;
virtual void SetString(unsigned int n, const wxString& label);
virtual wxString GetString(unsigned int n) const wxOVERRIDE;
virtual void SetString(unsigned int n, const wxString& label) wxOVERRIDE;
virtual bool Enable(unsigned int n, bool enable = true);
virtual bool Show(unsigned int n, bool show = true);
virtual bool Enable(unsigned int n, bool enable = true) wxOVERRIDE;
virtual bool Show(unsigned int n, bool show = true) wxOVERRIDE;
virtual bool IsItemEnabled(unsigned int n) const;
virtual bool IsItemShown(unsigned int n) const;
virtual bool IsItemEnabled(unsigned int n) const wxOVERRIDE;
virtual bool IsItemShown(unsigned int n) const wxOVERRIDE;
// we also override the wxControl methods to avoid virtual function hiding
virtual bool Enable(bool enable = true);
virtual bool Show(bool show = true);
virtual wxString GetLabel() const;
virtual void SetLabel(const wxString& label);
virtual bool Enable(bool enable = true) wxOVERRIDE;
virtual bool Show(bool show = true) wxOVERRIDE;
virtual wxString GetLabel() const wxOVERRIDE;
virtual void SetLabel(const wxString& label) wxOVERRIDE;
// we inherit a version always returning false from wxStaticBox, override
// it to behave normally
virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); }
virtual bool AcceptsFocus() const wxOVERRIDE { return wxControl::AcceptsFocus(); }
#if wxUSE_TOOLTIPS
virtual void DoSetToolTip( wxToolTip *tip );
@@ -119,12 +119,12 @@ public:
bool OnKeyDown(wxKeyEvent& event);
protected:
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
// override the base class methods dealing with window positioning/sizing
// as we must move/size the buttons as well
virtual void DoMoveWindow(int x, int y, int width, int height);
virtual wxSize DoGetBestClientSize() const;
virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
// generate a radiobutton click event for the current item
void SendRadioEvent();

12
include/wx/univ/radiobut.h
View File

@@ -47,16 +47,16 @@ public:
const wxString& name = wxRadioButtonNameStr);
// override some base class methods
virtual void ChangeValue(bool value);
virtual void ChangeValue(bool value) wxOVERRIDE;
protected:
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
// implement our own drawing
virtual void DoDraw(wxControlRenderer *renderer);
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
// we use the radio button bitmaps for size calculation
virtual wxSize GetBitmapSize() const;
virtual wxSize GetBitmapSize() const wxOVERRIDE;
// the radio button can only be cleared using this method, not
// ChangeValue() above - and it is protected as it can only be called by
@@ -65,10 +65,10 @@ protected:
// called when the radio button becomes checked: we clear all the buttons
// in the same group with us here
virtual void OnCheck();
virtual void OnCheck() wxOVERRIDE;
// send event about radio button selection
virtual void SendEvent();
virtual void SendEvent() wxOVERRIDE;
private:
DECLARE_DYNAMIC_CLASS(wxRadioButton)

138
include/wx/univ/renderer.h
View File

@@ -501,14 +501,14 @@ public:
const wxColour& col,
const wxRect& rect,
int flags,
wxWindow *window = NULL )
wxWindow *window = NULL ) wxOVERRIDE
{ m_renderer->DrawBackground(dc, col, rect, flags, window ); }
virtual void DrawButtonSurface(wxDC& dc,
const wxColour& col,
const wxRect& rect,
int flags)
int flags) wxOVERRIDE
{ m_renderer->DrawButtonSurface(dc, col, rect, flags); }
virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0)
virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) wxOVERRIDE
{ m_renderer->DrawFocusRect(win, dc, rect, flags); }
virtual void DrawLabel(wxDC& dc,
const wxString& label,
@@ -516,7 +516,7 @@ public:
int flags = 0,
int align = wxALIGN_LEFT | wxALIGN_TOP,
int indexAccel = -1,
wxRect *rectBounds = NULL)
wxRect *rectBounds = NULL) wxOVERRIDE
{ m_renderer->DrawLabel(dc, label, rect,
flags, align, indexAccel, rectBounds); }
virtual void DrawButtonLabel(wxDC& dc,
@@ -526,72 +526,72 @@ public:
int flags = 0,
int align = wxALIGN_LEFT | wxALIGN_TOP,
int indexAccel = -1,
wxRect *rectBounds = NULL)
wxRect *rectBounds = NULL) wxOVERRIDE
{ m_renderer->DrawButtonLabel(dc, label, image, rect,
flags, align, indexAccel, rectBounds); }
virtual void DrawBorder(wxDC& dc,
wxBorder border,
const wxRect& rect,
int flags = 0,
wxRect *rectIn = NULL)
wxRect *rectIn = NULL) wxOVERRIDE
{ m_renderer->DrawBorder(dc, border, rect, flags, rectIn); }
virtual void DrawTextBorder(wxDC& dc,
wxBorder border,
const wxRect& rect,
int flags = 0,
wxRect *rectIn = NULL)
wxRect *rectIn = NULL) wxOVERRIDE
{ m_renderer->DrawTextBorder(dc, border, rect, flags, rectIn); }
virtual void DrawButtonBorder(wxDC& dc,
const wxRect& rect,
int flags = 0,
wxRect *rectIn = NULL)
wxRect *rectIn = NULL) wxOVERRIDE
{ m_renderer->DrawButtonBorder(dc, rect, flags, rectIn); }
virtual void DrawFrame(wxDC& dc,
const wxString& label,
const wxRect& rect,
int flags = 0,
int align = wxALIGN_LEFT,
int indexAccel = -1)
int indexAccel = -1) wxOVERRIDE
{ m_renderer->DrawFrame(dc, label, rect, flags, align, indexAccel); }
virtual void DrawHorizontalLine(wxDC& dc,
wxCoord y, wxCoord x1, wxCoord x2)
wxCoord y, wxCoord x1, wxCoord x2) wxOVERRIDE
{ m_renderer->DrawHorizontalLine(dc, y, x1, x2); }
virtual void DrawVerticalLine(wxDC& dc,
wxCoord x, wxCoord y1, wxCoord y2)
wxCoord x, wxCoord y1, wxCoord y2) wxOVERRIDE
{ m_renderer->DrawVerticalLine(dc, x, y1, y2); }
virtual void DrawArrow(wxDC& dc,
wxDirection dir,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_renderer->DrawArrow(dc, dir, rect, flags); }
virtual void DrawScrollbarArrow(wxDC& dc,
wxDirection dir,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_renderer->DrawScrollbarArrow(dc, dir, rect, flags); }
virtual void DrawScrollbarThumb(wxDC& dc,
wxOrientation orient,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_renderer->DrawScrollbarThumb(dc, orient, rect, flags); }
virtual void DrawScrollbarShaft(wxDC& dc,
wxOrientation orient,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_renderer->DrawScrollbarShaft(dc, orient, rect, flags); }
virtual void DrawScrollCorner(wxDC& dc,
const wxRect& rect)
const wxRect& rect) wxOVERRIDE
{ m_renderer->DrawScrollCorner(dc, rect); }
virtual void DrawItem(wxDC& dc,
const wxString& label,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_renderer->DrawItem(dc, label, rect, flags); }
virtual void DrawCheckItem(wxDC& dc,
const wxString& label,
const wxBitmap& bitmap,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_renderer->DrawCheckItem(dc, label, bitmap, rect, flags); }
virtual void DrawCheckButton(wxDC& dc,
const wxString& label,
@@ -599,7 +599,7 @@ public:
const wxRect& rect,
int flags = 0,
wxAlignment align = wxALIGN_LEFT,
int indexAccel = -1)
int indexAccel = -1) wxOVERRIDE
{ m_renderer->DrawCheckButton(dc, label, bitmap, rect,
flags, align, indexAccel); }
virtual void DrawRadioButton(wxDC& dc,
@@ -608,7 +608,7 @@ public:
const wxRect& rect,
int flags = 0,
wxAlignment align = wxALIGN_LEFT,
int indexAccel = -1)
int indexAccel = -1) wxOVERRIDE
{ m_renderer->DrawRadioButton(dc, label, bitmap, rect,
flags, align, indexAccel); }
#if wxUSE_TOOLBAR
@@ -618,7 +618,7 @@ public:
const wxRect& rect,
int flags = 0,
long style = 0,
int tbarStyle = 0)
int tbarStyle = 0) wxOVERRIDE
{ m_renderer->DrawToolBarButton(dc, label, bitmap, rect, flags, style, tbarStyle); }
#endif // wxUSE_TOOLBAR
@@ -628,9 +628,9 @@ public:
const wxRect& rect,
int selStart = -1,
int selEnd = -1,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_renderer->DrawTextLine(dc, text, rect, selStart, selEnd, flags); }
virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect)
virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect) wxOVERRIDE
{ m_renderer->DrawLineWrapMark(dc, rect); }
#endif // wxUSE_TEXTCTRL
@@ -641,7 +641,7 @@ public:
const wxString& label,
const wxBitmap& bitmap = wxNullBitmap,
int flags = 0,
int accel = -1)
int accel = -1) wxOVERRIDE
{ m_renderer->DrawTab(dc, rect, dir, label, bitmap, flags, accel); }
#endif // wxUSE_NOTEBOOK
@@ -653,13 +653,13 @@ public:
wxOrientation orient,
int flags = 0,
long style = 0,
wxRect *rectShaft = NULL)
wxRect *rectShaft = NULL) wxOVERRIDE
{ m_renderer->DrawSliderShaft(dc, rect, lenThumb, orient, flags, style, rectShaft); }
virtual void DrawSliderThumb(wxDC& dc,
const wxRect& rect,
wxOrientation orient,
int flags = 0,
long style = 0)
long style = 0) wxOVERRIDE
{ m_renderer->DrawSliderThumb(dc, rect, orient, flags, style); }
virtual void DrawSliderTicks(wxDC& dc,
const wxRect& rect,
@@ -669,7 +669,7 @@ public:
int end,
int WXUNUSED(step) = 1,
int flags = 0,
long style = 0)
long style = 0) wxOVERRIDE
{ m_renderer->DrawSliderTicks(dc, rect, lenThumb, orient,
start, end, start, flags, style); }
#endif // wxUSE_SLIDER
@@ -679,7 +679,7 @@ public:
const wxRect& rect,
const wxString& label,
int flags = 0,
int indexAccel = -1)
int indexAccel = -1) wxOVERRIDE
{ m_renderer->DrawMenuBarItem(dc, rect, label, flags, indexAccel); }
virtual void DrawMenuItem(wxDC& dc,
wxCoord y,
@@ -688,12 +688,12 @@ public:
const wxString& accel,
const wxBitmap& bitmap = wxNullBitmap,
int flags = 0,
int indexAccel = -1)
int indexAccel = -1) wxOVERRIDE
{ m_renderer->DrawMenuItem(dc, y, gi, label, accel,
bitmap, flags, indexAccel); }
virtual void DrawMenuSeparator(wxDC& dc,
wxCoord y,
const wxMenuGeometryInfo& geomInfo)
const wxMenuGeometryInfo& geomInfo) wxOVERRIDE
{ m_renderer->DrawMenuSeparator(dc, y, geomInfo); }
#endif // wxUSE_MENUS
@@ -701,7 +701,7 @@ public:
virtual void DrawStatusField(wxDC& dc,
const wxRect& rect,
const wxString& label,
int flags = 0, int style = 0)
int flags = 0, int style = 0) wxOVERRIDE
{ m_renderer->DrawStatusField(dc, rect, label, flags, style); }
#endif // wxUSE_STATUSBAR
@@ -711,133 +711,133 @@ public:
const wxIcon& icon,
int flags,
int specialButton = 0,
int specialButtonFlag = 0)
int specialButtonFlag = 0) wxOVERRIDE
{ m_renderer->DrawFrameTitleBar(dc, rect, title, icon, flags,
specialButton, specialButtonFlag); }
virtual void DrawFrameBorder(wxDC& dc,
const wxRect& rect,
int flags)
int flags) wxOVERRIDE
{ m_renderer->DrawFrameBorder(dc, rect, flags); }
virtual void DrawFrameBackground(wxDC& dc,
const wxRect& rect,
int flags)
int flags) wxOVERRIDE
{ m_renderer->DrawFrameBackground(dc, rect, flags); }
virtual void DrawFrameTitle(wxDC& dc,
const wxRect& rect,
const wxString& title,
int flags)
int flags) wxOVERRIDE
{ m_renderer->DrawFrameTitle(dc, rect, title, flags); }
virtual void DrawFrameIcon(wxDC& dc,
const wxRect& rect,
const wxIcon& icon,
int flags)
int flags) wxOVERRIDE
{ m_renderer->DrawFrameIcon(dc, rect, icon, flags); }
virtual void DrawFrameButton(wxDC& dc,
wxCoord x, wxCoord y,
int button,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_renderer->DrawFrameButton(dc, x, y, button, flags); }
#if wxUSE_COMBOBOX
virtual void GetComboBitmaps(wxBitmap *bmpNormal,
wxBitmap *bmpFocus,
wxBitmap *bmpPressed,
wxBitmap *bmpDisabled)
wxBitmap *bmpDisabled) wxOVERRIDE
{ m_renderer->GetComboBitmaps(bmpNormal, bmpFocus,
bmpPressed, bmpDisabled); }
#endif // wxUSE_COMBOBOX
virtual void AdjustSize(wxSize *size, const wxWindow *window)
virtual void AdjustSize(wxSize *size, const wxWindow *window) wxOVERRIDE
{ m_renderer->AdjustSize(size, window); }
virtual wxRect GetBorderDimensions(wxBorder border) const
virtual wxRect GetBorderDimensions(wxBorder border) const wxOVERRIDE
{ return m_renderer->GetBorderDimensions(border); }
virtual bool AreScrollbarsInsideBorder() const
virtual bool AreScrollbarsInsideBorder() const wxOVERRIDE
{ return m_renderer->AreScrollbarsInsideBorder(); }
#if wxUSE_SCROLLBAR
virtual wxSize GetScrollbarArrowSize() const
virtual wxSize GetScrollbarArrowSize() const wxOVERRIDE
{ return m_renderer->GetScrollbarArrowSize(); }
#endif // wxUSE_SCROLLBAR
virtual wxCoord GetListboxItemHeight(wxCoord fontHeight)
virtual wxCoord GetListboxItemHeight(wxCoord fontHeight) wxOVERRIDE
{ return m_renderer->GetListboxItemHeight(fontHeight); }
virtual wxSize GetCheckBitmapSize() const
virtual wxSize GetCheckBitmapSize() const wxOVERRIDE
{ return m_renderer->GetCheckBitmapSize(); }
virtual wxSize GetRadioBitmapSize() const
virtual wxSize GetRadioBitmapSize() const wxOVERRIDE
{ return m_renderer->GetRadioBitmapSize(); }
virtual wxCoord GetCheckItemMargin() const
virtual wxCoord GetCheckItemMargin() const wxOVERRIDE
{ return m_renderer->GetCheckItemMargin(); }
#if wxUSE_TOOLBAR
virtual wxSize GetToolBarButtonSize(wxCoord *separator) const
virtual wxSize GetToolBarButtonSize(wxCoord *separator) const wxOVERRIDE
{ return m_renderer->GetToolBarButtonSize(separator); }
virtual wxSize GetToolBarMargin() const
virtual wxSize GetToolBarMargin() const wxOVERRIDE
{ return m_renderer->GetToolBarMargin(); }
#endif // wxUSE_TOOLBAR
#if wxUSE_TEXTCTRL
virtual wxRect GetTextTotalArea(const wxTextCtrl *text,
const wxRect& rect) const
const wxRect& rect) const wxOVERRIDE
{ return m_renderer->GetTextTotalArea(text, rect); }
virtual wxRect GetTextClientArea(const wxTextCtrl *text,
const wxRect& rect,
wxCoord *extraSpaceBeyond) const
wxCoord *extraSpaceBeyond) const wxOVERRIDE
{ return m_renderer->GetTextClientArea(text, rect, extraSpaceBeyond); }
#endif // wxUSE_TEXTCTRL
#if wxUSE_NOTEBOOK
virtual wxSize GetTabIndent() const { return m_renderer->GetTabIndent(); }
virtual wxSize GetTabPadding() const { return m_renderer->GetTabPadding(); }
virtual wxSize GetTabIndent() const wxOVERRIDE { return m_renderer->GetTabIndent(); }
virtual wxSize GetTabPadding() const wxOVERRIDE { return m_renderer->GetTabPadding(); }
#endif // wxUSE_NOTEBOOK
#if wxUSE_SLIDER
virtual wxCoord GetSliderDim() const
virtual wxCoord GetSliderDim() const wxOVERRIDE
{ return m_renderer->GetSliderDim(); }
virtual wxCoord GetSliderTickLen() const
virtual wxCoord GetSliderTickLen() const wxOVERRIDE
{ return m_renderer->GetSliderTickLen(); }
virtual wxRect GetSliderShaftRect(const wxRect& rect,
int lenThumb,
wxOrientation orient,
long style = 0) const
long style = 0) const wxOVERRIDE
{ return m_renderer->GetSliderShaftRect(rect, lenThumb, orient, style); }
virtual wxSize GetSliderThumbSize(const wxRect& rect,
int lenThumb,
wxOrientation orient) const
wxOrientation orient) const wxOVERRIDE
{ return m_renderer->GetSliderThumbSize(rect, lenThumb, orient); }
#endif // wxUSE_SLIDER
virtual wxSize GetProgressBarStep() const
virtual wxSize GetProgressBarStep() const wxOVERRIDE
{ return m_renderer->GetProgressBarStep(); }
#if wxUSE_MENUS
virtual wxSize GetMenuBarItemSize(const wxSize& sizeText) const
virtual wxSize GetMenuBarItemSize(const wxSize& sizeText) const wxOVERRIDE
{ return m_renderer->GetMenuBarItemSize(sizeText); }
virtual wxMenuGeometryInfo *GetMenuGeometry(wxWindow *win,
const wxMenu& menu) const
const wxMenu& menu) const wxOVERRIDE
{ return m_renderer->GetMenuGeometry(win, menu); }
#endif // wxUSE_MENUS
#if wxUSE_STATUSBAR
virtual wxSize GetStatusBarBorders() const
virtual wxSize GetStatusBarBorders() const wxOVERRIDE
{ return m_renderer->GetStatusBarBorders(); }
virtual wxCoord GetStatusBarBorderBetweenFields() const
virtual wxCoord GetStatusBarBorderBetweenFields() const wxOVERRIDE
{ return m_renderer->GetStatusBarBorderBetweenFields(); }
virtual wxSize GetStatusBarFieldMargins() const
virtual wxSize GetStatusBarFieldMargins() const wxOVERRIDE
{ return m_renderer->GetStatusBarFieldMargins(); }
#endif // wxUSE_STATUSBAR
virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const
virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const wxOVERRIDE
{ return m_renderer->GetFrameClientArea(rect, flags); }
virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const
virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const wxOVERRIDE
{ return m_renderer->GetFrameTotalSize(clientSize, flags); }
virtual wxSize GetFrameMinSize(int flags) const
virtual wxSize GetFrameMinSize(int flags) const wxOVERRIDE
{ return m_renderer->GetFrameMinSize(flags); }
virtual wxSize GetFrameIconSize() const
virtual wxSize GetFrameIconSize() const wxOVERRIDE
{ return m_renderer->GetFrameIconSize(); }
virtual int HitTestFrame(const wxRect& rect,
const wxPoint& pt,
int flags) const
int flags) const wxOVERRIDE
{ return m_renderer->HitTestFrame(rect, pt, flags); }
virtual int DrawHeaderButton(wxWindow *win,
@@ -845,12 +845,12 @@ public:
const wxRect& rect,
int flags = 0,
wxHeaderSortIconType sortIcon = wxHDR_SORT_ICON_NONE,
wxHeaderButtonParams* params = NULL)
wxHeaderButtonParams* params = NULL) wxOVERRIDE
{ return m_renderer->DrawHeaderButton(win, dc, rect, flags, sortIcon, params); }
virtual void DrawTreeItemButton(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_renderer->DrawTreeItemButton(win, dc, rect, flags); }
protected:

50
include/wx/univ/scrolbar.h
View File

@@ -75,47 +75,47 @@ public:
virtual ~wxScrollBar();
// implement base class pure virtuals
virtual int GetThumbPosition() const;
virtual int GetThumbSize() const;
virtual int GetPageSize() const;
virtual int GetRange() const;
virtual int GetThumbPosition() const wxOVERRIDE;
virtual int GetThumbSize() const wxOVERRIDE;
virtual int GetPageSize() const wxOVERRIDE;
virtual int GetRange() const wxOVERRIDE;
virtual void SetThumbPosition(int thumbPos);
virtual void SetThumbPosition(int thumbPos) wxOVERRIDE;
virtual void SetScrollbar(int position, int thumbSize,
int range, int pageSize,
bool refresh = true);
bool refresh = true) wxOVERRIDE;
// wxScrollBar actions
void ScrollToStart();
void ScrollToEnd();
bool ScrollLines(int nLines);
bool ScrollPages(int nPages);
bool ScrollLines(int nLines) wxOVERRIDE;
bool ScrollPages(int nPages) wxOVERRIDE;
virtual bool PerformAction(const wxControlAction& action,
long numArg = 0,
const wxString& strArg = wxEmptyString);
const wxString& strArg = wxEmptyString) wxOVERRIDE;
static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE
{
return GetStdInputHandler(handlerDef);
}
// scrollbars around a normal window should not receive the focus
virtual bool AcceptsFocus() const;
virtual bool AcceptsFocus() const wxOVERRIDE;
// wxScrollBar sub elements state (combination of wxCONTROL_XXX)
void SetState(Element which, int flags);
int GetState(Element which) const;
// implement wxControlWithArrows methods
virtual wxRenderer *GetRenderer() const { return m_renderer; }
virtual wxWindow *GetWindow() { return this; }
virtual bool IsVertical() const { return wxScrollBarBase::IsVertical(); }
virtual int GetArrowState(wxScrollArrows::Arrow arrow) const;
virtual void SetArrowFlag(wxScrollArrows::Arrow arrow, int flag, bool set);
virtual bool OnArrow(wxScrollArrows::Arrow arrow);
virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const;
virtual wxRenderer *GetRenderer() const wxOVERRIDE { return m_renderer; }
virtual wxWindow *GetWindow() wxOVERRIDE { return this; }
virtual bool IsVertical() const wxOVERRIDE { return wxScrollBarBase::IsVertical(); }
virtual int GetArrowState(wxScrollArrows::Arrow arrow) const wxOVERRIDE;
virtual void SetArrowFlag(wxScrollArrows::Arrow arrow, int flag, bool set) wxOVERRIDE;
virtual bool OnArrow(wxScrollArrows::Arrow arrow) wxOVERRIDE;
virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const wxOVERRIDE;
// for wxControlRenderer::DrawScrollbar() only
const wxScrollArrows& GetArrows() const { return m_arrows; }
@@ -124,12 +124,12 @@ public:
wxHitTest HitTestBar(const wxPoint& pt) const;
// idle processing
virtual void OnInternalIdle();
virtual void OnInternalIdle() wxOVERRIDE;
protected:
virtual wxSize DoGetBestClientSize() const;
virtual void DoDraw(wxControlRenderer *renderer);
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
// forces update of thumb's visual appearence (does nothing if m_dirty=false)
void UpdateThumb();
@@ -212,10 +212,10 @@ public:
virtual bool HandleKey(wxInputConsumer *consumer,
const wxKeyEvent& event,
bool pressed);
bool pressed) wxOVERRIDE;
virtual bool HandleMouse(wxInputConsumer *consumer,
const wxMouseEvent& event);
virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event);
const wxMouseEvent& event) wxOVERRIDE;
virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event) wxOVERRIDE;
virtual ~wxStdScrollBarInputHandler();

2
include/wx/univ/scrtimer.h
View File

@@ -34,7 +34,7 @@ public:
void StartAutoScroll();
// the base class method
virtual void Notify();
virtual void Notify() wxOVERRIDE;
protected:
// to implement in derived classes: perform the scroll action and return

58
include/wx/univ/slider.h
View File

@@ -61,22 +61,22 @@ public:
const wxString& name = wxSliderNameStr);
// implement base class pure virtuals
virtual int GetValue() const;
virtual void SetValue(int value);
virtual int GetValue() const wxOVERRIDE;
virtual void SetValue(int value) wxOVERRIDE;
virtual void SetRange(int minValue, int maxValue);
virtual int GetMin() const;
virtual int GetMax() const;
virtual void SetRange(int minValue, int maxValue) wxOVERRIDE;
virtual int GetMin() const wxOVERRIDE;
virtual int GetMax() const wxOVERRIDE;
virtual void SetLineSize(int lineSize);
virtual void SetPageSize(int pageSize);
virtual int GetLineSize() const;
virtual int GetPageSize() const;
virtual void SetLineSize(int lineSize) wxOVERRIDE;
virtual void SetPageSize(int pageSize) wxOVERRIDE;
virtual int GetLineSize() const wxOVERRIDE;
virtual int GetPageSize() const wxOVERRIDE;
virtual void SetThumbLength(int lenPixels);
virtual int GetThumbLength() const;
virtual void SetThumbLength(int lenPixels) wxOVERRIDE;
virtual int GetThumbLength() const wxOVERRIDE;
virtual int GetTickFreq() const { return m_tickFreq; }
virtual int GetTickFreq() const wxOVERRIDE { return m_tickFreq; }
// wxUniv-specific methods
// -----------------------
@@ -99,32 +99,32 @@ public:
((GetWindowStyle() & (wxSL_TOP|wxSL_BOTTOM|wxSL_LEFT|wxSL_RIGHT|wxSL_BOTH)) != 0); }
// implement wxControlWithThumb interface
virtual wxWindow *GetWindow() { return this; }
virtual bool IsVertical() const { return IsVert(); }
virtual wxWindow *GetWindow() wxOVERRIDE { return this; }
virtual bool IsVertical() const wxOVERRIDE { return IsVert(); }
virtual wxScrollThumb::Shaft HitTest(const wxPoint& pt) const;
virtual wxCoord ThumbPosToPixel() const;
virtual int PixelToThumbPos(wxCoord x) const;
virtual wxScrollThumb::Shaft HitTest(const wxPoint& pt) const wxOVERRIDE;
virtual wxCoord ThumbPosToPixel() const wxOVERRIDE;
virtual int PixelToThumbPos(wxCoord x) const wxOVERRIDE;
virtual void SetShaftPartState(wxScrollThumb::Shaft shaftPart,
int flag,
bool set = true);
bool set = true) wxOVERRIDE;
virtual void OnThumbDragStart(int pos);
virtual void OnThumbDrag(int pos);
virtual void OnThumbDragEnd(int pos);
virtual void OnPageScrollStart();
virtual bool OnPageScroll(int pageInc);
virtual void OnThumbDragStart(int pos) wxOVERRIDE;
virtual void OnThumbDrag(int pos) wxOVERRIDE;
virtual void OnThumbDragEnd(int pos) wxOVERRIDE;
virtual void OnPageScrollStart() wxOVERRIDE;
virtual bool OnPageScroll(int pageInc) wxOVERRIDE;
// for wxStdSliderInputHandler
wxScrollThumb& GetThumb() { return m_thumb; }
virtual bool PerformAction(const wxControlAction& action,
long numArg = 0,
const wxString& strArg = wxEmptyString);
const wxString& strArg = wxEmptyString) wxOVERRIDE;
static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE
{
return GetStdInputHandler(handlerDef);
}
@@ -136,12 +136,12 @@ protected:
};
// Platform-specific implementation of SetTickFreq
virtual void DoSetTickFreq(int freq);
virtual void DoSetTickFreq(int freq) wxOVERRIDE;
// overridden base class virtuals
virtual wxSize DoGetBestClientSize() const;
virtual void DoDraw(wxControlRenderer *renderer);
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
// event handlers
void OnSize(wxSizeEvent& event);

36
include/wx/univ/spinbutt.h
View File

@@ -41,36 +41,36 @@ public:
const wxString& name = wxSPIN_BUTTON_NAME);
// implement wxSpinButtonBase methods
virtual int GetValue() const;
virtual void SetValue(int val);
virtual void SetRange(int minVal, int maxVal);
virtual int GetValue() const wxOVERRIDE;
virtual void SetValue(int val) wxOVERRIDE;
virtual void SetRange(int minVal, int maxVal) wxOVERRIDE;
// implement wxControlWithArrows methods
virtual wxRenderer *GetRenderer() const { return m_renderer; }
virtual wxWindow *GetWindow() { return this; }
virtual bool IsVertical() const { return wxSpinButtonBase::IsVertical(); }
virtual int GetArrowState(wxScrollArrows::Arrow arrow) const;
virtual void SetArrowFlag(wxScrollArrows::Arrow arrow, int flag, bool set);
virtual bool OnArrow(wxScrollArrows::Arrow arrow);
virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const;
virtual wxRenderer *GetRenderer() const wxOVERRIDE { return m_renderer; }
virtual wxWindow *GetWindow() wxOVERRIDE { return this; }
virtual bool IsVertical() const wxOVERRIDE { return wxSpinButtonBase::IsVertical(); }
virtual int GetArrowState(wxScrollArrows::Arrow arrow) const wxOVERRIDE;
virtual void SetArrowFlag(wxScrollArrows::Arrow arrow, int flag, bool set) wxOVERRIDE;
virtual bool OnArrow(wxScrollArrows::Arrow arrow) wxOVERRIDE;
virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const wxOVERRIDE;
// for wxStdSpinButtonInputHandler
const wxScrollArrows& GetArrows() { return m_arrows; }
virtual bool PerformAction(const wxControlAction& action,
long numArg = 0,
const wxString& strArg = wxEmptyString);
const wxString& strArg = wxEmptyString) wxOVERRIDE;
static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE
{
return GetStdInputHandler(handlerDef);
}
protected:
virtual wxSize DoGetBestClientSize() const;
virtual void DoDraw(wxControlRenderer *renderer);
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
// the common part of all ctors
void Init();
@@ -110,11 +110,11 @@ public:
virtual bool HandleKey(wxInputConsumer *consumer,
const wxKeyEvent& event,
bool pressed);
bool pressed) wxOVERRIDE;
virtual bool HandleMouse(wxInputConsumer *consumer,
const wxMouseEvent& event);
const wxMouseEvent& event) wxOVERRIDE;
virtual bool HandleMouseMove(wxInputConsumer *consumer,
const wxMouseEvent& event);
const wxMouseEvent& event) wxOVERRIDE;
};
#endif // _WX_UNIV_SPINBUTT_H_

12
include/wx/univ/statbmp.h
View File

@@ -52,16 +52,16 @@ public:
long style = 0,
const wxString& name = wxStaticBitmapNameStr);
virtual void SetBitmap(const wxBitmap& bitmap);
virtual void SetIcon(const wxIcon& icon);
virtual wxBitmap GetBitmap() const { return m_bitmap; }
virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE;
virtual void SetIcon(const wxIcon& icon) wxOVERRIDE;
virtual wxBitmap GetBitmap() const wxOVERRIDE { return m_bitmap; }
wxIcon GetIcon() const;
wxIcon GetIcon() const wxOVERRIDE;
virtual bool HasTransparentBackground() { return true; }
virtual bool HasTransparentBackground() wxOVERRIDE { return true; }
protected:
virtual void DoDraw(wxControlRenderer *renderer);
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
private:
// the bitmap which we show

4
include/wx/univ/statbox.h
View File

@@ -48,11 +48,11 @@ public:
// returning true from here ensures that we act as a container window for
// our children
virtual bool IsStaticBox() const { return true; }
virtual bool IsStaticBox() const wxOVERRIDE { return true; }
protected:
// draw the control
virtual void DoDraw(wxControlRenderer *renderer);
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
// get the size of the border
wxRect GetBorderGeometry() const;

2
include/wx/univ/statline.h
View File

@@ -45,7 +45,7 @@ public:
const wxString &name = wxStaticLineNameStr );
protected:
virtual void DoDraw(wxControlRenderer *renderer);
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
private:
DECLARE_DYNAMIC_CLASS(wxStaticLine)

10
include/wx/univ/stattext.h
View File

@@ -50,16 +50,16 @@ public:
// implementation only from now on
virtual void SetLabel(const wxString& label);
virtual void SetLabel(const wxString& label) wxOVERRIDE;
virtual bool IsFocused() const { return false; }
virtual bool IsFocused() const wxOVERRIDE { return false; }
protected:
// draw the control
virtual void DoDraw(wxControlRenderer *renderer);
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
virtual void DoSetLabel(const wxString& str);
virtual wxString DoGetLabel() const;
virtual void DoSetLabel(const wxString& str) wxOVERRIDE;
virtual wxString DoGetLabel() const wxOVERRIDE;
DECLARE_DYNAMIC_CLASS(wxStaticText)
};

22
include/wx/univ/statusbr.h
View File

@@ -39,35 +39,35 @@ public:
const wxString& name = wxPanelNameStr);
// implement base class methods
virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
virtual void SetStatusWidths(int n, const int widths[]);
virtual void SetFieldsCount(int number = 1, const int *widths = NULL) wxOVERRIDE;
virtual void SetStatusWidths(int n, const int widths[]) wxOVERRIDE;
virtual bool GetFieldRect(int i, wxRect& rect) const;
virtual void SetMinHeight(int height);
virtual bool GetFieldRect(int i, wxRect& rect) const wxOVERRIDE;
virtual void SetMinHeight(int height) wxOVERRIDE;
virtual int GetBorderX() const;
virtual int GetBorderY() const;
virtual int GetBorderX() const wxOVERRIDE;
virtual int GetBorderY() const wxOVERRIDE;
// wxInputConsumer pure virtual
virtual wxWindow *GetInputWindow() const
virtual wxWindow *GetInputWindow() const wxOVERRIDE
{ return const_cast<wxStatusBar*>(this); }
protected:
virtual void DoUpdateStatusText(int i);
virtual void DoUpdateStatusText(int i) wxOVERRIDE;
// recalculate the field widths
void OnSize(wxSizeEvent& event);
// draw the statusbar
virtual void DoDraw(wxControlRenderer *renderer);
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
// tell them about our preferred height
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetBestSize() const wxOVERRIDE;
// override DoSetSize() to prevent the status bar height from changing
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
// get the (fixed) status bar height
wxCoord GetHeight() const;

80
include/wx/univ/stdrend.h
View File

@@ -30,14 +30,14 @@ public:
const wxColour& col,
const wxRect& rect,
int flags = 0,
wxWindow *window = NULL);
wxWindow *window = NULL) wxOVERRIDE;
virtual void DrawButtonSurface(wxDC& dc,
const wxColour& col,
const wxRect& rect,
int flags);
int flags) wxOVERRIDE;
virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);
virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) wxOVERRIDE;
virtual void DrawLabel(wxDC& dc,
const wxString& label,
@@ -45,7 +45,7 @@ public:
int flags = 0,
int alignment = wxALIGN_LEFT | wxALIGN_TOP,
int indexAccel = -1,
wxRect *rectBounds = NULL);
wxRect *rectBounds = NULL) wxOVERRIDE;
virtual void DrawButtonLabel(wxDC& dc,
const wxString& label,
const wxBitmap& image,
@@ -53,41 +53,41 @@ public:
int flags = 0,
int alignment = wxALIGN_LEFT | wxALIGN_TOP,
int indexAccel = -1,
wxRect *rectBounds = NULL);
wxRect *rectBounds = NULL) wxOVERRIDE;
virtual void DrawBorder(wxDC& dc,
wxBorder border,
const wxRect& rect,
int flags = 0,
wxRect *rectIn = NULL);
wxRect *rectIn = NULL) wxOVERRIDE;
virtual void DrawTextBorder(wxDC& dc,
wxBorder border,
const wxRect& rect,
int flags = 0,
wxRect *rectIn = NULL);
wxRect *rectIn = NULL) wxOVERRIDE;
virtual void DrawHorizontalLine(wxDC& dc,
wxCoord y, wxCoord x1, wxCoord x2);
wxCoord y, wxCoord x1, wxCoord x2) wxOVERRIDE;
virtual void DrawVerticalLine(wxDC& dc,
wxCoord x, wxCoord y1, wxCoord y2);
wxCoord x, wxCoord y1, wxCoord y2) wxOVERRIDE;
virtual void DrawFrame(wxDC& dc,
const wxString& label,
const wxRect& rect,
int flags = 0,
int alignment = wxALIGN_LEFT,
int indexAccel = -1);
int indexAccel = -1) wxOVERRIDE;
virtual void DrawItem(wxDC& dc,
const wxString& label,
const wxRect& rect,
int flags = 0);
int flags = 0) wxOVERRIDE;
virtual void DrawCheckItem(wxDC& dc,
const wxString& label,
const wxBitmap& bitmap,
const wxRect& rect,
int flags = 0);
int flags = 0) wxOVERRIDE;
virtual void DrawCheckButton(wxDC& dc,
const wxString& label,
@@ -95,21 +95,21 @@ public:
const wxRect& rect,
int flags = 0,
wxAlignment align = wxALIGN_LEFT,
int indexAccel = -1);
int indexAccel = -1) wxOVERRIDE;
virtual void DrawRadioButton(wxDC& dc,
const wxString& label,
const wxBitmap& bitmap,
const wxRect& rect,
int flags = 0,
wxAlignment align = wxALIGN_LEFT,
int indexAccel = -1);
int indexAccel = -1) wxOVERRIDE;
virtual void DrawScrollbarArrow(wxDC& dc,
wxDirection dir,
const wxRect& rect,
int flags = 0);
int flags = 0) wxOVERRIDE;
virtual void DrawScrollCorner(wxDC& dc,
const wxRect& rect);
const wxRect& rect) wxOVERRIDE;
#if wxUSE_TEXTCTRL
virtual void DrawTextLine(wxDC& dc,
@@ -117,39 +117,39 @@ public:
const wxRect& rect,
int selStart = -1,
int selEnd = -1,
int flags = 0);
int flags = 0) wxOVERRIDE;
virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect);
virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect) wxOVERRIDE;
virtual wxRect GetTextTotalArea(const wxTextCtrl *text,
const wxRect& rect) const;
const wxRect& rect) const wxOVERRIDE;
virtual wxRect GetTextClientArea(const wxTextCtrl *text,
const wxRect& rect,
wxCoord *extraSpaceBeyond) const;
wxCoord *extraSpaceBeyond) const wxOVERRIDE;
#endif // wxUSE_TEXTCTRL
virtual wxRect GetBorderDimensions(wxBorder border) const;
virtual wxRect GetBorderDimensions(wxBorder border) const wxOVERRIDE;
virtual bool AreScrollbarsInsideBorder() const;
virtual bool AreScrollbarsInsideBorder() const wxOVERRIDE;
virtual void AdjustSize(wxSize *size, const wxWindow *window);
virtual void AdjustSize(wxSize *size, const wxWindow *window) wxOVERRIDE;
virtual wxCoord GetListboxItemHeight(wxCoord fontHeight);
virtual wxCoord GetListboxItemHeight(wxCoord fontHeight) wxOVERRIDE;
#if wxUSE_STATUSBAR
virtual void DrawStatusField(wxDC& dc,
const wxRect& rect,
const wxString& label,
int flags = 0, int style = 0);
int flags = 0, int style = 0) wxOVERRIDE;
virtual wxSize GetStatusBarBorders() const;
virtual wxSize GetStatusBarBorders() const wxOVERRIDE;
virtual wxCoord GetStatusBarBorderBetweenFields() const;
virtual wxCoord GetStatusBarBorderBetweenFields() const wxOVERRIDE;
virtual wxSize GetStatusBarFieldMargins() const;
virtual wxSize GetStatusBarFieldMargins() const wxOVERRIDE;
#endif // wxUSE_STATUSBAR
virtual wxCoord GetCheckItemMargin() const { return 0; }
virtual wxCoord GetCheckItemMargin() const wxOVERRIDE { return 0; }
virtual void DrawFrameTitleBar(wxDC& dc,
@@ -158,37 +158,37 @@ public:
const wxIcon& icon,
int flags,
int specialButton = 0,
int specialButtonFlag = 0);
int specialButtonFlag = 0) wxOVERRIDE;
virtual void DrawFrameBorder(wxDC& dc,
const wxRect& rect,
int flags);
int flags) wxOVERRIDE;
virtual void DrawFrameBackground(wxDC& dc,
const wxRect& rect,
int flags);
int flags) wxOVERRIDE;
virtual void DrawFrameTitle(wxDC& dc,
const wxRect& rect,
const wxString& title,
int flags);
int flags) wxOVERRIDE;
virtual void DrawFrameIcon(wxDC& dc,
const wxRect& rect,
const wxIcon& icon,
int flags);
int flags) wxOVERRIDE;
virtual void DrawFrameButton(wxDC& dc,
wxCoord x, wxCoord y,
int button,
int flags = 0);
int flags = 0) wxOVERRIDE;
virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const;
virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const wxOVERRIDE;
virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const;
virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const wxOVERRIDE;
virtual wxSize GetFrameMinSize(int flags) const;
virtual wxSize GetFrameMinSize(int flags) const wxOVERRIDE;
virtual wxSize GetFrameIconSize() const;
virtual wxSize GetFrameIconSize() const wxOVERRIDE;
virtual int HitTestFrame(const wxRect& rect,
const wxPoint& pt,
int flags = 0) const;
int flags = 0) const wxOVERRIDE;
protected:
// various constants
enum ArrowDirection

88
include/wx/univ/textctrl.h
View File

@@ -103,39 +103,39 @@ public:
// implement base class pure virtuals
// ----------------------------------
virtual int GetLineLength(wxTextCoord lineNo) const;
virtual wxString GetLineText(wxTextCoord lineNo) const;
virtual int GetNumberOfLines() const;
virtual int GetLineLength(wxTextCoord lineNo) const wxOVERRIDE;
virtual wxString GetLineText(wxTextCoord lineNo) const wxOVERRIDE;
virtual int GetNumberOfLines() const wxOVERRIDE;
virtual bool IsModified() const;
virtual bool IsEditable() const;
virtual bool IsModified() const wxOVERRIDE;
virtual bool IsEditable() const wxOVERRIDE;
// If the return values from and to are the same, there is no selection.
virtual void GetSelection(wxTextPos* from, wxTextPos* to) const;
virtual void GetSelection(wxTextPos* from, wxTextPos* to) const wxOVERRIDE;
// operations
// ----------
// editing
virtual void Clear();
virtual void Replace(wxTextPos from, wxTextPos to, const wxString& value);
virtual void Remove(wxTextPos from, wxTextPos to);
virtual void Clear() wxOVERRIDE;
virtual void Replace(wxTextPos from, wxTextPos to, const wxString& value) wxOVERRIDE;
virtual void Remove(wxTextPos from, wxTextPos to) wxOVERRIDE;
// sets/clears the dirty flag
virtual void MarkDirty();
virtual void DiscardEdits();
virtual void MarkDirty() wxOVERRIDE;
virtual void DiscardEdits() wxOVERRIDE;
// writing text inserts it at the current position, appending always
// inserts it at the end
virtual void WriteText(const wxString& text);
virtual void AppendText(const wxString& text);
virtual void WriteText(const wxString& text) wxOVERRIDE;
virtual void AppendText(const wxString& text) wxOVERRIDE;
// translate between the position (which is just an index in the text ctrl
// considering all its contents as a single strings) and (x, y) coordinates
// which represent (logical, i.e. unwrapped) column and line.
virtual wxTextPos XYToPosition(wxTextCoord x, wxTextCoord y) const;
virtual wxTextPos XYToPosition(wxTextCoord x, wxTextCoord y) const wxOVERRIDE;
virtual bool PositionToXY(wxTextPos pos,
wxTextCoord *x, wxTextCoord *y) const;
wxTextCoord *x, wxTextCoord *y) const wxOVERRIDE;
// wxUniv-specific: find a screen position (in client coordinates) of the
// given text position or of the caret
@@ -143,28 +143,28 @@ public:
bool PositionToDeviceXY(wxTextPos pos, wxCoord *x, wxCoord *y) const;
wxPoint GetCaretPosition() const;
virtual void ShowPosition(wxTextPos pos);
virtual void ShowPosition(wxTextPos pos) wxOVERRIDE;
// Clipboard operations
virtual void Copy();
virtual void Cut();
virtual void Paste();
virtual void Copy() wxOVERRIDE;
virtual void Cut() wxOVERRIDE;
virtual void Paste() wxOVERRIDE;
// Undo/redo
virtual void Undo();
virtual void Redo();
virtual void Undo() wxOVERRIDE;
virtual void Redo() wxOVERRIDE;
virtual bool CanUndo() const;
virtual bool CanRedo() const;
virtual bool CanUndo() const wxOVERRIDE;
virtual bool CanRedo() const wxOVERRIDE;
// Insertion point
virtual void SetInsertionPoint(wxTextPos pos);
virtual void SetInsertionPointEnd();
virtual wxTextPos GetInsertionPoint() const;
virtual wxTextPos GetLastPosition() const;
virtual void SetInsertionPoint(wxTextPos pos) wxOVERRIDE;
virtual void SetInsertionPointEnd() wxOVERRIDE;
virtual wxTextPos GetInsertionPoint() const wxOVERRIDE;
virtual wxTextPos GetLastPosition() const wxOVERRIDE;
virtual void SetSelection(wxTextPos from, wxTextPos to);
virtual void SetEditable(bool editable);
virtual void SetSelection(wxTextPos from, wxTextPos to) wxOVERRIDE;
virtual void SetEditable(bool editable) wxOVERRIDE;
// wxUniv-specific methods
// -----------------------
@@ -185,10 +185,10 @@ public:
void RemoveSelection();
wxString GetSelectionText() const;
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const;
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE;
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
wxTextCoord *col,
wxTextCoord *row) const;
wxTextCoord *row) const wxOVERRIDE;
// find the character at this position in the given line, return value as
// for HitTest()
@@ -206,7 +206,7 @@ public:
void ScrollText(wxTextCoord col);
// adjust the DC for horz text control scrolling too
virtual void DoPrepareDC(wxDC& dc);
virtual void DoPrepareDC(wxDC& dc) wxOVERRIDE;
// implementation only from now on
// -------------------------------
@@ -218,17 +218,17 @@ public:
// perform an action
virtual bool PerformAction(const wxControlAction& action,
long numArg = -1,
const wxString& strArg = wxEmptyString);
const wxString& strArg = wxEmptyString) wxOVERRIDE;
static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE
{
return GetStdInputHandler(handlerDef);
}
// override these methods to handle the caret
virtual bool SetFont(const wxFont &font);
virtual bool Enable(bool enable = true);
virtual bool SetFont(const wxFont &font) wxOVERRIDE;
virtual bool Enable(bool enable = true) wxOVERRIDE;
// more readable flag testing methods
bool IsPassword() const { return HasFlag(wxTE_PASSWORD); }
@@ -239,25 +239,25 @@ public:
// override wxScrollHelper method to prevent (auto)scrolling beyond the end
// of line
virtual bool SendAutoScrollEvents(wxScrollWinEvent& event) const;
virtual bool SendAutoScrollEvents(wxScrollWinEvent& event) const wxOVERRIDE;
// idle processing
virtual void OnInternalIdle();
virtual void OnInternalIdle() wxOVERRIDE;
protected:
// ensure we have correct default border
virtual wxBorder GetDefaultBorder() const { return wxBORDER_SUNKEN; }
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_SUNKEN; }
// override base class methods
virtual void DoDrawBorder(wxDC& dc, const wxRect& rect);
virtual void DoDraw(wxControlRenderer *renderer);
virtual void DoDrawBorder(wxDC& dc, const wxRect& rect) wxOVERRIDE;
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
// calc the size from the text extent
virtual wxSize DoGetBestClientSize() const;
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
// implements Set/ChangeValue()
virtual void DoSetValue(const wxString& value, int flags = 0);
virtual wxString DoGetValue() const;
virtual void DoSetValue(const wxString& value, int flags = 0) wxOVERRIDE;
virtual wxString DoGetValue() const wxOVERRIDE;
// common part of all ctors
void Init();

8
include/wx/univ/tglbtn.h
View File

@@ -43,18 +43,18 @@ public:
virtual ~wxToggleButton();
virtual bool IsPressed() const { return m_isPressed || m_value; }
virtual bool IsPressed() const wxOVERRIDE { return m_isPressed || m_value; }
// wxToggleButton actions
virtual void Toggle();
virtual void Click();
virtual void Toggle() wxOVERRIDE;
virtual void Click() wxOVERRIDE;
// Get/set the value
void SetValue(bool state);
bool GetValue() const { return m_value; }
protected:
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
// the current value
bool m_value;

34
include/wx/univ/toolbar.h
View File

@@ -56,23 +56,23 @@ public:
virtual ~wxToolBar();
virtual bool Realize();
virtual bool Realize() wxOVERRIDE;
virtual void SetWindowStyleFlag( long style );
virtual void SetWindowStyleFlag( long style ) wxOVERRIDE;
virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE;
virtual void SetToolShortHelp(int id, const wxString& helpString);
virtual void SetToolShortHelp(int id, const wxString& helpString) wxOVERRIDE;
virtual void SetMargins(int x, int y);
virtual void SetMargins(int x, int y) wxOVERRIDE;
void SetMargins(const wxSize& size)
{ SetMargins((int) size.x, (int) size.y); }
virtual bool PerformAction(const wxControlAction& action,
long numArg = -1,
const wxString& strArg = wxEmptyString);
const wxString& strArg = wxEmptyString) wxOVERRIDE;
static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE
{
return GetStdInputHandler(handlerDef);
}
@@ -82,12 +82,12 @@ protected:
void Init();
// implement base class pure virtuals
virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE;
virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE;
virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable) wxOVERRIDE;
virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE;
virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE;
virtual wxToolBarToolBase *CreateTool(int id,
const wxString& label,
@@ -96,15 +96,15 @@ protected:
wxItemKind kind,
wxObject *clientData,
const wxString& shortHelp,
const wxString& longHelp);
const wxString& longHelp) wxOVERRIDE;
virtual wxToolBarToolBase *CreateTool(wxControl *control,
const wxString& label);
const wxString& label) wxOVERRIDE;
virtual wxSize DoGetBestClientSize() const;
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
virtual void DoDraw(wxControlRenderer *renderer);
int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
// get the bounding rect for the given tool
wxRect GetToolRect(wxToolBarToolBase *tool) const;

18
include/wx/univ/toplevel.h
View File

@@ -127,9 +127,9 @@ public:
// implement base class pure virtuals
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
virtual wxPoint GetClientAreaOrigin() const;
virtual void SetIcons(const wxIconBundle& icons);
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE;
virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE;
virtual void SetIcons(const wxIconBundle& icons) wxOVERRIDE;
// implementation from now on
// --------------------------
@@ -139,10 +139,10 @@ public:
virtual bool PerformAction(const wxControlAction& action,
long numArg = -1,
const wxString& strArg = wxEmptyString);
const wxString& strArg = wxEmptyString) wxOVERRIDE;
static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE
{
return GetStdInputHandler(handlerDef);
}
@@ -150,13 +150,13 @@ public:
// move/resize the frame interactively, i.e. let the user do it
virtual void InteractiveMove(int flags = wxINTERACTIVE_MOVE);
virtual wxSize GetMinSize() const;
virtual wxSize GetMinSize() const wxOVERRIDE;
virtual wxWindow *GetInputWindow() const { return const_cast<wxTopLevelWindow*>(this); }
virtual wxWindow *GetInputWindow() const wxOVERRIDE { return const_cast<wxTopLevelWindow*>(this); }
protected:
virtual void DoGetClientSize(int *width, int *height) const;
virtual void DoSetClientSize(int width, int height);
virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
virtual void DoSetClientSize(int width, int height) wxOVERRIDE;
// handle titlebar button click event
virtual void ClickTitleBarButton(long button);

32
include/wx/univ/window.h
View File

@@ -93,16 +93,16 @@ public:
int pos,
int page,
int range,
bool refresh = true );
virtual void SetScrollPos(int orient, int pos, bool refresh = true);
virtual int GetScrollPos(int orient) const;
virtual int GetScrollThumb(int orient) const;
virtual int GetScrollRange(int orient) const;
bool refresh = true ) wxOVERRIDE;
virtual void SetScrollPos(int orient, int pos, bool refresh = true) wxOVERRIDE;
virtual int GetScrollPos(int orient) const wxOVERRIDE;
virtual int GetScrollThumb(int orient) const wxOVERRIDE;
virtual int GetScrollRange(int orient) const wxOVERRIDE;
virtual void ScrollWindow(int dx, int dy,
const wxRect* rect = NULL);
const wxRect* rect = NULL) wxOVERRIDE;
// take into account the borders here
virtual wxPoint GetClientAreaOrigin() const;
virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE;
// popup menu support
// ------------------
@@ -179,15 +179,15 @@ public:
// the rect coordinates are, for us, in client coords, but if no rect is
// specified, the entire window is refreshed
virtual void Refresh(bool eraseBackground = true,
const wxRect *rect = (const wxRect *) NULL);
const wxRect *rect = (const wxRect *) NULL) wxOVERRIDE;
// we refresh the window when it is dis/enabled
virtual bool Enable(bool enable = true);
virtual bool Enable(bool enable = true) wxOVERRIDE;
// should we use the standard control colours or not?
virtual bool ShouldInheritColours() const { return false; }
virtual bool ShouldInheritColours() const wxOVERRIDE { return false; }
virtual bool IsClientAreaChild(const wxWindow *child) const
virtual bool IsClientAreaChild(const wxWindow *child) const wxOVERRIDE
{
#if wxUSE_SCROLLBAR
if ( child == (wxWindow*)m_scrollbarHorz ||
@@ -202,13 +202,13 @@ protected:
void Init();
#if wxUSE_MENUS
virtual bool DoPopupMenu(wxMenu *menu, int x, int y);
virtual bool DoPopupMenu(wxMenu *menu, int x, int y) wxOVERRIDE;
#endif // wxUSE_MENUS
// we deal with the scrollbars in these functions
virtual void DoSetClientSize(int width, int height);
virtual void DoGetClientSize(int *width, int *height) const;
virtual wxHitTest DoHitTest(wxCoord x, wxCoord y) const;
virtual void DoSetClientSize(int width, int height) wxOVERRIDE;
virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
virtual wxHitTest DoHitTest(wxCoord x, wxCoord y) const wxOVERRIDE;
// event handlers
void OnSize(wxSizeEvent& event);
@@ -235,7 +235,7 @@ protected:
virtual void DoDraw(wxControlRenderer *renderer);
// override the base class method to return the size of the window borders
virtual wxSize DoGetBorderSize() const;
virtual wxSize DoGetBorderSize() const wxOVERRIDE;
// adjust the size of the window to take into account its borders
wxSize AdjustSize(const wxSize& size) const;