new method for loading menu files etc

[chaz/openbox] / openbox / window.c

diff --git a/openbox/window.c b/openbox/window.c
index 15cebcd746e430e3721e2f546af50d2a0aeed86d..3f28a93f1dbe86d25524c14e81a2efafe34c6f8e 100644 (file)
--- a/openbox/window.c
+++ b/openbox/window.c
@@ -1,5 +1,5 @@
 #include "window.h"
-#include "menu.h"
+#include "menuframe.h"
 #include "config.h"
 #include "dock.h"
 #include "client.h"
@@ -21,9 +21,9 @@ Window window_top(ObWindow *self)
 {
     switch (self->type) {
     case Window_Menu:
-        return ((Menu*)self)->frame;
+        return ((ObMenuFrame*)self)->window;
     case Window_Dock:
-        return ((Dock*)self)->frame;
+        return ((ObDock*)self)->frame;
     case Window_DockApp:
         /* not to be used for stacking */
         g_assert_not_reached();
@@ -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:
@@ -51,7 +51,7 @@ Window window_layer(ObWindow *self)
     case Window_Client:
         return ((ObClient*)self)->layer;
     case Window_Internal:
-        return Layer_Internal;
+        return OB_STACKING_LAYER_INTERNAL;
     }
     g_assert_not_reached();
     return None;