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

more use of wxOVERRIDE

Browse Source
This commit is contained in:
Paul Cornett
2015-09-06 17:20:42 -07:00
parent 4177593aef
commit 27a8d28029
131 changed files with 1059 additions and 1059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/any.h
View File

@@ -163,7 +163,7 @@ public: \
const wxAnyValueType& otherRef = *otherType; \
return wxTypeId(inst) == wxTypeId(otherRef); \
} \
virtual bool IsSameType(const wxAnyValueType* otherType) const \
virtual bool IsSameType(const wxAnyValueType* otherType) const wxOVERRIDE \
{ \
return IsSameClass(otherType); \
} \
@@ -335,7 +335,7 @@ public:
virtual bool ConvertValue(const wxAnyValueBuffer& src,
wxAnyValueType* dstType,
wxAnyValueBuffer& dst) const
wxAnyValueBuffer& dst) const wxOVERRIDE
{
wxUnusedVar(src);
wxUnusedVar(dstType);
@@ -464,7 +464,7 @@ public: \
virtual ~wxAnyValueTypeImpl##TYPENAME() { } \
virtual bool ConvertValue(const wxAnyValueBuffer& src, \
wxAnyValueType* dstType, \
wxAnyValueBuffer& dst) const \
wxAnyValueBuffer& dst) const wxOVERRIDE \
{ \
GV value = GetValue(src); \
return CONVFUNC(value, dstType, dst); \
@@ -560,7 +560,7 @@ public: \
\
virtual bool ConvertValue(const wxAnyValueBuffer& src, \
wxAnyValueType* dstType, \
wxAnyValueBuffer& dst) const \
wxAnyValueBuffer& dst) const wxOVERRIDE \
{ \
wxUnusedVar(src); \
wxUnusedVar(dstType); \

52
include/wx/aui/auibar.h
View File

@@ -83,7 +83,7 @@ public:
m_toolId = c.m_toolId;
}
#endif
wxEvent *Clone() const { return new wxAuiToolBarEvent(*this); }
wxEvent *Clone() const wxOVERRIDE { return new wxAuiToolBarEvent(*this); }
bool IsDropDownClicked() const { return m_isDropdownClicked; }
void SetDropDownClicked(bool c) { m_isDropdownClicked = c; }
@@ -355,78 +355,78 @@ public:
wxAuiDefaultToolBarArt();
virtual ~wxAuiDefaultToolBarArt();
virtual wxAuiToolBarArt* Clone();
virtual void SetFlags(unsigned int flags);
virtual unsigned int GetFlags();
virtual void SetFont(const wxFont& font);
virtual wxFont GetFont();
virtual void SetTextOrientation(int orientation);
virtual int GetTextOrientation();
virtual wxAuiToolBarArt* Clone() wxOVERRIDE;
virtual void SetFlags(unsigned int flags) wxOVERRIDE;
virtual unsigned int GetFlags() wxOVERRIDE;
virtual void SetFont(const wxFont& font) wxOVERRIDE;
virtual wxFont GetFont() wxOVERRIDE;
virtual void SetTextOrientation(int orientation) wxOVERRIDE;
virtual int GetTextOrientation() wxOVERRIDE;
virtual void DrawBackground(
wxDC& dc,
wxWindow* wnd,
const wxRect& rect);
const wxRect& rect) wxOVERRIDE;
virtual void DrawPlainBackground(wxDC& dc,
wxWindow* wnd,
const wxRect& rect);
const wxRect& rect) wxOVERRIDE;
virtual void DrawLabel(
wxDC& dc,
wxWindow* wnd,
const wxAuiToolBarItem& item,
const wxRect& rect);
const wxRect& rect) wxOVERRIDE;
virtual void DrawButton(
wxDC& dc,
wxWindow* wnd,
const wxAuiToolBarItem& item,
const wxRect& rect);
const wxRect& rect) wxOVERRIDE;
virtual void DrawDropDownButton(
wxDC& dc,
wxWindow* wnd,
const wxAuiToolBarItem& item,
const wxRect& rect);
const wxRect& rect) wxOVERRIDE;
virtual void DrawControlLabel(
wxDC& dc,
wxWindow* wnd,
const wxAuiToolBarItem& item,
const wxRect& rect);
const wxRect& rect) wxOVERRIDE;
virtual void DrawSeparator(
wxDC& dc,
wxWindow* wnd,
const wxRect& rect);
const wxRect& rect) wxOVERRIDE;
virtual void DrawGripper(
wxDC& dc,
wxWindow* wnd,
const wxRect& rect);
const wxRect& rect) wxOVERRIDE;
virtual void DrawOverflowButton(
wxDC& dc,
wxWindow* wnd,
const wxRect& rect,
int state);
int state) wxOVERRIDE;
virtual wxSize GetLabelSize(
wxDC& dc,
wxWindow* wnd,
const wxAuiToolBarItem& item);
const wxAuiToolBarItem& item) wxOVERRIDE;
virtual wxSize GetToolSize(
wxDC& dc,
wxWindow* wnd,
const wxAuiToolBarItem& item);
const wxAuiToolBarItem& item) wxOVERRIDE;
virtual int GetElementSize(int element);
virtual void SetElementSize(int elementId, int size);
virtual int GetElementSize(int element) wxOVERRIDE;
virtual void SetElementSize(int elementId, int size) wxOVERRIDE;
virtual int ShowDropDown(wxWindow* wnd,
const wxAuiToolBarItemArray& items);
const wxAuiToolBarItemArray& items) wxOVERRIDE;
protected:
@@ -475,12 +475,12 @@ public:
const wxSize& size = wxDefaultSize,
long style = wxAUI_TB_DEFAULT_STYLE);
virtual void SetWindowStyleFlag(long style);
virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
void SetArtProvider(wxAuiToolBarArt* art);
wxAuiToolBarArt* GetArtProvider() const;
bool SetFont(const wxFont& font);
bool SetFont(const wxFont& font) wxOVERRIDE;
wxAuiToolBarItem* AddTool(int toolId,
@@ -605,7 +605,7 @@ public:
bool IsPaneValid(const wxAuiPaneInfo& pane) const;
// Override to call DoIdleUpdate().
virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE);
virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) wxOVERRIDE;
protected:
void Init();
@@ -631,7 +631,7 @@ protected:
int y,
int width,
int height,
int sizeFlags = wxSIZE_AUTO);
int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
protected: // handlers

20
include/wx/aui/tabmdi.h
View File

@@ -65,7 +65,7 @@ public:
wxMenu* GetWindowMenu() const { return m_pWindowMenu; }
void SetWindowMenu(wxMenu* pMenu);
virtual void SetMenuBar(wxMenuBar *pMenuBar);
virtual void SetMenuBar(wxMenuBar *pMenuBar) wxOVERRIDE;
#endif // wxUSE_MENUS
void SetChildMenuBar(wxAuiMDIChildFrame *pChild);
@@ -102,9 +102,9 @@ protected:
void DoHandleUpdateUI(wxUpdateUIEvent &event);
#endif // wxUSE_MENUS
virtual bool ProcessEvent(wxEvent& event);
virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE;
virtual void DoGetClientSize(int *width, int *height) const;
virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
private:
wxDECLARE_EVENT_TABLE();
@@ -151,9 +151,9 @@ public:
virtual const wxIcon& GetIcon() const;
virtual void Activate();
virtual bool Destroy();
virtual bool Destroy() wxOVERRIDE;
virtual bool Show(bool show = true);
virtual bool Show(bool show = true) wxOVERRIDE;
#if wxUSE_STATUSBAR
// no status bars
@@ -187,7 +187,7 @@ public:
virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return false; }
virtual bool IsFullScreen() const { return false; }
virtual bool IsTopLevel() const { return false; }
virtual bool IsTopLevel() const wxOVERRIDE { return false; }
void OnMenuHighlight(wxMenuEvent& evt);
void OnActivate(wxActivateEvent& evt);
@@ -198,13 +198,13 @@ public:
protected:
void Init();
virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags);
virtual void DoMoveWindow(int x, int y, int width, int height);
virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE;
virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
// no size hints
virtual void DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH),
int WXUNUSED(maxW), int WXUNUSED(maxH),
int WXUNUSED(incW), int WXUNUSED(incH)) {}
int WXUNUSED(incW), int WXUNUSED(incH)) wxOVERRIDE {}
public:
// This function needs to be called when a size change is confirmed,
// we needed this function to prevent anybody from the outside
@@ -247,7 +247,7 @@ public:
virtual bool CreateClient(wxAuiMDIParentFrame *parent,
long style = wxVSCROLL | wxHSCROLL);
virtual int SetSelection(size_t page);
virtual int SetSelection(size_t page) wxOVERRIDE;
virtual wxAuiMDIChildFrame* GetActiveChild();
virtual void SetActiveChild(wxAuiMDIChildFrame* pChildFrame)
{

4
include/wx/combobox.h
View File

@@ -53,8 +53,8 @@ public:
// but still make it pure virtual because for some platforms it's not
// implemented there and also because the derived class has to override
// it anyhow to avoid ambiguity with the other GetSelection()
virtual int GetSelection() const = 0;
virtual void GetSelection(long *from, long *to) const = 0;
virtual int GetSelection() const wxOVERRIDE = 0;
virtual void GetSelection(long *from, long *to) const wxOVERRIDE = 0;
virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); }
virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); }

114
include/wx/dcgraph.h
View File

@@ -36,8 +36,8 @@ public:
wxGCDC();
virtual ~wxGCDC();
wxGraphicsContext* GetGraphicsContext() const;
void SetGraphicsContext( wxGraphicsContext* ctx );
wxGraphicsContext* GetGraphicsContext() const wxOVERRIDE;
void SetGraphicsContext( wxGraphicsContext* ctx ) wxOVERRIDE;
#ifdef __WXMSW__
// override wxDC virtual functions to provide access to HDC associated with
@@ -70,100 +70,100 @@ public:
// implement base class pure virtuals
// ----------------------------------
virtual void Clear();
virtual void Clear() wxOVERRIDE;
virtual bool StartDoc( const wxString& message );
virtual void EndDoc();
virtual bool StartDoc( const wxString& message ) wxOVERRIDE;
virtual void EndDoc() wxOVERRIDE;
virtual void StartPage();
virtual void EndPage();
virtual void StartPage() wxOVERRIDE;
virtual void EndPage() wxOVERRIDE;
// flushing the content of this dc immediately onto screen
virtual void Flush();
virtual void Flush() wxOVERRIDE;
virtual void SetFont(const wxFont& font);
virtual void SetPen(const wxPen& pen);
virtual void SetBrush(const wxBrush& brush);
virtual void SetBackground(const wxBrush& brush);
virtual void SetBackgroundMode(int mode);
virtual void SetPalette(const wxPalette& palette);
virtual void SetFont(const wxFont& font) wxOVERRIDE;
virtual void SetPen(const wxPen& pen) wxOVERRIDE;
virtual void SetBrush(const wxBrush& brush) wxOVERRIDE;
virtual void SetBackground(const wxBrush& brush) wxOVERRIDE;
virtual void SetBackgroundMode(int mode) wxOVERRIDE;
virtual void SetPalette(const wxPalette& palette) wxOVERRIDE;
virtual void DestroyClippingRegion();
virtual void DestroyClippingRegion() wxOVERRIDE;
virtual wxCoord GetCharHeight() const;
virtual wxCoord GetCharWidth() const;
virtual wxCoord GetCharHeight() const wxOVERRIDE;
virtual wxCoord GetCharWidth() const wxOVERRIDE;
virtual bool CanDrawBitmap() const;
virtual bool CanGetTextExtent() const;
virtual int GetDepth() const;
virtual wxSize GetPPI() const;
virtual bool CanDrawBitmap() const wxOVERRIDE;
virtual bool CanGetTextExtent() const wxOVERRIDE;
virtual int GetDepth() const wxOVERRIDE;
virtual wxSize GetPPI() const wxOVERRIDE;
virtual void SetLogicalFunction(wxRasterOperationMode function);
virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE;
virtual void SetTextForeground(const wxColour& colour);
virtual void SetTextBackground(const wxColour& colour);
virtual void SetTextForeground(const wxColour& colour) wxOVERRIDE;
virtual void SetTextBackground(const wxColour& colour) wxOVERRIDE;
virtual void ComputeScaleAndOrigin();
virtual void ComputeScaleAndOrigin() wxOVERRIDE;
wxGraphicsContext* GetGraphicsContext() const { return m_graphicContext; }
virtual void SetGraphicsContext( wxGraphicsContext* ctx );
wxGraphicsContext* GetGraphicsContext() const wxOVERRIDE { return m_graphicContext; }
virtual void SetGraphicsContext( wxGraphicsContext* ctx ) wxOVERRIDE;
virtual void* GetHandle() const;
virtual void* GetHandle() const wxOVERRIDE;
// the true implementations
virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
wxFloodFillStyle style = wxFLOOD_SURFACE);
wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE;
virtual void DoGradientFillLinear(const wxRect& rect,
const wxColour& initialColour,
const wxColour& destColour,
wxDirection nDirection = wxEAST);
wxDirection nDirection = wxEAST) wxOVERRIDE;
virtual void DoGradientFillConcentric(const wxRect& rect,
const wxColour& initialColour,
const wxColour& destColour,
const wxPoint& circleCenter);
const wxPoint& circleCenter) wxOVERRIDE;
virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const wxOVERRIDE;
virtual void DoDrawPoint(wxCoord x, wxCoord y);
virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE;
#if wxUSE_SPLINES
virtual void DoDrawSpline(const wxPointList *points);
virtual void DoDrawSpline(const wxPointList *points) wxOVERRIDE;
#endif
virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE;
virtual void DoDrawArc(wxCoord x1, wxCoord y1,
wxCoord x2, wxCoord y2,
wxCoord xc, wxCoord yc);
wxCoord xc, wxCoord yc) wxOVERRIDE;
virtual void DoDrawCheckMark(wxCoord x, wxCoord y,
wxCoord width, wxCoord height);
wxCoord width, wxCoord height) wxOVERRIDE;
virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
double sa, double ea);
double sa, double ea) wxOVERRIDE;
virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE;
virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
wxCoord width, wxCoord height,
double radius);
virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
double radius) wxOVERRIDE;
virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE;
virtual void DoCrossHair(wxCoord x, wxCoord y);
virtual void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE;
virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE;
virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
bool useMask = false);
bool useMask = false) wxOVERRIDE;
virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE;
virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
double angle);
double angle) wxOVERRIDE;
virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc,
wxRasterOperationMode rop = wxCOPY, bool useMask = false,
wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
wxCoord xsrcMask = -1, wxCoord ysrcMask = -1) wxOVERRIDE;
virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,
wxCoord dstWidth, wxCoord dstHeight,
@@ -171,31 +171,31 @@ public:
wxCoord xsrc, wxCoord ysrc,
wxCoord srcWidth, wxCoord srcHeight,
wxRasterOperationMode = wxCOPY, bool useMask = false,
wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE;
virtual void DoGetSize(int *,int *) const;
virtual void DoGetSizeMM(int* width, int* height) const;
virtual void DoGetSize(int *,int *) const wxOVERRIDE;
virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE;
virtual void DoDrawLines(int n, const wxPoint points[],
wxCoord xoffset, wxCoord yoffset);
wxCoord xoffset, wxCoord yoffset) wxOVERRIDE;
virtual void DoDrawPolygon(int n, const wxPoint points[],
wxCoord xoffset, wxCoord yoffset,
wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE;
virtual void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[],
wxCoord xoffset, wxCoord yoffset,
wxPolygonFillMode fillStyle);
wxPolygonFillMode fillStyle) wxOVERRIDE;
virtual void DoSetDeviceClippingRegion(const wxRegion& region);
virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE;
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
wxCoord width, wxCoord height);
wxCoord width, wxCoord height) wxOVERRIDE;
virtual void DoGetTextExtent(const wxString& string,
wxCoord *x, wxCoord *y,
wxCoord *descent = NULL,
wxCoord *externalLeading = NULL,
const wxFont *theFont = NULL) const;
const wxFont *theFont = NULL) const wxOVERRIDE;
virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const wxOVERRIDE;
#ifdef __WXMSW__
virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const;

34
include/wx/dvrenderers.h
View File

@@ -305,12 +305,12 @@ public:
// Override the base class virtual method to simply store the attribute so
// that it can be accessed using GetAttr() from Render() if needed.
virtual void SetAttr(const wxDataViewItemAttr& attr) { m_attr = attr; }
virtual void SetAttr(const wxDataViewItemAttr& attr) wxOVERRIDE { m_attr = attr; }
const wxDataViewItemAttr& GetAttr() const { return m_attr; }
// Store the enabled state of the item so that it can be accessed from
// Render() via GetEnabled() if needed.
virtual void SetEnabled(bool enabled);
virtual void SetEnabled(bool enabled) wxOVERRIDE;
bool GetEnabled() const { return m_enabled; }
@@ -326,7 +326,7 @@ public:
// Prepare DC to use attributes and call Render().
void WXCallRender(wxRect rect, wxDC *dc, int state);
virtual bool IsCustomRenderer() const { return true; }
virtual bool IsCustomRenderer() const wxOVERRIDE { return true; }
protected:
// helper for GetSize() implementations, respects attributes
@@ -368,13 +368,13 @@ public:
wxDataViewSpinRenderer( int min, int max,
wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
int alignment = wxDVR_DEFAULT_ALIGNMENT );
virtual bool HasEditorCtrl() const { return true; }
virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value );
virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value );
virtual bool Render( wxRect rect, wxDC *dc, int state );
virtual wxSize GetSize() const;
virtual bool SetValue( const wxVariant &value );
virtual bool GetValue( wxVariant &value ) const;
virtual bool HasEditorCtrl() const wxOVERRIDE { return true; }
virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) wxOVERRIDE;
virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) wxOVERRIDE;
virtual bool Render( wxRect rect, wxDC *dc, int state ) wxOVERRIDE;
virtual wxSize GetSize() const wxOVERRIDE;
virtual bool SetValue( const wxVariant &value ) wxOVERRIDE;
virtual bool GetValue( wxVariant &value ) const wxOVERRIDE;
private:
long m_data;
@@ -446,13 +446,13 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
int align = wxDVR_DEFAULT_ALIGNMENT);
virtual bool HasEditorCtrl() const { return true; }
virtual wxWindow *CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant &value);
virtual bool GetValueFromEditorCtrl(wxWindow* editor, wxVariant &value);
virtual bool SetValue(const wxVariant &value);
virtual bool GetValue(wxVariant& value) const;
virtual bool Render( wxRect cell, wxDC *dc, int state );
virtual wxSize GetSize() const;
virtual bool HasEditorCtrl() const wxOVERRIDE { return true; }
virtual wxWindow *CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant &value) wxOVERRIDE;
virtual bool GetValueFromEditorCtrl(wxWindow* editor, wxVariant &value) wxOVERRIDE;
virtual bool SetValue(const wxVariant &value) wxOVERRIDE;
virtual bool GetValue(wxVariant& value) const wxOVERRIDE;
virtual bool Render( wxRect cell, wxDC *dc, int state ) wxOVERRIDE;
virtual wxSize GetSize() const wxOVERRIDE;
private:
wxDateTime m_date;

60
include/wx/generic/calctrlg.h
View File

