set eol-style

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

diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h
index ba851805133f61fdd7ab82fae6dcb60be42e59f8..92e0b22698ddc88578ecafb6cc2407ad5d7435b7 100644 (file)
--- a/include/wx/os2/font.h
+++ b/include/wx/os2/font.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        font.h
+// Name:        wx/os2/font.h

 // Purpose:     wxFont class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxFont class
 // Author:      David Webster
 // Modified by:


@@ -88,7 +88,7 @@ public:
     virtual void SetFamily(int nFamily);
     virtual void SetStyle(int nStyle);
     virtual void SetWeight(int nWeight);
     virtual void SetFamily(int nFamily);
     virtual void SetStyle(int nStyle);
     virtual void SetWeight(int nWeight);

-    virtual void SetFaceName(const wxString& rsFaceName);
+    virtual bool SetFaceName(const wxString& rsFaceName);

     virtual void SetUnderlined(bool bUnderlined);
     virtual void SetEncoding(wxFontEncoding vEncoding);
 
     virtual void SetUnderlined(bool bUnderlined);
     virtual void SetEncoding(wxFontEncoding vEncoding);
 


@@ -105,7 +105,7 @@ public:
     //
     virtual bool     IsFree(void) const;
     virtual bool     RealizeResource(void);
     //
     virtual bool     IsFree(void) const;
     virtual bool     RealizeResource(void);

-    virtual WXHANDLE GetResourceHandle(void);
+    virtual WXHANDLE GetResourceHandle(void) const;

     virtual bool     FreeResource(bool bForce = false);
 
     WXHFONT GetHFONT(void) const;
     virtual bool     FreeResource(bool bForce = false);
 
     WXHFONT GetHFONT(void) const;