alloc colors only when needed, and free them properly on destruction

[chaz/openbox] / otk / application.hh

diff --git a/otk/application.hh b/otk/application.hh
index 4d7b0d894cc04307fa2f2f7bb421d5b5cfe1963f..848b79858723a195155b393f99f6a73b79b1612c 100644 (file)
--- a/otk/application.hh
+++ b/otk/application.hh
@@ -4,9 +4,6 @@
 
 #include "eventdispatcher.hh"
 #include "display.hh"
-#include "configuration.hh"
-#include "image.hh"
-#include "style.hh"
 
 namespace otk {
 
@@ -19,22 +16,19 @@ public:
   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 Style *getStyle(void) const { return _style; }
-  // more accessors
-
 private:
   void loadStyle(void);
 
   Display _display;
-  ImageControl *_img_ctrl;
-  Configuration *_style_conf;
-  Style *_style;
+  int _screen;
   bool _dockable;
 
   int _appwidget_count;