#include "window.h"
-#include "menu.h"
+#include "menuframe.h"
#include "config.h"
#include "dock.h"
#include "client.h"
{
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();
break;
case Window_Client:
- return ((Client*)self)->frame->window;
+ return ((ObClient*)self)->frame->window;
case Window_Internal:
return ((InternalWindow*)self)->win;
}
{
switch (self->type) {
case Window_Menu:
- return Layer_Internal;
+ return OB_STACKING_LAYER_INTERNAL;
case Window_Dock:
return config_dock_layer;
case Window_DockApp:
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;