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

diff --git a/otk/application.hh b/otk/application.hh
index d6f1ed8d..63fb4195 100644
--- a/otk/application.hh
+++ b/otk/application.hh
@@ -10,7 +10,7 @@
 
 namespace otk {
 
-class OtkWidget;
+class OtkAppWidget;
 
 class OtkApplication : public OtkEventDispatcher {
 
@@ -19,29 +19,27 @@ public:
   OtkApplication(int argc, char **argv);
   virtual ~OtkApplication();
 
-  virtual void exec(void);
+  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; }
+  inline otk::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;
   Configuration *_style_conf;
   Style *_style;
   bool _dockable;
 
-  friend class OtkWidget; // for access to setMainWidget
+  int _appwidget_count;
+
+  friend class OtkAppWidget;
 };
 
 }