aboutsummaryrefslogtreecommitdiffstats
path: root/gui.h
diff options
context:
space:
mode:
authorThomas Saunders <trsaunders@gmail.com>2012-06-25 18:51:35 +0100
committerThomas Saunders <trsaunders@gmail.com>2012-06-25 18:51:35 +0100
commita51bb1bf5f298168d9b0964bf3a68a1090f8d00c (patch)
treef0b18420fce805300fbb58388f6e7171bba4b9e4 /gui.h
parent79f7278f3df0c377390653fdab3496371fb1cc66 (diff)
downloaduGFX-a51bb1bf5f298168d9b0964bf3a68a1090f8d00c.tar.gz
uGFX-a51bb1bf5f298168d9b0964bf3a68a1090f8d00c.tar.bz2
uGFX-a51bb1bf5f298168d9b0964bf3a68a1090f8d00c.zip
merge Abhishek's changes, small fixes for API changes
Diffstat (limited to 'gui.h')
-rw-r--r--gui.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/gui.h b/gui.h
index d0ec128a..b4a0ee56 100644
--- a/gui.h
+++ b/gui.h
@@ -1,6 +1,8 @@
#ifndef GUI_H
#define GUI_H
+#include "glcd.h"
+
struct button_t {
uint16_t x0;
uint16_t y0;
@@ -53,7 +55,7 @@ void guiInit(uint16_t updateIntervl);
*
* return: pointer to created thread
*/
-Thread *guiDrawButton(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, unsigned char *str, uint16_t fontColor, uint16_t buttonColor, uint16_t inverval, uint8_t *state);
+Thread *guiDrawButton(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, unsigned char *str, font_t font, uint16_t fontColor, uint16_t buttonColor, uint16_t inverval, uint8_t *state);
/*
* Description: draws a bar graph and updates it's value