diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-04 20:48:52 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-04 20:48:52 +0000 |
| commit | 1f003cf9e6a6318af036b8d1df70aa4d64ea6d05 (patch) | |
| tree | a7dac5cb2ba7ff75c73f1559a3cab61495f45c76 /NxWidgets/nxwm/include | |
| parent | bee0dc42f7930b2f1fa1f5a30b767cd7b797a8f4 (diff) | |
| download | nuttx-1f003cf9e6a6318af036b8d1df70aa4d64ea6d05.tar.gz nuttx-1f003cf9e6a6318af036b8d1df70aa4d64ea6d05.tar.bz2 nuttx-1f003cf9e6a6318af036b8d1df70aa4d64ea6d05.zip | |
Updated NxWM widgets, several NX, NxWidgets, and NxWM bug fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4699 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/nxwm/include')
| -rw-r--r-- | NxWidgets/nxwm/include/nxwmconfig.hxx | 18 | ||||
| -rw-r--r-- | NxWidgets/nxwm/include/nxwmglyphs.hxx | 4 |
2 files changed, 21 insertions, 1 deletions
diff --git a/NxWidgets/nxwm/include/nxwmconfig.hxx b/NxWidgets/nxwm/include/nxwmconfig.hxx index 9387e2713..57566b2d4 100644 --- a/NxWidgets/nxwm/include/nxwmconfig.hxx +++ b/NxWidgets/nxwm/include/nxwmconfig.hxx @@ -248,6 +248,7 @@ * * CONFIG_NXWM_STARTWINDOW_VSPACING - Vertical spacing. Default: 2 pixels * CONFIG_NXWM_STARTWINDOW_HSPACING - Horizontal spacing. Default: 2 rows + * CONFIG_NXWM_STARTWINDOW_ICON - The glyph to use as the start window icon */ #ifndef CONFIG_NXWM_STARTWINDOW_VSPACING @@ -258,6 +259,14 @@ # define CONFIG_NXWM_STARTWINDOW_HSPACING (2) #endif +/** + * The start window glyph + */ + +#ifndef CONFIG_NXWM_STARTWINDOW_ICON +# define CONFIG_NXWM_STARTWINDOW_ICON NxWM::g_playBitmap +#endif + /* NxConsole Window *********************************************************/ /** * NxConsole Window Configuration @@ -275,6 +284,7 @@ * NxConsole window. Default: MKRGB(0,0,0) * CONFIG_NXWM_NXCONSOLE_FONTID - The ID of the font to use in the NxConsole * window. Default: CONFIG_NXWM_DEFAULT_FONTID + * CONFIG_NXWM_NXCONSOLE_ICON - The glyph to use as the NxConsole icon */ #ifndef CONFIG_NXWM_NXCONSOLE_PRIO @@ -302,6 +312,14 @@ # define CONFIG_NXWM_NXCONSOLE_FONTID CONFIG_NXWM_DEFAULT_FONTID #endif +/** + * The NxConsole window glyph + */ + +#ifndef CONFIG_NXWM_NXCONSOLE_ICON +# define CONFIG_NXWM_NXCONSOLE_ICON NxWM::g_cmdBitmap +#endif + /**************************************************************************** * Global Function Prototypes ****************************************************************************/ diff --git a/NxWidgets/nxwm/include/nxwmglyphs.hxx b/NxWidgets/nxwm/include/nxwmglyphs.hxx index 198fe9f26..6a850179c 100644 --- a/NxWidgets/nxwm/include/nxwmglyphs.hxx +++ b/NxWidgets/nxwm/include/nxwmglyphs.hxx @@ -57,8 +57,10 @@ namespace NxWM { - extern const struct NXWidgets::SRlePaletteBitmap g_nshBitmap; + extern const struct NXWidgets::SRlePaletteBitmap g_cmdBitmap; extern const struct NXWidgets::SRlePaletteBitmap g_minimizeBitmap; + extern const struct NXWidgets::SRlePaletteBitmap g_nshBitmap; + extern const struct NXWidgets::SRlePaletteBitmap g_playBitmap; extern const struct NXWidgets::SRlePaletteBitmap g_startBitmap; extern const struct NXWidgets::SRlePaletteBitmap g_stopBitmap; } |