Fix RCS-IDs

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

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 8149aaa6afcdfcfafda14164304d8f3d6c64f45c..fc690bdcbcf09a91ad048b2edacb8e12d125c384 100644 (file)
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxFont class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxFont class
 // Author:      Julian Smart
 // Modified by:


@@ -12,38 +12,43 @@
 #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/gdicmn.h"

 
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
 

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

 {
 public:
     // ctors and such
 {
 public:
     // ctors and such

-    wxFont() { Init(); }
-    wxFont(const wxFont& font) { Init(); Ref(font); }
+    wxFont() { }

 
     wxFont(int size,
            int family,
            int style,
            int weight,
 
     wxFont(int size,
            int family,
            int style,
            int weight,

-           bool underlined = FALSE,
+           bool underlined = false,

            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {

-        Init();
-

         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 

-    wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0)
+    wxFont(const wxSize& pixelSize,
+           int family,
+           int style,
+           int weight,
+           bool underlined = false,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)

     {
     {

-        Init();
+        (void)Create(pixelSize, family, style, weight,
+                     underlined, face, encoding);
+    }

 
 

+    wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0)
+    {

         Create(info, hFont);
     }
 
         Create(info, hFont);
     }
 


@@ -53,63 +58,88 @@ public:
                 int family,
                 int style,
                 int weight,
                 int family,
                 int style,
                 int weight,

-                bool underlined = FALSE,
+                bool underlined = false,
+                const wxString& face = wxEmptyString,
+                wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        return DoCreate(size, wxDefaultSize, false, family, style,
+                        weight, underlined, face, encoding);
+    }
+
+    bool Create(const wxSize& pixelSize,
+                int family,
+                int style,
+                int weight,
+                bool underlined = false,

                 const wxString& face = wxEmptyString,
                 const wxString& face = wxEmptyString,

-                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+                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();
 
 
     bool Create(const wxNativeFontInfo& info, WXHFONT hFont = 0);
 
     virtual ~wxFont();
 

-    // assignment
-    wxFont& operator=(const wxFont& font);
+    // wxFontBase overridden functions
+    virtual wxString GetNativeFontInfoDesc() const;
+    virtual wxString GetNativeFontInfoUserDesc() const;

 
     // implement base class pure virtuals
     virtual int GetPointSize() const;
 
     // implement base class pure virtuals
     virtual int GetPointSize() const;

+    virtual wxSize GetPixelSize() const;
+    virtual bool IsUsingSizeInPixels() 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 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 const wxNativeFontInfo *GetNativeFontInfo() const;

 
     virtual void SetPointSize(int pointSize);
 
     virtual void SetPointSize(int pointSize);

+    virtual void SetPixelSize(const wxSize& pixelSize);

     virtual void SetFamily(int family);
     virtual void SetStyle(int style);
     virtual void SetWeight(int weight);
     virtual void SetFamily(int family);
     virtual void SetStyle(int style);
     virtual void SetWeight(int weight);

-    virtual void SetFaceName(const wxString& faceName);
+    virtual bool SetFaceName(const wxString& faceName);

     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);

-    virtual void SetNativeFontInfo(const wxNativeFontInfo& info);
+
+    virtual bool IsFixedWidth() const;

 
     // implementation only from now on
     // -------------------------------
 
 
     // implementation only from now on
     // -------------------------------
 

-    int GetFontId() const;

     virtual bool IsFree() const;
     virtual bool RealizeResource();
     virtual bool IsFree() const;
     virtual bool RealizeResource();

-    virtual WXHANDLE GetResourceHandle();
-    virtual bool FreeResource(bool force = FALSE);
+    virtual WXHANDLE GetResourceHandle() const;
+    virtual bool FreeResource(bool force = false);

 
 

-    // for consistency with other wxMSW classes and to have a const
-    // GetResourceHandle()-like function we have a synonym for it
+    // for consistency with other wxMSW classes

     WXHFONT GetHFONT() const;
 
     WXHFONT GetHFONT() const;
 

-    /*
-       virtual bool UseResource();
-       virtual bool ReleaseResource();
-     */
-

 protected:
 protected:

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

 
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 
 
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 

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