diff --git a/graphics/twm4nx/README.txt b/graphics/twm4nx/README.txt index d04e464e9..fc67e73b3 100644 --- a/graphics/twm4nx/README.txt +++ b/graphics/twm4nx/README.txt @@ -43,4 +43,8 @@ STATUS 3. For TWM-like behavior, a window frame and toolbar should be highlighted when the window has focus. 4. A right click on the toolbar should bring up a window-specific menu. + 2019-05-02: Some testing progress. The system comes up, connects to and + initializes the VNC window. For some reason, the VNC client breaks the + connection. The server is no longer connected so Twm4Nx constipates and + and eventually hangs. diff --git a/graphics/twm4nx/src/ciconwidget.cxx b/graphics/twm4nx/src/ciconwidget.cxx index 4d011e13b..cee92f75e 100644 --- a/graphics/twm4nx/src/ciconwidget.cxx +++ b/graphics/twm4nx/src/ciconwidget.cxx @@ -174,7 +174,7 @@ bool CIconWidget::initialize(FAR NXWidgets::IBitmap *ibitmap, FAR NXWidgets::CImage *image = new NXWidgets::CImage(m_widgetControl, iconImagePos.x, iconImagePos.y, iconImageSize.w, iconImageSize.h, - ibitmap, m_style); + ibitmap, &m_style); if (image == (FAR NXWidgets::CImage *)0) { twmerr("ERROR: Failed to create image\n"); @@ -199,7 +199,8 @@ bool CIconWidget::initialize(FAR NXWidgets::IBitmap *ibitmap, FAR NXWidgets::CLabel *label = new NXWidgets::CLabel(m_widgetControl, iconLabelPos.x, iconLabelPos.y, - iconLabelSize.w, iconLabelSize.h, title); + iconLabelSize.w, iconLabelSize.h, title, + &m_style); if (label == (FAR NXWidgets::CLabel *)0) { twmerr("ERROR: Failed to create icon label\n"); diff --git a/graphics/twm4nx/src/cwindowevent.cxx b/graphics/twm4nx/src/cwindowevent.cxx index ca0655e78..763d53247 100644 --- a/graphics/twm4nx/src/cwindowevent.cxx +++ b/graphics/twm4nx/src/cwindowevent.cxx @@ -173,7 +173,7 @@ void CWindowEvent::sendInputEvent(void) void CWindowEvent::handleRedrawEvent(FAR const nxgl_rect_s *nxRect, bool more) { - twminfo("backgound=%s\n", m_isBackground ? "YES" : "NO"); + twminfo("background=%s\n", m_isBackground ? "YES" : "NO"); // At present, only the background window will get redraw events diff --git a/include/graphics/nxwidgets/cnxwidget.hxx b/include/graphics/nxwidgets/cnxwidget.hxx index 2c0385474..4e6882895 100644 --- a/include/graphics/nxwidgets/cnxwidget.hxx +++ b/include/graphics/nxwidgets/cnxwidget.hxx @@ -92,10 +92,6 @@ #include "graphics/nxwidgets/cwidgeteventhandlerlist.hxx" #include "graphics/nxwidgets/tnxarray.hxx" -/**************************************************************************** - * Pre-Processor Definitions - ****************************************************************************/ - /**************************************************************************** * Implementation Classes ****************************************************************************/ diff --git a/include/graphics/twm4nx/ciconwidget.hxx b/include/graphics/twm4nx/ciconwidget.hxx index 30bcec88c..e8a1f782d 100644 --- a/include/graphics/twm4nx/ciconwidget.hxx +++ b/include/graphics/twm4nx/ciconwidget.hxx @@ -89,7 +89,6 @@ namespace Twm4Nx FAR CTwm4Nx *m_twm4nx; /**< Cached Twm4Nx session */ mqd_t m_eventq; /**< NxWidget event message queue */ FAR NXWidgets::CWidgetControl *m_widgetControl; /**< The controlling widget */ - FAR NXWidgets::CWidgetStyle *m_style; /**< Widget style */ // Dragging