X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fapplication.hh;h=a0795acc6c27700cbc533d3eb6a22703cf786560;hb=c34f2a5241fba850f3e48a08ebeff3190c6dc9d5;hp=d6f1ed8dac7f24fff6084291c49a65d180fa529d;hpb=81e1982744e1d692fbe54cc840e93099cbe974af;p=chaz%2Fopenbox

diff --git a/otk/application.hh b/otk/application.hh
index d6f1ed8d..a0795acc 100644
--- a/otk/application.hh
+++ b/otk/application.hh
@@ -1,3 +1,4 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 #ifndef __application_hh
 #define __application_hh
 
@@ -10,16 +11,16 @@
 
 namespace otk {
 
-class OtkWidget;
+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();
 
-  virtual void exec(void);
+  virtual void run(void);
   // more bummy cool functionality
 
   void setDockable(bool dockable) { _dockable = dockable; }
@@ -28,20 +29,19 @@ public:
   inline Style *getStyle(void) const { return _style; }
   // more accessors
 
-protected:
-  bool setMainWidget(const OtkWidget *main_widget);
-
 private:
   void loadStyle(void);
 
-  const OtkWidget *_main_widget;
-  OBTimerQueueManager *_timer_manager;
-  BImageControl *_img_ctrl;
+  Display _display;
+  TimerQueueManager *_timer_manager;
+  ImageControl *_img_ctrl;
   Configuration *_style_conf;
   Style *_style;
   bool _dockable;
 
-  friend class OtkWidget; // for access to setMainWidget
+  int _appwidget_count;
+
+  friend class AppWidget;
 };
 
 }