make the window.h interface more consistent with the rest of openbox, hide the window...

[chaz/openbox] / openbox / popup.c

diff --git a/openbox/popup.c b/openbox/popup.c
index 13465d3f050b481303093f1ea805e9102ee5f326..21beda58faccbd04d4c7c17d44f2de0c1c466abe 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -33,7 +33,7 @@ ObPopup *popup_new(void)
     XSetWindowAttributes attrib;
     ObPopup *self = g_new0(ObPopup, 1);
 
-    self->obwin.type = Window_Internal;
+    self->obwin.type = OB_WINDOW_CLASS_INTERNALWINDOW;
     self->gravity = NorthWestGravity;
     self->x = self->y = self->textw = self->h = 0;
     self->a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
@@ -56,8 +56,8 @@ ObPopup *popup_new(void)
 
     XMapWindow(obt_display, self->text);
 
-    stacking_add(INTERNAL_AS_WINDOW(self));
-    g_hash_table_insert(window_map, &self->bg, self);
+    stacking_add(INTERNALWINDOW_AS_WINDOW(self));
+    window_add(&self->bg, INTERNALWINDOW_AS_WINDOW(self));
     return self;
 }
 
@@ -68,7 +68,7 @@ void popup_free(ObPopup *self)
         XDestroyWindow(obt_display, self->text);
         RrAppearanceFree(self->a_bg);
         RrAppearanceFree(self->a_text);
-        g_hash_table_remove(window_map, &self->bg);
+        window_remove(self->bg);
         stacking_remove(self);
         g_free(self);
     }
@@ -141,7 +141,7 @@ static gboolean popup_show_timeout(gpointer data)
     ObPopup *self = data;
 
     XMapWindow(obt_display, self->bg);
-    stacking_raise(INTERNAL_AS_WINDOW(self));
+    stacking_raise(INTERNALWINDOW_AS_WINDOW(self));
     self->mapped = TRUE;
     self->delay_mapped = FALSE;