@@ -46,22 +46,22 @@ public:
virtual ~wxGenericCalendarCtrl();
virtual bool Destroy();
virtual bool Destroy() wxOVERRIDE;
// set/get the current date
// ------------------------
virtual bool SetDate(const wxDateTime& date);
virtual wxDateTime GetDate() const { return m_date; }
virtual bool SetDate(const wxDateTime& date) wxOVERRIDE;
virtual wxDateTime GetDate() const wxOVERRIDE { return m_date; }
// set/get the range in which selection can occur
// ---------------------------------------------
virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime,
const wxDateTime& upperdate = wxDefaultDateTime);
const wxDateTime& upperdate = wxDefaultDateTime) wxOVERRIDE;
virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const;
virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const wxOVERRIDE;
// these functions are for generic version only, don't use them but use the
// Set/GetDateRange() above instead
@@ -79,7 +79,7 @@ public:
// should be used instead for them
// corresponds to wxCAL_NO_MONTH_CHANGE bit
virtual bool EnableMonthChange(bool enable = true);
virtual bool EnableMonthChange(bool enable = true) wxOVERRIDE;
// corresponds to wxCAL_NO_YEAR_CHANGE bit, deprecated, generic only
void EnableYearChange(bool enable = true);
@@ -88,48 +88,48 @@ public:
// customization
// -------------
virtual void Mark(size_t day, bool mark);
virtual void Mark(size_t day, bool mark) wxOVERRIDE;
// all other functions in this section are for generic version only
// header colours are used for painting the weekdays at the top
virtual void SetHeaderColours(const wxColour& colFg, const wxColour& colBg)
virtual void SetHeaderColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE
{
m_colHeaderFg = colFg;
m_colHeaderBg = colBg;
}
virtual const wxColour& GetHeaderColourFg() const { return m_colHeaderFg; }
virtual const wxColour& GetHeaderColourBg() const { return m_colHeaderBg; }
virtual const wxColour& GetHeaderColourFg() const wxOVERRIDE { return m_colHeaderFg; }
virtual const wxColour& GetHeaderColourBg() const wxOVERRIDE { return m_colHeaderBg; }
// highlight colour is used for the currently selected date
virtual void SetHighlightColours(const wxColour& colFg, const wxColour& colBg)
virtual void SetHighlightColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE
{
m_colHighlightFg = colFg;
m_colHighlightBg = colBg;
}
virtual const wxColour& GetHighlightColourFg() const { return m_colHighlightFg; }
virtual const wxColour& GetHighlightColourBg() const { return m_colHighlightBg; }
virtual const wxColour& GetHighlightColourFg() const wxOVERRIDE { return m_colHighlightFg; }
virtual const wxColour& GetHighlightColourBg() const wxOVERRIDE { return m_colHighlightBg; }
// holiday colour is used for the holidays (if style & wxCAL_SHOW_HOLIDAYS)
virtual void SetHolidayColours(const wxColour& colFg, const wxColour& colBg)
virtual void SetHolidayColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE
{
m_colHolidayFg = colFg;
m_colHolidayBg = colBg;
}
virtual const wxColour& GetHolidayColourFg() const { return m_colHolidayFg; }
virtual const wxColour& GetHolidayColourBg() const { return m_colHolidayBg; }
virtual const wxColour& GetHolidayColourFg() const wxOVERRIDE { return m_colHolidayFg; }
virtual const wxColour& GetHolidayColourBg() const wxOVERRIDE { return m_colHolidayBg; }
virtual wxCalendarDateAttr *GetAttr(size_t day) const
virtual wxCalendarDateAttr *GetAttr(size_t day) const wxOVERRIDE
{
wxCHECK_MSG( day > 0 && day < 32, NULL, wxT("invalid day") );
return m_attrs[day - 1];
}
virtual void SetAttr(size_t day, wxCalendarDateAttr *attr)
virtual void SetAttr(size_t day, wxCalendarDateAttr *attr) wxOVERRIDE
{
wxCHECK_RET( day > 0 && day < 32, wxT("invalid day") );
@@ -137,24 +137,24 @@ public:
m_attrs[day - 1] = attr;
}
virtual void ResetAttr(size_t day) { SetAttr(day, NULL); }
virtual void ResetAttr(size_t day) wxOVERRIDE { SetAttr(day, NULL); }
virtual void SetHoliday(size_t day);
virtual void SetHoliday(size_t day) wxOVERRIDE;
virtual wxCalendarHitTestResult HitTest(const wxPoint& pos,
wxDateTime *date = NULL,
wxDateTime::WeekDay *wd = NULL);
wxDateTime::WeekDay *wd = NULL) wxOVERRIDE;
// implementation only from now on
// -------------------------------
// forward these functions to all subcontrols
virtual bool Enable(bool enable = true);
virtual bool Show(bool show = true);
virtual bool Enable(bool enable = true) wxOVERRIDE;
virtual bool Show(bool show = true) wxOVERRIDE;
virtual void SetWindowStyleFlag(long style);
virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
virtual wxVisualAttributes GetDefaultAttributes() const
virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
{ return GetClassDefaultAttributes(GetWindowVariant()); }
static wxVisualAttributes
@@ -164,9 +164,9 @@ public:
protected:
// override some base class virtuals
virtual wxSize DoGetBestSize() const;
virtual void DoMoveWindow(int x, int y, int width, int height);
virtual void DoGetSize(int *width, int *height) const;
virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
private:
// common part of all ctors
@@ -248,8 +248,8 @@ public:
wxControl *GetYearControl() const;
private:
virtual void ResetHolidayAttrs();
virtual void RefreshHolidays() { Refresh(); }
virtual void ResetHolidayAttrs() wxOVERRIDE;
virtual void RefreshHolidays() wxOVERRIDE { Refresh(); }
// OnPaint helper-methods

4
include/wx/generic/choicdgg.h
View File

@@ -279,13 +279,13 @@ public:
wxArrayInt GetSelections() const { return m_selections; }
// implementation from now on
virtual bool TransferDataFromWindow();
virtual bool TransferDataFromWindow() wxOVERRIDE;
protected:
#if wxUSE_CHECKLISTBOX
virtual wxListBoxBase *CreateList(int n,
const wxString *choices,
long styleLbox);
long styleLbox) wxOVERRIDE;
#endif // wxUSE_CHECKLISTBOX
wxArrayInt m_selections;

10
include/wx/generic/combo.h
View File

@@ -68,7 +68,7 @@ public:
void SetCustomPaintWidth( int width );
virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const;
virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const wxOVERRIDE;
static int GetFeatures() { return wxComboCtrlFeatures::All; }
@@ -88,15 +88,15 @@ protected:
virtual WXWidget GetTextWidget() const { return NULL; }
#elif defined(__WXGTK__)
#if defined(__WXGTK20__)
virtual GtkEditable *GetEditable() const { return NULL; }
virtual GtkEntry *GetEntry() const { return NULL; }
virtual GtkEditable *GetEditable() const wxOVERRIDE { return NULL; }
virtual GtkEntry *GetEntry() const wxOVERRIDE { return NULL; }
#endif
#elif defined(__WXMAC__)
// Looks like there's nothing we need to override here
#endif
// For better transparent background rendering
virtual bool HasTransparentBackground()
virtual bool HasTransparentBackground() wxOVERRIDE
{
#if wxALWAYS_NATIVE_DOUBLE_BUFFER
#ifdef __WXGTK__
@@ -111,7 +111,7 @@ protected:
}
// Mandatory virtuals
virtual void OnResize();
virtual void OnResize() wxOVERRIDE;
// Event handlers
void OnPaintEvent( wxPaintEvent& event );

14
include/wx/generic/datectrl.h
View File

@@ -49,11 +49,11 @@ public:
const wxString& name = wxDatePickerCtrlNameStr);
// wxDatePickerCtrl methods
void SetValue(const wxDateTime& date);
wxDateTime GetValue() const;
void SetValue(const wxDateTime& date) wxOVERRIDE;
wxDateTime GetValue() const wxOVERRIDE;
bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const;
void SetRange(const wxDateTime &dt1, const wxDateTime &dt2);
bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const wxOVERRIDE;
void SetRange(const wxDateTime &dt1, const wxDateTime &dt2) wxOVERRIDE;
bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime,
const wxDateTime& upperdate = wxDefaultDateTime);
@@ -66,16 +66,16 @@ public:
// -------------------------------
// overridden base class methods
virtual bool Destroy();
virtual bool Destroy() wxOVERRIDE;
protected:
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetBestSize() const wxOVERRIDE;
private:
void Init();
// return the list of the windows composing this one
virtual wxWindowList GetCompositeWindowParts() const;
virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE;
void OnText(wxCommandEvent &event);
void OnSize(wxSizeEvent& event);

2
include/wx/generic/dirctrlg.h
View File

@@ -174,7 +174,7 @@ public:
virtual void CollapseTree();
// overridden base class methods
virtual void SetFocus();
virtual void SetFocus() wxOVERRIDE;
protected:
virtual void ExpandRoot();

28
include/wx/generic/filectrlg.h
View File

@@ -217,32 +217,32 @@ public:
const wxSize& size = wxDefaultSize,
const wxString& name = wxFileCtrlNameStr );
virtual void SetWildcard( const wxString& wildCard );
virtual void SetFilterIndex( int filterindex );
virtual bool SetDirectory( const wxString& dir );
virtual void SetWildcard( const wxString& wildCard ) wxOVERRIDE;
virtual void SetFilterIndex( int filterindex ) wxOVERRIDE;
virtual bool SetDirectory( const wxString& dir ) wxOVERRIDE;
// Selects a certain file.
// In case the filename specified isn't found/couldn't be shown with
// currently selected filter, false is returned and nothing happens
virtual bool SetFilename( const wxString& name );
virtual bool SetFilename( const wxString& name ) wxOVERRIDE;
// Changes to a certain directory and selects a certain file.
// In case the filename specified isn't found/couldn't be shown with
// currently selected filter, false is returned and if directory exists
// it's chdir'ed to
virtual bool SetPath( const wxString& path );
virtual bool SetPath( const wxString& path ) wxOVERRIDE;
virtual wxString GetFilename() const;
virtual wxString GetDirectory() const;
virtual wxString GetWildcard() const { return this->m_wildCard; }
virtual wxString GetPath() const;
virtual void GetPaths( wxArrayString& paths ) const;
virtual void GetFilenames( wxArrayString& files ) const;
virtual int GetFilterIndex() const { return m_filterIndex; }
virtual wxString GetFilename() const wxOVERRIDE;
virtual wxString GetDirectory() const wxOVERRIDE;
virtual wxString GetWildcard() const wxOVERRIDE { return this->m_wildCard; }
virtual wxString GetPath() const wxOVERRIDE;
virtual void GetPaths( wxArrayString& paths ) const wxOVERRIDE;
virtual void GetFilenames( wxArrayString& files ) const wxOVERRIDE;
virtual int GetFilterIndex() const wxOVERRIDE { return m_filterIndex; }
virtual bool HasMultipleFileSelection() const
virtual bool HasMultipleFileSelection() const wxOVERRIDE
{ return HasFlag(wxFC_MULTIPLE); }
virtual void ShowHidden(bool show) { m_list->ShowHidden( show ); }
virtual void ShowHidden(bool show) wxOVERRIDE { m_list->ShowHidden( show ); }
void GoToParentDir();
void GoToHomeDir();

20
include/wx/generic/filepickerg.h
View File

@@ -46,7 +46,7 @@ public:
pos, size, style, validator, name);
}
virtual wxControl *AsControl() { return this; }
virtual wxControl *AsControl() wxOVERRIDE { return this; }
public: // overridable
@@ -57,7 +57,7 @@ public: // overridable
virtual wxEventType GetEventType() const = 0;
virtual void SetInitialDirectory(const wxString& dir);
virtual void SetInitialDirectory(const wxString& dir) wxOVERRIDE;
public:
@@ -144,15 +144,15 @@ public: // overridable
return filedlgstyle;
}
virtual wxDialog *CreateDialog();
virtual wxDialog *CreateDialog() wxOVERRIDE;
wxEventType GetEventType() const
wxEventType GetEventType() const wxOVERRIDE
{ return wxEVT_FILEPICKER_CHANGED; }
protected:
void UpdateDialogPath(wxDialog *p)
void UpdateDialogPath(wxDialog *p) wxOVERRIDE
{ wxStaticCast(p, wxFileDialog)->SetPath(m_path); }
void UpdatePathFromDialog(wxDialog *p)
void UpdatePathFromDialog(wxDialog *p) wxOVERRIDE
{ m_path = wxStaticCast(p, wxFileDialog)->GetPath(); }
private:
@@ -199,15 +199,15 @@ public: // overridable
return dirdlgstyle;
}
virtual wxDialog *CreateDialog();
virtual wxDialog *CreateDialog() wxOVERRIDE;
wxEventType GetEventType() const
wxEventType GetEventType() const wxOVERRIDE
{ return wxEVT_DIRPICKER_CHANGED; }
protected:
void UpdateDialogPath(wxDialog *p)
void UpdateDialogPath(wxDialog *p) wxOVERRIDE
{ wxStaticCast(p, wxDirDialog)->SetPath(m_path); }
void UpdatePathFromDialog(wxDialog *p)
void UpdatePathFromDialog(wxDialog *p) wxOVERRIDE
{ m_path = wxStaticCast(p, wxDirDialog)->GetPath(); }
private:

26
include/wx/generic/helpext.h
View File

@@ -37,36 +37,36 @@ public:
// Set viewer: new name for SetBrowser
virtual void SetViewer(const wxString& viewer = wxEmptyString,
long flags = wxHELP_NETSCAPE);
long flags = wxHELP_NETSCAPE) wxOVERRIDE;
virtual bool Initialize(const wxString& dir, int WXUNUSED(server))
virtual bool Initialize(const wxString& dir, int WXUNUSED(server)) wxOVERRIDE
{ return Initialize(dir); }
virtual bool Initialize(const wxString& dir);
virtual bool LoadFile(const wxString& file = wxEmptyString);
virtual bool DisplayContents(void);
virtual bool DisplaySection(int sectionNo);
virtual bool DisplaySection(const wxString& section);
virtual bool DisplayBlock(long blockNo);
virtual bool Initialize(const wxString& dir) wxOVERRIDE;
virtual bool LoadFile(const wxString& file = wxEmptyString) wxOVERRIDE;
virtual bool DisplayContents(void) wxOVERRIDE;
virtual bool DisplaySection(int sectionNo) wxOVERRIDE;
virtual bool DisplaySection(const wxString& section) wxOVERRIDE;
virtual bool DisplayBlock(long blockNo) wxOVERRIDE;
virtual bool KeywordSearch(const wxString& k,
wxHelpSearchMode mode = wxHELP_SEARCH_ALL);
wxHelpSearchMode mode = wxHELP_SEARCH_ALL) wxOVERRIDE;
virtual bool Quit(void);
virtual void OnQuit(void);
virtual bool Quit(void) wxOVERRIDE;
virtual void OnQuit(void) wxOVERRIDE;
virtual bool DisplayHelp(const wxString &) ;
virtual void SetFrameParameters(const wxString& WXUNUSED(title),
const wxSize& WXUNUSED(size),
const wxPoint& WXUNUSED(pos) = wxDefaultPosition,
bool WXUNUSED(newFrameEachTime) = false)
bool WXUNUSED(newFrameEachTime) = false) wxOVERRIDE
{
// does nothing by default
}
virtual wxFrame *GetFrameParameters(wxSize *WXUNUSED(size) = NULL,
wxPoint *WXUNUSED(pos) = NULL,
bool *WXUNUSED(newFrameEachTime) = NULL)
bool *WXUNUSED(newFrameEachTime) = NULL) wxOVERRIDE
{
return NULL; // does nothing by default
}

2
include/wx/generic/msgdlgg.h
View File

@@ -22,7 +22,7 @@ public:
long style = wxOK|wxCENTRE,
const wxPoint& pos = wxDefaultPosition);
virtual int ShowModal();
virtual int ShowModal() wxOVERRIDE;
protected:
// Creates a message dialog taking any options that have been set after

6
include/wx/generic/paletteg.h
View File

@@ -37,11 +37,11 @@ public:
int GetPixel( unsigned char red, unsigned char green, unsigned char blue ) const;
bool GetRGB( int pixel, unsigned char *red, unsigned char *green, unsigned char *blue ) const;
virtual int GetColoursCount() const;
virtual int GetColoursCount() const wxOVERRIDE;
protected:
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
private:
wxDECLARE_DYNAMIC_CLASS(wxPalette);

162
include/wx/generic/private/grid.h
View File

