keep the old wxFont::Create() signature (changed by font size in pixels patch) to...

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 e20075f1ebd538ded02fc7be4a2ebaa113f52400..5b05caf5d5cd1d790421a0b1b071b3051899eec7 100644 (file)
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -39,8 +39,7 @@ public:
     {
         Init();
 
     {
         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,
     }
 
     wxFont(const wxSize& pixelSize,


@@ -53,8 +52,8 @@ public:
     {
         Init();
 
     {
         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)
     }
 
     wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0)


@@ -67,14 +66,28 @@ public:
     wxFont(const wxString& fontDesc);
 
     bool Create(int size,
     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,
                 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);
 
 
     bool Create(const wxNativeFontInfo& info, WXHFONT hFont = 0);
 


@@ -123,6 +136,17 @@ public:
      */
 
 protected:
      */
 
 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
     virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
 
     // common part of all ctors

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 28ff194ba007b61227decd6fcb416c2738d28794..d87bdd0821ea09a08a8174d90c3c935cc1dd7522 100644 (file)
--- 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.
  */
 /* 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();
 
 {
     UnRef();