Remove unneeded obrender/button.h

[chaz/openbox] / obrender / button.c

diff --git a/obrender/button.c b/obrender/button.c
index 399888dc8f389e546c29253ce380531c65945d96..35437afdc961be49840e720b3d0e411808f1e637 100644 (file)
--- a/obrender/button.c
+++ b/obrender/button.c
@@ -1,6 +1,25 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   button.c for the Openbox window manager
+   Copyright (c) 2012        Mikael Magnusson
+   Copyright (c) 2012        Dana Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "render.h"
-#include "button.h"
 #include "instance.h"
+#include "mask.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -57,7 +76,7 @@ RrButton *RrButtonNew (const RrInstance *inst)
     return out;
 }
 
-void RrButtonFree(RrButton* b)
+void RrButtonFree(RrButton *b)
 {
     /* colors */
     if (b->focused_unpressed_color) 
@@ -90,27 +109,27 @@ void RrButtonFree(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);
+    if (b->mask) RrPixmapMaskFree(b->mask);
+    if (b->pressed_mask) RrPixmapMaskFree(b->pressed_mask);
+    if (b->disabled_mask) RrPixmapMaskFree(b->disabled_mask);
+    if (b->hover_mask) RrPixmapMaskFree(b->hover_mask);
+    if (b->toggled_mask) RrPixmapMaskFree(b->toggled_mask);
+    if (b->toggled_hover_mask) RrPixmapMaskFree(b->toggled_hover_mask);
+    if (b->toggled_pressed_mask) RrPixmapMaskFree(b->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);
+    RrAppearanceFree(b->a_focused_unpressed);
+    RrAppearanceFree(b->a_unfocused_unpressed);
+    RrAppearanceFree(b->a_focused_pressed);
+    RrAppearanceFree(b->a_unfocused_pressed);
+    RrAppearanceFree(b->a_disabled_focused);
+    RrAppearanceFree(b->a_disabled_unfocused);
+    RrAppearanceFree(b->a_hover_focused);
+    RrAppearanceFree(b->a_hover_unfocused);
+    RrAppearanceFree(b->a_toggled_focused_unpressed);
+    RrAppearanceFree(b->a_toggled_unfocused_unpressed);
+    RrAppearanceFree(b->a_toggled_focused_pressed);
+    RrAppearanceFree(b->a_toggled_unfocused_pressed);
+    RrAppearanceFree(b->a_toggled_hover_focused);
+    RrAppearanceFree(b->a_toggled_hover_unfocused);
 }