X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fapplication.hh;h=6f1cebc6087100194e71ddb91e3ea6b4d3b750ba;hb=88a82090cd9d51ac8061961af40b08b662d4db61;hp=220185ad49198a0d2dfb0d50f83c86699b843992;hpb=8f8acc24933830d4f5784616b9b0c5896bde0b93;p=chaz%2Fopenbox

diff --git a/otk/application.hh b/otk/application.hh
index 220185ad..6f1cebc6 100644
--- a/otk/application.hh
+++ b/otk/application.hh
@@ -4,10 +4,7 @@
 
 #include "eventdispatcher.hh"
 #include "display.hh"
-#include "configuration.hh"
-#include "timerqueuemanager.hh"
-#include "image.hh"
-#include "style.hh"
+#include "renderstyle.hh"
 
 namespace otk {
 
@@ -26,16 +23,14 @@ public:
   void setDockable(bool dockable) { _dockable = dockable; }
   inline bool isDockable(void) const { return _dockable; }
 
-  inline Style *getStyle(void) const { return _style; }
+  inline RenderStyle *getStyle(void) const { return _style; }
   // more accessors
 
 private:
   void loadStyle(void);
 
-  TimerQueueManager *_timer_manager;
-  ImageControl *_img_ctrl;
-  Configuration *_style_conf;
-  Style *_style;
+  Display _display;
+  RenderStyle *_style;
   bool _dockable;
 
   int _appwidget_count;