summaryrefslogtreecommitdiff
path: root/src/widget
diff options
context:
space:
mode:
Diffstat (limited to 'src/widget')
-rw-r--r--src/widget/widget_buttonimage.c10
-rw-r--r--src/widget/widget_buttonimage.h10
-rw-r--r--src/widget/widget_catchkey.c12
-rw-r--r--src/widget/widget_catchkey.h12
-rw-r--r--src/widget/widget_choicegroup.c14
-rw-r--r--src/widget/widget_choicegroup.h12
-rw-r--r--src/widget/widget_textfield.c12
-rw-r--r--src/widget/widget_textfield.h12
8 files changed, 47 insertions, 47 deletions
diff --git a/src/widget/widget_buttonimage.c b/src/widget/widget_buttonimage.c
index a924c5d..ce453fd 100644
--- a/src/widget/widget_buttonimage.c
+++ b/src/widget/widget_buttonimage.c
@@ -10,7 +10,7 @@
#include "widget.h"
#include "widget_buttonimage.h"
-widget_t *buttonImage_new(image_t * image, int x, int y, void (*fce_event) (void *))
+widget_t *button_image_new(image_t * image, int x, int y, void (*fce_event) (void *))
{
widget_buttonimage_t *new;
@@ -24,7 +24,7 @@ widget_t *buttonImage_new(image_t * image, int x, int y, void (*fce_event) (void
return widget_new(WIDGET_TYPE_BUTTONIMAGE, x, y, new->w, new->h, new);
}
-void buttonImage_set_active(widget_t * widget, bool_t active)
+void button_image_set_active(widget_t * widget, bool_t active)
{
widget_buttonimage_t *p;
@@ -35,7 +35,7 @@ void buttonImage_set_active(widget_t * widget, bool_t active)
p->active = active;
}
-void buttonImage_draw(widget_t * widget)
+void button_image_draw(widget_t * widget)
{
widget_buttonimage_t *p;
@@ -46,7 +46,7 @@ void buttonImage_draw(widget_t * widget)
image_draw(p->image, widget->x, widget->y, p->active * p->w, 0, p->w, p->h);
}
-void buttonImage_event(widget_t * widget)
+void button_image_event(widget_t * widget)
{
widget_buttonimage_t *p;
static int my_time = 0;
@@ -72,7 +72,7 @@ void buttonImage_event(widget_t * widget)
}
}
-void buttonImage_destroy(widget_t * widget)
+void button_image_destroy(widget_t * widget)
{
widget_buttonimage_t *p;
diff --git a/src/widget/widget_buttonimage.h b/src/widget/widget_buttonimage.h
index 2b05fe6..58321a4 100644
--- a/src/widget/widget_buttonimage.h
+++ b/src/widget/widget_buttonimage.h
@@ -16,12 +16,12 @@ typedef struct widget_buttonimageimage {
void (*fce_event) (void *);
} widget_buttonimage_t;
-extern widget_t *buttonImage_new(image_t * image, int x, int y,
+extern widget_t *button_image_new(image_t * image, int x, int y,
void (*fce_event) (void *));
-extern void buttonImage_set_active(widget_t * widget, bool_t active);
-extern void buttonImage_draw(widget_t * widget);
-extern void buttonImage_event(widget_t * widget);
-extern void buttonImage_destroy(widget_t * widget);
+extern void button_image_set_active(widget_t * widget, bool_t active);
+extern void button_image_draw(widget_t * widget);
+extern void button_image_event(widget_t * widget);
+extern void button_image_destroy(widget_t * widget);
#endif
diff --git a/src/widget/widget_catchkey.c b/src/widget/widget_catchkey.c
index 6e1268c..b9d1b2d 100644
--- a/src/widget/widget_catchkey.c
+++ b/src/widget/widget_catchkey.c
@@ -9,7 +9,7 @@
#include "widget.h"
#include "widget_catchkey.h"
-widget_t *catchKey_new(int key, int x, int y, void *event)
+widget_t *catch_key_new(int key, int x, int y, void *event)
{
widget_catchkey_t *new;
@@ -21,7 +21,7 @@ widget_t *catchKey_new(int key, int x, int y, void *event)
return widget_new(WIDGET_TYPE_CATCHKEY, x, y, WIDGET_CATCHKEY_WIDTH, WIDGET_CATCHKEY_HEIGHT, new);
}
-int catchKey_get(widget_t * widget)
+int catch_key_get(widget_t * widget)
{
widget_catchkey_t *p;
@@ -33,7 +33,7 @@ int catchKey_get(widget_t * widget)
return p->key;
}
-void catchKey_set(widget_t * widget, int key)
+void catch_key_set(widget_t * widget, int key)
{
widget_catchkey_t *p;
@@ -45,7 +45,7 @@ void catchKey_set(widget_t * widget, int key)
p->key = key;
}
-void catchKey_draw(widget_t * widget)
+void catch_key_draw(widget_t * widget)
{
widget_catchkey_t *p;
char *name;
@@ -93,7 +93,7 @@ static int getPessAnyKey()
return WIDGET_CATCHKEY_NOKEY;
}
-void catchKey_event(widget_t * widget)
+void catch_key_event(widget_t * widget)
{
widget_catchkey_t *p;
int x, y;
@@ -126,7 +126,7 @@ void catchKey_event(widget_t * widget)
}
}
-void catchKey_destroy(widget_t * widget)
+void catch_key_destroy(widget_t * widget)
{
widget_catchkey_t *p;
diff --git a/src/widget/widget_catchkey.h b/src/widget/widget_catchkey.h
index 6a431e4..9a1da1c 100644
--- a/src/widget/widget_catchkey.h
+++ b/src/widget/widget_catchkey.h
@@ -17,11 +17,11 @@ typedef struct widget_catchkey_struct {
void (*fce_event) (void *p);
} widget_catchkey_t;
-extern widget_t *catchKey_new(int key, int x, int y, void *event);
-extern int catchKey_get(widget_t * p);
-extern void catchKey_set(widget_t * p, int key);
-extern void catchKey_draw(widget_t * p);
-extern void catchKey_event(widget_t * p);
-extern void catchKey_destroy(widget_t * p);
+extern widget_t *catch_key_new(int key, int x, int y, void *event);
+extern int catch_key_get(widget_t * p);
+extern void catch_key_set(widget_t * p, int key);
+extern void catch_key_draw(widget_t * p);
+extern void catch_key_event(widget_t * p);
+extern void catch_key_destroy(widget_t * p);
#endif
diff --git a/src/widget/widget_choicegroup.c b/src/widget/widget_choicegroup.c
index 700c043..0f5ba13 100644
--- a/src/widget/widget_choicegroup.c
+++ b/src/widget/widget_choicegroup.c
@@ -9,7 +9,7 @@
#include "widget.h"
#include "widget_choicegroup.h"
-widget_t *choiceGroup_new(int x, int y, bool_t status, list_t * list, void (*fce_event) (void *))
+widget_t *choice_group_new(int x, int y, bool_t status, list_t * list, void (*fce_event) (void *))
{
widget_choicegroup_t *new;
widget_t *widget;
@@ -27,7 +27,7 @@ widget_t *choiceGroup_new(int x, int y, bool_t status, list_t * list, void (*fce
return widget;
}
-void choiceGroup_draw(widget_t * widget)
+void choice_group_draw(widget_t * widget)
{
widget_choicegroup_t *p;
static image_t *g_choicegroup = NULL;
@@ -55,7 +55,7 @@ void choiceGroup_draw(widget_t * widget)
WIDGET_CHOICEGROUP_WIDTH, WIDGET_CHOICEGROUP_HEIGHT);
}
-void choiceGroup_set_active(widget_t * widget)
+void choice_group_set_active(widget_t * widget)
{
widget_choicegroup_t *p;
int i;
@@ -82,7 +82,7 @@ void choiceGroup_set_active(widget_t * widget)
}
}
-bool_t choiceGroup_get_status(widget_t * widget)
+bool_t choice_group_get_status(widget_t * widget)
{
widget_choicegroup_t *p;
@@ -105,7 +105,7 @@ void choiceGroup_set_status(widget_t * widget, bool_t status)
p->status = status;
}
-void choiceGroup_event(widget_t * widget)
+void choice_group_event(widget_t * widget)
{
widget_choicegroup_t *p;
int x, y;
@@ -125,11 +125,11 @@ void choiceGroup_event(widget_t * widget)
if (x >= widget->x && x <= widget->x + WIDGET_CHOICEGROUP_WIDTH &&
y >= widget->y && y <= widget->y + WIDGET_CHOICEGROUP_HEIGHT &&
interface_is_mouse_clicket()) {
- choiceGroup_set_active(widget);
+ choice_group_set_active(widget);
}
}
-void choiceGroup_destroy(widget_t * widget)
+void choice_group_destroy(widget_t * widget)
{
widget_choicegroup_t *p;
int my_index;
diff --git a/src/widget/widget_choicegroup.h b/src/widget/widget_choicegroup.h
index a74b0d8..64f8ce4 100644
--- a/src/widget/widget_choicegroup.h
+++ b/src/widget/widget_choicegroup.h
@@ -19,15 +19,15 @@ typedef struct widget_choicegroup {
list_t *list;
} widget_choicegroup_t;
-extern widget_t *choiceGroup_new(int x, int y, bool_t status,
+extern widget_t *choice_group_new(int x, int y, bool_t status,
list_t * list,
void (*fce_event) (void *));
-extern void choiceGroup_draw(widget_t * p);
-extern void choiceGroup_set_active(widget_t * widget);
-extern bool_t choiceGroup_get_status(widget_t * widget);
+extern void choice_group_draw(widget_t * p);
+extern void choice_group_set_active(widget_t * widget);
+extern bool_t choice_group_get_status(widget_t * widget);
extern void choiceGroup_set_status(widget_t * widget, bool_t status);
-extern void choiceGroup_event(widget_t * p);
-extern void choiceGroup_destroy(widget_t * p);
+extern void choice_group_event(widget_t * p);
+extern void choice_group_destroy(widget_t * p);
#endif
diff --git a/src/widget/widget_textfield.c b/src/widget/widget_textfield.c
index 07481b9..52e2996 100644
--- a/src/widget/widget_textfield.c
+++ b/src/widget/widget_textfield.c
@@ -12,7 +12,7 @@
//#define ZZEEXX86_READKEY
-widget_t *textField_new(char *text, int filter, int x, int y)
+widget_t *text_field_new(char *text, int filter, int x, int y)
{
widget_textfield_t *new;
@@ -88,7 +88,7 @@ static void drawText(widget_t * widget)
widget->y + WIDGET_TEXTFIELD_HEIGHT / 2 - p->h / 2, COLOR_WHITE);
}
-void textField_draw(widget_t * widget)
+void text_field_draw(widget_t * widget)
{
assert(widget != NULL);
assert(widget->type == WIDGET_TYPE_TEXTFILED);
@@ -97,7 +97,7 @@ void textField_draw(widget_t * widget)
drawText(widget);
}
-void textField_set_text(widget_t * widget, char *text)
+void text_field_set_text(widget_t * widget, char *text)
{
widget_textfield_t *p;
@@ -111,7 +111,7 @@ void textField_set_text(widget_t * widget, char *text)
font_text_size(text, &p->w, &p->h);
}
-char *textField_get_text(widget_t * widget)
+char *text_field_get_text(widget_t * widget)
{
widget_textfield_t *p;
@@ -406,7 +406,7 @@ static void readKey(widget_textfield_t * p)
}
#endif
-void textField_event(widget_t * widget)
+void text_field_event(widget_t * widget)
{
widget_textfield_t *p;
int x, y;
@@ -430,7 +430,7 @@ void textField_event(widget_t * widget)
readKey(p);
}
-void textField_destroy(widget_t * widget)
+void text_field_destroy(widget_t * widget)
{
widget_textfield_t *p;
diff --git a/src/widget/widget_textfield.h b/src/widget/widget_textfield.h
index 7f8e198..b255694 100644
--- a/src/widget/widget_textfield.h
+++ b/src/widget/widget_textfield.h
@@ -31,11 +31,11 @@ typedef struct widget_textfield {
bool_t active;
} widget_textfield_t;
-extern widget_t *textField_new(char *text, int filter, int x, int y);
-extern void textField_set_text(widget_t * widget, char *text);
-extern char *textField_get_text(widget_t * widget);
-extern void textField_draw(widget_t * widget);
-extern void textField_event(widget_t * widget);
-extern void textField_destroy(widget_t * widget);
+extern widget_t *text_field_new(char *text, int filter, int x, int y);
+extern void text_field_set_text(widget_t * widget, char *text);
+extern char *text_field_get_text(widget_t * widget);
+extern void text_field_draw(widget_t * widget);
+extern void text_field_event(widget_t * widget);
+extern void text_field_destroy(widget_t * widget);
#endif