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/src | |
parent | e35aa390b0d57483b82638952ad62f3a7f5373b5 (diff) | |
download | px4-nuttx-530e4e8173cbbdc299b7244ef5ba839f17b49556.tar.gz px4-nuttx-530e4e8173cbbdc299b7244ef5ba839f17b49556.tar.bz2 px4-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/src')
-rw-r--r-- | NxWidgets/libnxwidgets/src/cbgwindow.cxx | 12 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/src/cnxserver.cxx | 2 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/src/cnxtkwindow.cxx | 12 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/src/cnxtoolbar.cxx | 12 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/src/cnxwindow.cxx | 12 |
5 files changed, 49 insertions, 1 deletions
diff --git a/NxWidgets/libnxwidgets/src/cbgwindow.cxx b/NxWidgets/libnxwidgets/src/cbgwindow.cxx index 08ae584b8..58ecc1f51 100644 --- a/NxWidgets/libnxwidgets/src/cbgwindow.cxx +++ b/NxWidgets/libnxwidgets/src/cbgwindow.cxx @@ -114,6 +114,18 @@ bool CBgWindow::open(void) } /** + * Each implementation of INxWindow must provide a method to recover + * the contained CWidgetControl instance. + * + * @return The contained CWidgetControl instance + */ + +CWidgetControl *CBgWindow::getWidgetControl(void) const +{ + return m_widgetControl; +} + +/** * Request the position and size information of the window. The values * will be returned asynchronously through the client callback method. * The GetPosition() method may than be called to obtain the positional diff --git a/NxWidgets/libnxwidgets/src/cnxserver.cxx b/NxWidgets/libnxwidgets/src/cnxserver.cxx index 2f36b0f2d..ef71deb44 100644 --- a/NxWidgets/libnxwidgets/src/cnxserver.cxx +++ b/NxWidgets/libnxwidgets/src/cnxserver.cxx @@ -120,7 +120,7 @@ CNxServer::~CNxServer(void) #ifndef CONFIG_NX_MULTIUSER bool CNxServer::connect(void) { -#if defined(SCREENS_EXTERNINIT) +#if defined(CONFIG_NXWIDGETS_EXTERNINIT) // Use external graphics driver initialization m_hDevice = up_nxdrvinit(CONFIG_NXWIDGETS_DEVNO); diff --git a/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx b/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx index 36b07dce5..ba62ee435 100644 --- a/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx +++ b/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx @@ -112,6 +112,18 @@ bool CNxTkWindow::open(void) } /** + * Each implementation of INxWindow must provide a method to recover + * the contained CWidgetControl instance. + * + * @return The contained CWidgetControl instance + */ + +CWidgetControl *CNxTkWindow::getWidgetControl(void) const +{ + return m_widgetControl; +} + +/** * Open a toolbar on the framed window * * @param height Height of the toolbar diff --git a/NxWidgets/libnxwidgets/src/cnxtoolbar.cxx b/NxWidgets/libnxwidgets/src/cnxtoolbar.cxx index 5911c731d..1c560deb1 100644 --- a/NxWidgets/libnxwidgets/src/cnxtoolbar.cxx +++ b/NxWidgets/libnxwidgets/src/cnxtoolbar.cxx @@ -118,6 +118,18 @@ bool CNxToolbar::open(void) } /** + * Each implementation of INxWindow must provide a method to recover + * the contained CWidgetControl instance. + * + * @return The contained CWidgetControl instance + */ + +CWidgetControl *CNxToolbar::getWidgetControl(void) const +{ + return m_widgetControl; +} + +/** * Request the position and size information of the toolbar. The values * will be returned asynchronously through the client callback method. * The GetPosition() method may than be called to obtain the positional diff --git a/NxWidgets/libnxwidgets/src/cnxwindow.cxx b/NxWidgets/libnxwidgets/src/cnxwindow.cxx index fd4cc6ef2..599335972 100644 --- a/NxWidgets/libnxwidgets/src/cnxwindow.cxx +++ b/NxWidgets/libnxwidgets/src/cnxwindow.cxx @@ -104,6 +104,18 @@ bool CNxWindow::open(void) } /** + * Each implementation of INxWindow must provide a method to recover + * the contained CWidgetControl instance. + * + * @return The contained CWidgetControl instance + */ + +CWidgetControl *CNxWindow::getWidgetControl(void) const +{ + return m_widgetControl; +} + +/** * Request the position and size information of the window. The values * will be returned asynchronously through the client callback method. * The GetPosition() method may than be called to obtain the positional |