handle size==-1 or absence of size parameter in font tag as expected, i.e. by ignoring it

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

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index d2bb2f63de6f02cddd68374fb2f953da28169ce8..6698d8a73cb3234f7685e23c78f7743d46703855 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -1291,10 +1291,10 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
     // font attributes:
 
     // size
     // font attributes:
 
     // size

-    int isize = wxDEFAULT;
+    int isize = -1;

     bool hasSize = HasParam(wxT("size"));
     if (hasSize)
     bool hasSize = HasParam(wxT("size"));
     if (hasSize)

-        isize = GetLong(wxT("size"), wxDEFAULT);
+        isize = GetLong(wxT("size"), -1);

 
     // style
     int istyle = wxNORMAL;
 
     // style
     int istyle = wxNORMAL;


@@ -1372,36 +1372,38 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
     }
 
     // is this font based on a system font?
     }
 
     // is this font based on a system font?

-    wxFont sysfont = GetSystemFont(GetParamValue(wxT("sysfont")));
+    wxFont font = GetSystemFont(GetParamValue(wxT("sysfont")));

 
 

-    if (sysfont.Ok())
+    if (font.Ok())

     {
     {

-        if (hasSize)
-            sysfont.SetPointSize(isize);
+        if (hasSize && isize != -1)
+            font.SetPointSize(isize);

         else if (HasParam(wxT("relativesize")))
         else if (HasParam(wxT("relativesize")))

-            sysfont.SetPointSize(int(sysfont.GetPointSize() *
+            font.SetPointSize(int(font.GetPointSize() *

                                      GetFloat(wxT("relativesize"))));
 
         if (hasStyle)
                                      GetFloat(wxT("relativesize"))));
 
         if (hasStyle)

-            sysfont.SetStyle(istyle);
+            font.SetStyle(istyle);

         if (hasWeight)
         if (hasWeight)

-            sysfont.SetWeight(iweight);
+            font.SetWeight(iweight);

         if (hasUnderlined)
         if (hasUnderlined)

-            sysfont.SetUnderlined(underlined);
+            font.SetUnderlined(underlined);

         if (hasFamily)
         if (hasFamily)

-            sysfont.SetFamily(ifamily);
+            font.SetFamily(ifamily);

         if (hasFacename)
         if (hasFacename)

-            sysfont.SetFaceName(facename);
+            font.SetFaceName(facename);

         if (hasEncoding)
         if (hasEncoding)

-            sysfont.SetDefaultEncoding(enc);
-
-        m_node = oldnode;
-        return sysfont;
+            font.SetDefaultEncoding(enc);
+    }
+    else // not based on system font
+    {
+        font = wxFont(isize == -1 ? wxNORMAL_FONT->GetPointSize() : isize,
+                      ifamily, istyle, iweight,
+                      underlined, facename, enc);

     }
 
     m_node = oldnode;
     }
 
     m_node = oldnode;

-    return wxFont(isize, ifamily, istyle, iweight,
-                  underlined, facename, enc);
+    return font;

 }
 
 
 }