NxWM update

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4675 42af7a65-404d-4744-a932-0658087f49c3

1 files changed, 26 insertions, 2 deletions

diff --git a/NxWidgets/nxwm/include/nxwmconfig.hxx b/NxWidgets/nxwm/include/nxwmconfig.hxx
index e5a85ac5a..1400d41a4 100644
--- a/NxWidgets/nxwm/include/nxwmconfig.hxx
+++ b/NxWidgets/nxwm/include/nxwmconfig.hxx
@@ -56,13 +56,21 @@
 #  warning "NX multi-user support is required (CONFIG_NX_MULTIUSER)"
 #endif
 
+/**
+ * Default font ID
+ */
+
+#ifndef CONFIG_NXWM_DEFAULT_FONTID
+#  define CONFIG_NXWM_DEFAULT_FONTID NXFONT_DEFAULT
+#endif
+
 /* Colors *******************************************************************/
 /**
  * Normal background color
  */
 
 #ifndef CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR
-#  define CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
+#  define CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR
 #endif
 
 /**
@@ -70,7 +78,7 @@
  */
 
 #ifndef CONFIG_NXWM_DEFAULT_SELECTEDBACKGROUNDCOLOR
-#  define CONFIG_NXWM_DEFAULT_SELECTEDBACKGROUNDCOLOR CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR
+#  define CONFIG_NXWM_DEFAULT_SELECTEDBACKGROUNDCOLOR CONFIG_NXWM_DEFAULT_SELECTEDBACKGROUNDCOLOR
 #endif
 
 /**
@@ -89,6 +97,22 @@
 #  define CONFIG_NXWM_DEFAULT_SELECTEDFOREGROUNDCOLOR  MKRGB(248,248,248)
 #endif
 
+/**
+ * The default font color
+ */
+
+#ifndef CONFIG_NXWM_DEFAULT_FONTCOLOR
+#  define CONFIG_NXWM_DEFAULT_FONTCOLOR  MKRGB(255,255,255)
+#endif
+
+/**
+ * The transparent color
+ */
+
+#ifndef CONFIG_NXWM_TRANSPARENT_COLOR
+#  define CONFIG_NXWM_TRANSPARENT_COLOR  MKRGB(0,0,0)
+#endif
+
 /* Task Bar Configuation  ***************************************************/
 /* At present, all icons are 25 pixels in "widgth" and, hence require a
  * task bar of at least that size.