diff options
author | Bartosz Fenski <fenio@debian.org> | 2006-08-14 13:03:15 +0200 |
---|---|---|
committer | Daniel Lange <DLange@git.local> | 2016-04-11 13:00:21 +0200 |
commit | 8ae888dfb193b86560b4d874767c347bf2be8097 (patch) | |
tree | d82d76a4fb242d84ab6371f76ca88459d9d8b98e /FunctionBar.c | |
parent | f520e61979ccb94cf3f6f8e5c67784c6c260924e (diff) | |
parent | 85bb4ad9cb820ac3b8e935a930084a06cbfd2847 (diff) | |
download | debian_htop-8ae888dfb193b86560b4d874767c347bf2be8097.tar.gz debian_htop-8ae888dfb193b86560b4d874767c347bf2be8097.tar.bz2 debian_htop-8ae888dfb193b86560b4d874767c347bf2be8097.zip |
Imported Debian patch 0.6.3-1debian/0.6.3-1
Diffstat (limited to 'FunctionBar.c')
-rw-r--r-- | FunctionBar.c | 12 |
1 files changed, 5 insertions, 7 deletions
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; |