mirror of
https://github.com/aseprite/aseprite.git
synced 2024-10-04 22:09:55 +00:00
Remove Widget::user_data and theme_data fields
This commit is contained in:
parent
512c7d4ecf
commit
1b3d8650bd
@ -233,7 +233,6 @@ void ColorButton::openSelectorDialog()
|
|||||||
|
|
||||||
if (m_window == NULL) {
|
if (m_window == NULL) {
|
||||||
m_window = new ColorSelector();
|
m_window = new ColorSelector();
|
||||||
m_window->user_data[0] = this;
|
|
||||||
m_window->ColorChange.connect(&ColorButton::onWindowColorChange, this);
|
m_window->ColorChange.connect(&ColorButton::onWindowColorChange, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -169,7 +169,6 @@ StatusBar::StatusBar()
|
|||||||
#define BUTTON_NEW(name, text, action) \
|
#define BUTTON_NEW(name, text, action) \
|
||||||
{ \
|
{ \
|
||||||
(name) = new Button(text); \
|
(name) = new Button(text); \
|
||||||
(name)->user_data[0] = this; \
|
|
||||||
setup_mini_look(name); \
|
setup_mini_look(name); \
|
||||||
(name)->Click.connect(Bind<void>(&ani_button_command, (name), action)); \
|
(name)->Click.connect(Bind<void>(&ani_button_command, (name), action)); \
|
||||||
}
|
}
|
||||||
|
@ -83,16 +83,6 @@ Widget::Widget(WidgetType type)
|
|||||||
this->m_font = (this->m_theme ? this->m_theme->default_font: NULL);
|
this->m_font = (this->m_theme ? this->m_theme->default_font: NULL);
|
||||||
this->m_bgColor = gfx::ColorNone;
|
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_preferredSize = NULL;
|
||||||
m_doubleBuffered = false;
|
m_doubleBuffered = false;
|
||||||
m_transparent = false;
|
m_transparent = false;
|
||||||
|
@ -59,11 +59,6 @@ namespace ui {
|
|||||||
int max_w, max_h;
|
int max_w, max_h;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
// Extra data for the theme
|
|
||||||
void *theme_data[4];
|
|
||||||
|
|
||||||
/* for user */
|
|
||||||
void *user_data[4];
|
|
||||||
|
|
||||||
// ===============================================================
|
// ===============================================================
|
||||||
// CTOR & DTOR
|
// CTOR & DTOR
|
||||||
|
Loading…
Reference in New Issue
Block a user