remove tabs added by error in previous commit

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

diff --git a/interface/wx/font.h b/interface/wx/font.h
index 5f49e1a9a8236a7323214fff0bc2b94054572c00..496aac3c79e1dfda97f7b13af8ec9b2d9e478380 100644 (file)
--- a/interface/wx/font.h
+++ b/interface/wx/font.h
@@ -312,7 +312,7 @@ public:
     */
     wxFont(int pointSize, wxFontFamily family, int style,
            wxFontWeight weight,
     */
     wxFont(int pointSize, wxFontFamily family, int style,
            wxFontWeight weight,

-           const bool underline = false,
+           bool underline = false,

            const wxString& faceName = "",
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
            const wxString& faceName = "",
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 


@@ -361,7 +361,7 @@ public:
     */
     wxFont(const wxSize& pixelSize, wxFontFamily family,
            int style, wxFontWeight weight,
     */
     wxFont(const wxSize& pixelSize, wxFontFamily family,
            int style, wxFontWeight weight,

-           const bool underline = false,
+           bool underline = false,

            const wxString& faceName = "",
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     //@}
            const wxString& faceName = "",
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     //@}


@@ -401,7 +401,7 @@ public:
 
         @see SetFamily()
     */
 
         @see SetFamily()
     */

-    wxFontFamily GetFamily() const;
+    virtual wxFontFamily GetFamily() const;

 
     /**
         Returns the platform-dependent string completely describing this font.
 
     /**
         Returns the platform-dependent string completely describing this font.


@@ -437,7 +437,7 @@ public:
 
         @see SetStyle()
     */
 
         @see SetStyle()
     */

-    wxFontStyle GetStyle() const;
+    virtual wxFontStyle GetStyle() const;

 
     /**
         Returns @true if the font is underlined, @false otherwise.
 
     /**
         Returns @true if the font is underlined, @false otherwise.


@@ -451,7 +451,7 @@ public:
 
         @see SetWeight()
     */
 
         @see SetWeight()
     */

-    wxFontWeight GetWeight() const;
+    virtual wxFontWeight GetWeight() const;

 
     /**
         Returns @true if the font is a fixed width (or monospaced) font,
 
     /**
         Returns @true if the font is a fixed width (or monospaced) font,


@@ -462,7 +462,7 @@ public:
     /**
         Returns @true if this object is a valid font, @false otherwise.
     */
     /**
         Returns @true if this object is a valid font, @false otherwise.
     */

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

 
     //@{
     /**
 
     //@{
     /**


@@ -475,7 +475,7 @@ public:
     */
     static wxFont* New(int pointSize, wxFontFamily family, int style,
                        wxFontWeight weight,
     */
     static wxFont* New(int pointSize, wxFontFamily family, int style,
                        wxFontWeight weight,

-                       const bool underline = false,
+                       bool underline = false,

                        const wxString& faceName = "",
                        wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     static wxFont* New(int pointSize, wxFontFamily family,
                        const wxString& faceName = "",
                        wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     static wxFont* New(int pointSize, wxFontFamily family,


@@ -486,7 +486,7 @@ public:
                        wxFontFamily family,
                        int style,
                        wxFontWeight weight,
                        wxFontFamily family,
                        int style,
                        wxFontWeight weight,

-                       const bool underline = false,
+                       bool underline = false,

                        const wxString& faceName = "",
                        wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     static wxFont* New(const wxSize& pixelSize,
                        const wxString& faceName = "",
                        wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     static wxFont* New(const wxSize& pixelSize,


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

-    void SetFamily(wxFontFamily family);
+    virtual void SetFamily(wxFontFamily family);

 
     /**
         Creates the font corresponding to the given native font description string
 
     /**
         Creates the font corresponding to the given native font description string


@@ -586,7 +586,7 @@ public:
 
         @see GetStyle()
     */
 
         @see GetStyle()
     */

-    void SetStyle(wxFontStyle style);
+    virtual void SetStyle(wxFontStyle style);

 
     /**
         Sets underlining.
 
     /**
         Sets underlining.


@@ -596,7 +596,7 @@ public:
 
         @see GetUnderlined()
     */
 
         @see GetUnderlined()
     */

-    void SetUnderlined(const bool underlined);
+    virtual void SetUnderlined(bool underlined);

 
     /**
         Sets the font weight.
 
     /**
         Sets the font weight.


@@ -606,7 +606,7 @@ public:
 
         @see GetWeight()
     */
 
         @see GetWeight()
     */

-    void SetWeight(wxFontWeight weight);
+    virtual void SetWeight(wxFontWeight weight);

 
     /**
         Inequality operator.
 
     /**
         Inequality operator.


@@ -614,7 +614,7 @@ public:
         See @ref overview_refcount_equality "reference-counted object comparison" for
         more info.
     */
         See @ref overview_refcount_equality "reference-counted object comparison" for
         more info.
     */

-    bool operator !=(const wxFont& font);
+    bool operator!=(const wxFont& font) const;

 
     /**
         Equality operator.
 
     /**
         Equality operator.


@@ -622,7 +622,7 @@ public:
         See @ref overview_refcount_equality "reference-counted object comparison" for
         more info.
     */
         See @ref overview_refcount_equality "reference-counted object comparison" for
         more info.
     */

-    bool operator ==(const wxFont& font);
+    bool operator==(const wxFont& font) const;

 
     /**
         Assignment operator, using @ref overview_refcount "reference counting".
 
     /**
         Assignment operator, using @ref overview_refcount "reference counting".


@@ -692,10 +692,9 @@ public:
         Finds a font of the given specification, or creates one and adds it to the
         list. See the @ref wxFont "wxFont constructor" for details of the arguments.
     */
         Finds a font of the given specification, or creates one and adds it to the
         list. See the @ref wxFont "wxFont constructor" for details of the arguments.
     */

-    wxFont* FindOrCreateFont(int point_size, int family, int style,
-                             int weight,
-                             bool underline = false,
-                             const wxString& facename = NULL,
+    wxFont* FindOrCreateFont(int point_size, wxFontFamily family, wxFontStyle style,
+                             wxFontWeight weight, bool underline = false,
+                             const wxString& facename = wxEmptyString,

                              wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 };
 
                              wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 };