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 789761a6e1fba0d46785caaad5ea4e56564857fc..96a7cd6b5a9e9870905565884c46aabea4c5d2a4 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -27,6 +27,7 @@
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/bitmap.h"
+    #include "wx/image.h"
 #endif
 
 #ifndef __WXWINCE__
@@ -39,7 +40,6 @@
 #include "wx/tokenzr.h"
 #include "wx/fontenum.h"
 #include "wx/module.h"
-#include "wx/image.h"
 #include "wx/fontmap.h"
 #include "wx/artprov.h"
 
@@ -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
@@ -1147,6 +1151,14 @@ wxXmlNode *wxXmlResourceHandler::GetParamNode(const wxString& param)
 }
 
 
+
+bool wxXmlResourceHandler::IsOfClass(wxXmlNode *node, const wxString& classname)
+{
+    return node->GetPropVal(wxT("class"), wxEmptyString) == classname;
+}
+
+
+
 wxString wxXmlResourceHandler::GetNodeContent(wxXmlNode *node)
 {
     wxXmlNode *n = node;