From 75504144d2ee5ce2bc62d186f04b2d445c2048c5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 16 Apr 2010 12:47:31 +0000
Subject: [PATCH] Minor corrections to the documentations.

Use the correct "override" instead of "overload". Remove unnecessary "virtual"
keyword occurrences.

Closes #11949.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 interface/wx/listctrl.h | 12 ++++++------
 interface/wx/window.h   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/interface/wx/listctrl.h b/interface/wx/listctrl.h
index 860049943c..fe29f57455 100644
--- a/interface/wx/listctrl.h
+++ b/interface/wx/listctrl.h
@@ -19,7 +19,7 @@
     and attributes) is managed by the main program and is requested by the control
     itself only when needed which allows to have controls with millions of items
     without consuming much memory. To use virtual list control you must use
-    wxListCtrl::SetItemCount first and overload at least wxListCtrl::OnGetItemText
+    wxListCtrl::SetItemCount first and override at least wxListCtrl::OnGetItemText
     (and optionally wxListCtrl::OnGetItemImage or wxListCtrl::OnGetItemColumnImage and
     wxListCtrl::OnGetItemAttr) to return the information about the items when the
     control requests it.
@@ -923,7 +923,7 @@ public:
 protected:
 
     /**
-        This function may be overloaded in the derived class for a control with
+        This function may be overridden in the derived class for a control with
         @c wxLC_VIRTUAL style. It should return the attribute for the specified
         @c item or @NULL to use the default appearance parameters.
 
@@ -955,7 +955,7 @@ protected:
     virtual wxListItemAttr* OnGetItemColumnAttr(long item, long column) const;
 
     /**
-        Overload this function in the derived class for a control with
+        Override this function in the derived class for a control with
         @c wxLC_VIRTUAL and @c wxLC_REPORT styles in order to specify the image
         index for the given line and column.
 
@@ -968,9 +968,9 @@ protected:
     virtual int OnGetItemColumnImage(long item, long column) const;
 
     /**
-        This function must be overloaded in the derived class for a control with
+        This function must be overridden in the derived class for a control with
         @c wxLC_VIRTUAL style having an "image list" (see SetImageList(); if the
-        control doesn't have an image list, it is not necessary to overload it).
+        control doesn't have an image list, it is not necessary to override it).
         It should return the index of the items image in the controls image list
         or -1 for no image.
 
@@ -984,7 +984,7 @@ protected:
     virtual int OnGetItemImage(long item) const;
 
     /**
-        This function @b must be overloaded in the derived class for a control with
+        This function @b must be overridden in the derived class for a control with
         @c wxLC_VIRTUAL style. It should return the string containing the text of
         the given @a column for the specified @c item.
 
diff --git a/interface/wx/window.h b/interface/wx/window.h
index 2adb33ebdf..0335e85abe 100644
--- a/interface/wx/window.h
+++ b/interface/wx/window.h
@@ -767,7 +767,7 @@ public:
         wxPanel), the size returned by this function will be the same as the size
         the window would have had after calling Fit().
 
-        Note that when you write your own widget you need to overload the
+        Note that when you write your own widget you need to override the
         DoGetBestSize() function instead of this (non-virtual!) function.
 
         @see CacheBestSize(), @ref overview_windowsizing
@@ -971,12 +971,12 @@ public:
 
         @see @ref overview_windowsizing
     */
-    virtual void SetClientSize(int width, int height);
+    void SetClientSize(int width, int height);
 
     /**
         @overload
     */
-    virtual void SetClientSize(const wxSize& size);
+    void SetClientSize(const wxSize& size);
 
     /**
         This normally does not need to be called by user code.
@@ -1114,17 +1114,17 @@ public:
 
         @see Move(), @ref overview_windowsizing
     */
-    virtual void SetSize(const wxRect& rect);
+    void SetSize(const wxRect& rect);
 
     /**
         @overload
     */
-    virtual void SetSize(const wxSize& size);
+    void SetSize(const wxSize& size);
 
     /**
         @overload
     */
-    virtual void SetSize(int width, int height);
+    void SetSize(int width, int height);
 
     /**
         Use of this function for windows which are not toplevel windows
-- 
2.45.2