prefixing and capitalizing the StackLayer -> ObStackingLayer enum.

[chaz/openbox] / openbox / window.c

diff --git a/openbox/window.c b/openbox/window.c
index ed139b64e04483030e908e0bff9ee16deeb1377d..8ca01b6f76838173f93b79500d94839bcd8ac18f 100644 (file)
--- a/openbox/window.c
+++ b/openbox/window.c
@@ -23,13 +23,13 @@ Window window_top(ObWindow *self)
     case Window_Menu:
         return ((Menu*)self)->frame;
     case Window_Dock:
-        return ((Dock*)self)->frame;
+        return ((ObDock*)self)->frame;
     case Window_DockApp:
         /* not to be used for stacking */
         g_assert_not_reached();
         break;
     case Window_Client:
-        return ((Client*)self)->frame->window;
+        return ((ObClient*)self)->frame->window;
     case Window_Internal:
         return ((InternalWindow*)self)->win;
     }
@@ -41,7 +41,7 @@ Window window_layer(ObWindow *self)
 {
     switch (self->type) {
     case Window_Menu:
-        return Layer_Internal;
+        return OB_STACKING_LAYER_INTERNAL;
     case Window_Dock:
         return config_dock_layer;
     case Window_DockApp:
@@ -49,9 +49,9 @@ Window window_layer(ObWindow *self)
         g_assert_not_reached();
         break;
     case Window_Client:
-        return ((Client*)self)->layer;
+        return ((ObClient*)self)->layer;
     case Window_Internal:
-        return Layer_Internal;
+        return OB_STACKING_LAYER_INTERNAL;
     }
     g_assert_not_reached();
     return None;