From 1b3d8650bd335a676823145bb7effc29b43edd48 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 25 Nov 2014 22:46:50 -0300
Subject: [PATCH] Remove Widget::user_data and theme_data fields

---
 src/app/ui/color_button.cpp |  1 -
 src/app/ui/status_bar.cpp   |  1 -
 src/ui/widget.cpp           | 10 ----------
 src/ui/widget.h             |  5 -----
 4 files changed, 17 deletions(-)

diff --git a/src/app/ui/color_button.cpp b/src/app/ui/color_button.cpp
index 6752184dd..f2c29d1a2 100644
--- a/src/app/ui/color_button.cpp
+++ b/src/app/ui/color_button.cpp
@@ -233,7 +233,6 @@ void ColorButton::openSelectorDialog()
 
   if (m_window == NULL) {
     m_window = new ColorSelector();
-    m_window->user_data[0] = this;
     m_window->ColorChange.connect(&ColorButton::onWindowColorChange, this);
   }
 
diff --git a/src/app/ui/status_bar.cpp b/src/app/ui/status_bar.cpp
index 74a6ea429..d72cc6b1b 100644
--- a/src/app/ui/status_bar.cpp
+++ b/src/app/ui/status_bar.cpp
@@ -169,7 +169,6 @@ StatusBar::StatusBar()
 #define BUTTON_NEW(name, text, action)                                  \
   {                                                                     \
     (name) = new Button(text);                                          \
-    (name)->user_data[0] = this;                                        \
     setup_mini_look(name);                                              \
     (name)->Click.connect(Bind<void>(&ani_button_command, (name), action)); \
   }
diff --git a/src/ui/widget.cpp b/src/ui/widget.cpp
index 44b25545b..69c62cdb9 100644
--- a/src/ui/widget.cpp
+++ b/src/ui/widget.cpp
@@ -83,16 +83,6 @@ Widget::Widget(WidgetType type)
   this->m_font = (this->m_theme ? this->m_theme->default_font: NULL);
   this->m_bgColor = gfx::ColorNone;
 
-  this->theme_data[0] = NULL;
-  this->theme_data[1] = NULL;
-  this->theme_data[2] = NULL;
-  this->theme_data[3] = NULL;
-
-  this->user_data[0] = NULL;
-  this->user_data[1] = NULL;
-  this->user_data[2] = NULL;
-  this->user_data[3] = NULL;
-
   m_preferredSize = NULL;
   m_doubleBuffered = false;
   m_transparent = false;
diff --git a/src/ui/widget.h b/src/ui/widget.h
index dbcbbe3c2..d710e3b08 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -59,11 +59,6 @@ namespace ui {
     int max_w, max_h;
 
   public:
-    // Extra data for the theme
-    void *theme_data[4];
-
-    /* for user */
-    void *user_data[4];
 
     // ===============================================================
     // CTOR & DTOR