diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-01-20 02:56:12 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-01-31 12:25:30 -0500 |
| commit | 29637976e6aecf45bae84ba9ce3ecb26635012f7 (patch) | |
| tree | e1fc7cf42223214e6465f9f0d96dc645bb30cf70 /openbox/popup.c | |
| parent | ea481338b5f16fd81a7b33e036ead39b918a51af (diff) | |
make the window.h interface more consistent with the rest of openbox, hide the window_map behind some functions, and make obdockapps not obwindows anymore
Diffstat (limited to 'openbox/popup.c')
| -rw-r--r-- | openbox/popup.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/openbox/popup.c b/openbox/popup.c index 13465d3f..21beda58 100644 --- 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; |