@@ -92,11 +92,11 @@ public:
{
}
virtual wxString GetTitle() const { return m_grid->GetColLabelValue(m_col); }
virtual wxBitmap GetBitmap() const { return wxNullBitmap; }
virtual int GetWidth() const { return m_grid->GetColSize(m_col); }
virtual int GetMinWidth() const { return 0; }
virtual wxAlignment GetAlignment() const
virtual wxString GetTitle() const wxOVERRIDE { return m_grid->GetColLabelValue(m_col); }
virtual wxBitmap GetBitmap() const wxOVERRIDE { return wxNullBitmap; }
virtual int GetWidth() const wxOVERRIDE { return m_grid->GetColSize(m_col); }
virtual int GetMinWidth() const wxOVERRIDE { return 0; }
virtual wxAlignment GetAlignment() const wxOVERRIDE
{
int horz,
vert;
@@ -105,7 +105,7 @@ public:
return static_cast<wxAlignment>(horz);
}
virtual int GetFlags() const
virtual int GetFlags() const wxOVERRIDE
{
// we can't know in advance whether we can sort by this column or not
// with wxGrid API so suppose we can by default
@@ -120,12 +120,12 @@ public:
return flags;
}
virtual bool IsSortKey() const
virtual bool IsSortKey() const wxOVERRIDE
{
return m_grid->IsSortingBy(m_col);
}
virtual bool IsSortOrderAscending() const
virtual bool IsSortOrderAscending() const wxOVERRIDE
{
return m_grid->IsSortOrderAscending();
}
@@ -153,7 +153,7 @@ public:
}
protected:
virtual const wxHeaderColumn& GetColumn(unsigned int idx) const
virtual const wxHeaderColumn& GetColumn(unsigned int idx) const wxOVERRIDE
{
return m_columns[idx];
}
@@ -171,7 +171,7 @@ private:
}
// override the base class method to update our m_columns array
virtual void OnColumnCountChanging(unsigned int count)
virtual void OnColumnCountChanging(unsigned int count) wxOVERRIDE
{
const unsigned countOld = m_columns.size();
if ( count < countOld )
@@ -191,7 +191,7 @@ private:
}
// override to implement column auto sizing
virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle)
virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle) wxOVERRIDE
{
// TODO: currently grid doesn't support computing the column best width
// from its contents so we just use the best label width as is
@@ -201,7 +201,7 @@ private:
}
// overridden to react to the actions using the columns popup menu
virtual void UpdateColumnVisibility(unsigned int idx, bool show)
virtual void UpdateColumnVisibility(unsigned int idx, bool show) wxOVERRIDE
{
GetOwner()->SetColSize(idx, show ? wxGRID_AUTOSIZE : 0);
@@ -213,7 +213,7 @@ private:
// overridden to react to the columns order changes in the customization
// dialog
virtual void UpdateColumnsOrder(const wxArrayInt& order)
virtual void UpdateColumnsOrder(const wxArrayInt& order) wxOVERRIDE
{
GetOwner()->SetColumnsOrder(order);
}
@@ -304,9 +304,9 @@ public:
m_owner = owner;
}
virtual wxWindow *GetMainWindowOfCompositeControl() { return m_owner; }
virtual wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE { return m_owner; }
virtual bool AcceptsFocus() const { return false; }
virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
wxGrid *GetOwner() { return m_owner; }
@@ -385,9 +385,9 @@ public:
}
virtual void ScrollWindow( int dx, int dy, const wxRect *rect );
virtual void ScrollWindow( int dx, int dy, const wxRect *rect ) wxOVERRIDE;
virtual bool AcceptsFocus() const { return true; }
virtual bool AcceptsFocus() const wxOVERRIDE { return true; }
private:
void OnPaint( wxPaintEvent &event );
@@ -574,135 +574,135 @@ public:
class wxGridRowOperations : public wxGridOperations
{
public:
virtual wxGridOperations& Dual() const;
virtual wxGridOperations& Dual() const wxOVERRIDE;
virtual int GetNumberOfLines(const wxGrid *grid) const
virtual int GetNumberOfLines(const wxGrid *grid) const wxOVERRIDE
{ return grid->GetNumberRows(); }
virtual wxGrid::wxGridSelectionModes GetSelectionMode() const
virtual wxGrid::wxGridSelectionModes GetSelectionMode() const wxOVERRIDE
{ return wxGrid::wxGridSelectRows; }
virtual wxGridCellCoords MakeCoords(int thisDir, int otherDir) const
virtual wxGridCellCoords MakeCoords(int thisDir, int otherDir) const wxOVERRIDE
{ return wxGridCellCoords(thisDir, otherDir); }
virtual int CalcScrolledPosition(wxGrid *grid, int pos) const
virtual int CalcScrolledPosition(wxGrid *grid, int pos) const wxOVERRIDE
{ return grid->CalcScrolledPosition(wxPoint(pos, 0)).x; }
virtual int Select(const wxGridCellCoords& c) const { return c.GetRow(); }
virtual int Select(const wxPoint& pt) const { return pt.x; }
virtual int Select(const wxSize& sz) const { return sz.x; }
virtual int Select(const wxRect& r) const { return r.x; }
virtual int& Select(wxRect& r) const { return r.x; }
virtual int& SelectSize(wxRect& r) const { return r.width; }
virtual wxSize MakeSize(int first, int second) const
virtual int Select(const wxGridCellCoords& c) const wxOVERRIDE { return c.GetRow(); }
virtual int Select(const wxPoint& pt) const wxOVERRIDE { return pt.x; }
virtual int Select(const wxSize& sz) const wxOVERRIDE { return sz.x; }
virtual int Select(const wxRect& r) const wxOVERRIDE { return r.x; }
virtual int& Select(wxRect& r) const wxOVERRIDE { return r.x; }
virtual int& SelectSize(wxRect& r) const wxOVERRIDE { return r.width; }
virtual wxSize MakeSize(int first, int second) const wxOVERRIDE
{ return wxSize(first, second); }
virtual void Set(wxGridCellCoords& coords, int line) const
virtual void Set(wxGridCellCoords& coords, int line) const wxOVERRIDE
{ coords.SetRow(line); }
virtual void DrawParallelLine(wxDC& dc, int start, int end, int pos) const
virtual void DrawParallelLine(wxDC& dc, int start, int end, int pos) const wxOVERRIDE
{ dc.DrawLine(start, pos, end, pos); }
virtual int PosToLine(const wxGrid *grid, int pos, bool clip = false) const
virtual int PosToLine(const wxGrid *grid, int pos, bool clip = false) const wxOVERRIDE
{ return grid->YToRow(pos, clip); }
virtual int GetLineStartPos(const wxGrid *grid, int line) const
virtual int GetLineStartPos(const wxGrid *grid, int line) const wxOVERRIDE
{ return grid->GetRowTop(line); }
virtual int GetLineEndPos(const wxGrid *grid, int line) const
virtual int GetLineEndPos(const wxGrid *grid, int line) const wxOVERRIDE
{ return grid->GetRowBottom(line); }
virtual int GetLineSize(const wxGrid *grid, int line) const
virtual int GetLineSize(const wxGrid *grid, int line) const wxOVERRIDE
{ return grid->GetRowHeight(line); }
virtual const wxArrayInt& GetLineEnds(const wxGrid *grid) const
virtual const wxArrayInt& GetLineEnds(const wxGrid *grid) const wxOVERRIDE
{ return grid->m_rowBottoms; }
virtual int GetDefaultLineSize(const wxGrid *grid) const
virtual int GetDefaultLineSize(const wxGrid *grid) const wxOVERRIDE
{ return grid->GetDefaultRowSize(); }
virtual int GetMinimalAcceptableLineSize(const wxGrid *grid) const
virtual int GetMinimalAcceptableLineSize(const wxGrid *grid) const wxOVERRIDE
{ return grid->GetRowMinimalAcceptableHeight(); }
virtual int GetMinimalLineSize(const wxGrid *grid, int line) const
virtual int GetMinimalLineSize(const wxGrid *grid, int line) const wxOVERRIDE
{ return grid->GetRowMinimalHeight(line); }
virtual void SetLineSize(wxGrid *grid, int line, int size) const
virtual void SetLineSize(wxGrid *grid, int line, int size) const wxOVERRIDE
{ grid->SetRowSize(line, size); }
virtual void SetDefaultLineSize(wxGrid *grid, int size, bool resizeExisting) const
virtual void SetDefaultLineSize(wxGrid *grid, int size, bool resizeExisting) const wxOVERRIDE
{ grid->SetDefaultRowSize(size, resizeExisting); }
virtual int GetLineAt(const wxGrid * WXUNUSED(grid), int pos) const
virtual int GetLineAt(const wxGrid * WXUNUSED(grid), int pos) const wxOVERRIDE
{ return pos; } // TODO: implement row reordering
virtual int GetLinePos(const wxGrid * WXUNUSED(grid), int line) const
virtual int GetLinePos(const wxGrid * WXUNUSED(grid), int line) const wxOVERRIDE
{ return line; } // TODO: implement row reordering
virtual int GetLineBefore(const wxGrid* WXUNUSED(grid), int line) const
virtual int GetLineBefore(const wxGrid* WXUNUSED(grid), int line) const wxOVERRIDE
{ return line - 1; }
virtual wxWindow *GetHeaderWindow(wxGrid *grid) const
virtual wxWindow *GetHeaderWindow(wxGrid *grid) const wxOVERRIDE
{ return grid->GetGridRowLabelWindow(); }
virtual int GetHeaderWindowSize(wxGrid *grid) const
virtual int GetHeaderWindowSize(wxGrid *grid) const wxOVERRIDE
{ return grid->GetRowLabelSize(); }
};
class wxGridColumnOperations : public wxGridOperations
{
public:
virtual wxGridOperations& Dual() const;
virtual wxGridOperations& Dual() const wxOVERRIDE;
virtual int GetNumberOfLines(const wxGrid *grid) const
virtual int GetNumberOfLines(const wxGrid *grid) const wxOVERRIDE
{ return grid->GetNumberCols(); }
virtual wxGrid::wxGridSelectionModes GetSelectionMode() const
virtual wxGrid::wxGridSelectionModes GetSelectionMode() const wxOVERRIDE
{ return wxGrid::wxGridSelectColumns; }
virtual wxGridCellCoords MakeCoords(int thisDir, int otherDir) const
virtual wxGridCellCoords MakeCoords(int thisDir, int otherDir) const wxOVERRIDE
{ return wxGridCellCoords(otherDir, thisDir); }
virtual int CalcScrolledPosition(wxGrid *grid, int pos) const
virtual int CalcScrolledPosition(wxGrid *grid, int pos) const wxOVERRIDE
{ return grid->CalcScrolledPosition(wxPoint(0, pos)).y; }
virtual int Select(const wxGridCellCoords& c) const { return c.GetCol(); }
virtual int Select(const wxPoint& pt) const { return pt.y; }
virtual int Select(const wxSize& sz) const { return sz.y; }
virtual int Select(const wxRect& r) const { return r.y; }
virtual int& Select(wxRect& r) const { return r.y; }
virtual int& SelectSize(wxRect& r) const { return r.height; }
virtual wxSize MakeSize(int first, int second) const
virtual int Select(const wxGridCellCoords& c) const wxOVERRIDE { return c.GetCol(); }
virtual int Select(const wxPoint& pt) const wxOVERRIDE { return pt.y; }
virtual int Select(const wxSize& sz) const wxOVERRIDE { return sz.y; }
virtual int Select(const wxRect& r) const wxOVERRIDE { return r.y; }
virtual int& Select(wxRect& r) const wxOVERRIDE { return r.y; }
virtual int& SelectSize(wxRect& r) const wxOVERRIDE { return r.height; }
virtual wxSize MakeSize(int first, int second) const wxOVERRIDE
{ return wxSize(second, first); }
virtual void Set(wxGridCellCoords& coords, int line) const
virtual void Set(wxGridCellCoords& coords, int line) const wxOVERRIDE
{ coords.SetCol(line); }
virtual void DrawParallelLine(wxDC& dc, int start, int end, int pos) const
virtual void DrawParallelLine(wxDC& dc, int start, int end, int pos) const wxOVERRIDE
{ dc.DrawLine(pos, start, pos, end); }
virtual int PosToLine(const wxGrid *grid, int pos, bool clip = false) const
virtual int PosToLine(const wxGrid *grid, int pos, bool clip = false) const wxOVERRIDE
{ return grid->XToCol(pos, clip); }
virtual int GetLineStartPos(const wxGrid *grid, int line) const
virtual int GetLineStartPos(const wxGrid *grid, int line) const wxOVERRIDE
{ return grid->GetColLeft(line); }
virtual int GetLineEndPos(const wxGrid *grid, int line) const
virtual int GetLineEndPos(const wxGrid *grid, int line) const wxOVERRIDE
{ return grid->GetColRight(line); }
virtual int GetLineSize(const wxGrid *grid, int line) const
virtual int GetLineSize(const wxGrid *grid, int line) const wxOVERRIDE
{ return grid->GetColWidth(line); }
virtual const wxArrayInt& GetLineEnds(const wxGrid *grid) const
virtual const wxArrayInt& GetLineEnds(const wxGrid *grid) const wxOVERRIDE
{ return grid->m_colRights; }
virtual int GetDefaultLineSize(const wxGrid *grid) const
virtual int GetDefaultLineSize(const wxGrid *grid) const wxOVERRIDE
{ return grid->GetDefaultColSize(); }
virtual int GetMinimalAcceptableLineSize(const wxGrid *grid) const
virtual int GetMinimalAcceptableLineSize(const wxGrid *grid) const wxOVERRIDE
{ return grid->GetColMinimalAcceptableWidth(); }
virtual int GetMinimalLineSize(const wxGrid *grid, int line) const
virtual int GetMinimalLineSize(const wxGrid *grid, int line) const wxOVERRIDE
{ return grid->GetColMinimalWidth(line); }
virtual void SetLineSize(wxGrid *grid, int line, int size) const
virtual void SetLineSize(wxGrid *grid, int line, int size) const wxOVERRIDE
{ grid->SetColSize(line, size); }
virtual void SetDefaultLineSize(wxGrid *grid, int size, bool resizeExisting) const
virtual void SetDefaultLineSize(wxGrid *grid, int size, bool resizeExisting) const wxOVERRIDE
{ grid->SetDefaultColSize(size, resizeExisting); }
virtual int GetLineAt(const wxGrid *grid, int pos) const
virtual int GetLineAt(const wxGrid *grid, int pos) const wxOVERRIDE
{ return grid->GetColAt(pos); }
virtual int GetLinePos(const wxGrid *grid, int line) const
virtual int GetLinePos(const wxGrid *grid, int line) const wxOVERRIDE
{ return grid->GetColPos(line); }
virtual int GetLineBefore(const wxGrid* grid, int line) const
virtual int GetLineBefore(const wxGrid* grid, int line) const wxOVERRIDE
{
int posBefore = grid->GetColPos(line) - 1;
return posBefore >= 0 ? grid->GetColAt(posBefore) : wxNOT_FOUND;
}
virtual wxWindow *GetHeaderWindow(wxGrid *grid) const
virtual wxWindow *GetHeaderWindow(wxGrid *grid) const wxOVERRIDE
{ return grid->GetGridColLabelWindow(); }
virtual int GetHeaderWindowSize(wxGrid *grid) const
virtual int GetHeaderWindowSize(wxGrid *grid) const wxOVERRIDE
{ return grid->GetColLabelSize(); }
};
@@ -787,7 +787,7 @@ public:
{
}
virtual bool IsAtBoundary(const wxGridCellCoords& coords) const
virtual bool IsAtBoundary(const wxGridCellCoords& coords) const wxOVERRIDE
{
wxASSERT_MSG( m_oper.Select(coords) >= 0, "invalid row/column" );
@@ -808,7 +808,7 @@ public:
return true;
}
virtual void Advance(wxGridCellCoords& coords) const
virtual void Advance(wxGridCellCoords& coords) const wxOVERRIDE
{
int pos = GetLinePos(coords);
for ( ;; )
@@ -825,7 +825,7 @@ public:
}
}
virtual int MoveByPixelDistance(int line, int distance) const
virtual int MoveByPixelDistance(int line, int distance) const wxOVERRIDE
{
int pos = m_oper.GetLineStartPos(m_grid, line);
return m_oper.PosToLine(m_grid, pos - distance + 1, true);
@@ -843,7 +843,7 @@ public:
{
}
virtual bool IsAtBoundary(const wxGridCellCoords& coords) const
virtual bool IsAtBoundary(const wxGridCellCoords& coords) const wxOVERRIDE
{
wxASSERT_MSG( m_oper.Select(coords) < m_numLines, "invalid row/column" );
@@ -858,7 +858,7 @@ public:
return true;
}
virtual void Advance(wxGridCellCoords& coords) const
virtual void Advance(wxGridCellCoords& coords) const wxOVERRIDE
{
int pos = GetLinePos(coords);
for ( ;; )
@@ -875,7 +875,7 @@ public:
}
}
virtual int MoveByPixelDistance(int line, int distance) const
virtual int MoveByPixelDistance(int line, int distance) const wxOVERRIDE
{
int pos = m_oper.GetLineStartPos(m_grid, line);
return m_oper.PosToLine(m_grid, pos + distance, true);

14
include/wx/generic/private/listctrl.h
View File

@@ -349,7 +349,7 @@ public:
virtual ~wxListHeaderWindow();
// We never need focus as we don't have any keyboard interface.
virtual bool AcceptsFocus() const { return false; }
virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
void DrawCurrent();
void AdjustDC( wxDC& dc );
@@ -365,7 +365,7 @@ public:
int m_colToSend;
int m_widthToSend;
virtual void OnInternalIdle();
virtual void OnInternalIdle() wxOVERRIDE;
private:
// common part of all ctors
@@ -389,7 +389,7 @@ private:
public:
wxListRenameTimer( wxListMainWindow *owner );
void Notify();
void Notify() wxOVERRIDE;
};
//-----------------------------------------------------------------------------
@@ -407,7 +407,7 @@ public:
{
}
virtual void Notify();
virtual void Notify() wxOVERRIDE;
private:
wxListMainWindow *m_owner;
@@ -694,7 +694,7 @@ public:
const wxPoint& point = wxDefaultPosition );
// override base class virtual to reset m_lineHeight when the font changes
virtual bool SetFont(const wxFont& font)
virtual bool SetFont(const wxFont& font) wxOVERRIDE
{
if ( !wxWindow::SetFont(font) )
return false;
@@ -724,7 +724,7 @@ public:
return m_hasFocus ? m_highlightBrush : m_highlightUnfocusedBrush;
}
bool HasFocus() const
bool HasFocus() const wxOVERRIDE
{
return m_hasFocus;
}
@@ -780,7 +780,7 @@ protected:
m_lineSelectSingleOnUp;
protected:
wxWindow *GetMainWindowOfCompositeControl() { return GetParent(); }
wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE { return GetParent(); }
// the total count of items in a virtual list control
size_t m_countVirt;

30
include/wx/generic/prntdlgg.h
View File

@@ -83,11 +83,11 @@ public:
wxPostScriptPrintNativeData();
virtual ~wxPostScriptPrintNativeData();
virtual bool TransferTo( wxPrintData &data );
virtual bool TransferFrom( const wxPrintData &data );
virtual bool TransferTo( wxPrintData &data ) wxOVERRIDE;
virtual bool TransferFrom( const wxPrintData &data ) wxOVERRIDE;
virtual bool Ok() const { return IsOk(); }
virtual bool IsOk() const { return true; }
virtual bool Ok() const wxOVERRIDE { return IsOk(); }
virtual bool IsOk() const wxOVERRIDE { return true; }
const wxString& GetPrinterCommand() const { return m_printerCommand; }
const wxString& GetPrinterOptions() const { return m_printerOptions; }
@@ -149,16 +149,16 @@ public:
void OnRange(wxCommandEvent& event);
void OnOK(wxCommandEvent& event);
virtual bool TransferDataFromWindow();
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow() wxOVERRIDE;
virtual bool TransferDataToWindow() wxOVERRIDE;
virtual int ShowModal();
virtual int ShowModal() wxOVERRIDE;
wxPrintData& GetPrintData()
wxPrintData& GetPrintData() wxOVERRIDE
{ return m_printDialogData.GetPrintData(); }
wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
wxDC *GetPrintDC();
wxPrintDialogData& GetPrintDialogData() wxOVERRIDE { return m_printDialogData; }
wxDC *GetPrintDC() wxOVERRIDE;
public:
// wxStaticText* m_printerMessage;
@@ -193,8 +193,8 @@ public:
void OnPrinter(wxListEvent& event);
virtual bool TransferDataFromWindow();
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow() wxOVERRIDE;
virtual bool TransferDataToWindow() wxOVERRIDE;
virtual wxComboBox *CreatePaperTypeChoice();
@@ -226,10 +226,10 @@ public:
wxPageSetupDialogData* data = NULL);
virtual ~wxGenericPageSetupDialog();
virtual bool TransferDataFromWindow();
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow() wxOVERRIDE;
virtual bool TransferDataToWindow() wxOVERRIDE;
virtual wxPageSetupDialogData& GetPageSetupDialogData();
virtual wxPageSetupDialogData& GetPageSetupDialogData() wxOVERRIDE;
void OnPrinter(wxCommandEvent& event);
wxComboBox *CreatePaperTypeChoice(int* x, int* y);

6
include/wx/generic/richmsgdlgg.h
View File

@@ -27,15 +27,15 @@ public:
m_detailsPane(NULL)
{ }
virtual bool IsCheckBoxChecked() const;
virtual bool IsCheckBoxChecked() const wxOVERRIDE;
protected:
wxCheckBox *m_checkBox;
wxCollapsiblePane *m_detailsPane;
// overrides methods in the base class
virtual void AddMessageDialogCheckBox(wxSizer *sizer);
virtual void AddMessageDialogDetails(wxSizer *sizer);
virtual void AddMessageDialogCheckBox(wxSizer *sizer) wxOVERRIDE;
virtual void AddMessageDialogDetails(wxSizer *sizer) wxOVERRIDE;
private:
void OnPaneChanged(wxCollapsiblePaneEvent& event);

8
include/wx/generic/statbmpg.h
View File

