NxWM::CMediaPlayer: Convert CLabel to a CListBox

6 files changed, 20 insertions, 8 deletions

diff --git a/NxWidgets/libnxwidgets/include/clistbox.hxx b/NxWidgets/libnxwidgets/include/clistbox.hxx
index d4861af8c..07a6296e8 100644
--- a/NxWidgets/libnxwidgets/include/clistbox.hxx
+++ b/NxWidgets/libnxwidgets/include/clistbox.hxx
@@ -259,7 +259,7 @@ namespace NXWidgets
     virtual void selectOption(const int index);
 
     /**
-     * Select an option by its index.
+     * De-select an option by its index.
      * Redraws the widget and raises a value changed event.
      *
      * @param index The index of the option to select.
diff --git a/NxWidgets/libnxwidgets/include/cnxwidget.hxx b/NxWidgets/libnxwidgets/include/cnxwidget.hxx
index dd1880cc2..543c0b24b 100644
--- a/NxWidgets/libnxwidgets/include/cnxwidget.hxx
+++ b/NxWidgets/libnxwidgets/include/cnxwidget.hxx
@@ -801,6 +801,7 @@ namespace NXWidgets
      *
      * @return Const pointer to CWidgetStyle stored inside this widget.
      */
+
     inline const CWidgetStyle *getWidgetStyle() const { return &m_style; }
 
     /**
@@ -867,6 +868,17 @@ namespace NXWidgets
       m_widgetEventHandlers->removeWidgetEventHandler(eventHandler);
     }
 
+   /**
+     * Return the number of registered event handlers
+     *
+     * @return The number of registered event handlers
+     */
+
+    inline int nWidgetEventHandlers(void) const
+    {
+      return m_widgetEventHandlers->size();
+    }
+
     /**
      * Enables or disables event firing for this widget.
      *
diff --git a/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx b/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx
index 7d5424365..66f5cd654 100644
--- a/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx
+++ b/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx
@@ -151,7 +151,7 @@ namespace NXWidgets
      * @return The size of the array.
      */
 
-    inline nxgl_coord_t size(void) const
+    inline int size(void) const
     {
       return m_widgetEventHandlers.size();
     }
diff --git a/NxWidgets/libnxwidgets/src/clistbox.cxx b/NxWidgets/libnxwidgets/src/clistbox.cxx
index d37915e42..8d076f3d3 100644
--- a/NxWidgets/libnxwidgets/src/clistbox.cxx
+++ b/NxWidgets/libnxwidgets/src/clistbox.cxx
@@ -73,8 +73,8 @@
 
 #include <nuttx/config.h>
 
-#include <stdint.h>
-#include <stdbool.h>
+#include <cstdint>
+#include <cstdbool>
 
 #include "cwidgetcontrol.hxx"
 #include "clistbox.hxx"
diff --git a/NxWidgets/libnxwidgets/src/cnxwidget.cxx b/NxWidgets/libnxwidgets/src/cnxwidget.cxx
index 7db9eee99..99f7014cc 100644
--- a/NxWidgets/libnxwidgets/src/cnxwidget.cxx
+++ b/NxWidgets/libnxwidgets/src/cnxwidget.cxx
@@ -73,8 +73,8 @@
 
 #include <nuttx/config.h>
 
-#include <stdint.h>
-#include <stdbool.h>
+#include <cstdint>
+#include <cstdbool>
 
 #include "cnxwidget.hxx"
 #include "cgraphicsport.hxx"
diff --git a/NxWidgets/libnxwidgets/src/cwidgeteventhandlerlist.cxx b/NxWidgets/libnxwidgets/src/cwidgeteventhandlerlist.cxx
index 840778bac..d3f0bfe9e 100644
--- a/NxWidgets/libnxwidgets/src/cwidgeteventhandlerlist.cxx
+++ b/NxWidgets/libnxwidgets/src/cwidgeteventhandlerlist.cxx
@@ -73,8 +73,8 @@
 
 #include <nuttx/config.h>
 
-#include <stdint.h>
-#include <stdbool.h>
+#include <cstdint>
+#include <cstdbool>
 
 #include "cnxwidget.hxx"
 #include "cwidgeteventhandler.hxx"