Removed widget flag USES_HINTS.

6 files changed, 3 insertions, 26 deletions

diff --git a/dw/ruler.cc b/dw/ruler.cc
index cb48ee79..3bb61f22 100644
--- a/dw/ruler.cc
+++ b/dw/ruler.cc
@@ -28,7 +28,6 @@ namespace dw {
 
 Ruler::Ruler ()
 {
-   setFlags (USES_HINTS);
    unsetFlags (HAS_CONTENTS);
 }
 
diff --git a/dw/table.cc b/dw/table.cc
index 1a61c9b6..a213e879 100644
--- a/dw/table.cc
+++ b/dw/table.cc
@@ -34,7 +34,6 @@ Table::Table(bool limitTextWidth)
 {
    DBG_OBJ_CREATE ("dw::Table");
    registerName ("dw::Table", &CLASS_ID);
-   setFlags (USES_HINTS);
    setButtonSensitive(false);
 
    this->limitTextWidth = limitTextWidth;
diff --git a/dw/textblock.cc b/dw/textblock.cc
index 9342e792..0df4270b 100644
--- a/dw/textblock.cc
+++ b/dw/textblock.cc
@@ -225,7 +225,6 @@ Textblock::Textblock (bool limitTextWidth)
 {
    DBG_OBJ_CREATE ("dw::Textblock");
    registerName ("dw::Textblock", &CLASS_ID);
-   setFlags (USES_HINTS);
    setButtonSensitive(true);
 
    containingBlock = NULL;
diff --git a/dw/ui.cc b/dw/ui.cc
index dbb5b66b..4bc86543 100644
--- a/dw/ui.cc
+++ b/dw/ui.cc
@@ -283,9 +283,6 @@ void ComplexButtonResource::init (Widget *widget)
 void ComplexButtonResource::setEmbed (Embed *embed)
 {
    ButtonResource::setEmbed (embed);
-
-   if (childWidget->usesHints ())
-      embed->setUsesHints ();
 }
 
 ComplexButtonResource::~ComplexButtonResource ()
diff --git a/dw/ui.hh b/dw/ui.hh
index 14ca0bf4..98c90ed6 100644
--- a/dw/ui.hh
+++ b/dw/ui.hh
@@ -248,8 +248,6 @@ public:
    Iterator *iterator (Content::Type mask, bool atEnd);
    void setStyle (style::Style *style);
 
-   inline void setUsesHints () { setFlags (USES_HINTS); }
-
    inline Resource *getResource () { return resource; }
 };
 
diff --git a/dw/widget.hh b/dw/widget.hh
index a2bda3c0..38551fde 100644
--- a/dw/widget.hh
+++ b/dw/widget.hh
@@ -69,27 +69,19 @@ protected:
       EXTREMES_CHANGED = 1 << 5,
 
       /**
-       * \brief Set by the widget itself (in the constructor), when set...
-       *    methods are implemented.
-       *
-       * Will hopefully be removed, after redesigning the size model.
-       */
-      USES_HINTS       = 1 << 6,
-
-      /**
        * \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 << 7,
+      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 << 8,
+      WAS_ALLOCATED    = 1 << 7,
    };
 
    /**
@@ -205,14 +197,13 @@ 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:%s",
+         snprintf (buf, sizeof (buf), "%s:%s:%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 & USES_HINTS)       ? "uh" : "--",
                    (flags & HAS_CONTENTS)     ? "hc" : "--",
                    (flags & WAS_ALLOCATED)    ? "wA" : "--",
                    (flags & BLOCK_LEVEL)      ? "bl" : "--");
@@ -253,11 +244,6 @@ protected:
                              (flags & EXTREMES_CHANGED) ? "true" : "false");
             break;
             
-         case USES_HINTS:
-            DBG_OBJ_SET_SYM ("flags.USES_HINTS",
-                             (flags & USES_HINTS) ? "true" : "false");
-            break;
-            
          case HAS_CONTENTS:
             DBG_OBJ_SET_SYM ("flags.HAS_CONTENTS",
                              (flags & HAS_CONTENTS) ? "true" : "false");
@@ -417,7 +403,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 usesHints ()       { return flags & USES_HINTS; }
    inline bool hasContents ()     { return flags & HAS_CONTENTS; }
 
    void setParent (Widget *parent);