RCS-IDs

[wxWidgets.git] / interface / wx / font.h

diff --git a/interface/wx/font.h b/interface/wx/font.h
index ca682bc9a3e5b4e598cd1f95fd6ad07be6bf1a15..5f49e1a9a8236a7323214fff0bc2b94054572c00 100644 (file)
--- a/interface/wx/font.h
+++ b/interface/wx/font.h
@@ -369,7 +369,7 @@ public:
     /**
         Destructor.
 
     /**
         Destructor.
 

-        See @ref overview_refcountdestruct "reference-counted object destruction"
+        See @ref overview_refcount_destruct "reference-counted object destruction"

         for more info.
 
         @remarks Although all remaining fonts are deleted when the application
         for more info.
 
         @remarks Although all remaining fonts are deleted when the application


@@ -378,7 +378,7 @@ public:
                  pointer to the font object is stored in an application
                  data structure, and there is a risk of double deletion.
     */
                  pointer to the font object is stored in an application
                  data structure, and there is a risk of double deletion.
     */

-    ~wxFont();
+    virtual ~wxFont();

 
     /**
         Returns the current application's default encoding.
 
     /**
         Returns the current application's default encoding.


@@ -393,7 +393,7 @@ public:
 
         @see SetFaceName()
     */
 
         @see SetFaceName()
     */

-    wxString GetFaceName() const;
+    virtual wxString GetFaceName() const;

 
     /**
         Gets the font family. See SetFamily() for a list of valid
 
     /**
         Gets the font family. See SetFamily() for a list of valid


@@ -423,14 +423,14 @@ public:
 
         @see GetNativeFontInfoDesc()
     */
 
         @see GetNativeFontInfoDesc()
     */

-    wxString GetNativeFontInfoUserDesc();
+    wxString GetNativeFontInfoUserDesc() const;

 
     /**
         Gets the point size.
 
         @see SetPointSize()
     */
 
     /**
         Gets the point size.
 
         @see SetPointSize()
     */

-    int GetPointSize() const;
+    virtual int GetPointSize() const;

 
     /**
         Gets the font style. See wxFontStyle for a list of valid styles.
 
     /**
         Gets the font style. See wxFontStyle for a list of valid styles.


@@ -444,7 +444,7 @@ public:
 
         @see SetUnderlined()
     */
 
         @see SetUnderlined()
     */

-    bool GetUnderlined() const;
+    virtual bool GetUnderlined() const;

 
     /**
         Gets the font weight. See wxFontWeight for a list of valid weight identifiers.
 
     /**
         Gets the font weight. See wxFontWeight for a list of valid weight identifiers.


@@ -457,7 +457,7 @@ public:
         Returns @true if the font is a fixed width (or monospaced) font,
         @false if it is a proportional one or font is invalid.
     */
         Returns @true if the font is a fixed width (or monospaced) font,
         @false if it is a proportional one or font is invalid.
     */

-    bool IsFixedWidth() const;
+    virtual bool IsFixedWidth() const;

 
     /**
         Returns @true if this object is a valid font, @false otherwise.
 
     /**
         Returns @true if this object is a valid font, @false otherwise.


@@ -466,8 +466,9 @@ public:
 
     //@{
     /**
 
     //@{
     /**

-        These functions take the same parameters as @ref ctor() wxFont
-        constructor and return a new font object allocated on the heap.
+        These functions take the same parameters as
+        @ref wxFont::wxFont "wxFont constructors" and return a new font
+        object allocated on the heap.

 
         Using @c New() is currently the only way to directly create a font with
         the given size in pixels on platforms other than wxMSW.
 
         Using @c New() is currently the only way to directly create a font with
         the given size in pixels on platforms other than wxMSW.


@@ -518,7 +519,7 @@ public:
 
         @see GetFaceName(), SetFamily()
     */
 
         @see GetFaceName(), SetFamily()
     */

-    bool SetFaceName(const wxString& faceName);
+    virtual bool SetFaceName(const wxString& faceName);

 
     /**
         Sets the font family.
 
     /**
         Sets the font family.


@@ -575,7 +576,7 @@ public:
 
         @see GetPointSize()
     */
 
         @see GetPointSize()
     */

-    void SetPointSize(int pointSize);
+    virtual void SetPointSize(int pointSize);

 
     /**
         Sets the font style.
 
     /**
         Sets the font style.


@@ -610,7 +611,7 @@ public:
     /**
         Inequality operator.
 
     /**
         Inequality operator.
 

-        See @ref overview_refcountequality "reference-counted object comparison" for
+        See @ref overview_refcount_equality "reference-counted object comparison" for

         more info.
     */
     bool operator !=(const wxFont& font);
         more info.
     */
     bool operator !=(const wxFont& font);


@@ -618,7 +619,7 @@ public:
     /**
         Equality operator.
 
     /**
         Equality operator.
 

-        See @ref overview_refcountequality "reference-counted object comparison" for
+        See @ref overview_refcount_equality "reference-counted object comparison" for

         more info.
     */
     bool operator ==(const wxFont& font);
         more info.
     */
     bool operator ==(const wxFont& font);