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 25b5be6516b0a2b85a5070df90c72bf77a3c9eb6..92e0b22698ddc88578ecafb6cc2407ad5d7435b7 100644 (file)
--- a/include/wx/os2/font.h
+++ b/include/wx/os2/font.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxFont class
 // Author:      David Webster
 // Modified by:
 // Created:     10/06/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Purpose:     wxFont class
 // Author:      David Webster
 // Modified by:
 // Created:     10/06/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONT_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONT_H_


@@ -25,20 +25,17 @@ class WXDLLEXPORT wxFont : public wxFontBase
 {
 public:
     // ctors and such
 {
 public:
     // ctors and such

-    wxFont() { Init(); }
-    wxFont(const wxFont& rFont) { Init(); Ref(rFont); }
+    wxFont() { }

 
     wxFont( int             nSize
            ,int             nFamily
            ,int             nStyle
            ,int             nWeight
 
     wxFont( int             nSize
            ,int             nFamily
            ,int             nStyle
            ,int             nWeight

-           ,bool            bUnderlined = FALSE
+           ,bool            bUnderlined = false

            ,const wxString& rsFace = wxEmptyString
            ,wxFontEncoding  vEncoding = wxFONTENCODING_DEFAULT
           )
     {
            ,const wxString& rsFace = wxEmptyString
            ,wxFontEncoding  vEncoding = wxFONTENCODING_DEFAULT
           )
     {

-        Init();
-

         (void)Create( nSize
                      ,nFamily
                      ,nStyle
         (void)Create( nSize
                      ,nFamily
                      ,nStyle


@@ -54,8 +51,6 @@ public:
           )
 
     {
           )
 
     {

-        Init();
-

         (void)Create( rInfo
                      ,hFont
                     );
         (void)Create( rInfo
                      ,hFont
                     );


@@ -67,7 +62,7 @@ public:
                 ,int             nFamily
                 ,int             nStyle
                 ,int             nWeight
                 ,int             nFamily
                 ,int             nStyle
                 ,int             nWeight

-                ,bool            bUnderlined = FALSE
+                ,bool            bUnderlined = false

                 ,const wxString& rsFace = wxEmptyString
                 ,wxFontEncoding  vEncoding = wxFONTENCODING_DEFAULT
                );
                 ,const wxString& rsFace = wxEmptyString
                 ,wxFontEncoding  vEncoding = wxFONTENCODING_DEFAULT
                );


@@ -77,11 +72,6 @@ public:
 
     virtual ~wxFont();
 
 
     virtual ~wxFont();
 

-    //
-    // Assignment
-    //
-    wxFont& operator=(const wxFont& rFont);
-

     //
     // Implement base class pure virtuals
     //
     //
     // Implement base class pure virtuals
     //


@@ -98,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);
 


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

-    virtual WXHANDLE GetResourceHandle(void);
-    virtual bool     FreeResource(bool bForce = FALSE);
+    virtual WXHANDLE GetResourceHandle(void) const;
+    virtual bool     FreeResource(bool bForce = false);

 
     WXHFONT GetHFONT(void) const;
 
 protected:
     virtual void DoSetNativeFontInfo(const wxNativeFontInfo& rInfo);
 
 
     WXHFONT GetHFONT(void) const;
 
 protected:
     virtual void DoSetNativeFontInfo(const wxNativeFontInfo& rInfo);
 

-    //
-    // Common part of all ctors
-    //
-    void Init(void);

     void Unshare(void);
 
 private:
     void Unshare(void);
 
 private: