Move IdleCallback outside App class; Cleanup

3 files changed, 12 insertions, 14 deletions

diff --git a/examples/cairo.cpp b/examples/cairo.cpp
index 36563780..999e4036 100644
--- a/examples/cairo.cpp
+++ b/examples/cairo.cpp
@@ -76,8 +76,8 @@ private:
 // ------------------------------------------------------
 // Custom Cairo Widget
 
-class CustomCairoWidget : public App::IdleCallback,
-                                 CairoWidget
+class CustomCairoWidget : public CairoWidget,
+                          public IdleCallback
 {
 public:
     CustomCairoWidget(Window& parent)
@@ -186,7 +186,7 @@ public:
           bg(*this),
           cairo(*this)
     {
-        app.addIdleCallback(&cairo);
+        addIdleCallback(&cairo);
     }
 
 private:
diff --git a/examples/color.cpp b/examples/color.cpp
index b110e71d..0aaee0e7 100644
--- a/examples/color.cpp
+++ b/examples/color.cpp
@@ -21,8 +21,6 @@
 #include "Window.hpp"
 #include "Widget.hpp"
 
-#include <cstdio>
-
 // ------------------------------------------------------
 // use namespace
 
@@ -31,8 +29,8 @@ using namespace DGL;
 // ------------------------------------------------------
 // Single color widget
 
-class ColorWidget : public App::IdleCallback,
-                           Widget
+class ColorWidget : public Widget,
+                    public IdleCallback
 {
 public:
     ColorWidget(Window& parent)
@@ -41,6 +39,7 @@ public:
           reverse(false),
           r(0), g(0), b(0)
     {
+        parent.addIdleCallback(this);
     }
 
 private:
@@ -139,8 +138,6 @@ int main()
     Window win(app);
     ColorWidget color(win);
 
-    app.addIdleCallback(&color);
-
     win.setSize(300, 300);
     win.setTitle("Color");
     win.show();
diff --git a/examples/images.cpp b/examples/images.cpp
index 88949cb2..a858b7bc 100644
--- a/examples/images.cpp
+++ b/examples/images.cpp
@@ -34,8 +34,8 @@ using namespace DGL;
 // ------------------------------------------------------
 // our widget
 
-class ExampleImagesWidget : public App::IdleCallback,
-                                   Widget
+class ExampleImagesWidget : public Widget,
+                            public IdleCallback
 {
 public:
     static const int kImg1y = 0;
@@ -59,7 +59,10 @@ public:
           fImg3rev(true),
           fImg1(CatPics::cat1Data, CatPics::cat1Width, CatPics::cat1Height, GL_BGR),
           fImg2(CatPics::cat2Data, CatPics::cat2Width, CatPics::cat2Height, GL_BGR),
-          fImg3(CatPics::cat3Data, CatPics::cat3Width, CatPics::cat3Height, GL_BGR) {}
+          fImg3(CatPics::cat3Data, CatPics::cat3Width, CatPics::cat3Height, GL_BGR)
+    {
+        win.addIdleCallback(this);
+    }
 
 private:
     void idleCallback() override
@@ -198,8 +201,6 @@ int main()
     Window win(app);
     ExampleImagesWidget images(win);
 
-    app.addIdleCallback(&images);
-
     win.setResizable(false);
     win.setSize(500, 400);
     win.setTitle("Images");