X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dfc5454127ac2195e10deebb216d82c674e757df..19e30148e18cc99296b26503c155e5cef59045f4:/include/wx/motif/font.h

diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h
index b5149ef4dc..f75bf6c423 100644
--- a/include/wx/motif/font.h
+++ b/include/wx/motif/font.h
@@ -16,91 +16,102 @@
 #pragma interface "font.h"
 #endif
 
-#include "wx/gdiobj.h"
-#include "wx/list.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;
-
-  // A list of XFontStructs indexed by scale (*100)
-  wxList        m_fontsByScale;
-};
-
-#define M_FONTDATA ((wxFontRefData *)m_refData)
-
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+class wxXFont;
 
 // Font
-class WXDLLEXPORT wxFont: public wxGDIObject
+class wxFont : public wxFontBase
 {
-  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); }
-  inline wxFont(const wxFont* font) { if (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
-
-  // Find an existing, or create a new, XFontStruct
-  // based on this wxFont and the given scale. Append the
-  // font to list in the private data for future reference.
-
-  // TODO This is a very basic implementation, that doesn't
-  // allow for different facenames, and also doesn't do a mapping
-  // between 'standard' facenames (e.g. Arial, Helvetica, Times Roman etc.)
-  // and the fonts that are available on a particular system.
-  // Maybe we need to scan the user's machine to build up a profile
-  // of the fonts and a mapping file.
-
-  WXFontStructPtr FindOrCreateFontStruct(double scale = 1.0);
-  WXFontStructPtr LoadQueryFont(int pointSize, int family, int style,
-   int weight, bool underlined);
+    // 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);
+    }
+    
+    wxFont(const wxNativeFontInfo& info);
+    
+    bool Create(int size,
+        int family,
+        int style,
+        int weight,
+        bool underlined = FALSE,
+        const wxString& face = wxEmptyString,
+        wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+    
+    // wxMOTIF-specific
+    bool Create(const wxString& fontname,
+        wxFontEncoding fontenc = wxFONTENCODING_DEFAULT);
+    bool Create(const wxNativeFontInfo& fontinfo);
+    
+    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 wxNativeFontInfo *GetNativeFontInfo() 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);
+    virtual void SetNativeFontInfo( const wxNativeFontInfo& info );
+    
+    // Implementation
+    
+    // Find an existing, or create a new, XFontStruct
+    // based on this wxFont and the given scale. Append the
+    // font to list in the private data for future reference.
+    
+    // TODO This is a fairly basic implementation, that doesn't
+    // allow for different facenames, and also doesn't do a mapping
+    // between 'standard' facenames (e.g. Arial, Helvetica, Times Roman etc.)
+    // and the fonts that are available on a particular system.
+    // Maybe we need to scan the user's machine to build up a profile
+    // of the fonts and a mapping file.
+    
+    // Return font struct, and optionally the Motif font list
+    wxXFont *GetInternalFont(double scale = 1.0,
+        WXDisplay* display = NULL) const;
+    
+    // These two are helper functions for convenient access of the above.
+    WXFontStructPtr GetFontStruct(double scale = 1.0,
+        WXDisplay* display = NULL) const;
+    WXFontList GetFontList(double scale = 1.0,
+        WXDisplay* display = NULL) const;
+    
 protected:
-  bool RealizeResource();
-  void Unshare();
+    // common part of all ctors
+    void Init();
+    
+    // VZ: IMHO, we don't need it at all...
+    bool RealizeResource() { return TRUE; }
+    void Unshare();
+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxFont)
 };
 
 #endif
-    // _WX_FONT_H_
+// _WX_FONT_H_