From 530e4e8173cbbdc299b7244ef5ba839f17b49556 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sun, 29 Apr 2012 14:34:56 +0000
Subject: Fix STM32 USART4/5 vs UART4/5 confusion

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4671 42af7a65-404d-4744-a932-0658087f49c3
---
 NxWidgets/nxwm/include/nxwmconfig.hxx | 38 +++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'NxWidgets/nxwm/include/nxwmconfig.hxx')

diff --git a/NxWidgets/nxwm/include/nxwmconfig.hxx b/NxWidgets/nxwm/include/nxwmconfig.hxx
index 18b35d83a..e5a85ac5a 100644
--- a/NxWidgets/nxwm/include/nxwmconfig.hxx
+++ b/NxWidgets/nxwm/include/nxwmconfig.hxx
@@ -47,7 +47,16 @@
 /****************************************************************************
  * Pre-Processor Definitions
  ****************************************************************************/
+/* General Configuration ****************************************************/
+/**
+ * NX Multi-user support is required
+ */
+
+#ifndef CONFIG_NX_MULTIUSER
+#  warning "NX multi-user support is required (CONFIG_NX_MULTIUSER)"
+#endif
 
+/* Colors *******************************************************************/
 /**
  * Normal background color
  */
@@ -80,5 +89,34 @@
 #  define CONFIG_NXWM_DEFAULT_SELECTEDFOREGROUNDCOLOR  MKRGB(248,248,248)
 #endif
 
+/* Task Bar Configuation  ***************************************************/
+/* At present, all icons are 25 pixels in "widgth" and, hence require a
+ * task bar of at least that size.
+ */
+
+#ifndef CONFIG_NXWM_TASKBAR_WIDTH
+#  define CONFIG_NXWM_TASKBAR_WIDTH (25+2*2)
+#endif
+
+/* Check task bar location */
+
+#if defined(CONFIG_NXWM_TASKBAR_TOP)
+#  if defined(CONFIG_NXWM_TASKBAR_BOTTOM) || defined (CONFIG_NXWM_TASKBAR_LEFT) || defined (CONFIG_NXWM_TASKBAR_RIGHT)
+#    warning "Multiple task positions specified"
+#  endif
+#elif defined(CONFIG_NXWM_TASKBAR_BOTTOM)
+#  if defined (CONFIG_NXWM_TASKBAR_LEFT) || defined (CONFIG_NXWM_TASKBAR_RIGHT)
+#    warning "Multiple task positions specified"
+#  endif
+#elif defined(CONFIG_NXWM_TASKBAR_LEFT)
+#  if defined defined (CONFIG_NXWM_TASKBAR_RIGHT)
+#    warning "Multiple task positions specified"
+#  endif
+#elif !defined(CONFIG_NXWM_TASKBAR_RIGHT)
+#  warning "No task positions specified"
+#  define CONFIG_NXWM_TASKBAR_TOP 1
+#endif
+
+/* Colors *******************************************************************/
 
 #endif // __INCLUDE_NXWM_CONFIG_HXX
-- 
cgit v1.2.3