@@ -35,16 +35,16 @@ public:
long style = 0,
const wxString& name = wxStaticBitmapNameStr);
virtual void SetBitmap(const wxBitmap& bitmap)
virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE
{
m_bitmap = bitmap;
SetInitialSize(GetBitmapSize());
Refresh();
}
virtual wxBitmap GetBitmap() const { return m_bitmap; }
virtual wxBitmap GetBitmap() const wxOVERRIDE { return m_bitmap; }
virtual void SetIcon(const wxIcon& icon)
virtual void SetIcon(const wxIcon& icon) wxOVERRIDE
{
m_bitmap.CopyFromIcon(icon);
SetInitialSize(GetBitmapSize());
@@ -53,7 +53,7 @@ public:
#if defined(__WXGTK20__) || defined(__WXMAC__)
// icons and bitmaps are really the same thing in wxGTK and wxMac
wxIcon GetIcon() const { return (const wxIcon &)m_bitmap; }
wxIcon GetIcon() const wxOVERRIDE { return (const wxIcon &)m_bitmap; }
#endif

14
include/wx/generic/stattextg.h
View File

@@ -48,19 +48,19 @@ public:
// overridden base class virtual methods
virtual void SetLabel(const wxString& label);
virtual bool SetFont(const wxFont &font);
virtual void SetLabel(const wxString& label) wxOVERRIDE;
virtual bool SetFont(const wxFont &font) wxOVERRIDE;
protected:
virtual wxSize DoGetBestClientSize() const;
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
virtual wxString DoGetLabel() const { return m_label; }
virtual void DoSetLabel(const wxString& label);
virtual wxString DoGetLabel() const wxOVERRIDE { return m_label; }
virtual void DoSetLabel(const wxString& label) wxOVERRIDE;
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;
#if wxUSE_MARKUP
virtual bool DoSetLabelMarkup(const wxString& markup);
virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE;
#endif // wxUSE_MARKUP
private:

2
include/wx/gtk/control.h
View File

@@ -39,7 +39,7 @@ public:
virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE;
#ifdef __WXGTK3__
virtual bool SetFont(const wxFont& font);
virtual bool SetFont(const wxFont& font) wxOVERRIDE;
#endif
protected:

12
include/wx/gtk/dvrenderer.h
View File

@@ -25,14 +25,14 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT );
virtual void SetMode( wxDataViewCellMode mode );
virtual wxDataViewCellMode GetMode() const;
virtual void SetMode( wxDataViewCellMode mode ) wxOVERRIDE;
virtual wxDataViewCellMode GetMode() const wxOVERRIDE;
virtual void SetAlignment( int align );
virtual int GetAlignment() const;
virtual void SetAlignment( int align ) wxOVERRIDE;
virtual int GetAlignment() const wxOVERRIDE;
virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE);
virtual wxEllipsizeMode GetEllipsizeMode() const;
virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE) wxOVERRIDE;
virtual wxEllipsizeMode GetEllipsizeMode() const wxOVERRIDE;
virtual bool FinishEditing() wxOVERRIDE;

54
include/wx/gtk/dvrenderers.h
View File

@@ -31,12 +31,12 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT );
virtual bool SetValue( const wxVariant &value )
virtual bool SetValue( const wxVariant &value ) wxOVERRIDE
{
return SetTextValue(value);
}
virtual bool GetValue( wxVariant &value ) const
virtual bool GetValue( wxVariant &value ) const wxOVERRIDE
{
wxString str;
if ( !GetTextValue(str) )
@@ -47,9 +47,9 @@ public:
return true;
}
virtual void SetAlignment( int align );
virtual void SetAlignment( int align ) wxOVERRIDE;
virtual GtkCellRendererText *GtkGetTextRenderer() const;
virtual GtkCellRendererText *GtkGetTextRenderer() const wxOVERRIDE;
protected:
virtual void SetAttr(const wxDataViewItemAttr& attr) wxOVERRIDE;
@@ -75,8 +75,8 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT );
bool SetValue( const wxVariant &value );
bool GetValue( wxVariant &value ) const;
bool SetValue( const wxVariant &value ) wxOVERRIDE;
bool GetValue( wxVariant &value ) const wxOVERRIDE;
protected:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer);
@@ -95,8 +95,8 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT );
bool SetValue( const wxVariant &value );
bool GetValue( wxVariant &value ) const;
bool SetValue( const wxVariant &value ) wxOVERRIDE;
bool GetValue( wxVariant &value ) const wxOVERRIDE;
protected:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer);
@@ -119,14 +119,14 @@ public:
// Create DC on request
virtual wxDC *GetDC();
virtual wxDC *GetDC() wxOVERRIDE;
// override the base class function to use GTK text cell renderer
virtual void RenderText(const wxString& text,
int xoffset,
wxRect cell,
wxDC *dc,
int state);
int state) wxOVERRIDE;
struct GTKRenderParams;
@@ -136,7 +136,7 @@ public:
m_renderParams = renderParams;
}
virtual GtkCellRendererText *GtkGetTextRenderer() const;
virtual GtkCellRendererText *GtkGetTextRenderer() const wxOVERRIDE;
private:
bool Init(wxDataViewCellMode mode, int align);
@@ -171,11 +171,11 @@ public:
int align = wxDVR_DEFAULT_ALIGNMENT );
virtual ~wxDataViewProgressRenderer();
bool SetValue( const wxVariant &value );
bool GetValue( wxVariant &value ) const;
bool SetValue( const wxVariant &value ) wxOVERRIDE;
bool GetValue( wxVariant &value ) const wxOVERRIDE;
virtual bool Render( wxRect cell, wxDC *dc, int state );
virtual wxSize GetSize() const;
virtual bool Render( wxRect cell, wxDC *dc, int state ) wxOVERRIDE;
virtual wxSize GetSize() const wxOVERRIDE;
private:
void GTKSetLabel();
@@ -207,15 +207,15 @@ public:
int align = wxDVR_DEFAULT_ALIGNMENT );
virtual ~wxDataViewIconTextRenderer();
bool SetValue( const wxVariant &value );
bool GetValue( wxVariant &value ) const;
bool SetValue( const wxVariant &value ) wxOVERRIDE;
bool GetValue( wxVariant &value ) const wxOVERRIDE;
virtual void GtkPackIntoColumn(GtkTreeViewColumn *column);
virtual void GtkPackIntoColumn(GtkTreeViewColumn *column) wxOVERRIDE;
protected:
virtual void GtkOnCellChanged(const wxVariant& value,
const wxDataViewItem& item,
unsigned col);
unsigned col) wxOVERRIDE;
private:
wxDataViewIconText m_value;
@@ -236,12 +236,12 @@ public:
wxDataViewChoiceRenderer(const wxArrayString &choices,
wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
int alignment = wxDVR_DEFAULT_ALIGNMENT );
virtual bool Render( wxRect rect, wxDC *dc, int state );
virtual wxSize GetSize() const;
virtual bool SetValue( const wxVariant &value );
virtual bool GetValue( wxVariant &value ) const;
virtual bool Render( wxRect rect, wxDC *dc, int state ) wxOVERRIDE;
virtual wxSize GetSize() const wxOVERRIDE;
virtual bool SetValue( const wxVariant &value ) wxOVERRIDE;
virtual bool GetValue( wxVariant &value ) const wxOVERRIDE;
void SetAlignment( int align );
void SetAlignment( int align ) wxOVERRIDE;
wxString GetChoice(size_t index) const { return m_choices[index]; }
const wxArrayString& GetChoices() const { return m_choices; }
@@ -262,11 +262,11 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
int alignment = wxDVR_DEFAULT_ALIGNMENT );
virtual bool SetValue( const wxVariant &value );
virtual bool GetValue( wxVariant &value ) const;
virtual bool SetValue( const wxVariant &value ) wxOVERRIDE;
virtual bool GetValue( wxVariant &value ) const wxOVERRIDE;
private:
virtual void GtkOnTextEdited(const char *itempath, const wxString& str);
virtual void GtkOnTextEdited(const char *itempath, const wxString& str) wxOVERRIDE;
};

14
include/wx/gtk/filepicker.h
View File

@@ -28,7 +28,7 @@
/* needs to create the dialog in ::Create() and not for each user */ \
/* request in response to the user click as the generic implementation */ \
/* does. */ \
virtual wxWindow *GetDialogParent() \
virtual wxWindow *GetDialogParent() wxOVERRIDE \
{ \
return NULL; \
} \
@@ -42,7 +42,7 @@
/* give us access to the internal GdkWindow of a GtkFileChooserButton */ \
protected: \
virtual GdkWindow * \
GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const \
GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const wxOVERRIDE \
{ return NULL; }
@@ -92,8 +92,8 @@ public: // overrides
// event handler for the click
void OnDialogOK(wxCommandEvent &);
virtual void SetPath(const wxString &str);
virtual void SetInitialDirectory(const wxString& dir);
virtual void SetPath(const wxString &str) wxOVERRIDE;
virtual void SetInitialDirectory(const wxString& dir) wxOVERRIDE;
// see macro defined above
FILEDIRBTN_OVERRIDES
@@ -156,13 +156,13 @@ public: // overrides
// GtkFileChooserButton does not support GTK_FILE_CHOOSER_CREATE_FOLDER
// thus we must ensure that the wxDD_DIR_MUST_EXIST style was given
long GetDialogStyle() const
long GetDialogStyle() const wxOVERRIDE
{
return (wxGenericDirButton::GetDialogStyle() | wxDD_DIR_MUST_EXIST);
}
virtual void SetPath(const wxString &str);
virtual void SetInitialDirectory(const wxString& dir);
virtual void SetPath(const wxString &str) wxOVERRIDE;
virtual void SetInitialDirectory(const wxString& dir) wxOVERRIDE;
// see macro defined above
FILEDIRBTN_OVERRIDES

2
include/wx/html/m_templ.h
View File

@@ -60,7 +60,7 @@ I STRONGLY recommend reading and understanding these macros!!
{ \
wxDECLARE_DYNAMIC_CLASS(wxHTML_Module##name ); \
public: \
void FillHandlersTable(wxHtmlWinParser *parser) \
void FillHandlersTable(wxHtmlWinParser *parser) wxOVERRIDE \
{

2
include/wx/htmllbox.h
View File

@@ -272,7 +272,7 @@ public:
virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE;
// resolve ambiguity between wxItemContainer and wxVListBox versions
void Clear();
void Clear() wxOVERRIDE;
protected:
virtual int DoInsertItems(const wxArrayStringsAdapter & items,

2
include/wx/mdi.h
View File

@@ -239,7 +239,7 @@ public:
// title is used as the tab label
virtual wxString GetTitle() const wxOVERRIDE { return m_title; }
virtual void SetTitle(const wxString& title) = 0;
virtual void SetTitle(const wxString& title) wxOVERRIDE = 0;
// no maximize etc
virtual void Maximize(bool WXUNUSED(maximize) = true) wxOVERRIDE { }

2
include/wx/nativewin.h
View File

@@ -190,7 +190,7 @@ public:
}
#ifdef __WXMSW__
virtual bool IsShown() const;
virtual bool IsShown() const wxOVERRIDE;
#endif // __WXMSW__
// this is an implementation detail: called when the native window is

64
include/wx/propgrid/advprops.h
View File

@@ -158,14 +158,14 @@ public:
const wxString& name = wxPG_LABEL,
const wxFont& value = wxFont());
virtual ~wxFontProperty();
virtual void OnSetValue();
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
virtual void OnSetValue() wxOVERRIDE;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
virtual bool OnEvent( wxPropertyGrid* propgrid,
wxWindow* primary, wxEvent& event );
wxWindow* primary, wxEvent& event ) wxOVERRIDE;
virtual wxVariant ChildChanged( wxVariant& thisValue,
int childIndex,
wxVariant& childValue ) const;
virtual void RefreshChildren();
wxVariant& childValue ) const wxOVERRIDE;
virtual void RefreshChildren() wxOVERRIDE;
protected:
};
@@ -193,10 +193,10 @@ public:
value = wxColourPropertyValue() );
virtual ~wxSystemColourProperty();
virtual void OnSetValue();
virtual void OnSetValue() wxOVERRIDE;
virtual bool IntToValue(wxVariant& variant,
int number,
int argFlags = 0) const;
int argFlags = 0) const wxOVERRIDE;
/**
Override in derived class to customize how colours are printed as
@@ -210,16 +210,16 @@ public:
*/
virtual int GetCustomColourIndex() const;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
virtual bool StringToValue( wxVariant& variant,
const wxString& text,
int argFlags = 0 ) const;
int argFlags = 0 ) const wxOVERRIDE;
virtual bool OnEvent( wxPropertyGrid* propgrid,
wxWindow* primary, wxEvent& event );
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
virtual wxSize OnMeasureImage( int item ) const;
wxWindow* primary, wxEvent& event ) wxOVERRIDE;
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
virtual wxSize OnMeasureImage( int item ) const wxOVERRIDE;
virtual void OnCustomPaint( wxDC& dc,
const wxRect& rect, wxPGPaintData& paintdata );
const wxRect& rect, wxPGPaintData& paintdata ) wxOVERRIDE;
// Helper function to show the colour dialog
bool QueryColourFromUser( wxVariant& variant ) const;
@@ -270,11 +270,11 @@ public:
const wxColour& value = *wxWHITE );
virtual ~wxColourProperty();
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
virtual wxColour GetColour( int index ) const;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
virtual wxColour GetColour( int index ) const wxOVERRIDE;
protected:
virtual wxVariant DoTranslateVal( wxColourPropertyValue& v ) const;
virtual wxVariant DoTranslateVal( wxColourPropertyValue& v ) const wxOVERRIDE;
private:
void Init( wxColour colour );
@@ -295,9 +295,9 @@ class WXDLLIMPEXP_PROPGRID wxCursorProperty : public wxEnumProperty
int value = 0 );
virtual ~wxCursorProperty();
virtual wxSize OnMeasureImage( int item ) const;
virtual wxSize OnMeasureImage( int item ) const wxOVERRIDE;
virtual void OnCustomPaint( wxDC& dc,
const wxRect& rect, wxPGPaintData& paintdata );
const wxRect& rect, wxPGPaintData& paintdata ) wxOVERRIDE;
};
// -----------------------------------------------------------------------
@@ -320,11 +320,11 @@ public:
const wxString& value = wxEmptyString);
virtual ~wxImageFileProperty();
virtual void OnSetValue();
virtual void OnSetValue() wxOVERRIDE;
virtual wxSize OnMeasureImage( int item ) const;
virtual wxSize OnMeasureImage( int item ) const wxOVERRIDE;
virtual void OnCustomPaint( wxDC& dc,
const wxRect& rect, wxPGPaintData& paintdata );
const wxRect& rect, wxPGPaintData& paintdata ) wxOVERRIDE;
protected:
wxBitmap* m_pBitmap; // final thumbnail area
@@ -371,13 +371,13 @@ public:
virtual ~wxMultiChoiceProperty();
virtual void OnSetValue();
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
virtual void OnSetValue() wxOVERRIDE;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
virtual bool StringToValue(wxVariant& variant,
const wxString& text,
int argFlags = 0) const;
int argFlags = 0) const wxOVERRIDE;
virtual bool OnEvent( wxPropertyGrid* propgrid,
wxWindow* primary, wxEvent& event );
wxWindow* primary, wxEvent& event ) wxOVERRIDE;
wxArrayInt GetValueAsArrayInt() const
{
@@ -423,13 +423,13 @@ public:
const wxDateTime& value = wxDateTime() );
virtual ~wxDateProperty();
virtual void OnSetValue();
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
virtual void OnSetValue() wxOVERRIDE;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
virtual bool StringToValue(wxVariant& variant,
const wxString& text,
int argFlags = 0) const;
int argFlags = 0) const wxOVERRIDE;
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
void SetFormat( const wxString& format )
{
@@ -498,13 +498,13 @@ class WXDLLIMPEXP_PROPGRID wxPGSpinCtrlEditor : public wxPGTextCtrlEditor
public:
virtual ~wxPGSpinCtrlEditor();
wxString GetName() const;
wxString GetName() const wxOVERRIDE;
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
wxPGProperty* property,
const wxPoint& pos,
const wxSize& size) const;
const wxSize& size) const wxOVERRIDE;
virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property,
wxWindow* wnd, wxEvent& event ) const;
wxWindow* wnd, wxEvent& event ) const wxOVERRIDE;
private:
mutable wxString m_tempString;

72
include/wx/propgrid/editors.h
View File

@@ -254,24 +254,24 @@ public:
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
wxPGProperty* property,
const wxPoint& pos,
const wxSize& size) const;
const wxSize& size) const wxOVERRIDE;
virtual void UpdateControl( wxPGProperty* property,
wxWindow* ctrl ) const;
wxWindow* ctrl ) const wxOVERRIDE;
virtual bool OnEvent( wxPropertyGrid* propgrid,
wxPGProperty* property,
wxWindow* primaryCtrl,
wxEvent& event ) const;
wxEvent& event ) const wxOVERRIDE;
virtual bool GetValueFromControl( wxVariant& variant,
wxPGProperty* property,
wxWindow* ctrl ) const;
wxWindow* ctrl ) const wxOVERRIDE;
virtual wxString GetName() const;
virtual wxString GetName() const wxOVERRIDE;
//virtual wxPGCellRenderer* GetCellRenderer() const;
virtual void SetControlStringValue( wxPGProperty* property,
wxWindow* ctrl,
const wxString& txt ) const;
virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const;
const wxString& txt ) const wxOVERRIDE;
virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const wxOVERRIDE;
// Provided so that, for example, ComboBox editor can use the same code
// (multiple inheritance would get way too messy).
@@ -297,32 +297,32 @@ public:
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
wxPGProperty* property,
const wxPoint& pos,
const wxSize& size) const;
const wxSize& size) const wxOVERRIDE;
virtual void UpdateControl( wxPGProperty* property,
wxWindow* ctrl ) const;
wxWindow* ctrl ) const wxOVERRIDE;
virtual bool OnEvent( wxPropertyGrid* propgrid,
wxPGProperty* property,
wxWindow* primaryCtrl,
wxEvent& event ) const;
wxEvent& event ) const wxOVERRIDE;
virtual bool GetValueFromControl( wxVariant& variant,
wxPGProperty* property,
wxWindow* ctrl ) const;
wxWindow* ctrl ) const wxOVERRIDE;
virtual void SetValueToUnspecified( wxPGProperty* property,
wxWindow* ctrl ) const;
virtual wxString GetName() const;
wxWindow* ctrl ) const wxOVERRIDE;
virtual wxString GetName() const wxOVERRIDE;
virtual void SetControlIntValue( wxPGProperty* property,
wxWindow* ctrl,
int value ) const;
int value ) const wxOVERRIDE;
virtual void SetControlStringValue( wxPGProperty* property,
wxWindow* ctrl,
const wxString& txt ) const;
const wxString& txt ) const wxOVERRIDE;
virtual int InsertItem( wxWindow* ctrl,
const wxString& label,
int index ) const;
virtual void DeleteItem( wxWindow* ctrl, int index ) const;
virtual bool CanContainCustomImage() const;
int index ) const wxOVERRIDE;
virtual void DeleteItem( wxWindow* ctrl, int index ) const wxOVERRIDE;
virtual bool CanContainCustomImage() const wxOVERRIDE;
// CreateControls calls this with CB_READONLY in extraStyle
wxWindow* CreateControlsBase( wxPropertyGrid* propgrid,
@@ -344,20 +344,20 @@ public:
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
wxPGProperty* property,
const wxPoint& pos,
const wxSize& size) const;
const wxSize& size) const wxOVERRIDE;
virtual wxString GetName() const;
virtual wxString GetName() const wxOVERRIDE;
virtual void UpdateControl( wxPGProperty* property, wxWindow* ctrl ) const;
virtual void UpdateControl( wxPGProperty* property, wxWindow* ctrl ) const wxOVERRIDE;
virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property,
wxWindow* ctrl, wxEvent& event ) const;
wxWindow* ctrl, wxEvent& event ) const wxOVERRIDE;
virtual bool GetValueFromControl( wxVariant& variant,
wxPGProperty* property,
wxWindow* ctrl ) const;
wxWindow* ctrl ) const wxOVERRIDE;
virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const;
virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const wxOVERRIDE;
};
@@ -367,12 +367,12 @@ class WXDLLIMPEXP_PROPGRID wxPGChoiceAndButtonEditor : public wxPGChoiceEditor
public:
wxPGChoiceAndButtonEditor() {}
virtual ~wxPGChoiceAndButtonEditor();
virtual wxString GetName() const;
virtual wxString GetName() const wxOVERRIDE;
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
wxPGProperty* property,
const wxPoint& pos,
const wxSize& size) const;
const wxSize& size) const wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxPGChoiceAndButtonEditor);
};
@@ -383,12 +383,12 @@ wxPGTextCtrlAndButtonEditor : public wxPGTextCtrlEditor
public:
wxPGTextCtrlAndButtonEditor() {}
virtual ~wxPGTextCtrlAndButtonEditor();
virtual wxString GetName() const;
virtual wxString GetName() const wxOVERRIDE;
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
wxPGProperty* property,
const wxPoint& pos,
const wxSize& size) const;
const wxSize& size) const wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxPGTextCtrlAndButtonEditor);
};
@@ -407,32 +407,32 @@ public:
wxPGCheckBoxEditor() {}
virtual ~wxPGCheckBoxEditor();
virtual wxString GetName() const;
virtual wxString GetName() const wxOVERRIDE;
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
wxPGProperty* property,
const wxPoint& pos,
const wxSize& size) const;
const wxSize& size) const wxOVERRIDE;
virtual void UpdateControl( wxPGProperty* property,
wxWindow* ctrl ) const;
wxWindow* ctrl ) const wxOVERRIDE;
virtual bool OnEvent( wxPropertyGrid* propgrid,
wxPGProperty* property,
wxWindow* primaryCtrl,
wxEvent& event ) const;
wxEvent& event ) const wxOVERRIDE;
virtual bool GetValueFromControl( wxVariant& variant,
wxPGProperty* property,
wxWindow* ctrl ) const;
wxWindow* ctrl ) const wxOVERRIDE;
virtual void SetValueToUnspecified( wxPGProperty* property,
wxWindow* ctrl ) const;
wxWindow* ctrl ) const wxOVERRIDE;
virtual void DrawValue( wxDC& dc,
const wxRect& rect,
wxPGProperty* property,
const wxString& text ) const;
const wxString& text ) const wxOVERRIDE;
//virtual wxPGCellRenderer* GetCellRenderer() const;
virtual void SetControlIntValue( wxPGProperty* property,
wxWindow* ctrl,
int value ) const;
int value ) const wxOVERRIDE;
};
#endif

