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

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;