simplify window.h macros, and rename the window types to ObWindowClass for consistent...

[chaz/openbox] / openbox / window.c

diff --git a/openbox/window.c b/openbox/window.c
index 32f1ea52ca0aae9d9b84ee6ab9c3773946959349..f094602cbdb26c34428a4d6eeb5bb5c22263d200 100644 (file)
--- a/openbox/window.c
+++ b/openbox/window.c
@@ -52,8 +52,8 @@ Window window_top(ObWindow *self)
         return WINDOW_AS_DOCK(self)->frame;
     case OB_WINDOW_CLASS_CLIENT:
         return WINDOW_AS_CLIENT(self)->frame->window;
-    case OB_WINDOW_CLASS_INTERNALWINDOW:
-        return WINDOW_AS_INTERNALWINDOW(self)->window;
+    case OB_WINDOW_CLASS_INTERNAL:
+        return WINDOW_AS_INTERNAL(self)->window;
     }
     g_assert_not_reached();
     return None;
@@ -67,7 +67,7 @@ ObStackingLayer window_layer(ObWindow *self)
     case OB_WINDOW_CLASS_CLIENT:
         return ((ObClient*)self)->layer;
     case OB_WINDOW_CLASS_MENUFRAME:
-    case OB_WINDOW_CLASS_INTERNALWINDOW:
+    case OB_WINDOW_CLASS_INTERNAL:
         return OB_STACKING_LAYER_INTERNAL;
     }
     g_assert_not_reached();