12
include/wx/propgrid/property.h
View File

@@ -184,11 +184,11 @@ public:
wxPGProperty* property,
int column,
int item,
int flags ) const;
int flags ) const wxOVERRIDE;
virtual wxSize GetImageSize( const wxPGProperty* property,
int column,
int item ) const;
int item ) const wxOVERRIDE;
protected:
};
@@ -2572,7 +2572,7 @@ private:
//
#define WX_PG_DECLARE_DOGETEDITORCLASS \
virtual const wxPGEditor* DoGetEditorClass() const;
virtual const wxPGEditor* DoGetEditorClass() const wxOVERRIDE;
#ifndef WX_PG_DECLARE_PROPERTY_CLASS
#define WX_PG_DECLARE_PROPERTY_CLASS(CLASSNAME) \
@@ -2612,7 +2612,7 @@ public:
wxPGRootProperty( const wxString& name = wxS("<Root>") );
virtual ~wxPGRootProperty();
virtual bool StringToValue( wxVariant&, const wxString&, int ) const
virtual bool StringToValue( wxVariant&, const wxString&, int ) const wxOVERRIDE
{
return false;
}
@@ -2642,8 +2642,8 @@ public:
int GetTextExtent( const wxWindow* wnd, const wxFont& font ) const;
virtual wxString ValueToString( wxVariant& value, int argFlags ) const;
virtual wxString GetValueAsString( int argFlags = 0 ) const;
virtual wxString ValueToString( wxVariant& value, int argFlags ) const wxOVERRIDE;
virtual wxString GetValueAsString( int argFlags = 0 ) const wxOVERRIDE;
protected:
void SetTextColIndex( unsigned int colInd )

6
include/wx/propgrid/propgriddefs.h
View File

