X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fapplication.hh;h=6da36d28e40764f0963f446ee7d1982e27a22303;hb=3dfe9f4ebeb7abd8446c52db0232b9f610a78846;hp=4d7b0d894cc04307fa2f2f7bb421d5b5cfe1963f;hpb=96a9196cbb71b7f8d5e3d98a92b2e59bb1b591a8;p=chaz%2Fopenbox diff --git a/otk/application.hh b/otk/application.hh index 4d7b0d89..6da36d28 100644 --- a/otk/application.hh +++ b/otk/application.hh @@ -3,10 +3,6 @@ #define __application_hh #include "eventdispatcher.hh" -#include "display.hh" -#include "configuration.hh" -#include "image.hh" -#include "style.hh" namespace otk { @@ -19,22 +15,18 @@ 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;