Merge branch 'master' of newgeom:newgeom.git

[modules/shaper.git] / src / Config / Config_WidgetAPI.cpp

diff --git a/src/Config/Config_WidgetAPI.cpp b/src/Config/Config_WidgetAPI.cpp
index 38b4476ade39806eec6eaf0f6213a177f73b9017..65d4b14cad33bd13191fd5730a56ffd6b1405234 100644 (file)
--- a/src/Config/Config_WidgetAPI.cpp
+++ b/src/Config/Config_WidgetAPI.cpp
@@ -29,12 +29,13 @@ void Config_WidgetAPI::reset()
   if(aRoot) {
     myCurrentNode = aRoot->children;
   }
-
 }
 
 bool Config_WidgetAPI::nextWidget()
 {
-  myCurrentNode = myCurrentNode->next;
+  if(myCurrentNode) {
+    myCurrentNode = myCurrentNode->next;
+  }
   return myCurrentNode != NULL;
 }
 
@@ -57,6 +58,26 @@ std::string Config_WidgetAPI::getProperty(const char* thePropName)
   return result;
 }
 
+std::string Config_WidgetAPI::widgetId()
+{
+  return getProperty("id");
+}
+
+std::string Config_WidgetAPI::widgetTooltip()
+{
+  return getProperty("tooltip");
+}
+
+std::string Config_WidgetAPI::widgetIcon()
+{
+  return getProperty("icon");
+}
+
+std::string Config_WidgetAPI::widgetLabel()
+{
+  return getProperty("label");
+}
+
 bool Config_WidgetAPI::isNode(xmlNodePtr theNode, const char* theNodeName, ...)
 {
   bool result = false;