@@ -521,11 +521,11 @@ public:\
\
const classname &GetValue() const { return m_value; } \
\
virtual bool Eq(wxVariantData& data) const; \
virtual bool Eq(wxVariantData& data) const wxOVERRIDE; \
\
virtual wxString GetType() const; \
virtual wxString GetType() const wxOVERRIDE; \
\
virtual wxVariantData* Clone() const { return new classname##VariantData(m_value); } \
virtual wxVariantData* Clone() const wxOVERRIDE { return new classname##VariantData(m_value); } \
\
DECLARE_WXANY_CONVERSION() \
protected:\

138
include/wx/propgrid/props.h
View File

@@ -115,16 +115,16 @@ public:
const wxString& value = wxEmptyString );
virtual ~wxStringProperty();
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
virtual bool StringToValue( wxVariant& variant,
const wxString& text,
int argFlags = 0 ) const;
int argFlags = 0 ) const wxOVERRIDE;
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
/** This is updated so "<composed>" special value can be handled.
*/
virtual void OnSetValue();
virtual void OnSetValue() wxOVERRIDE;
protected:
};
@@ -167,7 +167,7 @@ public:
wxNumericPropertyValidator( NumericType numericType, int base = 10 );
virtual ~wxNumericPropertyValidator() { }
virtual bool Validate(wxWindow* parent);
virtual bool Validate(wxWindow* parent) wxOVERRIDE;
};
#endif // wxUSE_VALIDATORS
@@ -228,17 +228,17 @@ public:
const wxString& name,
const wxLongLong& value );
#endif
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
virtual bool StringToValue( wxVariant& variant,
const wxString& text,
int argFlags = 0 ) const;
int argFlags = 0 ) const wxOVERRIDE;
virtual bool ValidateValue( wxVariant& value,
wxPGValidationInfo& validationInfo ) const;
wxPGValidationInfo& validationInfo ) const wxOVERRIDE;
virtual bool IntToValue( wxVariant& variant,
int number,
int argFlags = 0 ) const;
int argFlags = 0 ) const wxOVERRIDE;
static wxValidator* GetClassValidator();
virtual wxValidator* DoGetValidator() const;
virtual wxValidator* DoGetValidator() const wxOVERRIDE;
/** Validation helpers.
*/
@@ -291,17 +291,17 @@ public:
const wxString& name,
const wxULongLong& value );
#endif
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
virtual bool StringToValue( wxVariant& variant,
const wxString& text,
int argFlags = 0 ) const;
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
int argFlags = 0 ) const wxOVERRIDE;
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
virtual bool ValidateValue( wxVariant& value,
wxPGValidationInfo& validationInfo ) const;
virtual wxValidator* DoGetValidator () const;
wxPGValidationInfo& validationInfo ) const wxOVERRIDE;
virtual wxValidator* DoGetValidator () const wxOVERRIDE;
virtual bool IntToValue( wxVariant& variant,
int number,
int argFlags = 0 ) const;
int argFlags = 0 ) const wxOVERRIDE;
protected:
wxByte m_base;
@@ -342,15 +342,15 @@ public:
double value = 0.0 );
virtual ~wxFloatProperty();
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
virtual bool StringToValue( wxVariant& variant,
const wxString& text,
int argFlags = 0 ) const;
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
virtual wxVariant DoGetAttribute( const wxString& name ) const;
int argFlags = 0 ) const wxOVERRIDE;
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
virtual wxVariant DoGetAttribute( const wxString& name ) const wxOVERRIDE;
virtual bool ValidateValue( wxVariant& value,
wxPGValidationInfo& validationInfo ) const;
wxPGValidationInfo& validationInfo ) const wxOVERRIDE;
/** Validation helper.
*/
@@ -360,7 +360,7 @@ public:
int mode =
wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE );
static wxValidator* GetClassValidator();
virtual wxValidator* DoGetValidator () const;
virtual wxValidator* DoGetValidator () const wxOVERRIDE;
protected:
int m_precision;
@@ -385,14 +385,14 @@ public:
bool value = false );
virtual ~wxBoolProperty();
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
virtual bool StringToValue( wxVariant& variant,
const wxString& text,
int argFlags = 0 ) const;
int argFlags = 0 ) const wxOVERRIDE;
virtual bool IntToValue( wxVariant& variant,
int number, int argFlags = 0 ) const;
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
virtual wxVariant DoGetAttribute( const wxString& name ) const;
int number, int argFlags = 0 ) const wxOVERRIDE;
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
virtual wxVariant DoGetAttribute( const wxString& name ) const wxOVERRIDE;
};
// -----------------------------------------------------------------------
@@ -453,19 +453,19 @@ public:
size_t GetItemCount() const { return m_choices.GetCount(); }
virtual void OnSetValue();
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
virtual void OnSetValue() wxOVERRIDE;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
virtual bool StringToValue( wxVariant& variant,
const wxString& text,
int argFlags = 0 ) const;
int argFlags = 0 ) const wxOVERRIDE;
virtual bool ValidateValue( wxVariant& value,
wxPGValidationInfo& validationInfo ) const;
wxPGValidationInfo& validationInfo ) const wxOVERRIDE;
// If wxPG_FULL_VALUE is not set in flags, then the value is interpreted
// as index to choices list. Otherwise, it is actual value.
virtual bool IntToValue( wxVariant& variant,
int number,
int argFlags = 0 ) const;
int argFlags = 0 ) const wxOVERRIDE;
//
// Additional virtuals
@@ -476,9 +476,9 @@ public:
// GetChoiceSelection needs to overridden since m_index is
// the true index, and various property classes derived from
// this take advantage of it.
virtual int GetChoiceSelection() const { return m_index; }
virtual int GetChoiceSelection() const wxOVERRIDE { return m_index; }
virtual void OnValidationFailure( wxVariant& pendingValue );
virtual void OnValidationFailure( wxVariant& pendingValue ) wxOVERRIDE;
protected:
@@ -600,20 +600,20 @@ public:
int value = 0 );
virtual ~wxFlagsProperty ();
virtual void OnSetValue();
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
virtual void OnSetValue() wxOVERRIDE;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
virtual bool StringToValue( wxVariant& variant,
const wxString& text,
int flags ) const;
int flags ) const wxOVERRIDE;
virtual wxVariant ChildChanged( wxVariant& thisValue,
int childIndex,
wxVariant& childValue ) const;
virtual void RefreshChildren();
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
wxVariant& childValue ) const wxOVERRIDE;
virtual void RefreshChildren() wxOVERRIDE;
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
// GetChoiceSelection needs to overridden since m_choices is
// used and value is integer, but it is not index.
virtual int GetChoiceSelection() const { return wxNOT_FOUND; }
virtual int GetChoiceSelection() const wxOVERRIDE { return wxNOT_FOUND; }
// helpers
size_t GetItemCount() const { return m_choices.GetCount(); }
@@ -644,7 +644,7 @@ class WXDLLIMPEXP_PROPGRID
{
public:
virtual bool DoShowDialog( wxPropertyGrid* propGrid,
wxPGProperty* property );
wxPGProperty* property ) wxOVERRIDE;
};
// -----------------------------------------------------------------------
@@ -677,16 +677,16 @@ public:
const wxString& value = wxEmptyString );
virtual ~wxFileProperty ();
virtual void OnSetValue();
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
virtual void OnSetValue() wxOVERRIDE;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
virtual bool StringToValue( wxVariant& variant,
const wxString& text,
int argFlags = 0 ) const;
virtual wxPGEditorDialogAdapter* GetEditorDialog() const;
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
int argFlags = 0 ) const wxOVERRIDE;
virtual wxPGEditorDialogAdapter* GetEditorDialog() const wxOVERRIDE;
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
static wxValidator* GetClassValidator();
virtual wxValidator* DoGetValidator() const;
virtual wxValidator* DoGetValidator() const wxOVERRIDE;
/**
Returns filename to file represented by current value.
@@ -717,7 +717,7 @@ class WXDLLIMPEXP_PROPGRID
{
public:
virtual bool DoShowDialog( wxPropertyGrid* propGrid,
wxPGProperty* property );
wxPGProperty* property ) wxOVERRIDE;
};
@@ -736,12 +736,12 @@ public:
const wxString& value = wxEmptyString );
virtual ~wxLongStringProperty();
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
virtual bool StringToValue( wxVariant& variant,
const wxString& text,
int argFlags = 0 ) const;
int argFlags = 0 ) const wxOVERRIDE;
virtual bool OnEvent( wxPropertyGrid* propgrid,
wxWindow* primary, wxEvent& event );
wxWindow* primary, wxEvent& event ) wxOVERRIDE;
// Shows string editor dialog. Value to be edited should be read from
// value, and if dialog is not cancelled, it should be stored back and true
@@ -774,10 +774,10 @@ public:
const wxString& value = wxEmptyString );
virtual ~wxDirProperty();
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
virtual wxValidator* DoGetValidator() const;
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
virtual wxValidator* DoGetValidator() const wxOVERRIDE;
virtual bool OnButtonClick ( wxPropertyGrid* propGrid, wxString& value );
virtual bool OnButtonClick ( wxPropertyGrid* propGrid, wxString& value ) wxOVERRIDE;
protected:
wxString m_dlgMessage;
@@ -806,14 +806,14 @@ public:
const wxArrayString& value = wxArrayString() );
virtual ~wxArrayStringProperty();
virtual void OnSetValue();
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
virtual void OnSetValue() wxOVERRIDE;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE;
virtual bool StringToValue( wxVariant& variant,
const wxString& text,
int argFlags = 0 ) const;
int argFlags = 0 ) const wxOVERRIDE;
virtual bool OnEvent( wxPropertyGrid* propgrid,
wxWindow* primary, wxEvent& event );
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
wxWindow* primary, wxEvent& event ) wxOVERRIDE;
virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
// Implement in derived class for custom array-to-string conversion.
virtual void ConvertArrayToString(const wxArrayString& arr,
@@ -1041,12 +1041,12 @@ public:
void Init();
virtual void SetDialogValue( const wxVariant& value )
virtual void SetDialogValue( const wxVariant& value ) wxOVERRIDE
{
m_array = value.GetArrayString();
}
virtual wxVariant GetDialogValue() const
virtual wxVariant GetDialogValue() const wxOVERRIDE
{
return m_array;
}
@@ -1061,19 +1061,19 @@ public:
}
}
virtual bool OnCustomNewAction(wxString* resString);
virtual bool OnCustomNewAction(wxString* resString) wxOVERRIDE;
protected:
wxArrayString m_array;
wxArrayStringProperty* m_pCallingClass;
virtual wxString ArrayGet( size_t index );
virtual size_t ArrayGetCount();
virtual bool ArrayInsert( const wxString& str, int index );
virtual bool ArraySet( size_t index, const wxString& str );
virtual void ArrayRemoveAt( int index );
virtual void ArraySwap( size_t first, size_t second );
virtual wxString ArrayGet( size_t index ) wxOVERRIDE;
virtual size_t ArrayGetCount() wxOVERRIDE;
virtual bool ArrayInsert( const wxString& str, int index ) wxOVERRIDE;
virtual bool ArraySet( size_t index, const wxString& str ) wxOVERRIDE;
virtual void ArrayRemoveAt( int index ) wxOVERRIDE;
virtual void ArraySwap( size_t first, size_t second ) wxOVERRIDE;
private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPGArrayStringEditorDialog);

4
include/wx/richtext/richtextbackgroundpage.h
View File

@@ -72,8 +72,8 @@ public:
wxRichTextAttr* GetAttributes();
/// Data transfer
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
virtual bool TransferDataToWindow() wxOVERRIDE;
virtual bool TransferDataFromWindow() wxOVERRIDE;
/// Respond to colour swatch click
void OnColourSwatch(wxCommandEvent& event);

4
include/wx/richtext/richtextborderspage.h
View File

@@ -73,8 +73,8 @@ public:
wxRichTextAttr* GetAttributes();
/// Data transfer
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
virtual bool TransferDataToWindow() wxOVERRIDE;
virtual bool TransferDataFromWindow() wxOVERRIDE;
/// Updates the synchronization checkboxes to reflect the state of the attributes
void UpdateSyncControls();

288
include/wx/richtext/richtextbuffer.h
View File

@@ -3115,21 +3115,21 @@ public:
// Overridables
virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0);
virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0) wxOVERRIDE;
virtual bool FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart);
virtual bool FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart) wxOVERRIDE;
virtual void CalculateRange(long start, long& end);
virtual void CalculateRange(long start, long& end) wxOVERRIDE;
virtual bool DeleteRange(const wxRichTextRange& range);
virtual bool DeleteRange(const wxRichTextRange& range) wxOVERRIDE;
virtual wxString GetTextForRange(const wxRichTextRange& range) const;
virtual wxString GetTextForRange(const wxRichTextRange& range) const wxOVERRIDE;
virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const;
virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const wxOVERRIDE;
virtual void Dump(wxTextOutputStream& stream);
virtual void Dump(wxTextOutputStream& stream) wxOVERRIDE;
virtual void Invalidate(const wxRichTextRange& invalidRange = wxRICHTEXT_ALL);
virtual void Invalidate(const wxRichTextRange& invalidRange = wxRICHTEXT_ALL) wxOVERRIDE;
// Accessors
@@ -3155,18 +3155,18 @@ public:
/**
Returns @true if this object is composite.
*/
virtual bool IsComposite() const { return true; }
virtual bool IsComposite() const wxOVERRIDE { return true; }
/**
Returns @true if no user editing can be done inside the object. This returns @true for simple objects,
@false for most composite objects, but @true for fields, which if composite, should not be user-edited.
*/
virtual bool IsAtomic() const { return false; }
virtual bool IsAtomic() const wxOVERRIDE { return false; }
/**
Returns true if the buffer is empty.
*/
virtual bool IsEmpty() const { return GetChildCount() == 0; }
virtual bool IsEmpty() const wxOVERRIDE { return GetChildCount() == 0; }
/**
Returns the child object at the given character position.
@@ -3207,7 +3207,7 @@ public:
/**
Moves the object recursively, by adding the offset from old to new.
*/
virtual void Move(const wxPoint& pt);
virtual void Move(const wxPoint& pt) wxOVERRIDE;
protected:
wxRichTextObjectList m_children;
@@ -3236,33 +3236,33 @@ public:
// Overridables
virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0);
virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0) wxOVERRIDE;
virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) wxOVERRIDE;
virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style);
virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) wxOVERRIDE;
virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const;
virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const wxOVERRIDE;
virtual bool DeleteRange(const wxRichTextRange& range);
virtual bool DeleteRange(const wxRichTextRange& range) wxOVERRIDE;
virtual wxString GetTextForRange(const wxRichTextRange& range) const;
virtual wxString GetTextForRange(const wxRichTextRange& range) const wxOVERRIDE;
#if wxUSE_XML
virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse);
virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse) wxOVERRIDE;
#endif
#if wxRICHTEXT_HAVE_DIRECT_OUTPUT
virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler);
virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler) wxOVERRIDE;
#endif
#if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT
virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler);
virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler) wxOVERRIDE;
#endif
virtual wxString GetXMLNodeName() const { return wxT("paragraphlayout"); }
virtual wxString GetXMLNodeName() const wxOVERRIDE { return wxT("paragraphlayout"); }
virtual bool AcceptsFocus() const { return true; }
virtual bool AcceptsFocus() const wxOVERRIDE { return true; }
// Accessors
@@ -3291,7 +3291,7 @@ public:
*/
virtual wxRichTextStyleSheet* GetStyleSheet() const;
virtual bool IsTopLevel() const { return true; }
virtual bool IsTopLevel() const wxOVERRIDE { return true; }
// Operations
@@ -3681,7 +3681,7 @@ public:
*/
virtual bool HasParagraphAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const;
virtual wxRichTextObject* Clone() const { return new wxRichTextParagraphLayoutBox(*this); }
virtual wxRichTextObject* Clone() const wxOVERRIDE { return new wxRichTextParagraphLayoutBox(*this); }
/**
Prepares the content just before insertion (or after buffer reset).
@@ -3760,7 +3760,7 @@ public:
/**
Invalidates the buffer. With no argument, invalidates whole buffer.
*/
virtual void Invalidate(const wxRichTextRange& invalidRange = wxRICHTEXT_ALL);
virtual void Invalidate(const wxRichTextRange& invalidRange = wxRICHTEXT_ALL) wxOVERRIDE;
/**
Do the (in)validation for this object only.
@@ -3849,21 +3849,21 @@ public:
// Overridables
virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) wxOVERRIDE;
virtual wxString GetXMLNodeName() const { return wxT("textbox"); }
virtual wxString GetXMLNodeName() const wxOVERRIDE { return wxT("textbox"); }
virtual bool CanEditProperties() const { return true; }
virtual bool CanEditProperties() const wxOVERRIDE { return true; }
virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer);
virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer) wxOVERRIDE;
virtual wxString GetPropertiesMenuLabel() const { return wxGetTranslation("&Box"); }
virtual wxString GetPropertiesMenuLabel() const wxOVERRIDE { return wxGetTranslation("&Box"); }
// Accessors
// Operations
virtual wxRichTextObject* Clone() const { return new wxRichTextBox(*this); }
virtual wxRichTextObject* Clone() const wxOVERRIDE { return new wxRichTextBox(*this); }
void Copy(const wxRichTextBox& obj);
@@ -3931,32 +3931,32 @@ public:
// Overridables
virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) wxOVERRIDE;
virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style);
virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) wxOVERRIDE;
virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const;
virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const wxOVERRIDE;
virtual wxString GetXMLNodeName() const { return wxT("field"); }
virtual wxString GetXMLNodeName() const wxOVERRIDE { return wxT("field"); }
virtual bool CanEditProperties() const;
virtual bool CanEditProperties() const wxOVERRIDE;
virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer);
virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer) wxOVERRIDE;
virtual wxString GetPropertiesMenuLabel() const;
virtual wxString GetPropertiesMenuLabel() const wxOVERRIDE;
virtual bool AcceptsFocus() const { return false; }
virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
virtual void CalculateRange(long start, long& end);
virtual void CalculateRange(long start, long& end) wxOVERRIDE;
/**
If a field has children, we don't want the user to be able to edit it.
*/
virtual bool IsAtomic() const { return true; }
virtual bool IsAtomic() const wxOVERRIDE { return true; }
virtual bool IsEmpty() const { return false; }
virtual bool IsEmpty() const wxOVERRIDE { return false; }
virtual bool IsTopLevel() const;
virtual bool IsTopLevel() const wxOVERRIDE;
// Accessors
@@ -3971,7 +3971,7 @@ public:
*/
virtual bool UpdateField(wxRichTextBuffer* buffer);
virtual wxRichTextObject* Clone() const { return new wxRichTextField(*this); }
virtual wxRichTextObject* Clone() const wxOVERRIDE { return new wxRichTextField(*this); }
void Copy(const wxRichTextField& obj);
@@ -4187,7 +4187,7 @@ public:
Draw the item, within the given range. Some objects may ignore the range (for
example paragraphs) while others must obey it (lines, to implement wrapping)
*/
virtual bool Draw(wxRichTextField* obj, wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
virtual bool Draw(wxRichTextField* obj, wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) wxOVERRIDE;
/**
Lay the item out at the specified position with the given size constraint.
@@ -4195,13 +4195,13 @@ public:
and @a parentRect is the container that is used to determine a relative size
or position (for example if a text box must be 50% of the parent text box).
*/
virtual bool Layout(wxRichTextField* obj, wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style);
virtual bool Layout(wxRichTextField* obj, wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) wxOVERRIDE;
/**
Returns the object size for the given range. Returns @false if the range
is invalid for this object.
*/
virtual bool GetRangeSize(wxRichTextField* obj, const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const;
virtual bool GetRangeSize(wxRichTextField* obj, const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const wxOVERRIDE;
/**
Get the size of the field, given the label, font size, and so on.
@@ -4211,7 +4211,7 @@ public:
/**
Returns @true if the display type is wxRICHTEXT_FIELD_STYLE_COMPOSITE, @false otherwise.
*/
virtual bool IsTopLevel(wxRichTextField* WXUNUSED(obj)) const { return (GetDisplayStyle() & wxRICHTEXT_FIELD_STYLE_COMPOSITE) != 0; }
virtual bool IsTopLevel(wxRichTextField* WXUNUSED(obj)) const wxOVERRIDE { return (GetDisplayStyle() & wxRICHTEXT_FIELD_STYLE_COMPOSITE) != 0; }
/**
Sets the text label for fields of this type.
@@ -4506,19 +4506,19 @@ public:
// Overridables
virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) wxOVERRIDE;
virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style);
virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) wxOVERRIDE;
virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const;
virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const wxOVERRIDE;
virtual bool FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart);
virtual bool FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart) wxOVERRIDE;
virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0);
virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0) wxOVERRIDE;
virtual void CalculateRange(long start, long& end);
virtual void CalculateRange(long start, long& end) wxOVERRIDE;
virtual wxString GetXMLNodeName() const { return wxT("paragraph"); }
virtual wxString GetXMLNodeName() const wxOVERRIDE { return wxT("paragraph"); }
// Accessors
@@ -4534,7 +4534,7 @@ public:
*/
void Copy(const wxRichTextParagraph& obj);
virtual wxRichTextObject* Clone() const { return new wxRichTextParagraph(*this); }
virtual wxRichTextObject* Clone() const wxOVERRIDE { return new wxRichTextParagraph(*this); }
/**
Clears the cached lines.
@@ -4690,33 +4690,33 @@ public:
// Overridables
virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) wxOVERRIDE;
virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style);
virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) wxOVERRIDE;
virtual bool AdjustAttributes(wxRichTextAttr& attr, wxRichTextDrawingContext& context);
virtual bool AdjustAttributes(wxRichTextAttr& attr, wxRichTextDrawingContext& context) wxOVERRIDE;
virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const;
virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const wxOVERRIDE;
virtual wxString GetTextForRange(const wxRichTextRange& range) const;
virtual wxString GetTextForRange(const wxRichTextRange& range) const wxOVERRIDE;
virtual wxRichTextObject* DoSplit(long pos);
virtual wxRichTextObject* DoSplit(long pos) wxOVERRIDE;
virtual void CalculateRange(long start, long& end);
virtual void CalculateRange(long start, long& end) wxOVERRIDE;
virtual bool DeleteRange(const wxRichTextRange& range);
virtual bool DeleteRange(const wxRichTextRange& range) wxOVERRIDE;
virtual bool IsEmpty() const { return m_text.empty(); }
virtual bool IsEmpty() const wxOVERRIDE { return m_text.empty(); }
virtual bool CanMerge(wxRichTextObject* object, wxRichTextDrawingContext& context) const;
virtual bool CanMerge(wxRichTextObject* object, wxRichTextDrawingContext& context) const wxOVERRIDE;
virtual bool Merge(wxRichTextObject* object, wxRichTextDrawingContext& context);
virtual bool Merge(wxRichTextObject* object, wxRichTextDrawingContext& context) wxOVERRIDE;
virtual void Dump(wxTextOutputStream& stream);
virtual void Dump(wxTextOutputStream& stream) wxOVERRIDE;
virtual bool CanSplit(wxRichTextDrawingContext& context) const;
virtual bool CanSplit(wxRichTextDrawingContext& context) const wxOVERRIDE;
virtual wxRichTextObject* Split(wxRichTextDrawingContext& context);
virtual wxRichTextObject* Split(wxRichTextDrawingContext& context) wxOVERRIDE;
/**
Get the first position from pos that has a line break character.
@@ -4724,21 +4724,21 @@ public:
long GetFirstLineBreakPosition(long pos);
/// Does this object take note of paragraph attributes? Text and image objects don't.
virtual bool UsesParagraphAttributes() const { return false; }
virtual bool UsesParagraphAttributes() const wxOVERRIDE { return false; }
#if wxUSE_XML
virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse);
virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse) wxOVERRIDE;
#endif
#if wxRICHTEXT_HAVE_DIRECT_OUTPUT
virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler);
virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler) wxOVERRIDE;
#endif
#if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT
virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler);
virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler) wxOVERRIDE;
#endif
virtual wxString GetXMLNodeName() const { return wxT("text"); }
virtual wxString GetXMLNodeName() const wxOVERRIDE { return wxT("text"); }
// Accessors
@@ -4758,7 +4758,7 @@ public:
void Copy(const wxRichTextPlainText& obj);
// Clones the text object.
virtual wxRichTextObject* Clone() const { return new wxRichTextPlainText(*this); }
virtual wxRichTextObject* Clone() const wxOVERRIDE { return new wxRichTextPlainText(*this); }
private:
bool DrawTabbedString(wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect, wxString& str, wxCoord& x, wxCoord& y, bool selected);
@@ -4984,43 +4984,43 @@ public:
// Overridables
virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) wxOVERRIDE;
virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style);
virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) wxOVERRIDE;
virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const;
virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const wxOVERRIDE;
/**
Returns the 'natural' size for this object - the image size.
*/
virtual wxTextAttrSize GetNaturalSize() const;
virtual wxTextAttrSize GetNaturalSize() const wxOVERRIDE;
virtual bool IsEmpty() const { return false; /* !m_imageBlock.IsOk(); */ }
virtual bool IsEmpty() const wxOVERRIDE { return false; /* !m_imageBlock.IsOk(); */ }
virtual bool CanEditProperties() const { return true; }
virtual bool CanEditProperties() const wxOVERRIDE { return true; }
virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer);
virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer) wxOVERRIDE;
virtual wxString GetPropertiesMenuLabel() const { return wxGetTranslation("&Picture"); }
virtual wxString GetPropertiesMenuLabel() const wxOVERRIDE { return wxGetTranslation("&Picture"); }
virtual bool UsesParagraphAttributes() const { return false; }
virtual bool UsesParagraphAttributes() const wxOVERRIDE { return false; }
#if wxUSE_XML
virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse);
virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse) wxOVERRIDE;
#endif
#if wxRICHTEXT_HAVE_DIRECT_OUTPUT
virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler);
virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler) wxOVERRIDE;
#endif
#if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT
virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler);
virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler) wxOVERRIDE;
#endif
// Images can be floatable (optionally).
virtual bool IsFloatable() const { return true; }
virtual bool IsFloatable() const wxOVERRIDE { return true; }
virtual wxString GetXMLNodeName() const { return wxT("image"); }
virtual wxString GetXMLNodeName() const wxOVERRIDE { return wxT("image"); }
// Accessors
@@ -5054,7 +5054,7 @@ public:
/**
Clones the image object.
*/
virtual wxRichTextObject* Clone() const { return new wxRichTextImage(*this); }
virtual wxRichTextObject* Clone() const wxOVERRIDE { return new wxRichTextImage(*this); }
/**
Creates a cached image at the required size.
@@ -5144,7 +5144,7 @@ public:
/**
Returns the style sheet.
*/
virtual wxRichTextStyleSheet* GetStyleSheet() const { return m_styleSheet; }
virtual wxRichTextStyleSheet* GetStyleSheet() const wxOVERRIDE { return m_styleSheet; }
/**
Sets the style sheet and sends a notification of the change.
@@ -5262,7 +5262,7 @@ public:
/**
Convenience function to add a paragraph of text.
*/
virtual wxRichTextRange AddParagraph(const wxString& text, wxRichTextAttr* paraStyle = NULL) { Modify(); return wxRichTextParagraphLayoutBox::AddParagraph(text, paraStyle); }
virtual wxRichTextRange AddParagraph(const wxString& text, wxRichTextAttr* paraStyle = NULL) wxOVERRIDE { Modify(); return wxRichTextParagraphLayoutBox::AddParagraph(text, paraStyle); }
/**
Begin collapsing undo/redo commands. Note that this may not work properly
@@ -5602,7 +5602,7 @@ public:
// Implementation
virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0);
virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0) wxOVERRIDE;
/**
Copies the buffer.
@@ -5617,7 +5617,7 @@ public:
/**
Clones the buffer.
*/
virtual wxRichTextObject* Clone() const { return new wxRichTextBuffer(*this); }
virtual wxRichTextObject* Clone() const wxOVERRIDE { return new wxRichTextBuffer(*this); }
/**
Submits a command to insert paragraphs.
@@ -5665,7 +5665,7 @@ public:
Dumps contents of buffer for debugging purposes.
*/
virtual void Dump();
virtual void Dump(wxTextOutputStream& stream) { wxRichTextParagraphLayoutBox::Dump(stream); }
virtual void Dump(wxTextOutputStream& stream) wxOVERRIDE { wxRichTextParagraphLayoutBox::Dump(stream); }
//@}
/**
@@ -5939,22 +5939,22 @@ public:
// Overridables
virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) wxOVERRIDE;
virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0);
virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0) wxOVERRIDE;
virtual bool AdjustAttributes(wxRichTextAttr& attr, wxRichTextDrawingContext& context);
virtual bool AdjustAttributes(wxRichTextAttr& attr, wxRichTextDrawingContext& context) wxOVERRIDE;
virtual wxString GetXMLNodeName() const { return wxT("cell"); }
virtual wxString GetXMLNodeName() const wxOVERRIDE { return wxT("cell"); }
virtual bool CanEditProperties() const { return true; }
virtual bool CanEditProperties() const wxOVERRIDE { return true; }
virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer);
virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer) wxOVERRIDE;
virtual wxString GetPropertiesMenuLabel() const { return wxGetTranslation("&Cell"); }
virtual wxString GetPropertiesMenuLabel() const wxOVERRIDE { return wxGetTranslation("&Cell"); }
/// Don't allow a cell to be deleted in Defragment
virtual bool IsEmpty() const { return false; }
virtual bool IsEmpty() const wxOVERRIDE { return false; }
// Accessors
@@ -5980,7 +5980,7 @@ public:
// Operations
virtual wxRichTextObject* Clone() const { return new wxRichTextCell(*this); }
virtual wxRichTextObject* Clone() const wxOVERRIDE { return new wxRichTextCell(*this); }
void Copy(const wxRichTextCell& obj);
@@ -6017,55 +6017,55 @@ public:
// Overridables
virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) wxOVERRIDE;
virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0);
virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0) wxOVERRIDE;
virtual bool AdjustAttributes(wxRichTextAttr& attr, wxRichTextDrawingContext& context);
virtual bool AdjustAttributes(wxRichTextAttr& attr, wxRichTextDrawingContext& context) wxOVERRIDE;
virtual wxString GetXMLNodeName() const { return wxT("table"); }
virtual wxString GetXMLNodeName() const wxOVERRIDE { return wxT("table"); }
virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style);
virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) wxOVERRIDE;
virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const;
virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const wxOVERRIDE;
virtual bool DeleteRange(const wxRichTextRange& range);
virtual bool DeleteRange(const wxRichTextRange& range) wxOVERRIDE;
virtual wxString GetTextForRange(const wxRichTextRange& range) const;
virtual wxString GetTextForRange(const wxRichTextRange& range) const wxOVERRIDE;
#if wxUSE_XML
virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse);
virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse) wxOVERRIDE;
#endif
#if wxRICHTEXT_HAVE_DIRECT_OUTPUT
virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler);
virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler) wxOVERRIDE;
#endif
#if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT
virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler);
virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler) wxOVERRIDE;
#endif
virtual bool FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart);
virtual bool FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart) wxOVERRIDE;
virtual void CalculateRange(long start, long& end);
virtual void CalculateRange(long start, long& end) wxOVERRIDE;
// Can this object handle the selections of its children? FOr example, a table.
virtual bool HandlesChildSelections() const { return true; }
virtual bool HandlesChildSelections() const wxOVERRIDE { return true; }
/// Returns a selection object specifying the selections between start and end character positions.
/// For example, a table would deduce what cells (of range length 1) are selected when dragging across the table.
virtual wxRichTextSelection GetSelection(long start, long end) const;
virtual wxRichTextSelection GetSelection(long start, long end) const wxOVERRIDE;
virtual bool CanEditProperties() const { return true; }
virtual bool CanEditProperties() const wxOVERRIDE { return true; }
virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer);
virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer) wxOVERRIDE;
virtual wxString GetPropertiesMenuLabel() const { return wxGetTranslation("&Table"); }
virtual wxString GetPropertiesMenuLabel() const wxOVERRIDE { return wxGetTranslation("&Table"); }
// Returns true if objects of this class can accept the focus, i.e. a call to SetFocusObject
// is possible. For example, containers supporting text, such as a text box object, can accept the focus,
// but a table can't (set the focus to individual cells instead).
virtual bool AcceptsFocus() const { return false; }
virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
// Accessors
@@ -6164,7 +6164,7 @@ public:
virtual bool AddColumns(int startCol, int noCols = 1, const wxRichTextAttr& attr = wxRichTextAttr());
// Makes a clone of this object.
virtual wxRichTextObject* Clone() const { return new wxRichTextTable(*this); }
virtual wxRichTextObject* Clone() const wxOVERRIDE { return new wxRichTextTable(*this); }
// Copies this object.
void Copy(const wxRichTextTable& obj);
@@ -6353,12 +6353,12 @@ public:
/**
Performs the command.
*/
bool Do();
bool Do() wxOVERRIDE;
/**
Undoes the command.
*/
bool Undo();
bool Undo() wxOVERRIDE;
/**
Adds an action to the action list.
@@ -6784,16 +6784,16 @@ public:
{ }
// Can we save using this handler?
virtual bool CanSave() const { return true; }
virtual bool CanSave() const wxOVERRIDE { return true; }
// Can we load using this handler?
virtual bool CanLoad() const { return true; }
virtual bool CanLoad() const wxOVERRIDE { return true; }
protected:
#if wxUSE_STREAMS
virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream);
virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream);
virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream) wxOVERRIDE;
virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) wxOVERRIDE;
#endif
};
@@ -6907,16 +6907,16 @@ public:
// base class pure virtuals
virtual wxDataFormat GetPreferredFormat(Direction dir) const;
virtual size_t GetDataSize() const;
virtual bool GetDataHere(void *pBuf) const;
virtual bool SetData(size_t len, const void *buf);
virtual wxDataFormat GetPreferredFormat(Direction dir) const wxOVERRIDE;
virtual size_t GetDataSize() const wxOVERRIDE;
virtual bool GetDataHere(void *pBuf) const wxOVERRIDE;
virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
// prevent warnings
virtual size_t GetDataSize(const wxDataFormat&) const { return GetDataSize(); }
virtual bool GetDataHere(const wxDataFormat&, void *buf) const { return GetDataHere(buf); }
virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) { return SetData(len, buf); }
virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE { return GetDataSize(); }
virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE { return GetDataHere(buf); }
virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE { return SetData(len, buf); }
protected:
wxDataFormat m_formatRichTextBuffer; // our custom format
@@ -6992,19 +6992,19 @@ public:
wxRichTextStdRenderer() {}
// Draw a standard bullet, as specified by the value of GetBulletName
virtual bool DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect);
virtual bool DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect) wxOVERRIDE;
// Draw a bullet that can be described by text, such as numbered or symbol bullets
virtual bool DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect, const wxString& text);
virtual bool DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect, const wxString& text) wxOVERRIDE;
// Draw a bitmap bullet, where the bullet bitmap is specified by the value of GetBulletName
virtual bool DrawBitmapBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect);
virtual bool DrawBitmapBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect) wxOVERRIDE;
// Enumerate the standard bullet names currently supported
virtual bool EnumerateStandardBulletNames(wxArrayString& bulletNames);
virtual bool EnumerateStandardBulletNames(wxArrayString& bulletNames) wxOVERRIDE;
// Measure the bullet.
virtual bool MeasureBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, wxSize& sz);
virtual bool MeasureBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, wxSize& sz) wxOVERRIDE;
// Set a font which may depend on text effects.
static void SetFontForBullet(wxRichTextBuffer& buffer, wxDC& dc, const wxRichTextAttr& attr);

4
include/wx/richtext/richtextbulletspage.h
View File

@@ -67,8 +67,8 @@ public:
void UpdatePreview();
/// Transfer data from/to window
virtual bool TransferDataFromWindow();
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow() wxOVERRIDE;
virtual bool TransferDataToWindow() wxOVERRIDE;
/// Gets the attributes associated with the main formatting dialog
wxRichTextAttr* GetAttributes();

114
include/wx/richtext/richtextctrl.h
View File

@@ -278,32 +278,32 @@ public:
The end point of range is specified as the last character position of
the span of text, plus one.
*/
virtual wxString GetRange(long from, long to) const;
virtual wxString GetRange(long from, long to) const wxOVERRIDE;
/**
Returns the length of the specified line in characters.
*/
virtual int GetLineLength(long lineNo) const ;
virtual int GetLineLength(long lineNo) const wxOVERRIDE ;
/**
Returns the text for the given line.
*/
virtual wxString GetLineText(long lineNo) const ;
virtual wxString GetLineText(long lineNo) const wxOVERRIDE ;
/**
Returns the number of lines in the buffer.
*/
virtual int GetNumberOfLines() const ;
virtual int GetNumberOfLines() const wxOVERRIDE ;
/**
Returns @true if the buffer has been modified.
*/
virtual bool IsModified() const ;
virtual bool IsModified() const wxOVERRIDE ;
/**
Returns @true if the control is editable.
*/
virtual bool IsEditable() const ;
virtual bool IsEditable() const wxOVERRIDE ;
/**
Returns @true if the control is single-line.
@@ -323,7 +323,7 @@ public:
of text, plus one.
If the return values @a from and @a to are the same, there is no selection.
*/
virtual void GetSelection(long* from, long* to) const;
virtual void GetSelection(long* from, long* to) const wxOVERRIDE;
const wxRichTextSelection& GetSelection() const { return m_selection; }
wxRichTextSelection& GetSelection() { return m_selection; }
//@}
@@ -331,7 +331,7 @@ public:
/**
Returns the text within the current selection range, if any.
*/
virtual wxString GetStringSelection() const;
virtual wxString GetStringSelection() const wxOVERRIDE;
/**
Gets the current filename associated with the control.
@@ -548,18 +548,18 @@ public:
/**
Clears the buffer content, leaving a single empty paragraph. Cannot be undone.
*/
virtual void Clear();
virtual void Clear() wxOVERRIDE;
/**
Replaces the content in the specified range with the string specified by
@a value.
*/
virtual void Replace(long from, long to, const wxString& value);
virtual void Replace(long from, long to, const wxString& value) wxOVERRIDE;
/**
Removes the content in the specified range.
*/
virtual void Remove(long from, long to);
virtual void Remove(long from, long to) wxOVERRIDE;
#ifdef DOXYGEN
/**
@@ -583,7 +583,7 @@ public:
This function looks for a suitable wxRichTextFileHandler object.
*/
virtual bool DoLoadFile(const wxString& file, int fileType);
virtual bool DoLoadFile(const wxString& file, int fileType) wxOVERRIDE;
#endif // wxUSE_FFILE && wxUSE_STREAMS
#ifdef DOXYGEN
@@ -609,7 +609,7 @@ public:
This function looks for a suitable wxRichTextFileHandler object.
*/
virtual bool DoSaveFile(const wxString& file = wxEmptyString,
int fileType = wxRICHTEXT_TYPE_ANY);
int fileType = wxRICHTEXT_TYPE_ANY) wxOVERRIDE;
#endif // wxUSE_FFILE && wxUSE_STREAMS
/**
@@ -630,29 +630,29 @@ public:
/**
Marks the buffer as modified.
*/
virtual void MarkDirty();
virtual void MarkDirty() wxOVERRIDE;
/**
Sets the buffer's modified status to @false, and clears the buffer's command
history.
*/
virtual void DiscardEdits();
virtual void DiscardEdits() wxOVERRIDE;
/**
Sets the maximum number of characters that may be entered in a single line
text control. For compatibility only; currently does nothing.
*/
virtual void SetMaxLength(unsigned long WXUNUSED(len)) { }
virtual void SetMaxLength(unsigned long WXUNUSED(len)) wxOVERRIDE { }
/**
Writes text at the current position.
*/
virtual void WriteText(const wxString& text);
virtual void WriteText(const wxString& text) wxOVERRIDE;
/**
Sets the insertion point to the end of the buffer and writes the text.
*/
virtual void AppendText(const wxString& text);
virtual void AppendText(const wxString& text) wxOVERRIDE;
//@{
/**
@@ -668,7 +668,7 @@ public:
returning a 2-element list (ok, attr).
@endWxPerlOnly
*/
virtual bool GetStyle(long position, wxTextAttr& style);
virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE;
virtual bool GetStyle(long position, wxRichTextAttr& style);
virtual bool GetStyle(long position, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container);
//@}
@@ -682,7 +682,7 @@ public:
So, for example, to set the style for a character at position 5, use the range
(5,6).
*/
virtual bool SetStyle(long start, long end, const wxTextAttr& style);
virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE;
virtual bool SetStyle(long start, long end, const wxRichTextAttr& style);
virtual bool SetStyle(const wxRichTextRange& range, const wxTextAttr& style);
virtual bool SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style);
@@ -764,7 +764,7 @@ public:
Sets the current default style, which can be used to change how subsequently
inserted text is displayed.
*/
virtual bool SetDefaultStyle(const wxTextAttr& style);
virtual bool SetDefaultStyle(const wxTextAttr& style) wxOVERRIDE;
virtual bool SetDefaultStyle(const wxRichTextAttr& style);
//@}
@@ -879,17 +879,17 @@ public:
/**
Translates from column and line number to position.
*/
virtual long XYToPosition(long x, long y) const;
virtual long XYToPosition(long x, long y) const wxOVERRIDE;
/**
Converts a text position to zero-based column and line numbers.
*/
virtual bool PositionToXY(long pos, long *x, long *y) const;
virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE;
/**
Scrolls the buffer so that the given position is in view.
*/
virtual void ShowPosition(long pos);
virtual void ShowPosition(long pos) wxOVERRIDE;
//@{
/**
@@ -897,10 +897,10 @@ public:
@a pt is in device coords (not adjusted for the client area origin nor for
scrolling).
*/
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;
/**
Finds the container at the given point, which is in screen coordinates.
@@ -920,18 +920,18 @@ public:
/**
Copies the selected content (if any) to the clipboard.
*/
virtual void Copy();
virtual void Copy() wxOVERRIDE;
/**
Copies the selected content (if any) to the clipboard and deletes the selection.
This is undoable.
*/
virtual void Cut();
virtual void Cut() wxOVERRIDE;
/**
Pastes content from the clipboard to the buffer.
*/
virtual void Paste();
virtual void Paste() wxOVERRIDE;
/**
Deletes the content in the selection, if any. This is undoable.
@@ -941,17 +941,17 @@ public:
/**
Returns @true if selected content can be copied to the clipboard.
*/
virtual bool CanCopy() const;
virtual bool CanCopy() const wxOVERRIDE;
/**
Returns @true if selected content can be copied to the clipboard and deleted.
*/
virtual bool CanCut() const;
virtual bool CanCut() const wxOVERRIDE;
/**
Returns @true if the clipboard content can be pasted to the buffer.
*/
virtual bool CanPaste() const;
virtual bool CanPaste() const wxOVERRIDE;
/**
Returns @true if selected content can be deleted.
@@ -961,43 +961,43 @@ public:
/**
Undoes the command at the top of the command history, if there is one.
*/
virtual void Undo();
virtual void Undo() wxOVERRIDE;
/**
Redoes the current command.
*/
virtual void Redo();
virtual void Redo() wxOVERRIDE;
/**
Returns @true if there is a command in the command history that can be undone.
*/
virtual bool CanUndo() const;
virtual bool CanUndo() const wxOVERRIDE;
/**
Returns @true if there is a command in the command history that can be redone.
*/
virtual bool CanRedo() const;
virtual bool CanRedo() const wxOVERRIDE;
/**
Sets the insertion point and causes the current editing style to be taken from
the new position (unlike wxRichTextCtrl::SetCaretPosition).
*/
virtual void SetInsertionPoint(long pos);
virtual void SetInsertionPoint(long pos) wxOVERRIDE;
/**
Sets the insertion point to the end of the text control.
*/
virtual void SetInsertionPointEnd();
virtual void SetInsertionPointEnd() wxOVERRIDE;
/**
Returns the current insertion point.
*/
virtual long GetInsertionPoint() const;
virtual long GetInsertionPoint() const wxOVERRIDE;
/**
Returns the last position in the buffer.
*/
virtual wxTextPos GetLastPosition() const;
virtual wxTextPos GetLastPosition() const wxOVERRIDE;
//@{
/**
@@ -1008,14 +1008,14 @@ public:
So, for example, to set the selection for a character at position 5, use the
range (5,6).
*/
virtual void SetSelection(long from, long to);
virtual void SetSelection(long from, long to) wxOVERRIDE;
void SetSelection(const wxRichTextSelection& sel) { m_selection = sel; }
//@}
/**
Makes the control editable, or not.
*/
virtual void SetEditable(bool editable);
virtual void SetEditable(bool editable) wxOVERRIDE;
/**
Returns @true if there is a selection and the object containing the selection
@@ -1360,7 +1360,7 @@ public:
/**
Cancels any selection.
*/
virtual void SelectNone();
virtual void SelectNone() wxOVERRIDE;
/**
Selects the word at the given character position.
@@ -1787,7 +1787,7 @@ public:
/**
Sends the event to the control.
*/
void Command(wxCommandEvent& event);
void Command(wxCommandEvent& event) wxOVERRIDE;
/**
Loads the first dropped file.
@@ -1928,7 +1928,7 @@ public:
Sets the font, and also the basic and default attributes
(see wxRichTextCtrl::SetDefaultStyle).
*/
virtual bool SetFont(const wxFont& font);
virtual bool SetFont(const wxFont& font) wxOVERRIDE;
/**
A helper function setting up scrollbars, for example after a resize.
@@ -1963,7 +1963,7 @@ public:
virtual void DoWriteText(const wxString& value, int flags = 0);
// Should we inherit colours?
virtual bool ShouldInheritColours() const { return false; }
virtual bool ShouldInheritColours() const wxOVERRIDE { return false; }
/**
Internal function to position the visible caret according to the current caret
@@ -2001,7 +2001,7 @@ public:
Overrides standard refresh in order to provoke delayed image loading.
*/
virtual void Refresh( bool eraseBackground = true,
const wxRect *rect = (const wxRect *) NULL );
const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE;
/**
Sets the caret position.
@@ -2262,7 +2262,7 @@ public:
WX_FORWARD_TO_SCROLL_HELPER()
// implement wxTextEntry methods
virtual wxString DoGetValue() const;
virtual wxString DoGetValue() const wxOVERRIDE;
/**
Do delayed image loading and garbage-collect other images
@@ -2282,11 +2282,11 @@ public:
protected:
// implement the wxTextEntry pure virtual method
virtual wxWindow *GetEditableWindow() { return this; }
virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; }
// margins functions
virtual bool DoSetMargins(const wxPoint& pt);
virtual wxPoint DoGetMargins() const;
virtual bool DoSetMargins(const wxPoint& pt) wxOVERRIDE;
virtual wxPoint DoGetMargins() const wxOVERRIDE;
// FIXME: this does not work, it allows this code to compile but will fail
// during run-time
@@ -2309,11 +2309,11 @@ protected:
/**
Currently this simply returns @c wxSize(10, 10).
*/
virtual wxSize DoGetBestSize() const ;
virtual wxSize DoGetBestSize() const wxOVERRIDE ;
virtual void DoSetValue(const wxString& value, int flags = 0);
virtual void DoSetValue(const wxString& value, int flags = 0) wxOVERRIDE;
virtual void DoThaw();
virtual void DoThaw() wxOVERRIDE;
// Data members
@@ -2423,7 +2423,7 @@ public:
: wxDropSource(data, tc), m_rtc(tc) {}
protected:
bool GiveFeedback(wxDragResult effect);
bool GiveFeedback(wxDragResult effect) wxOVERRIDE;
wxRichTextCtrl* m_rtc;
};
@@ -2434,7 +2434,7 @@ public:
wxRichTextDropTarget(wxRichTextCtrl* tc)
: wxDropTarget(new wxRichTextBufferDataObject(new wxRichTextBuffer)), m_rtc(tc) {}
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def)
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE
{
if ( !GetData() )
return wxDragNone;
@@ -2640,7 +2640,7 @@ public:
*/
void SetOldContainer(wxRichTextParagraphLayoutBox* container) { m_oldContainer = container; }
virtual wxEvent *Clone() const { return new wxRichTextEvent(*this); }
virtual wxEvent *Clone() const wxOVERRIDE { return new wxRichTextEvent(*this); }
protected:
int m_flags;

4
include/wx/richtext/richtextfontpage.h
View File

@@ -70,8 +70,8 @@ public:
void CreateControls();
/// Transfer data from/to window
virtual bool TransferDataFromWindow();
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow() wxOVERRIDE;
virtual bool TransferDataToWindow() wxOVERRIDE;
/// Updates the font preview
void UpdatePreview();

8
include/wx/richtext/richtextformatdlg.h
View File

@@ -192,8 +192,8 @@ public:
void SetObject(wxRichTextObject* obj) { m_object = obj; }
/// Transfers the data and from to the window
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
virtual bool TransferDataToWindow() wxOVERRIDE;
virtual bool TransferDataFromWindow() wxOVERRIDE;
/// Apply the styles when a different tab is selected, so the previews are
/// up to date
@@ -312,7 +312,7 @@ public:
wxColour& GetColour() { return m_colour; }
virtual wxSize DoGetBestSize() const { return GetSize(); }
virtual wxSize DoGetBestSize() const wxOVERRIDE { return GetSize(); }
protected:
wxColour m_colour;
@@ -366,7 +366,7 @@ public:
protected:
/// Returns the HTML for this item
virtual wxString OnGetItem(size_t n) const;
virtual wxString OnGetItem(size_t n) const wxOVERRIDE;
private:

10
include/wx/richtext/richtexthtml.h
View File

@@ -31,13 +31,13 @@ public:
wxRichTextHTMLHandler(const wxString& name = wxT("HTML"), const wxString& ext = wxT("html"), int type = wxRICHTEXT_TYPE_HTML);
/// Can we save using this handler?
virtual bool CanSave() const { return true; }
virtual bool CanSave() const wxOVERRIDE { return true; }
/// Can we load using this handler?
virtual bool CanLoad() const { return false; }
virtual bool CanLoad() const wxOVERRIDE { return false; }
/// Can we handle this filename (if using files)? By default, checks the extension.
virtual bool CanHandle(const wxString& filename) const;
virtual bool CanHandle(const wxString& filename) const wxOVERRIDE;
// Accessors and operations unique to this handler
@@ -75,8 +75,8 @@ protected:
// Implementation
#if wxUSE_STREAMS
virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream);
virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream);
virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream) wxOVERRIDE;
virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) wxOVERRIDE;
/// Output character formatting
void BeginCharacterFormatting(const wxRichTextAttr& currentStyle, const wxRichTextAttr& thisStyle, const wxRichTextAttr& paraStyle, wxTextOutputStream& stream );

