diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-04-29 14:34:56 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-04-29 14:34:56 +0000 |
| commit | 530e4e8173cbbdc299b7244ef5ba839f17b49556 (patch) | |
| tree | a1b741f5bd64efb9dbae3d238b08072ebcc2883c /NxWidgets/libnxwidgets/include/cnxserver.hxx | |
| parent | e35aa390b0d57483b82638952ad62f3a7f5373b5 (diff) | |
| download | nuttx-530e4e8173cbbdc299b7244ef5ba839f17b49556.tar.gz nuttx-530e4e8173cbbdc299b7244ef5ba839f17b49556.tar.bz2 nuttx-530e4e8173cbbdc299b7244ef5ba839f17b49556.zip | |
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
Diffstat (limited to 'NxWidgets/libnxwidgets/include/cnxserver.hxx')
| -rw-r--r-- | NxWidgets/libnxwidgets/include/cnxserver.hxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/NxWidgets/libnxwidgets/include/cnxserver.hxx b/NxWidgets/libnxwidgets/include/cnxserver.hxx index 2c79558a0..3043fd9e0 100644 --- a/NxWidgets/libnxwidgets/include/cnxserver.hxx +++ b/NxWidgets/libnxwidgets/include/cnxserver.hxx @@ -48,6 +48,7 @@ #include <nuttx/nx/nx.h> #include "cnxwindow.hxx" +#include "cnxtkwindow.hxx" #include "cbgwindow.hxx" /**************************************************************************** @@ -176,12 +177,10 @@ namespace NXWidgets * Get an instance of the framed NX window. */ -#if 0 // Not ready for prime time - inline CFramedWindow *createFramedWindow(CWidgetControl *widgetControl) + inline CNxTkWindow *createFramedWindow(CWidgetControl *widgetControl) { - return new CFramedWindow(m_hNxServer, widgetControl); + return new CNxTkWindow(m_hNxServer, widgetControl); } -#endif /** * Get an instance of the background window. |