fixed emscripten build

eez-open · Mar 18, 2020 · 4c1e164 · 4c1e164
1 parent a82cf1e
commit 4c1e164
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/eez/gui/action_impl.cpp b/src/eez/gui/action_impl.cpp
@@ -252,11 +252,13 @@ void action_show_sys_settings_ethernet() {
 }
 
 void action_show_sys_settings_ethernet_error() {
+#if OPTION_ETHERNET    
     if (persist_conf::devConf.mqttEnabled && mqtt::g_connectionState == mqtt::CONNECTION_STATE_ERROR) {
         pushPage(PAGE_ID_SYS_SETTINGS_MQTT);
     } else {
         pushPage(PAGE_ID_SYS_SETTINGS_ETHERNET);
     }
+#endif
 }
 
 void action_show_sys_settings_protections() {

diff --git a/src/eez/modules/psu/gui/psu.h b/src/eez/modules/psu/gui/psu.h
@@ -199,8 +199,8 @@ class PsuAppContext : public AppContext {
     bool isAutoRepeatAction(int action) override;
     void onPageTouch(const WidgetCursor &foundWidget, Event &touchEvent) override;
     bool testExecuteActionOnTouchDown(int action) override;
-    bool canExecuteActionWhenTouchedOutsideOfActivePage(int pageId, int action);
-    void updatePage(int i, WidgetCursor &widgetCursor);
+    bool canExecuteActionWhenTouchedOutsideOfActivePage(int pageId, int action) override;
+    void updatePage(int i, WidgetCursor &widgetCursor) override;
 
 private:
     void doShowProgressPage();

diff --git a/src/eez/platform/simulator/front_panel.h b/src/eez/platform/simulator/front_panel.h
@@ -27,7 +27,7 @@ namespace gui {
 
 class FrontPanelAppContext : public AppContext {
 public:
-    void stateManagment();
+    void stateManagment() override;
 
     int getLongTouchActionHook(const WidgetCursor &widgetCursor) override;