From c74c38760df69bb87e93dff18cf91464e5d02f37 Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Mon, 11 Apr 2016 13:00:22 +0200 Subject: Imported Upstream version 0.8.1 --- MetersPanel.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'MetersPanel.c') diff --git a/MetersPanel.c b/MetersPanel.c index b87f510..549d8fe 100644 --- a/MetersPanel.c +++ b/MetersPanel.c @@ -20,32 +20,14 @@ typedef struct MetersPanel_ { }*/ -MetersPanel* MetersPanel_new(Settings* settings, char* header, Vector* meters, ScreenManager* scr) { - MetersPanel* this = (MetersPanel*) malloc(sizeof(MetersPanel)); - Panel* super = (Panel*) this; - Panel_init(super, 1, 1, 1, 1, LISTITEM_CLASS, true); - ((Object*)this)->delete = MetersPanel_delete; - - this->settings = settings; - this->meters = meters; - this->scr = scr; - super->eventHandler = MetersPanel_EventHandler; - Panel_setHeader(super, header); - for (int i = 0; i < Vector_size(meters); i++) { - Meter* meter = (Meter*) Vector_get(meters, i); - Panel_add(super, (Object*) Meter_toListItem(meter)); - } - return this; -} - -void MetersPanel_delete(Object* object) { +static void MetersPanel_delete(Object* object) { Panel* super = (Panel*) object; MetersPanel* this = (MetersPanel*) object; Panel_done(super); free(this); } -HandlerResult MetersPanel_EventHandler(Panel* super, int ch) { +static HandlerResult MetersPanel_EventHandler(Panel* super, int ch) { MetersPanel* this = (MetersPanel*) super; int selected = Panel_getSelectedIndex(super); @@ -103,3 +85,21 @@ HandlerResult MetersPanel_EventHandler(Panel* super, int ch) { } return result; } + +MetersPanel* MetersPanel_new(Settings* settings, char* header, Vector* meters, ScreenManager* scr) { + MetersPanel* this = (MetersPanel*) malloc(sizeof(MetersPanel)); + Panel* super = (Panel*) this; + Panel_init(super, 1, 1, 1, 1, LISTITEM_CLASS, true); + ((Object*)this)->delete = MetersPanel_delete; + + this->settings = settings; + this->meters = meters; + this->scr = scr; + super->eventHandler = MetersPanel_EventHandler; + Panel_setHeader(super, header); + for (int i = 0; i < Vector_size(meters); i++) { + Meter* meter = (Meter*) Vector_get(meters, i); + Panel_add(super, (Object*) Meter_toListItem(meter)); + } + return this; +} -- cgit v1.2.3