X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dddb8a2dde675b85bbe28399b921648a22e6be1..f5a1953b341d16396763bee067ccdd96108f3aad:/include/wx/msw/font.h?ds=sidebyside

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 22708e45ae..5b05caf5d5 100644
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -16,6 +16,8 @@
     #pragma interface "font.h"
 #endif
 
+#include <wx/gdicmn.h>
+
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
@@ -40,6 +42,20 @@ public:
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
+    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)
     {
         Init();
@@ -55,7 +71,23 @@ public:
                 int weight,
                 bool underlined = false,
                 const wxString& face = wxEmptyString,
-                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+                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,
+                wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        return DoCreate(-1, pixelSize, true, family, style,
+                        weight, underlined, face, encoding);
+    }
 
     bool Create(const wxNativeFontInfo& info, WXHFONT hFont = 0);
 
@@ -66,6 +98,8 @@ public:
 
     // 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;
@@ -75,6 +109,7 @@ public:
     virtual const wxNativeFontInfo *GetNativeFontInfo() const;
 
     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);
@@ -101,6 +136,17 @@ public:
      */
 
 protected:
+    // 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);
 
     // common part of all ctors