From cee305244662d352a7ad5ab7ae22f6221c064d3d Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Mon, 11 Nov 2002 10:05:06 +0000
Subject: not using any old blackbox classes anymore!

---
 src/xeventhandler.cc | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src/xeventhandler.cc')

diff --git a/src/xeventhandler.cc b/src/xeventhandler.cc
index afa5ecee..560aace2 100644
--- a/src/xeventhandler.cc
+++ b/src/xeventhandler.cc
@@ -8,13 +8,10 @@
 #include "client.hh"
 #include "frame.hh"
 #include "openbox.hh"
+#include "screen.hh"
 #include "otk/display.hh"
 #include "otk/rect.hh"
 
-// XXX: REMOVE THIS SOON!!#!
-#include "blackbox.hh"
-#include "bbscreen.hh"
-
 extern "C" {
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -168,12 +165,9 @@ void OBXEventHandler::manageWindow(int screen, Window window)
     // XXX: position the window intelligenty
   }
 
-  // XXX: store a style somewheres cooler!!
-  otk::Style *style = ((Blackbox*)Openbox::instance)->
-    searchScreen(RootWindow(otk::OBDisplay::display, screen))->
-    getWindowStyle();
   // create the decoration frame for the client window
-  client->frame = new OBFrame(client, style);
+  client->frame = new OBFrame(client,
+                              Openbox::instance->screen(screen)->style());
 
   // add all the client's decoration windows as event handlers for the client
   Openbox::instance->addClient(client->frame->window(), client);
-- 
cgit v1.2.3