Compilation fixes

radio/src/thirdparty/libopenui/src/choice.h

@@ -20,7 +20,6 @@
 #ifndef _CHOICE_H_
 #define _CHOICE_H_
 
-#include <string>
 #include "form.h"
 
 class Choice : public FormField {

radio/src/thirdparty/libopenui/src/coloredit.cpp

@@ -18,6 +18,7 @@
  */
 
 #include "coloredit.h"
+#include "libopenui_globals.h"
 #include "numberedit.h"
 #include "bitfield.h"
 

radio/src/thirdparty/libopenui/src/keyboard_number.cpp

@@ -20,6 +20,7 @@
 #include "keyboard_number.h"
 #include "button.h"
 #include "basenumberedit.h"
+#include "libopenui_globals.h"
 
 constexpr coord_t KEYBOARD_HEIGHT = 90;
 

radio/src/thirdparty/libopenui/src/libopenui_depends.h

@@ -24,7 +24,6 @@
 #include "libopenui_config.h"
 
 void lcdNextLayer();
-void lcdSetColor(uint16_t color);
 void DMACopyBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint16_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h);
 void DMACopyAlphaBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint16_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h);
 void onKeyPress();

radio/src/thirdparty/libopenui/src/libopenui_globals.h

@@ -27,4 +27,9 @@ extern uint16_t lcdColorTable[LCD_COLOR_COUNT];
 extern const uint16_t * const fontspecsTable[FONT_TABLE_SIZE];
 extern const uint8_t * fontsTable[FONT_TABLE_SIZE];
 
+inline void lcdSetColor(uint16_t color)
+{
+  lcdColorTable[CUSTOM_COLOR_INDEX] = color;
+}
+
 #endif // _LIBOPEUI_GLOBALS_H_

radio/src/thirdparty/libopenui/src/menu.cpp

@@ -107,9 +107,9 @@ void Menu::addLine(const std::string & text, std::function<void()> onPress)
   updatePosition();
 }
 
-void Menu::addLine(std::function<void(BitmapBuffer * dc, coord_t x, coord_t y, LcdFlags flags)> drawLine, std::function<void()> onPress)
+void Menu::addCustomLine(std::function<void(BitmapBuffer * dc, coord_t x, coord_t y, LcdFlags flags)> drawLine, std::function<void()> onPress)
 {
-  menuWindow.addLine(drawLine, std::move(onPress));
+  menuWindow.addCustomLine(drawLine, std::move(onPress));
   updatePosition();
 }
 

radio/src/thirdparty/libopenui/src/menu.h

@@ -23,7 +23,6 @@
 #include <vector>
 #include <functional>
 #include <utility>
-#include <string>
 #include "mainwindow.h"
 
 class Menu;
@@ -78,7 +77,7 @@ class MenuWindow: public Window {
       invalidate();
     }
 
-    void addLine(std::function<void(BitmapBuffer * dc, coord_t x, coord_t y, LcdFlags flags)> drawLine, std::function<void()> onPress)
+    void addCustomLine(std::function<void(BitmapBuffer * dc, coord_t x, coord_t y, LcdFlags flags)> drawLine, std::function<void()> onPress)
     {
       lines.emplace_back(drawLine, onPress);
       invalidate();
@@ -162,7 +161,7 @@ class Menu : public Window {
 
     void addLine(const std::string & text, std::function<void()> onPress);
 
-    void addLine(std::function<void(BitmapBuffer * dc, coord_t x, coord_t y, LcdFlags flags)> drawLine, std::function<void()> onPress);
+    void addCustomLine(std::function<void(BitmapBuffer * dc, coord_t x, coord_t y, LcdFlags flags)> drawLine, std::function<void()> onPress);
 
     void removeLines();
 

radio/src/thirdparty/libopenui/src/static.h

@@ -20,7 +20,6 @@
 #ifndef _STATIC_H_
 #define _STATIC_H_
 
-#include <string>
 #include "window.h"
 #include "button.h" // TODO just for BUTTON_BACKGROUND