diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-12-30 10:04:34 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-12-30 10:04:34 -0600 |
| commit | 740fa31fee4328e095cfb62a2a9128c858d7f062 (patch) | |
| tree | f02f5817428aa1ce67ce7f74d25973dcb9d6b286 /NxWidgets/libnxwidgets | |
| parent | 9642e859e341e35fb01fd027d315f0195cb63358 (diff) | |
| download | nuttx-740fa31fee4328e095cfb62a2a9128c858d7f062.tar.gz nuttx-740fa31fee4328e095cfb62a2a9128c858d7f062.tar.bz2 nuttx-740fa31fee4328e095cfb62a2a9128c858d7f062.zip | |
NxWM: Can now disable the NxConsole window. STM3240G-EVAL knxwm: Disabled the NxConsole for now because there are issues with the kernel build.
Diffstat (limited to 'NxWidgets/libnxwidgets')
| -rw-r--r-- | NxWidgets/libnxwidgets/include/ccallback.hxx | 10 | ||||
| -rw-r--r-- | NxWidgets/libnxwidgets/src/ccallback.cxx | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/NxWidgets/libnxwidgets/include/ccallback.hxx b/NxWidgets/libnxwidgets/include/ccallback.hxx index 714ed1a7f..bef4a2ca9 100644 --- a/NxWidgets/libnxwidgets/include/ccallback.hxx +++ b/NxWidgets/libnxwidgets/include/ccallback.hxx @@ -58,11 +58,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -98,7 +98,7 @@ namespace NXWidgets #endif // Methods in the callback vtable - + /** * Re-Draw Callback. The redraw event is handled by CWidgetControl::redrawEvent. * @@ -113,7 +113,7 @@ namespace NXWidgets * @param arg User provided argument (see nx_openwindow, nx_requestbg, * nxtk_openwindow, or nxtk_opentoolbar). */ - + static void redraw(NXHANDLE hwnd, FAR const struct nxgl_rect_s *rect, bool bMore, FAR void *arg); @@ -157,7 +157,7 @@ namespace NXWidgets * @param arg User provided argument (see nx_openwindow, nx_requestbg, * nxtk_openwindow, or nxtk_opentoolbar). */ - + #ifdef CONFIG_NX_MOUSE static void newMouseEvent(NXHANDLE hwnd, FAR const struct nxgl_point_s *pos, diff --git a/NxWidgets/libnxwidgets/src/ccallback.cxx b/NxWidgets/libnxwidgets/src/ccallback.cxx index 269a5cdb1..b7cd31161 100644 --- a/NxWidgets/libnxwidgets/src/ccallback.cxx +++ b/NxWidgets/libnxwidgets/src/ccallback.cxx @@ -1,7 +1,7 @@ /**************************************************************************** * NxWidgets/libnxwidgets/src/ccallback.cxx * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -102,7 +102,7 @@ CCallback::CCallback(CWidgetControl *widgetControl) * @param arg User provided argument (see nx_openwindow, nx_requestbg, * nxtk_openwindow, or nxtk_opentoolbar). */ - + void CCallback::redraw(NXHANDLE hwnd, FAR const struct nxgl_rect_s *rect, bool bMore, FAR void *arg) @@ -171,7 +171,7 @@ void CCallback::newMouseEvent(NXHANDLE hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg) { - gvdbg("hwnd=%p pos=(%d,%d) buttons=%02x arg=%p\n", + gvdbg("hwnd=%p pos=(%d,%d) buttons=%02x arg=%p\n", hwnd, pos->x, pos->y, buttons, arg); // The argument must be the CCallback instance |