- vsetky widegety pouzivaju widget_t

  ( priparava na kontajner s widgetmi )
 


git-svn-id: http://opensvn.csie.org/tuxanci_ng@201 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

1 files changed, 6 insertions, 7 deletions

diff --git a/src/widget/widget_button.h b/src/widget/widget_button.h
index 5090e55..4bdf7c0 100644
--- a/src/widget/widget_button.h
+++ b/src/widget/widget_button.h
@@ -4,6 +4,7 @@
 #define WIDGET_BUTTON_H
 
 #include "main.h"
+#include "widget.h"
 
 #define WIDGET_BUTTON_TIME	10
 
@@ -12,16 +13,14 @@
 
 typedef struct widget_button
 {
-	int x, y;
-	int w, h;
 	char *text;
+	int w, h;
 	void (*fce_event)(void *);
 } widget_button_t;
 
-extern widget_button_t* newWidgetButton(char *text, int x, int y, void (*fce_event)(void *));
-extern void drawWidgetButton(widget_button_t *p);
-extern void eventWidgetButton(widget_button_t *p);
-extern void destroyWidgetButton(widget_button_t *p);
+extern widget_t* newWidgetButton(char *text, int x, int y, void (*fce_event)(void *));
+extern void drawWidgetButton(widget_t *widget);
+extern void eventWidgetButton(widget_t *widget);
+extern void destroyWidgetButton(widget_t *widget);
 
 #endif
-