sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps/graphic/twm4nx: Fix junk varialbe that was shadowing variable of the same name in the base CNxWidget class. Resolves all start up crash issues. Now I need to figure out why the host VNC client drops the connection.

Browse Source
This commit is contained in:
Gregory Nutt 2019-05-02 16:40:10 -06:00
parent 2fff83d60d
commit 445e0eef79
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/twm4nx/README.txt
View File

@ -43,4 +43,8 @@ STATUS
3. For TWM-like behavior, a window frame and toolbar should be highlighted 3. For TWM-like behavior, a window frame and toolbar should be highlighted
when the window has focus. when the window has focus.
4. A right click on the toolbar should bring up a window-specific menu. 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.

5
graphics/twm4nx/src/ciconwidget.cxx
View File

@ -174,7 +174,7 @@ bool CIconWidget::initialize(FAR NXWidgets::IBitmap *ibitmap,
FAR NXWidgets::CImage *image = FAR NXWidgets::CImage *image =
new NXWidgets::CImage(m_widgetControl, iconImagePos.x, new NXWidgets::CImage(m_widgetControl, iconImagePos.x,
iconImagePos.y, iconImageSize.w, iconImageSize.h, iconImagePos.y, iconImageSize.w, iconImageSize.h,
ibitmap, m_style); ibitmap, &m_style);
if (image == (FAR NXWidgets::CImage *)0) if (image == (FAR NXWidgets::CImage *)0)
{ {
twmerr("ERROR: Failed to create image\n"); twmerr("ERROR: Failed to create image\n");
@ -199,7 +199,8 @@ bool CIconWidget::initialize(FAR NXWidgets::IBitmap *ibitmap,
FAR NXWidgets::CLabel *label = FAR NXWidgets::CLabel *label =
new NXWidgets::CLabel(m_widgetControl, iconLabelPos.x, iconLabelPos.y, 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) if (label == (FAR NXWidgets::CLabel *)0)
{ {
twmerr("ERROR: Failed to create icon label\n"); twmerr("ERROR: Failed to create icon label\n");

2
graphics/twm4nx/src/cwindowevent.cxx
View File

@ -173,7 +173,7 @@ void CWindowEvent::sendInputEvent(void)
void CWindowEvent::handleRedrawEvent(FAR const nxgl_rect_s *nxRect, void CWindowEvent::handleRedrawEvent(FAR const nxgl_rect_s *nxRect,
bool more) 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 // At present, only the background window will get redraw events

4
include/graphics/nxwidgets/cnxwidget.hxx
View File

@ -92,10 +92,6 @@
#include "graphics/nxwidgets/cwidgeteventhandlerlist.hxx" #include "graphics/nxwidgets/cwidgeteventhandlerlist.hxx"
#include "graphics/nxwidgets/tnxarray.hxx" #include "graphics/nxwidgets/tnxarray.hxx"
/****************************************************************************
* Pre-Processor Definitions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Implementation Classes * Implementation Classes
****************************************************************************/ ****************************************************************************/

1
include/graphics/twm4nx/ciconwidget.hxx
View File

@ -89,7 +89,6 @@ namespace Twm4Nx
FAR CTwm4Nx *m_twm4nx; /**< Cached Twm4Nx session */ FAR CTwm4Nx *m_twm4nx; /**< Cached Twm4Nx session */
mqd_t m_eventq; /**< NxWidget event message queue */ mqd_t m_eventq; /**< NxWidget event message queue */
FAR NXWidgets::CWidgetControl *m_widgetControl; /**< The controlling widget */ FAR NXWidgets::CWidgetControl *m_widgetControl; /**< The controlling widget */
FAR NXWidgets::CWidgetStyle *m_style; /**< Widget style */
// Dragging // Dragging