From 85bb4ad9cb820ac3b8e935a930084a06cbfd2847 Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Mon, 11 Apr 2016 13:00:20 +0200 Subject: Imported Upstream version 0.6.3 --- FunctionBar.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'FunctionBar.c') diff --git a/FunctionBar.c b/FunctionBar.c index 7f04d8e..1140267 100644 --- a/FunctionBar.c +++ b/FunctionBar.c @@ -28,25 +28,23 @@ typedef struct FunctionBar_ { bool staticData; } FunctionBar; -extern char* FUNCTIONBAR_CLASS; - }*/ -/* private property */ +#ifdef DEBUG char* FUNCTIONBAR_CLASS = "FunctionBar"; +#else +#define FUNCTIONBAR_CLASS NULL +#endif -/* private property */ static char* FunctionBar_FKeys[10] = {"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10"}; -/* private property */ static char* FunctionBar_FLabels[10] = {" ", " ", " ", " ", " ", " ", " ", " ", " ", " "}; -/* private property */ static int FunctionBar_FEvents[10] = {KEY_F(1), KEY_F(2), KEY_F(3), KEY_F(4), KEY_F(5), KEY_F(6), KEY_F(7), KEY_F(8), KEY_F(9), KEY_F(10)}; FunctionBar* FunctionBar_new(int size, char** functions, char** keys, int* events) { FunctionBar* this = malloc(sizeof(FunctionBar)); - ((Object*) this)->class = FUNCTIONBAR_CLASS; + Object_setClass(this, FUNCTIONBAR_CLASS); ((Object*) this)->delete = FunctionBar_delete; this->functions = functions; this->size = size; -- cgit v1.2.3