X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fapplication.hh;h=848b79858723a195155b393f99f6a73b79b1612c;hb=e451c08ac5a103362adbece9b8a11a16ade739c1;hp=63fb4195a5286c0d6ec4d4f0c8ddc0d30de97e3e;hpb=5869cc29ef15181427e65079d9a52c5d21190206;p=chaz%2Fopenbox

diff --git a/otk/application.hh b/otk/application.hh
index 63fb4195..848b7985 100644
--- a/otk/application.hh
+++ b/otk/application.hh
@@ -1,45 +1,39 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 #ifndef __application_hh
 #define __application_hh
 
 #include "eventdispatcher.hh"
 #include "display.hh"
-#include "configuration.hh"
-#include "timerqueuemanager.hh"
-#include "image.hh"
-#include "style.hh"
 
 namespace otk {
 
-class OtkAppWidget;
+class AppWidget;
 
-class OtkApplication : public OtkEventDispatcher {
+class Application : public EventDispatcher {
 
 public:
 
-  OtkApplication(int argc, char **argv);
-  virtual ~OtkApplication();
+  Application(int argc, char **argv);
+  virtual ~Application();
 
+  inline int screen() const { return _screen; }
+  
   virtual void run(void);
   // more bummy cool functionality
 
   void setDockable(bool dockable) { _dockable = dockable; }
   inline bool isDockable(void) const { return _dockable; }
 
-  inline otk::Style *getStyle(void) const { return _style; }
-  // more accessors
-
 private:
   void loadStyle(void);
 
-  OBTimerQueueManager *_timer_manager;
-  BImageControl *_img_ctrl;
-  Configuration *_style_conf;
-  Style *_style;
+  Display _display;
+  int _screen;
   bool _dockable;
 
   int _appwidget_count;
 
-  friend class OtkAppWidget;
+  friend class AppWidget;
 };
 
 }