4
include/wx/richtext/richtextindentspage.h
View File

@@ -66,8 +66,8 @@ public:
void CreateControls();
/// Transfer data from/to window
virtual bool TransferDataFromWindow();
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow() wxOVERRIDE;
virtual bool TransferDataToWindow() wxOVERRIDE;
/// Updates the paragraph preview
void UpdatePreview();

4
include/wx/richtext/richtextliststylepage.h
View File

@@ -63,8 +63,8 @@ public:
void UpdatePreview();
/// Transfer data from/to window
virtual bool TransferDataFromWindow();
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow() wxOVERRIDE;
virtual bool TransferDataToWindow() wxOVERRIDE;
/// Get attributes for selected level
wxRichTextAttr* GetAttributesForSelection();

4
include/wx/richtext/richtextmarginspage.h
View File

@@ -72,8 +72,8 @@ public:
wxRichTextAttr* GetAttributes();
/// Data transfer
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
virtual bool TransferDataToWindow() wxOVERRIDE;
virtual bool TransferDataFromWindow() wxOVERRIDE;
////@begin wxRichTextMarginsPage event handler declarations

4
include/wx/richtext/richtextsizepage.h
View File

@@ -73,8 +73,8 @@ public:
wxRichTextAttr* GetAttributes();
/// Data transfer
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
virtual bool TransferDataToWindow() wxOVERRIDE;
virtual bool TransferDataFromWindow() wxOVERRIDE;
/// Show/hide position controls
static void ShowPositionControls(bool show) { sm_showPositionControls = show; }

4
include/wx/richtext/richtextstyledlg.h
View File

@@ -97,8 +97,8 @@ public:
void Init();
/// Transfer data from/to window
virtual bool TransferDataFromWindow();
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow() wxOVERRIDE;
virtual bool TransferDataToWindow() wxOVERRIDE;
/// Set/get style sheet
void SetStyleSheet(wxRichTextStyleSheet* sheet) { m_richTextStyleSheet = sheet; }

4
include/wx/richtext/richtextstylepage.h
View File

@@ -50,8 +50,8 @@ public:
void CreateControls();
/// Transfer data from/to window
virtual bool TransferDataFromWindow();
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow() wxOVERRIDE;
virtual bool TransferDataToWindow() wxOVERRIDE;
/// Gets the attributes associated with the main formatting dialog
wxRichTextAttr* GetAttributes();

22
include/wx/richtext/richtextstyles.h
View File

