remove SetBackgroundStyle call from OnInternalIdle, it should be done from realize...

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

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index c210aed28c295a197d5d0f97c89b5d05b0734892..3f49e65e78287e67530c2054a8ac4ac82ed7b2d9 100644 (file)
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -1,101 +1,171 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxFont class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxFont class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// 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/gdicmn.h"

 
 

-class WXDLLEXPORT wxFont;
+// ----------------------------------------------------------------------------
+// wxFont
+// ----------------------------------------------------------------------------

 
 

-class WXDLLEXPORT wxFontRefData: public wxGDIRefData
+class WXDLLIMPEXP_CORE wxFont : public wxFontBase

 {
 {

-    friend class WXDLLEXPORT wxFont;

 public:
 public:

-    wxFontRefData(void);
-    wxFontRefData(const wxFontRefData& data);
-    ~wxFontRefData(void);
-protected:
-  bool          m_temporary;   // If TRUE, the pointer to the actual font
-                               // is temporary and SHOULD NOT BE DELETED by
-                               // destructor
-  int           m_pointSize;
-  int           m_family;
-  int           m_fontId;
-  int           m_style;
-  int           m_weight;
-  bool          m_underlined;
-  wxString      m_faceName;
-  WXHFONT       m_hFont;
-
-};
-
-#define M_FONTDATA ((wxFontRefData *)m_refData)
+    // ctors and such
+    wxFont() { }
+
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxFont(int size,
+           int family,
+           int style,
+           int weight,
+           bool underlined = false,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
+    }
+#endif

 
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
+    wxFont(int size,
+           wxFontFamily family,
+           wxFontStyle style,
+           wxFontWeight weight,
+           bool underlined = false,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        Create(size, family, style, weight, underlined, face, encoding);
+    }
+
+    bool Create(int size,
+                wxFontFamily family,
+                wxFontStyle style,
+                wxFontWeight weight,
+                bool underlined = false,
+                const wxString& face = wxEmptyString,
+                wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        return DoCreate(size, wxDefaultSize, false, family, style,
+                        weight, underlined, face, encoding);
+    }
+
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxFont(const wxSize& pixelSize,
+           int family,
+           int style,
+           int weight,
+           bool underlined = false,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        (void)Create(pixelSize, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight,
+                     underlined, face, encoding);
+    }
+#endif

 
 

-// Font
-class WXDLLEXPORT wxFont: public wxGDIObject
-{
-  DECLARE_DYNAMIC_CLASS(wxFont)
-public:
-  wxFont(void);
-  wxFont(int PointSize, int Family, int Style, int Weight, bool underlined = FALSE, const wxString& Face = wxEmptyString);
-  inline wxFont(const wxFont& font) { Ref(font); }
-
-  ~wxFont(void);
-
-  bool Create(int PointSize, int Family, int Style, int Weight, bool underlined = FALSE, const wxString& Face = wxEmptyString);
-
-  // Internal
-  virtual bool RealizeResource(void);
-  virtual WXHANDLE GetResourceHandle(void) ;
-  virtual bool FreeResource(bool force = FALSE);
-/*
-  virtual bool UseResource(void);
-  virtual bool ReleaseResource(void);
-*/
-
-  virtual bool IsFree(void);
-  virtual bool Ok(void) const { return (m_refData != NULL) ; }
-
-  inline int GetPointSize(void) const { return M_FONTDATA->m_pointSize; }
-  inline int GetFamily(void) const { return M_FONTDATA->m_family; }
-  inline int GetFontId(void) const { return M_FONTDATA->m_fontId; } /* New font system */
-  inline int GetStyle(void) const { return M_FONTDATA->m_style; }
-  inline int GetWeight(void) const { return M_FONTDATA->m_weight; }
-  wxString GetFamilyString(void) const ;
-  wxString GetFaceName(void) const ;
-  wxString GetStyleString(void) const ;
-  wxString GetWeightString(void) const ;
-  inline bool GetUnderlined(void) 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);
-
-  wxFont& operator = (const wxFont& font) { if (*this == font) return (*this); Ref(font); return *this; }
-  bool operator == (const wxFont& font) const { return m_refData == font.m_refData; }
-  bool operator != (const wxFont& font) const { return m_refData != font.m_refData; }
+    wxFont(const wxSize& pixelSize,
+           wxFontFamily family,
+           wxFontStyle style,
+           wxFontWeight weight,
+           bool underlined = false,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        (void)Create(pixelSize, family, style, weight,
+                     underlined, face, encoding);
+    }
+
+    wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0)
+    {
+        Create(info, hFont);
+    }
+
+    wxFont(const wxString& fontDesc);
+
+
+    bool Create(const wxSize& pixelSize,
+                wxFontFamily family,
+                wxFontStyle style,
+                wxFontWeight weight,
+                bool underlined = false,
+                const wxString& face = wxEmptyString,
+                wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        return DoCreate(-1, pixelSize, true, family, style,
+                        weight, underlined, face, encoding);
+    }
+
+    bool Create(const wxNativeFontInfo& info, WXHFONT hFont = 0);
+
+    virtual ~wxFont();
+
+    // implement base class pure virtuals
+    virtual int GetPointSize() const;
+    virtual wxSize GetPixelSize() const;
+    virtual bool IsUsingSizeInPixels() const;
+    virtual wxFontStyle GetStyle() const;
+    virtual wxFontWeight GetWeight() const;
+    virtual bool GetUnderlined() const;
+    virtual wxString GetFaceName() const;
+    virtual wxFontEncoding GetEncoding() const;
+    virtual const wxNativeFontInfo *GetNativeFontInfo() const;
+
+    virtual void SetPointSize(int pointSize);
+    virtual void SetPixelSize(const wxSize& pixelSize);
+    virtual void SetFamily(wxFontFamily family);
+    virtual void SetStyle(wxFontStyle style);
+    virtual void SetWeight(wxFontWeight weight);
+    virtual bool SetFaceName(const wxString& faceName);
+    virtual void SetUnderlined(bool underlined);
+    virtual void SetEncoding(wxFontEncoding encoding);
+
+    wxDECLARE_COMMON_FONT_METHODS();
+
+    virtual bool IsFixedWidth() const;
+
+    // implementation only from now on
+    // -------------------------------
+
+    virtual bool IsFree() const;
+    virtual bool RealizeResource();
+    virtual WXHANDLE GetResourceHandle() const;
+    virtual bool FreeResource(bool force = false);
+
+    // for consistency with other wxMSW classes
+    WXHFONT GetHFONT() const;

 
 protected:
 
 protected:

-  void Unshare();
+    // real font creation function, used in all cases
+    bool DoCreate(int size,
+                  const wxSize& pixelSize,
+                  bool sizeUsingPixels,
+                  wxFontFamily family,
+                  wxFontStyle style,
+                  wxFontWeight weight,
+                  bool underlined = false,
+                  const wxString& face = wxEmptyString,
+                  wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+
+    virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
+    virtual wxFontFamily DoGetFamily() const;
+
+    // implement wxObject virtuals which are used by AllocExclusive()
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxFont)

 };
 
 };
 

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