X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fapplication.cc;h=e325a58218bc824557bcf4b5573a85b4b9bff9f3;hb=0348a2f3abd2334f5f5812c5fb45c1b4fffb46a5;hp=fda65dc1fd0ec84a8881564cb0cdc5172a31cd42;hpb=8f8acc24933830d4f5784616b9b0c5896bde0b93;p=chaz%2Fopenbox

diff --git a/otk/application.cc b/otk/application.cc
index fda65dc1..e325a582 100644
--- a/otk/application.cc
+++ b/otk/application.cc
@@ -7,6 +7,9 @@
 #include "application.hh"
 #include "eventhandler.hh"
 #include "widget.hh"
+#include "timer.hh"
+#include "property.hh"
+#include "rendercolor.hh"
 
 extern "C" {
 #ifdef HAVE_STDLIB_H
@@ -20,18 +23,19 @@ namespace otk {
 
 Application::Application(int argc, char **argv)
   : EventDispatcher(),
+    _display(),
     _dockable(false),
     _appwidget_count(0)
 {
   (void)argc;
   (void)argv;
 
-  Display::initialize(0);
-  const ScreenInfo *s_info =
-    Display::screenInfo(DefaultScreen(Display::display));
+  const ScreenInfo *s_info = _display.screenInfo(DefaultScreen(*_display));
 
-  _timer_manager = new TimerQueueManager();
-  _img_ctrl = new ImageControl(_timer_manager, s_info, True, 4, 5, 200);
+  Timer::initialize();
+  RenderColor::initialize();
+  Property::initialize();
+  _img_ctrl = new ImageControl(s_info, True, 4, 5, 200);
   _style_conf = new Configuration(False);
   _style = new Style(_img_ctrl);
 
@@ -42,10 +46,9 @@ Application::~Application()
 {
   delete _style_conf;
   delete _img_ctrl;
-  delete _timer_manager;
   delete _style;
-  
-  Display::destroy();
+  RenderColor::destroy();
+  Timer::destroy();
 }
 
 void Application::loadStyle(void)
@@ -71,7 +74,7 @@ void Application::run(void)
 
   while (_appwidget_count > 0) {
     dispatchEvents();
-    _timer_manager->fire(); // fire pending events
+    Timer::dispatchTimers(); // fire pending events
   }
 }