From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 27 Sep 2004 11:02:11 +0000 (+0000)
Subject: keep the old wxFont::Create() signature (changed by font size in pixels patch) to... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/df455719ff6891112733200ff533109c34d184e0

keep the old wxFont::Create() signature (changed by font size in pixels patch) to fix XTI and to preserve backwards compatibility


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index e20075f1eb..5b05caf5d5 100644
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -39,8 +39,7 @@ public:
     {
         Init();
 
-        (void)Create(size, wxSize(0, 0), FALSE, family, style, weight,
-                     underlined, face, encoding);
+        (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
     wxFont(const wxSize& pixelSize,
@@ -53,8 +52,8 @@ public:
     {
         Init();
 
-        (void)Create(0, pixelSize, TRUE, family, style, weight, underlined,
-                     face, encoding);
+        (void)Create(pixelSize, family, style, weight,
+                     underlined, face, encoding);
     }
 
     wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0)
@@ -67,14 +66,28 @@ public:
     wxFont(const wxString& fontDesc);
 
     bool Create(int size,
-                const wxSize& pixelSize,
-                bool sizeUsingPixels,
                 int family,
                 int style,
                 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);
 
@@ -123,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
diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 28ff194ba0..d87bdd0821 100644
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -787,15 +787,15 @@ wxFont::wxFont(const wxString& fontdesc)
 /* Constructor for a font. Note that the real construction is done
  * in wxDC::SetFont, when information is available about scaling etc.
  */
-bool wxFont::Create(int pointSize,
-                    const wxSize& pixelSize,
-                    bool sizeUsingPixels,
-                    int family,
-                    int style,
-                    int weight,
-                    bool underlined,
-                    const wxString& faceName,
-                    wxFontEncoding encoding)
+bool wxFont::DoCreate(int pointSize,
+                      const wxSize& pixelSize,
+                      bool sizeUsingPixels,
+                      int family,
+                      int style,
+                      int weight,
+                      bool underlined,
+                      const wxString& faceName,
+                      wxFontEncoding encoding)
 {
     UnRef();