moved MGL initialization to earlier stage (crashes otherwise...) and implemented...

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

diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h
index aff8fb3a759d10f1dd05ddfa6266e8218e71c690..fc8c8e55560eb7f1915173d7d7be4773759933fe 100644 (file)
--- a/include/wx/os2/font.h
+++ b/include/wx/os2/font.h
@@ -1,89 +1,124 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        font.h
 // Purpose:     wxFont class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        font.h
 // Purpose:     wxFont class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/06/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
-#pragma interface "font.h"
-#endif
-

 #include "wx/gdiobj.h"
 #include "wx/gdiobj.h"

+#include "wx/os2/private.h"
+#include "wx/fontutil.h"

 
 

-class WXDLLEXPORT wxFont;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;

 
 

-class WXDLLEXPORT wxFontRefData: public wxGDIRefData
-{
-    friend class WXDLLEXPORT wxFont;
-public:
-    wxFontRefData();
-    wxFontRefData(const wxFontRefData& data);
-    ~wxFontRefData();
-protected:
-  int           m_pointSize;
-  int           m_family;
-  int           m_style;
-  int           m_weight;
-  bool          m_underlined;
-  wxString      m_faceName;
-/* TODO: implementation
-  WXHFONT       m_hFont;
-*/
-};
-
-#define M_FONTDATA ((wxFontRefData *)m_refData)
-
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
-
-// Font
-class WXDLLEXPORT wxFont: public wxGDIObject
+// ----------------------------------------------------------------------------
+// wxFont
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxFont : public wxFontBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxFont)

 public:
 public:

-  wxFont();
-  wxFont(int pointSize, int family, int style, int weight, bool underlined = FALSE, const wxString& faceName = wxEmptyString);
-  inline wxFont(const wxFont& font) { Ref(font); }
-
-  ~wxFont();
-
-  bool Create(int pointSize, int family, int style, int weight, bool underlined = FALSE, const wxString& faceName = wxEmptyString);
-
-  virtual bool Ok() const { return (m_refData != NULL) ; }
-
-  inline int GetPointSize() const { return M_FONTDATA->m_pointSize; }
-  inline int GetFamily() const { return M_FONTDATA->m_family; }
-  inline int GetStyle() const { return M_FONTDATA->m_style; }
-  inline int GetWeight() const { return M_FONTDATA->m_weight; }
-  wxString GetFamilyString() const ;
-  wxString GetFaceName() const ;
-  wxString GetStyleString() const ;
-  wxString GetWeightString() const ;
-  inline bool GetUnderlined() const { return M_FONTDATA->m_underlined; }
-
-  void SetPointSize(int pointSize);
-  void SetFamily(int family);
-  void SetStyle(int style);
-  void SetWeight(int weight);
-  void SetFaceName(const wxString& faceName);
-  void SetUnderlined(bool underlined);
-
-  inline wxFont& operator = (const wxFont& font) { if (*this == font) return (*this); Ref(font); return *this; }
-  inline bool operator == (const wxFont& font) { return m_refData == font.m_refData; }
-  inline bool operator != (const wxFont& font) { return m_refData != font.m_refData; }
-
-  // Implementation
+    // ctors and such
+    wxFont() { Init(); }
+    wxFont(const wxFont& rFont) { Init(); Ref(rFont); }
+
+    wxFont( int             nSize
+           ,int             nFamily
+           ,int             nStyle
+           ,int             nWeight
+           ,bool            bUnderlined = FALSE
+           ,const wxString& rsFace = wxEmptyString
+           ,wxFontEncoding  vEncoding = wxFONTENCODING_DEFAULT
+          )
+    {
+        Init();
+
+        (void)Create(nSize, nFamily, nStyle, nWeight, bUnderlined, rsFace, vEncoding);
+    }
+
+    wxFont(const wxNativeFontInfo& rInfo)
+    {
+        Init();
+
+        (void)Create( rInfo.pointSize
+                     ,rInfo.family
+                     ,rInfo.style
+                     ,rInfo.weight
+                     ,rInfo.underlined
+                     ,rInfo.faceName
+                     ,rInfo.encoding
+                    );
+    }
+
+    bool Create( int             nSize
+                ,int             nFamily
+                ,int             nStyle
+                ,int             nWeight
+                ,bool            bUnderlined = FALSE
+                ,const wxString& rsFace = wxEmptyString
+                ,wxFontEncoding  vEncoding = wxFONTENCODING_DEFAULT
+               );
+
+    virtual ~wxFont();
+
+    //
+    // Assignment
+    //
+    wxFont& operator=(const wxFont& rFont);
+
+    //
+    // Implement base class pure virtuals
+    //
+    virtual int            GetPointSize(void) const;
+    virtual int            GetFamily(void) const;
+    virtual int            GetStyle(void) const;
+    virtual int            GetWeight(void) const;
+    virtual bool           GetUnderlined(void) const;
+    virtual wxString       GetFaceName(void) const;
+    virtual wxFontEncoding GetEncoding(void) const;
+    virtual HPS            GetPS(void) const;
+
+    virtual void SetPointSize(int nPointSize);
+    virtual void SetFamily(int nFamily);
+    virtual void SetStyle(int nStyle);
+    virtual void SetWeight(int nWeight);
+    virtual void SetFaceName(const wxString& rsFaceName);
+    virtual void SetUnderlined(bool bUnderlined);
+    virtual void SetEncoding(wxFontEncoding vEncoding);
+    virtual void SetPS(HPS hPS);
+    virtual void SetFM( PFONTMETRICS pFM
+                       ,int          nNumFonts
+                      );
+
+    //
+    // Implementation only from now on
+    // -------------------------------
+    //
+    int              GetFontId(void) const;
+    virtual bool     IsFree(void) const;
+    virtual bool     RealizeResource(void);
+    virtual WXHANDLE GetResourceHandle(void);
+    virtual bool     FreeResource(bool bForce = FALSE);
+
+    WXHFONT GetHFONT(void) const;

 protected:
 protected:

-  bool RealizeResource();
-  void Unshare();
-};
+    //
+    // Common part of all ctors
+    //
+    void Init(void);
+    void Unshare(void);
+
+private:
+    void OS2SelectMatchingFontByName(void);
+
+    DECLARE_DYNAMIC_CLASS(wxFont)
+}; // end of wxFont

 
 

-#endif
-    // _WX_FONT_H_
+#endif // _WX_FONT_H_