Diff: Widgets/TextWidget.h

Revision:

2:bb9183379488

Parent:

1:48796b602c86

Child:

3:cb004f59b715

--- a/Widgets/TextWidget.h	Fri Mar 25 16:47:33 2016 +0000
+++ b/Widgets/TextWidget.h	Fri Mar 25 18:58:50 2016 +0000
@@ -2,6 +2,7 @@
 #define SIMPLEGUI_TEXT_WIDGET_H
 
 #include "Widget.h"
+#include "Font.h"
 
 class TextWidget : public Widget {
     
@@ -10,7 +11,7 @@
         TextWidget(GraphicsDisplay* display);
                 
         // Ccncrete methods for this class
-        virtual void setFont(unsigned char* f, unsigned char firstascii=32, unsigned char lastascii=127, bool proportional = true);
+        virtual void setFont(Font* font);
 
         virtual void setText(char* text);
     
@@ -21,9 +22,7 @@
     protected:
     
         char *_text;
-        unsigned char *_font;
-        uint8_t _fontWidth, _fontHeight, _fontBytesPerLine, _fontOffset;
-        uint8_t _fontFirstAscii, _fontLastAscii, _fontProportional;
+        Font* _font;
 };
 
 #endif
\ No newline at end of file