add support for asynchronous execution in wxBase (patch 1906889)

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

diff --git a/include/wx/mac/font.h b/include/wx/mac/font.h
index aff8fb3a759d10f1dd05ddfa6266e8218e71c690..ae2770d072a37d89a3959010523b2a1eeb6b1b6b 100644 (file)
--- a/include/wx/mac/font.h
+++ b/include/wx/mac/font.h
@@ -1,89 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        font.h
-// Purpose:     wxFont class
-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// 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
 #endif

-
-#include "wx/gdiobj.h"
-
-class WXDLLEXPORT wxFont;
-
-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
-{
-  DECLARE_DYNAMIC_CLASS(wxFont)
-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
-protected:
-  bool RealizeResource();
-  void Unshare();
-};
-
-#endif
-    // _WX_FONT_H_