summaryrefslogtreecommitdiff
path: root/NxWidgets/nxwm/src/cnxconsole.cxx
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-19 04:20:56 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-19 04:20:56 +0000
commit38b3dcac9e4dcb225ceaa7a4798a644537c50ece (patch)
treeaec833bcd4833134c4a769b6e3057a06eb2a9f74 /NxWidgets/nxwm/src/cnxconsole.cxx
parente5350e893168b675cfd96b36fd7aad3ccfabf791 (diff)
downloadnuttx-38b3dcac9e4dcb225ceaa7a4798a644537c50ece.tar.gz
nuttx-38b3dcac9e4dcb225ceaa7a4798a644537c50ece.tar.bz2
nuttx-38b3dcac9e4dcb225ceaa7a4798a644537c50ece.zip
NxWM unit test now appears bug free (other than some NxConsole-related issues).
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4750 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/nxwm/src/cnxconsole.cxx')
-rw-r--r--NxWidgets/nxwm/src/cnxconsole.cxx14
1 files changed, 2 insertions, 12 deletions
diff --git a/NxWidgets/nxwm/src/cnxconsole.cxx b/NxWidgets/nxwm/src/cnxconsole.cxx
index 6a64afc1b..30105910b 100644
--- a/NxWidgets/nxwm/src/cnxconsole.cxx
+++ b/NxWidgets/nxwm/src/cnxconsole.cxx
@@ -132,11 +132,6 @@ CNxConsole::CNxConsole(CTaskbar *taskbar, CApplicationWindow *window)
// Add our callbacks with the application window
window->registerCallbacks(static_cast<IApplicationCallback *>(this));
-
- // Add our messenger as the window callback
-
- NXWidgets::CWidgetControl *control = window->getWidgetControl();
- control->addWindowEventHandler(&m_messenger);
}
/**
@@ -152,11 +147,6 @@ CNxConsole::~CNxConsole(void)
stop();
- // Remove ourself from the window callback
-
- NXWidgets::CWidgetControl *control = m_window->getWidgetControl();
- control->removeWindowEventHandler(&m_messenger);
-
// Although we didn't create it, we are responsible for deleting the
// application window
@@ -303,7 +293,7 @@ void CNxConsole::stop(void)
// Delete the NxConsole task if it is still running (this could strand
// resources). If we get here due to CTaskbar::stopApplication() processing
// initialed by CNxConsole::exitHandler, then do *not* delete the task (it
- // is already being delete).
+ // is already being deleted).
if (m_pid >= 0)
{
@@ -320,7 +310,7 @@ void CNxConsole::stop(void)
}
// Destroy the NX console device
-
+
if (m_nxcon)
{
nxcon_unregister(m_nxcon);