diff options
| author | Dave Foster <daf@minuslab.net> | 2007-09-20 22:36:52 -0400 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@gmail.com> | 2010-10-14 15:54:47 +0200 |
| commit | 0ae3388b6a6cef0f33f26369ccc3cdd5687ea930 (patch) | |
| tree | fa8af943b0312d8d3b751b020311829e0c1041f9 /obrender/button.c | |
| parent | 6d30d66efb028fbafb58712aa5b71cadfeef2e32 (diff) | |
Button proper freeing/newing.
Diffstat (limited to 'obrender/button.c')
| -rw-r--r-- | obrender/button.c | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/obrender/button.c b/obrender/button.c index 5d3f9203..399888dc 100644 --- a/obrender/button.c +++ b/obrender/button.c @@ -6,15 +6,12 @@ #include <X11/Xutil.h> #include <string.h> -static void RrButtonFreeReal(RrButton* b); - RrButton *RrButtonNew (const RrInstance *inst) { RrButton *out = NULL; out = g_new(RrButton, 1); out->inst = inst; - out->ref = 1; /* no need to alloc colors, set them null (for freeing later) */ out->focused_unpressed_color = NULL; @@ -60,14 +57,7 @@ RrButton *RrButtonNew (const RrInstance *inst) return out; } -void RrButtonFree(RrButton *b) -{ - b->ref--; - if (b->ref <= 0) - RrButtonFreeReal(b); -} - -void RrButtonFreeReal(RrButton* b) +void RrButtonFree(RrButton* b) { /* colors */ if (b->focused_unpressed_color) @@ -100,4 +90,27 @@ void RrButtonFreeReal(RrButton* b) RrColorFree(b->toggled_unfocused_unpressed_color); /* masks */ + if (mask) RrPixmapMaskFree(mask); + if (pressed_mask) RrPixmapMaskFree(pressed_mask); + if (disabled_mask) RrPixmapMaskFree(disabled_mask); + if (hover_mask) RrPixmapMaskFree(hover_mask); + if (toggled_mask) RrPixmapMaskFree(toggled_mask); + if (toggled_hover_mask) RrPixmapMaskFree(toggled_hover_mask); + if (toggled_pressed_mask) RrPixmapMaskFree(toggled_pressed_mask); + + /* appearances */ + RrAppearanceFree(a_focused_unpressed); + RrAppearanceFree(a_unfocused_unpressed); + RrAppearanceFree(a_focused_pressed); + RrAppearanceFree(a_unfocused_pressed); + RrAppearanceFree(a_disabled_focused); + RrAppearanceFree(a_disabled_unfocused); + RrAppearanceFree(a_hover_focused); + RrAppearanceFree(a_hover_unfocused); + RrAppearanceFree(a_toggled_focused_unpressed); + RrAppearanceFree(a_toggled_unfocused_unpressed); + RrAppearanceFree(a_toggled_focused_pressed); + RrAppearanceFree(a_toggled_unfocused_pressed); + RrAppearanceFree(a_toggled_hover_focused); + RrAppearanceFree(a_toggled_hover_unfocused); } |