Applied patch [ 1181975 ] [wxMSW] Removes all flicker from wxNotebook

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

diff --git a/include/wx/mac/font.h b/include/wx/mac/font.h
index 1dd3f3da7c553fd98cda58855f558d9499f88044..ae2770d072a37d89a3959010523b2a1eeb6b1b6b 100644 (file)
--- a/include/wx/mac/font.h
+++ b/include/wx/mac/font.h
@@ -1,158 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        font.h
-// Purpose:     wxFont class
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FONT_H_
-#define _WX_FONT_H_
-
-#ifdef __GNUG__
-    #pragma interface "font.h"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/font.h"
+#else
+#include "wx/mac/carbon/font.h"
 #endif
-
-class WXDLLEXPORT wxFontRefData: public wxGDIRefData
-{
-    friend class WXDLLEXPORT wxFont;
-public:
-    wxFontRefData()
-    {
-        Init(12, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
-             "", wxFONTENCODING_DEFAULT);
-    }
-
-    wxFontRefData(const wxFontRefData& data)
-    {
-        Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
-             data.m_underlined, data.m_faceName, data.m_encoding);
-
-               m_macFontNum = data.m_macFontNum ;
-               m_macFontSize = data.m_macFontSize;
-               m_macFontStyle = data.m_macFontStyle;
-               m_fontId = data.m_fontId;
-    }
-
-    wxFontRefData(int size,
-                  int family,
-                  int style,
-                  int weight,
-                  bool underlined,
-                  const wxString& faceName,
-                  wxFontEncoding encoding)
-    {
-        Init(size, family, style, weight, underlined, faceName, encoding);
-    }
-
-    virtual ~wxFontRefData();
-protected:
-    // common part of all ctors
-    void Init(int size,
-              int family,
-              int style,
-              int weight,
-              bool underlined,
-              const wxString& faceName,
-              wxFontEncoding encoding);
-
-    // font characterstics
-    int           m_fontId;
-    int           m_pointSize;
-    int           m_family;
-    int           m_style;
-    int           m_weight;
-    bool          m_underlined;
-    wxString      m_faceName;
-    wxFontEncoding m_encoding;
-
-public :
-       short           m_macFontNum ;
-       short           m_macFontSize ;
-       Style           m_macFontStyle ;
-public :
-       void            MacFindFont() ;
-};
-// ----------------------------------------------------------------------------
-// wxFont
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxFont : public wxFontBase
-{
-public:
-    // ctors and such
-    wxFont() { Init(); }
-    wxFont(const wxFont& font) { Init(); Ref(font); }
-
-    wxFont(int size,
-           int family,
-           int style,
-           int weight,
-           bool underlined = FALSE,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        Init();
-
-        (void)Create(size, family, style, weight, underlined, face, encoding);
-    }
-
-    bool Create(int size,
-                int family,
-                int style,
-                int weight,
-                bool underlined = FALSE,
-                const wxString& face = wxEmptyString,
-                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
-
-    virtual ~wxFont();
-
-    // assignment
-    wxFont& operator=(const wxFont& font);
-
-    // implement base class pure virtuals
-    virtual int GetPointSize() const;
-    virtual int GetFamily() const;
-    virtual int GetStyle() const;
-    virtual int GetWeight() const;
-    virtual bool GetUnderlined() const;
-    virtual wxString GetFaceName() const;
-    virtual wxFontEncoding GetEncoding() const;
-
-    virtual void SetPointSize(int pointSize);
-    virtual void SetFamily(int family);
-    virtual void SetStyle(int style);
-    virtual void SetWeight(int weight);
-    virtual void SetFaceName(const wxString& faceName);
-    virtual void SetUnderlined(bool underlined);
-    virtual void SetEncoding(wxFontEncoding encoding);
-
-    // implementation only from now on
-    // -------------------------------
-
-    int GetFontId() const;
-    virtual bool IsFree() const;
-    virtual bool RealizeResource();
-    virtual WXHANDLE GetResourceHandle();
-    virtual bool FreeResource(bool force = FALSE);
-    void MacInstall() const ;
-    /*
-       virtual bool UseResource();
-       virtual bool ReleaseResource();
-     */
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    void Unshare();
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxFont)
-};
-
-#endif
-    // _WX_FONT_H_