Removed widget flag HAS_CONTENTS.

3 files changed, 5 insertions, 22 deletions

diff --git a/dw/ruler.cc b/dw/ruler.cc
index 3bb61f22..3fdbfb6d 100644
--- a/dw/ruler.cc
+++ b/dw/ruler.cc
@@ -28,7 +28,6 @@ namespace dw {
 
 Ruler::Ruler ()
 {
-   unsetFlags (HAS_CONTENTS);
 }
 
 void Ruler::sizeRequestImpl (core::Requisition *requisition)
diff --git a/dw/widget.cc b/dw/widget.cc
index 8d00c127..e7bd5f8f 100644
--- a/dw/widget.cc
+++ b/dw/widget.cc
@@ -69,7 +69,7 @@ Widget::Widget ()
    DBG_OBJ_CREATE ("dw::core::Widget");
    registerName ("dw::core::Widget", &CLASS_ID);
 
-   flags = (Flags)(NEEDS_RESIZE | EXTREMES_CHANGED | HAS_CONTENTS);
+   flags = (Flags)(NEEDS_RESIZE | EXTREMES_CHANGED);
    parent = generator = container = NULL;
    DBG_OBJ_SET_PTR ("container", container);
 
diff --git a/dw/widget.hh b/dw/widget.hh
index 38551fde..d045ffc2 100644
--- a/dw/widget.hh
+++ b/dw/widget.hh
@@ -69,19 +69,11 @@ protected:
       EXTREMES_CHANGED = 1 << 5,
 
       /**
-       * \brief Set by the widget itself (in the constructor), when it contains
-       *    some contents, e.g. an image, as opposed to a horizontal ruler.
-       *
-       * Will hopefully be removed, after redesigning the size model.
-       */
-      HAS_CONTENTS     = 1 << 6,
-
-      /**
        * \brief Set, when a widget was already once allocated,
        *
        * The dw::Image widget uses this flag, see dw::Image::setBuffer.
        */
-      WAS_ALLOCATED    = 1 << 7,
+      WAS_ALLOCATED    = 1 << 6,
    };
 
    /**
@@ -197,16 +189,14 @@ protected:
    /*inline void printFlags () {
       DBG_IF_RTFL {
          char buf[10 * 3 - 1 + 1];
-         snprintf (buf, sizeof (buf), "%s:%s:%s:%s:%s:%s:%s:%s:%s",
+         snprintf (buf, sizeof (buf), "%s:%s:%s:%s:%s:%s:%s",
                    (flags & RESIZE_QUEUED)    ? "Rq" : "--",
                    (flags & EXTREMES_QUEUED)  ? "Eq" : "--",
                    (flags & NEEDS_RESIZE)     ? "nR" : "--",
                    (flags & NEEDS_ALLOCATE)   ? "nA" : "--",
                    (flags & ALLOCATE_QUEUED)  ? "Aq" : "--",
                    (flags & EXTREMES_CHANGED) ? "Ec" : "--",
-                   (flags & HAS_CONTENTS)     ? "hc" : "--",
-                   (flags & WAS_ALLOCATED)    ? "wA" : "--",
-                   (flags & BLOCK_LEVEL)      ? "bl" : "--");
+                   (flags & WAS_ALLOCATED)    ? "wA" : "--");
          DBG_OBJ_SET_SYM ("flags", buf);
       }
    }*/
@@ -243,12 +233,7 @@ protected:
             DBG_OBJ_SET_SYM ("flags.EXTREMES_CHANGED",
                              (flags & EXTREMES_CHANGED) ? "true" : "false");
             break;
-            
-         case HAS_CONTENTS:
-            DBG_OBJ_SET_SYM ("flags.HAS_CONTENTS",
-                             (flags & HAS_CONTENTS) ? "true" : "false");
-            break;
-            
+                       
          case WAS_ALLOCATED:
             DBG_OBJ_SET_SYM ("flags.WAS_ALLOCATED",
                              (flags & WAS_ALLOCATED) ? "true" : "false");
@@ -403,7 +388,6 @@ public:
    inline bool allocateQueued ()  { return flags & ALLOCATE_QUEUED; }
    inline bool extremesChanged () { return flags & EXTREMES_CHANGED; }
    inline bool wasAllocated ()    { return flags & WAS_ALLOCATED; }
-   inline bool hasContents ()     { return flags & HAS_CONTENTS; }
 
    void setParent (Widget *parent);