@@ -143,7 +143,7 @@ public:
virtual ~wxRichTextCharacterStyleDefinition() {}
/// Clones the object
virtual wxRichTextStyleDefinition* Clone() const { return new wxRichTextCharacterStyleDefinition(*this); }
virtual wxRichTextStyleDefinition* Clone() const wxOVERRIDE { return new wxRichTextCharacterStyleDefinition(*this); }
protected:
};
@@ -181,7 +181,7 @@ public:
bool operator ==(const wxRichTextParagraphStyleDefinition& def) const;
/// Clones the object
virtual wxRichTextStyleDefinition* Clone() const { return new wxRichTextParagraphStyleDefinition(*this); }
virtual wxRichTextStyleDefinition* Clone() const wxOVERRIDE { return new wxRichTextParagraphStyleDefinition(*this); }
protected:
@@ -218,7 +218,7 @@ public:
bool operator ==(const wxRichTextListStyleDefinition& def) const;
/// Clones the object
virtual wxRichTextStyleDefinition* Clone() const { return new wxRichTextListStyleDefinition(*this); }
virtual wxRichTextStyleDefinition* Clone() const wxOVERRIDE { return new wxRichTextListStyleDefinition(*this); }
/// Sets/gets the attributes for the given level
void SetLevelAttributes(int i, const wxRichTextAttr& attr);
@@ -284,7 +284,7 @@ public:
bool operator ==(const wxRichTextBoxStyleDefinition& def) const;
/// Clones the object
virtual wxRichTextStyleDefinition* Clone() const { return new wxRichTextBoxStyleDefinition(*this); }
virtual wxRichTextStyleDefinition* Clone() const wxOVERRIDE { return new wxRichTextBoxStyleDefinition(*this); }
protected:
};
@@ -556,7 +556,7 @@ public:
protected:
/// Returns the HTML for this item
virtual wxString OnGetItem(size_t n) const;
virtual wxString OnGetItem(size_t n) const wxOVERRIDE;
private:
@@ -656,23 +656,23 @@ private:
class wxRichTextStyleComboPopup : public wxRichTextStyleListBox, public wxComboPopup
{
public:
virtual void Init()
virtual void Init() wxOVERRIDE
{
m_itemHere = -1; // hot item in list
m_value = -1;
}
virtual bool Create( wxWindow* parent );
virtual bool Create( wxWindow* parent ) wxOVERRIDE;
virtual wxWindow *GetControl() { return this; }
virtual wxWindow *GetControl() wxOVERRIDE { return this; }
virtual void SetStringValue( const wxString& s );
virtual void SetStringValue( const wxString& s ) wxOVERRIDE;
virtual wxString GetStringValue() const;
virtual wxString GetStringValue() const wxOVERRIDE;
/// Can we set the selection based on the editor caret position?
// virtual bool CanAutoSetSelection() { return ((m_combo == NULL) || !m_combo->IsPopupShown()); }
virtual bool CanAutoSetSelection() { return false; }
virtual bool CanAutoSetSelection() wxOVERRIDE { return false; }
//
// Popup event handlers

8
include/wx/richtext/richtextsymboldlg.h
View File

@@ -103,7 +103,7 @@ public:
static void SetShowToolTips(bool show) { sm_showToolTips = show; }
/// Data transfer
virtual bool TransferDataToWindow();
virtual bool TransferDataToWindow() wxOVERRIDE;
////@begin wxSymbolPickerDialog event handler declarations
@@ -231,7 +231,7 @@ public:
// ---------
// set the current font
virtual bool SetFont(const wxFont& font);
virtual bool SetFont(const wxFont& font) wxOVERRIDE;
// set Unicode/ASCII mode
void SetUnicodeMode(bool unicodeMode);
@@ -276,7 +276,7 @@ public:
// change the background colour of the selected cells
void SetSelectionBackground(const wxColour& col);
virtual wxVisualAttributes GetDefaultAttributes() const
virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
{
return GetClassDefaultAttributes(GetWindowVariant());
}
@@ -297,7 +297,7 @@ protected:
virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const;
// gets the line height
virtual wxCoord OnGetRowHeight(size_t line) const;
virtual wxCoord OnGetRowHeight(size_t line) const wxOVERRIDE;
// event handlers
void OnPaint(wxPaintEvent& event);

4
include/wx/richtext/richtexttabspage.h
View File

@@ -64,8 +64,8 @@ public:
void Init();
/// Transfer data from/to window
virtual bool TransferDataFromWindow();
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow() wxOVERRIDE;
virtual bool TransferDataToWindow() wxOVERRIDE;
/// Sorts the tab array
virtual void SortTabs();

8
include/wx/richtext/richtextxml.h
View File

@@ -202,10 +202,10 @@ public:
virtual wxRichTextObject* CreateObjectForXMLName(wxRichTextObject* parent, const wxString& name) const;
/// Can we save using this handler?
virtual bool CanSave() const { return true; }
virtual bool CanSave() const wxOVERRIDE { return true; }
/// Can we load using this handler?
virtual bool CanLoad() const { return true; }
virtual bool CanLoad() const wxOVERRIDE { return true; }
/// Returns the XML helper object, implementing functionality
/// that can be reused elsewhere.
@@ -226,8 +226,8 @@ public:
protected:
#if wxUSE_STREAMS
virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream);
virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream);
virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream) wxOVERRIDE;
virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) wxOVERRIDE;
#endif
wxRichTextXMLHelper m_helper;

14
include/wx/sckaddr.h
View File

@@ -124,14 +124,14 @@ public:
wxIPV4address(const wxIPV4address& other) : wxIPaddress(other) { }
// implement wxSockAddress pure virtuals:
virtual Family Type() { return IPV4; }
virtual wxSockAddress *Clone() const { return new wxIPV4address(*this); }
virtual Family Type() wxOVERRIDE { return IPV4; }
virtual wxSockAddress *Clone() const wxOVERRIDE { return new wxIPV4address(*this); }
// implement wxIPaddress pure virtuals:
virtual bool IsLocalHost() const;
virtual bool IsLocalHost() const wxOVERRIDE;
virtual wxString IPAddress() const;
virtual wxString IPAddress() const wxOVERRIDE;
// IPv4-specific methods:
@@ -143,7 +143,7 @@ public:
bool BroadcastAddress();
private:
virtual void DoInitImpl();
virtual void DoInitImpl() wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxIPV4address);
};
@@ -198,8 +198,8 @@ public:
void Filename(const wxString& name);
wxString Filename() const;
virtual Family Type() { return UNIX; }
virtual wxSockAddress *Clone() const { return new wxUNIXaddress(*this); }
virtual Family Type() wxOVERRIDE { return UNIX; }
virtual wxSockAddress *Clone() const wxOVERRIDE { return new wxUNIXaddress(*this); }
private:
wxSockAddressImpl& GetUNIX();

12
include/wx/scrolwin.h
View File

@@ -341,13 +341,13 @@ protected:
// methods to corresponding wxScrollHelper methods
#define WX_FORWARD_TO_SCROLL_HELPER() \
public: \
virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); } \
virtual bool Layout() { return ScrollLayout(); } \
virtual bool CanScroll(int orient) const \
virtual void PrepareDC(wxDC& dc) wxOVERRIDE { DoPrepareDC(dc); } \
virtual bool Layout() wxOVERRIDE { return ScrollLayout(); } \
virtual bool CanScroll(int orient) const wxOVERRIDE \
{ return IsScrollbarShown(orient); } \
virtual void DoSetVirtualSize(int x, int y) \
virtual void DoSetVirtualSize(int x, int y) wxOVERRIDE \
{ ScrollDoSetVirtualSize(x, y); } \
virtual wxSize GetBestVirtualSize() const \
virtual wxSize GetBestVirtualSize() const wxOVERRIDE \
{ return ScrollGetBestVirtualSize(); }
// include the declaration of the real wxScrollHelper
@@ -446,7 +446,7 @@ public:
WX_FORWARD_TO_SCROLL_HELPER()
protected:
virtual wxSize DoGetBestSize() const
virtual wxSize DoGetBestSize() const wxOVERRIDE
{
return FilterBestSize(this, this, T::DoGetBestSize());
}

2
include/wx/tipwin.h
View File

@@ -73,7 +73,7 @@ protected:
void OnActivate(wxActivateEvent& event);
void OnKillFocus(wxFocusEvent& event);
#else // wxUSE_POPUPWIN
virtual void OnDismiss();
virtual void OnDismiss() wxOVERRIDE;
#endif // wxUSE_POPUPWIN/!wxUSE_POPUPWIN
private:

12
include/wx/unix/apptrait.h
View File

@@ -54,8 +54,8 @@ public:
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE;
#endif
#if wxUSE_THREADS && defined(__WXGTK20__)
virtual void MutexGuiEnter();
virtual void MutexGuiLeave();
virtual void MutexGuiEnter() wxOVERRIDE;
virtual void MutexGuiLeave() wxOVERRIDE;
#endif
#if defined(__WXMAC__) && wxUSE_STDPATHS
@@ -64,13 +64,13 @@ public:
virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const wxOVERRIDE;
#ifdef __WXGTK20__
virtual wxString GetDesktopEnvironment() const;
virtual wxString GetDesktopEnvironment() const wxOVERRIDE;
virtual wxString GetStandardCmdLineOptions(wxArrayString& names,
wxArrayString& desc) const;
wxArrayString& desc) const wxOVERRIDE;
#endif // __WXGTK20____
#if defined(__WXGTK20__)
virtual bool ShowAssertDialog(const wxString& msg);
virtual bool ShowAssertDialog(const wxString& msg) wxOVERRIDE;
#endif
#if wxUSE_SOCKETS
@@ -80,7 +80,7 @@ public:
#endif
#ifdef wxHAS_GUI_FDIOMANAGER
virtual wxFDIOManager *GetFDIOManager();
virtual wxFDIOManager *GetFDIOManager() wxOVERRIDE;
#endif
#endif // wxUSE_SOCKETS

6
include/wx/valnum.h
View File

@@ -41,7 +41,7 @@ public:
// Override base class method to not do anything but always return success:
// we don't need this as we do our validation on the fly here.
virtual bool Validate(wxWindow * WXUNUSED(parent)) { return true; }
virtual bool Validate(wxWindow * WXUNUSED(parent)) wxOVERRIDE { return true; }
protected:
wxNumValidatorBase(int style)
@@ -279,7 +279,7 @@ protected:
}
// Implement wxNumValidatorBase pure virtual method.
virtual bool IsCharOk(const wxString& val, int pos, wxChar ch) const;
virtual bool IsCharOk(const wxString& val, int pos, wxChar ch) const wxOVERRIDE;
private:
// Minimal and maximal values accepted (inclusive).
@@ -374,7 +374,7 @@ protected:
}
// Implement wxNumValidatorBase pure virtual method.
virtual bool IsCharOk(const wxString& val, int pos, wxChar ch) const;
virtual bool IsCharOk(const wxString& val, int pos, wxChar ch) const wxOVERRIDE;
private:
// Maximum number of decimals digits after the decimal separator.

10
include/wx/variant.h
View File

@@ -438,7 +438,7 @@ private:
};
#define DECLARE_WXANY_CONVERSION() \
virtual bool GetAsAny(wxAny* any) const; \
virtual bool GetAsAny(wxAny* any) const wxOVERRIDE; \
static wxVariantData* VariantDataFactory(const wxAny& any);
#define _REGISTER_WXANY_CONVERSION(T, CLASSNAME, FUNC) \
@@ -489,12 +489,12 @@ public:\
\
classname &GetValue() { return m_value; } \
\
virtual bool Eq(wxVariantData& data) const; \
virtual bool Eq(wxVariantData& data) const wxOVERRIDE; \
\
virtual wxString GetType() const; \
virtual wxClassInfo* GetValueClassInfo(); \
virtual wxString GetType() const wxOVERRIDE; \
virtual wxClassInfo* GetValueClassInfo() wxOVERRIDE; \
\
virtual wxVariantData* Clone() const { return new classname##VariantData(m_value); } \
virtual wxVariantData* Clone() const wxOVERRIDE { return new classname##VariantData(m_value); } \
\
DECLARE_WXANY_CONVERSION() \
protected:\

4
include/wx/vscroll.h
View File

@@ -655,8 +655,8 @@ typedef wxVarVScrollHelper wxVarVScrollLegacyAdaptor;
// classes
#define WX_FORWARD_TO_VAR_SCROLL_HELPER() \
public: \
virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); } \
virtual bool Layout() { return ScrollLayout(); }
virtual void PrepareDC(wxDC& dc) wxOVERRIDE { DoPrepareDC(dc); } \
virtual bool Layout() wxOVERRIDE { return ScrollLayout(); }

4
include/wx/xrc/xh_animatctrl.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxAnimationCtrlXmlHandler : public wxXmlResourceHandler
public:
wxAnimationCtrlXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
#endif // wxUSE_XRC && wxUSE_ANIMATIONCTRL

4
include/wx/xrc/xh_auinotbk.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_AUI wxAuiNotebookXmlHandler : public wxXmlResourceHandler
{
public:
wxAuiNotebookXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
bool m_isInside;

4
include/wx/xrc/xh_auitoolb.h
View File

@@ -23,8 +23,8 @@ class WXDLLIMPEXP_AUI wxAuiToolBarXmlHandler : public wxXmlResourceHandler
{
public:
wxAuiToolBarXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
bool m_isInside;

4
include/wx/xrc/xh_bannerwindow.h
View File

@@ -19,8 +19,8 @@ class WXDLLIMPEXP_XRC wxBannerWindowXmlHandler : public wxXmlResourceHandler
public:
wxBannerWindowXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxBannerWindowXmlHandler);
};

8
include/wx/xrc/xh_bmp.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxBitmapXmlHandler : public wxXmlResourceHandler
public:
wxBitmapXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
class WXDLLIMPEXP_XRC wxIconXmlHandler : public wxXmlResourceHandler
@@ -30,8 +30,8 @@ class WXDLLIMPEXP_XRC wxIconXmlHandler : public wxXmlResourceHandler
public:
wxIconXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
#endif // wxUSE_XRC

4
include/wx/xrc/xh_bmpbt.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxBitmapButtonXmlHandler : public wxXmlResourceHandler
public:
wxBitmapButtonXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
#endif // wxUSE_XRC && wxUSE_BMPBUTTON

4
include/wx/xrc/xh_bmpcbox.h
View File

@@ -22,8 +22,8 @@ class WXDLLIMPEXP_XRC wxBitmapComboBoxXmlHandler : public wxXmlResourceHandler
public:
wxBitmapComboBoxXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
wxBitmapComboBox* m_combobox;

4
include/wx/xrc/xh_bttn.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxButtonXmlHandler : public wxXmlResourceHandler
public:
wxButtonXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
#endif // wxUSE_XRC && wxUSE_BUTTON

4
include/wx/xrc/xh_cald.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxCalendarCtrlXmlHandler : public wxXmlResourceHandler
public:
wxCalendarCtrlXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
#endif // wxUSE_XRC && wxUSE_CALENDARCTRL

4
include/wx/xrc/xh_chckb.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxCheckBoxXmlHandler : public wxXmlResourceHandler
public:
wxCheckBoxXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
#endif // wxUSE_XRC && wxUSE_CHECKBOX

4
include/wx/xrc/xh_chckl.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxCheckListBoxXmlHandler : public wxXmlResourceHandler
public:
wxCheckListBoxXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
bool m_insideBox;

4
include/wx/xrc/xh_choic.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxChoiceXmlHandler : public wxXmlResourceHandler
public:
wxChoiceXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
bool m_insideBox;

4
include/wx/xrc/xh_choicbk.h
View File

@@ -21,8 +21,8 @@ class WXDLLIMPEXP_XRC wxChoicebookXmlHandler : public wxXmlResourceHandler
public:
wxChoicebookXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
bool m_isInside;

4
include/wx/xrc/xh_clrpicker.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxColourPickerCtrlXmlHandler : public wxXmlResourceHandler
public:
wxColourPickerCtrlXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
#endif // wxUSE_XRC && wxUSE_COLOURPICKERCTRL

4
include/wx/xrc/xh_cmdlinkbn.h
View File

@@ -19,8 +19,8 @@ class WXDLLIMPEXP_XRC wxCommandLinkButtonXmlHandler : public wxXmlResourceHandle
public:
wxCommandLinkButtonXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
wxDECLARE_DYNAMIC_CLASS(wxCommandLinkButtonXmlHandler);

4
include/wx/xrc/xh_collpane.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxCollapsiblePaneXmlHandler : public wxXmlResourceHandler
{
public:
wxCollapsiblePaneXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
bool m_isInside;

4
include/wx/xrc/xh_combo.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxComboBoxXmlHandler : public wxXmlResourceHandler
public:
wxComboBoxXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
bool m_insideBox;

4
include/wx/xrc/xh_comboctrl.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxComboCtrlXmlHandler : public wxXmlResourceHandler
public:
wxComboCtrlXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
};

4
include/wx/xrc/xh_datectrl.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxDateCtrlXmlHandler : public wxXmlResourceHandler
public:
wxDateCtrlXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
#endif // wxUSE_XRC && wxUSE_DATEPICKCTRL

4
include/wx/xrc/xh_dirpicker.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxDirPickerCtrlXmlHandler : public wxXmlResourceHandler
public:
wxDirPickerCtrlXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
#endif // wxUSE_XRC && wxUSE_DIRPICKERCTRL

4
include/wx/xrc/xh_dlg.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxDialogXmlHandler : public wxXmlResourceHandler
public:
wxDialogXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
#endif // wxUSE_XRC

4
include/wx/xrc/xh_editlbox.h
View File

@@ -23,8 +23,8 @@ class WXDLLIMPEXP_XRC wxEditableListBoxXmlHandler : public wxXmlResourceHandler
public:
wxEditableListBoxXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
bool m_insideBox;

4
include/wx/xrc/xh_filectrl.h
View File

@@ -18,8 +18,8 @@ class WXDLLIMPEXP_XRC wxFileCtrlXmlHandler : public wxXmlResourceHandler
{
public:
wxFileCtrlXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
wxDECLARE_DYNAMIC_CLASS(wxFileCtrlXmlHandler);

4
include/wx/xrc/xh_filepicker.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxFilePickerCtrlXmlHandler : public wxXmlResourceHandler
public:
wxFilePickerCtrlXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
#endif // wxUSE_XRC && wxUSE_FILEPICKERCTRL

4
include/wx/xrc/xh_fontpicker.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxFontPickerCtrlXmlHandler : public wxXmlResourceHandler
public:
wxFontPickerCtrlXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
#endif // wxUSE_XRC && wxUSE_FONTPICKERCTRL

4
include/wx/xrc/xh_frame.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxFrameXmlHandler : public wxXmlResourceHandler
public:
wxFrameXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
#endif // wxUSE_XRC

4
include/wx/xrc/xh_gauge.h
View File

@@ -18,8 +18,8 @@ class WXDLLIMPEXP_XRC wxGaugeXmlHandler : public wxXmlResourceHandler
{
public:
wxGaugeXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler);
};

4
include/wx/xrc/xh_gdctl.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler
public:
wxGenericDirCtrlXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
#endif // wxUSE_XRC && wxUSE_DIRDLG

4
include/wx/xrc/xh_grid.h
View File

@@ -21,8 +21,8 @@ class WXDLLIMPEXP_XRC wxGridXmlHandler : public wxXmlResourceHandler
public:
wxGridXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
#endif // wxUSE_XRC && wxUSE_GRID

4
include/wx/xrc/xh_html.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxHtmlWindowXmlHandler : public wxXmlResourceHandler
public:
wxHtmlWindowXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
#endif // wxUSE_XRC && wxUSE_HTML

4
include/wx/xrc/xh_htmllbox.h
View File

@@ -18,8 +18,8 @@ class WXDLLIMPEXP_XRC wxSimpleHtmlListBoxXmlHandler : public wxXmlResourceHandle
{
public:
wxSimpleHtmlListBoxXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
bool m_insideBox;

4
include/wx/xrc/xh_hyperlink.h
View File

@@ -25,10 +25,10 @@ public:
wxHyperlinkCtrlXmlHandler();
// Creates the control and returns a pointer to it.
virtual wxObject *DoCreateResource();
virtual wxObject *DoCreateResource() wxOVERRIDE;
// Returns true if we know how to create a control for the given node.
virtual bool CanHandle(wxXmlNode *node);
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
#endif // wxUSE_XRC && wxUSE_HYPERLINKCTRL

4
include/wx/xrc/xh_listb.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxListBoxXmlHandler : public wxXmlResourceHandler
public:
wxListBoxXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
bool m_insideBox;

4
include/wx/xrc/xh_listbk.h
View File

@@ -21,8 +21,8 @@ class WXDLLIMPEXP_XRC wxListbookXmlHandler : public wxXmlResourceHandler
public:
wxListbookXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
bool m_isInside;

4
include/wx/xrc/xh_listc.h
View File

@@ -21,8 +21,8 @@ class WXDLLIMPEXP_XRC wxListCtrlXmlHandler : public wxXmlResourceHandler
{
public:
wxListCtrlXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
// handlers for wxListCtrl itself and its listcol and listitem children

4
include/wx/xrc/xh_mdi.h
View File

@@ -22,8 +22,8 @@ class WXDLLIMPEXP_XRC wxMdiXmlHandler : public wxXmlResourceHandler
public:
wxMdiXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
wxWindow *CreateFrame();

8
include/wx/xrc/xh_menu.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxMenuXmlHandler : public wxXmlResourceHandler
public:
wxMenuXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
bool m_insideMenu;
@@ -33,8 +33,8 @@ class WXDLLIMPEXP_XRC wxMenuBarXmlHandler : public wxXmlResourceHandler
public:
wxMenuBarXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
#endif // wxUSE_XRC && wxUSE_MENUS

4
include/wx/xrc/xh_notbk.h
View File

@@ -21,8 +21,8 @@ class WXDLLIMPEXP_XRC wxNotebookXmlHandler : public wxXmlResourceHandler
public:
wxNotebookXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
bool m_isInside;

4
include/wx/xrc/xh_odcombo.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxOwnerDrawnComboBoxXmlHandler : public wxXmlResourceHandl
public:
wxOwnerDrawnComboBoxXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
bool m_insideBox;

4
include/wx/xrc/xh_panel.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxPanelXmlHandler : public wxXmlResourceHandler
public:
wxPanelXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
};
#endif // wxUSE_XRC

Some files were not shown because too many files have changed in this diff Show More