8 files changed, 13 insertions, 6 deletions
diff --git a/fw/fe310/eos/eve/widget/freew.c b/fw/fe310/eos/eve/widget/freew.c
index 51d1ead..eaf982c 100644
--- a/fw/fe310/eos/eve/widget/freew.c
+++ b/fw/fe310/eos/eve/widget/freew.c
@@ -7,6 +7,7 @@
 
 #include "screen/screen.h"
 #include "screen/window.h"
+#include "screen/view.h"
 #include "screen/page.h"
 
 #include "font.h"
diff --git a/fw/fe310/eos/eve/widget/label.c b/fw/fe310/eos/eve/widget/label.c
index b4af37f..728f0bb 100644
--- a/fw/fe310/eos/eve/widget/label.c
+++ b/fw/fe310/eos/eve/widget/label.c
@@ -7,6 +7,7 @@
 
 #include "screen/screen.h"
 #include "screen/window.h"
+#include "screen/view.h"
 #include "screen/page.h"
 
 #include "font.h"
diff --git a/fw/fe310/eos/eve/widget/pagew.c b/fw/fe310/eos/eve/widget/pagew.c
index b3e71a6..319e207 100644
--- a/fw/fe310/eos/eve/widget/pagew.c
+++ b/fw/fe310/eos/eve/widget/pagew.c
@@ -7,6 +7,7 @@
 
 #include "screen/screen.h"
 #include "screen/window.h"
+#include "screen/view.h"
 #include "screen/page.h"
 
 #include "font.h"
@@ -20,7 +21,7 @@ int eve_pagew_create(EVEPageWidget *widget, EVERect *g, EVEPageSpec *spec) {
     return EVE_OK;
 }
 
-void eve_pagew_init(EVEPageWidget *widget, EVERect *g, EVEFont *font, char *title, eve_page_constructor_t constructor) {
+void eve_pagew_init(EVEPageWidget *widget, EVERect *g, EVEFont *font, char *title, eve_view_constructor_t constructor) {
     EVEWidget *_widget = &widget->w;
 
     memset(widget, 0, sizeof(EVEPageWidget));
@@ -28,7 +29,7 @@ void eve_pagew_init(EVEPageWidget *widget, EVERect *g, EVEFont *font, char *titl
     eve_pagew_update(widget, font, title, constructor);
 }
 
-void eve_pagew_update(EVEPageWidget *widget, EVEFont *font, char *title, eve_page_constructor_t constructor) {
+void eve_pagew_update(EVEPageWidget *widget, EVEFont *font, char *title, eve_view_constructor_t constructor) {
     EVEWidget *_widget = &widget->w;
 
     if (font) widget->font = font;
diff --git a/fw/fe310/eos/eve/widget/pagew.h b/fw/fe310/eos/eve/widget/pagew.h
index 797f1c3..67b1199 100644
--- a/fw/fe310/eos/eve/widget/pagew.h
+++ b/fw/fe310/eos/eve/widget/pagew.h
@@ -4,19 +4,19 @@ typedef struct EVEPageWidget {
     EVEWidget w;
     char *title;
     EVEFont *font;
-    eve_page_constructor_t constructor;
+    eve_view_constructor_t constructor;
     uint8_t tag;
 } EVEPageWidget;
 
 typedef struct EVEPageSpec {
     EVEFont *font;
     char *title;
-    eve_page_constructor_t constructor;
+    eve_view_constructor_t constructor;
 } EVEPageSpec;
 
 int eve_pagew_create(EVEPageWidget *widget, EVERect *g, EVEPageSpec *spec);
-void eve_pagew_init(EVEPageWidget *widget, EVERect *g, EVEFont *font, char *title, eve_page_constructor_t constructor);
-void eve_pagew_update(EVEPageWidget *widget, EVEFont *font, char *title, eve_page_constructor_t constructor);
+void eve_pagew_init(EVEPageWidget *widget, EVERect *g, EVEFont *font, char *title, eve_view_constructor_t constructor);
+void eve_pagew_update(EVEPageWidget *widget, EVEFont *font, char *title, eve_view_constructor_t constructor);
 
 int eve_pagew_touch(EVEWidget *_widget, EVEPage *page, uint8_t tag0, int touch_idx);
 uint8_t eve_pagew_draw(EVEWidget *_widget, EVEPage *page, uint8_t tag0);
diff --git a/fw/fe310/eos/eve/widget/spacerw.c b/fw/fe310/eos/eve/widget/spacerw.c
index 23aec14..e53c9c1 100644
--- a/fw/fe310/eos/eve/widget/spacerw.c
+++ b/fw/fe310/eos/eve/widget/spacerw.c
@@ -7,6 +7,7 @@
 
 #include "screen/screen.h"
 #include "screen/window.h"
+#include "screen/view.h"
 #include "screen/page.h"
 
 #include "font.h"
diff --git a/fw/fe310/eos/eve/widget/strw.c b/fw/fe310/eos/eve/widget/strw.c
index 4344e7c..0e1c97f 100644
--- a/fw/fe310/eos/eve/widget/strw.c
+++ b/fw/fe310/eos/eve/widget/strw.c
@@ -7,6 +7,7 @@
 
 #include "screen/screen.h"
 #include "screen/window.h"
+#include "screen/view.h"
 #include "screen/page.h"
 
 #include "clipb.h"
diff --git a/fw/fe310/eos/eve/widget/textw.c b/fw/fe310/eos/eve/widget/textw.c
index dd11c11..c81031a 100644
--- a/fw/fe310/eos/eve/widget/textw.c
+++ b/fw/fe310/eos/eve/widget/textw.c
@@ -7,6 +7,7 @@
 
 #include "screen/screen.h"
 #include "screen/window.h"
+#include "screen/view.h"
 #include "screen/page.h"
 
 #include "clipb.h"
diff --git a/fw/fe310/eos/eve/widget/widget.c b/fw/fe310/eos/eve/widget/widget.c
index 7c1fcad..1d610bf 100644
--- a/fw/fe310/eos/eve/widget/widget.c
+++ b/fw/fe310/eos/eve/widget/widget.c
@@ -7,6 +7,7 @@
 
 #include "screen/screen.h"
 #include "screen/window.h"
+#include "screen/view.h"
 #include "screen/page.h"
 
 #include "widgets.h"