added default value argument to wxXmlResourceHandler::GetColour()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-15 15:32:57 +00:00
parent 374caf2301
commit 984f1d84fd
3 changed files with 7 additions and 3 deletions
--- 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