Add RunScript and implement on all backends. Document and add a very simple unit...

[wxWidgets.git] / include / wx / os2 / font.h

diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h
index ef692625d2a3f6f5e0ce0d01b50c0ceb29a70c17..7060847d66b2f536e3f1797b9a1ede4d48c67bd5 100644 (file)
--- a/include/wx/os2/font.h
+++ b/include/wx/os2/font.h
@@ -50,7 +50,7 @@ public:
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }

-    
+

     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,
     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,


@@ -62,7 +62,7 @@ public:
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }

-    
+

     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,
     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,


@@ -93,7 +93,6 @@ public:
     // Implement base class pure virtuals
     //
     virtual int               GetPointSize(void) const;
     // Implement base class pure virtuals
     //
     virtual int               GetPointSize(void) const;

-    virtual wxFontFamily GetFamily() const;

     virtual wxFontStyle GetStyle() const;
     virtual wxFontWeight GetWeight() const;
     virtual bool              GetUnderlined(void) const;
     virtual wxFontStyle GetStyle() const;
     virtual wxFontWeight GetWeight() const;
     virtual bool              GetUnderlined(void) const;


@@ -131,6 +130,7 @@ public:
 
 protected:
     virtual void DoSetNativeFontInfo(const wxNativeFontInfo& rInfo);
 
 protected:
     virtual void DoSetNativeFontInfo(const wxNativeFontInfo& rInfo);

+    virtual wxFontFamily DoGetFamily() const;

 
     // implement wxObject virtuals which are used by AllocExclusive()
     virtual wxGDIRefData *CreateGDIRefData() const;
 
     // implement wxObject virtuals which are used by AllocExclusive()
     virtual wxGDIRefData *CreateGDIRefData() const;