summaryrefslogtreecommitdiff
path: root/NxWidgets/nxwm/include
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-03 19:46:37 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-03 19:46:37 +0000
commitcb842a3b50a28145bb8be977f4e9a7069701c88d (patch)
treeceff943c049bd7cbe1d9f4ed7ab836f8039098e6 /NxWidgets/nxwm/include
parenta85f1d89916f8f0302c9f8cd77645a0c60fc93dc (diff)
downloadnuttx-cb842a3b50a28145bb8be977f4e9a7069701c88d.tar.gz
nuttx-cb842a3b50a28145bb8be977f4e9a7069701c88d.tar.bz2
nuttx-cb842a3b50a28145bb8be977f4e9a7069701c88d.zip
Upated NxWM comments
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4692 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/nxwm/include')
-rw-r--r--NxWidgets/nxwm/include/capplicationwindow.hxx4
-rw-r--r--NxWidgets/nxwm/include/cstartwindow.hxx2
-rw-r--r--NxWidgets/nxwm/include/ctaskbar.hxx2
-rw-r--r--NxWidgets/nxwm/include/nxwmconfig.hxx19
4 files changed, 27 insertions, 0 deletions
diff --git a/NxWidgets/nxwm/include/capplicationwindow.hxx b/NxWidgets/nxwm/include/capplicationwindow.hxx
index 167f51997..924389709 100644
--- a/NxWidgets/nxwm/include/capplicationwindow.hxx
+++ b/NxWidgets/nxwm/include/capplicationwindow.hxx
@@ -184,6 +184,7 @@ namespace NxWM
* used during automated testing of NxWM.
*/
+#ifdef CONFIG_NXWM_UNITTEST
inline void clickMinimizeIcon(int index)
{
// Get the size and position of the widget
@@ -198,12 +199,14 @@ namespace NxWM
m_minimizeImage->click(imagePos.x + (imageSize.w >> 1), imagePos.y + (imageSize.h >> 1));
}
+#endif
/**
* Simulate a mouse click on the stop applicaiton icon. This inline method is only
* used during automated testing of NxWM.
*/
+#ifdef CONFIG_NXWM_UNITTEST
inline void clickStopIcon(int index)
{
// Get the size and position of the widget
@@ -218,6 +221,7 @@ namespace NxWM
m_stopImage->click(imagePos.x + (imageSize.w >> 1), imagePos.y + (imageSize.h >> 1));
}
+#endif
};
}
diff --git a/NxWidgets/nxwm/include/cstartwindow.hxx b/NxWidgets/nxwm/include/cstartwindow.hxx
index 5eeb51781..924cc7d05 100644
--- a/NxWidgets/nxwm/include/cstartwindow.hxx
+++ b/NxWidgets/nxwm/include/cstartwindow.hxx
@@ -209,6 +209,7 @@ namespace NxWM
* used during automated testing of NxWM.
*/
+#ifdef CONFIG_NXWM_UNITTEST
inline void clickIcon(int index)
{
if (index < m_slots.size())
@@ -230,6 +231,7 @@ namespace NxWM
image->click(imagePos.x + (imageSize.w >> 1), imagePos.y + (imageSize.h >> 1));
}
}
+#endif
};
}
diff --git a/NxWidgets/nxwm/include/ctaskbar.hxx b/NxWidgets/nxwm/include/ctaskbar.hxx
index c290cb8ae..4e12fdb2c 100644
--- a/NxWidgets/nxwm/include/ctaskbar.hxx
+++ b/NxWidgets/nxwm/include/ctaskbar.hxx
@@ -366,6 +366,7 @@ namespace NxWM
* used during automated testing of NxWM.
*/
+#ifdef CONFIG_NXWM_UNITTEST
inline void clickIcon(int index)
{
if (index < m_slots.size())
@@ -387,6 +388,7 @@ namespace NxWM
image->click(imagePos.x + (imageSize.w >> 1), imagePos.y + (imageSize.h >> 1));
}
}
+#endif
};
}
diff --git a/NxWidgets/nxwm/include/nxwmconfig.hxx b/NxWidgets/nxwm/include/nxwmconfig.hxx
index 59ae1e79d..99383fe02 100644
--- a/NxWidgets/nxwm/include/nxwmconfig.hxx
+++ b/NxWidgets/nxwm/include/nxwmconfig.hxx
@@ -301,4 +301,23 @@
# define CONFIG_NXWM_NXCONSOLE_FONTID CONFIG_NXWM_DEFAULT_FONTID
#endif
+/****************************************************************************
+ * Global Function Prototypes
+ ****************************************************************************/
+/**
+ * Hook to support monitoring of memory usage by the NxWM unit test.
+ */
+
+#ifdef CONFIG_NXWM_UNITTEST
+# ifdef CONFIG_HAVE_FILENAME
+void _showTestStepMemory(FAR const char *file, int line, FAR const char *msg);
+# define showTestStepMemory(msg) \
+ _showTestStepMemory((FAR const char*)__FILE__, (int)__LINE__, msg)
+# else
+void showTestStepMemory(FAR const char *msg);
+# endif
+#else
+# define showTestStepMemory(msg)
+#endif
+
#endif // __INCLUDE_NXWMCONFIG_HXX