use wxOVERRIDE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
@@ -43,59 +43,59 @@ public:
|
||||
// implement base class pure virtuals
|
||||
// ----------------------------------
|
||||
|
||||
virtual void WriteText(const wxString& text);
|
||||
virtual wxString GetValue() const;
|
||||
virtual void WriteText(const wxString& text) wxOVERRIDE;
|
||||
virtual wxString GetValue() const wxOVERRIDE;
|
||||
virtual bool IsEmpty() const;
|
||||
|
||||
virtual int GetLineLength(long lineNo) const;
|
||||
virtual wxString GetLineText(long lineNo) const;
|
||||
virtual int GetNumberOfLines() const;
|
||||
virtual int GetLineLength(long lineNo) const wxOVERRIDE;
|
||||
virtual wxString GetLineText(long lineNo) const wxOVERRIDE;
|
||||
virtual int GetNumberOfLines() const wxOVERRIDE;
|
||||
|
||||
virtual bool IsModified() const;
|
||||
virtual bool IsEditable() const;
|
||||
virtual bool IsModified() const wxOVERRIDE;
|
||||
virtual bool IsEditable() const wxOVERRIDE;
|
||||
|
||||
virtual void GetSelection(long* from, long* to) const;
|
||||
virtual void GetSelection(long* from, long* to) const wxOVERRIDE;
|
||||
|
||||
virtual void Remove(long from, long to);
|
||||
virtual void Remove(long from, long to) wxOVERRIDE;
|
||||
|
||||
virtual void MarkDirty();
|
||||
virtual void DiscardEdits();
|
||||
virtual void MarkDirty() wxOVERRIDE;
|
||||
virtual void DiscardEdits() wxOVERRIDE;
|
||||
|
||||
virtual bool SetStyle(long start, long end, const wxTextAttr& style);
|
||||
virtual bool GetStyle(long position, wxTextAttr& style);
|
||||
virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE;
|
||||
virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE;
|
||||
|
||||
// translate between the position (which is just an index in the text ctrl
|
||||
// considering all its contents as a single strings) and (x, y) coordinates
|
||||
// which represent column and line.
|
||||
virtual long XYToPosition(long x, long y) const;
|
||||
virtual bool PositionToXY(long pos, long *x, long *y) const;
|
||||
virtual long XYToPosition(long x, long y) const wxOVERRIDE;
|
||||
virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE;
|
||||
|
||||
virtual void ShowPosition(long pos);
|
||||
virtual void ShowPosition(long pos) wxOVERRIDE;
|
||||
|
||||
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
|
||||
{
|
||||
return wxTextCtrlBase::HitTest(pt, col, row);
|
||||
}
|
||||
|
||||
// Clipboard operations
|
||||
virtual void Copy();
|
||||
virtual void Cut();
|
||||
virtual void Paste();
|
||||
virtual void Copy() wxOVERRIDE;
|
||||
virtual void Cut() wxOVERRIDE;
|
||||
virtual void Paste() wxOVERRIDE;
|
||||
|
||||
// Insertion point
|
||||
virtual void SetInsertionPoint(long pos);
|
||||
virtual long GetInsertionPoint() const;
|
||||
virtual wxTextPos GetLastPosition() const;
|
||||
virtual void SetInsertionPoint(long pos) wxOVERRIDE;
|
||||
virtual long GetInsertionPoint() const wxOVERRIDE;
|
||||
virtual wxTextPos GetLastPosition() const wxOVERRIDE;
|
||||
|
||||
virtual void SetSelection(long from, long to);
|
||||
virtual void SetEditable(bool editable);
|
||||
virtual void SetSelection(long from, long to) wxOVERRIDE;
|
||||
virtual void SetEditable(bool editable) wxOVERRIDE;
|
||||
|
||||
// Overridden wxWindow methods
|
||||
virtual void SetWindowStyleFlag( long style );
|
||||
virtual bool Enable( bool enable = true );
|
||||
virtual void SetWindowStyleFlag( long style ) wxOVERRIDE;
|
||||
virtual bool Enable( bool enable = true ) wxOVERRIDE;
|
||||
|
||||
// Implementation from now on
|
||||
void OnDropFiles( wxDropFilesEvent &event );
|
||||
@@ -113,11 +113,11 @@ public:
|
||||
void OnUpdateUndo(wxUpdateUIEvent& event);
|
||||
void OnUpdateRedo(wxUpdateUIEvent& event);
|
||||
|
||||
bool SetFont(const wxFont& font);
|
||||
bool SetForegroundColour(const wxColour& colour);
|
||||
bool SetBackgroundColour(const wxColour& colour);
|
||||
bool SetFont(const wxFont& font) wxOVERRIDE;
|
||||
bool SetForegroundColour(const wxColour& colour) wxOVERRIDE;
|
||||
bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE;
|
||||
|
||||
GtkWidget* GetConnectWidget();
|
||||
GtkWidget* GetConnectWidget() wxOVERRIDE;
|
||||
|
||||
void SetUpdateFont(bool WXUNUSED(update)) { }
|
||||
|
||||
@@ -137,7 +137,7 @@ public:
|
||||
bool MarkDirtyOnChange();
|
||||
|
||||
// always let GTK have mouse release events for multiline controls
|
||||
virtual bool GTKProcessEvent(wxEvent& event) const;
|
||||
virtual bool GTKProcessEvent(wxEvent& event) const wxOVERRIDE;
|
||||
|
||||
|
||||
static wxVisualAttributes
|
||||
@@ -145,26 +145,26 @@ public:
|
||||
|
||||
protected:
|
||||
// overridden wxWindow virtual methods
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual void DoApplyWidgetStyle(GtkRcStyle *style);
|
||||
virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE;
|
||||
virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE;
|
||||
|
||||
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
|
||||
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE;
|
||||
|
||||
virtual void DoFreeze();
|
||||
virtual void DoThaw();
|
||||
virtual void DoFreeze() wxOVERRIDE;
|
||||
virtual void DoThaw() wxOVERRIDE;
|
||||
|
||||
// Widgets that use the style->base colour for the BG colour should
|
||||
// override this and return true.
|
||||
virtual bool UseGTKStyleBase() const { return true; }
|
||||
virtual bool UseGTKStyleBase() const wxOVERRIDE { return true; }
|
||||
|
||||
virtual void DoSetValue(const wxString &value, int flags = 0);
|
||||
virtual void DoSetValue(const wxString &value, int flags = 0) wxOVERRIDE;
|
||||
|
||||
// Override this to use either GtkEntry or GtkTextView IME depending on the
|
||||
// kind of control we are.
|
||||
virtual int GTKIMFilterKeypress(GdkEventKey* event) const;
|
||||
virtual int GTKIMFilterKeypress(GdkEventKey* event) const wxOVERRIDE;
|
||||
|
||||
virtual wxPoint DoPositionToCoords(long pos) const;
|
||||
virtual wxPoint DoPositionToCoords(long pos) const wxOVERRIDE;
|
||||
|
||||
// wrappers hiding the differences between functions doing the same thing
|
||||
// for GtkTextView and GtkEntry (all of them use current window style to
|
||||
@@ -179,9 +179,9 @@ private:
|
||||
void Init();
|
||||
|
||||
// overridden wxTextEntry virtual methods
|
||||
virtual GtkEditable *GetEditable() const;
|
||||
virtual GtkEntry *GetEntry() const;
|
||||
virtual void EnableTextChangedEvents(bool enable);
|
||||
virtual GtkEditable *GetEditable() const wxOVERRIDE;
|
||||
virtual GtkEntry *GetEntry() const wxOVERRIDE;
|
||||
virtual void EnableTextChangedEvents(bool enable) wxOVERRIDE;
|
||||
|
||||
// change the font for everything in this control
|
||||
void ChangeFontGlobally();
|
||||
|
||||
Reference in New Issue
Block a user