don't add 7 and 14 pixel horz/vertical padding in DoGetBestSize() when the best size...

[wxWidgets.git] / src / xrc / xmlres.cpp

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 8743a5c135c1f481940252b024ebd35ccc084a20..96a7cd6b5a9e9870905565884c46aabea4c5d2a4 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -1042,9 +1042,13 @@ static wxColour GetSystemColour(const wxString& name)
     return wxNullColour;
 }
 
-wxColour wxXmlResourceHandler::GetColour(const wxString& param)
+wxColour wxXmlResourceHandler::GetColour(const wxString& param, const wxColour& defaultv)
 {
     wxString v = GetParamValue(param);
+
+    if ( v.empty() )
+        return defaultv;
+
     wxColour clr;
 
     // wxString -> wxColour conversion