mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-20 22:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove jwidget_send_message.

Browse Source
This commit is contained in:
David Capello 2011-01-21 23:33:56 -03:00
parent cb6d70521f
commit 75e618c6fa
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/jmanager.cpp
View File

@ -1096,7 +1096,7 @@ static bool manager_msg_proc(JWidget widget, JMessage msg)
/* send to the window */
JI_LIST_FOR_EACH(w->children, link2)
if (jwidget_send_message(reinterpret_cast<JWidget>(link2->data), msg))
if (reinterpret_cast<JWidget>(link2->data)->sendMessage(msg))
return true;
if (w->is_foreground() ||
@ -1265,7 +1265,7 @@ static void manager_pump_queue(JWidget widget_manager)
}
/* call message handler */
done = jwidget_send_message(widget, msg);
done = widget->sendMessage(msg);
/* restore clip */
if (msg->type == JM_DRAW) {

21
src/gui/widget.cpp
View File

@ -95,7 +95,7 @@ Widget::~Widget()
/* send destroy message */
msg = jmessage_new(JM_DESTROY);
jwidget_send_message(this, msg);
sendMessage(msg);
jmessage_free(msg);
/* break relationship with the manager */
@ -1004,7 +1004,7 @@ void jwidget_set_rect(JWidget widget, JRect rect)
msg = jmessage_new(JM_SETPOS);
jrect_copy(&msg->setpos.rect, rect);
jwidget_send_message(widget, msg);
widget->sendMessage(msg);
jmessage_free(msg);
}
@ -1205,7 +1205,7 @@ bool jwidget_emit_signal(JWidget widget, int signal_num)
msg->signal.num = signal_num;
msg->signal.from = widget;
ret = jwidget_send_message(widget, msg);
ret = widget->sendMessage(msg);
/* send the signal to the window too */
if (!ret && widget->type != JI_FRAME) {
@ -1224,9 +1224,6 @@ bool jwidget_emit_signal(JWidget widget, int signal_num)
/**********************************************************************/
/* manager handler */
bool jwidget_send_message(JWidget widget, JMessage msg)
{ return widget->sendMessage(msg); }
void jwidget_close_window(JWidget widget)
{ widget->closeWindow(); }
@ -1448,7 +1445,7 @@ bool Widget::onProcessMessage(JMessage msg)
/* broadcast the message to the children */
JI_LIST_FOR_EACH(widget->children, link)
jwidget_send_message(reinterpret_cast<JWidget>(link->data), msg);
reinterpret_cast<JWidget>(link->data)->sendMessage(msg);
break;
}
@ -1492,12 +1489,12 @@ bool Widget::onProcessMessage(JMessage msg)
/* broadcast the message to the children */
JI_LIST_FOR_EACH(widget->children, link)
jwidget_send_message(reinterpret_cast<JWidget>(link->data), msg);
reinterpret_cast<JWidget>(link->data)->sendMessage(msg);
}
/* propagate the message to the parent */
if (msg->key.propagate_to_parent && widget->parent != NULL)
return jwidget_send_message(widget->parent, msg);
return widget->parent->sendMessage(msg);
else
break;
@ -1508,14 +1505,14 @@ bool Widget::onProcessMessage(JMessage msg)
case JM_WHEEL:
/* propagate the message to the parent */
if (widget->parent != NULL)
return jwidget_send_message(widget->parent, msg);
return widget->parent->sendMessage(msg);
else
break;
case JM_SETCURSOR:
/* propagate the message to the parent */
if (widget->parent != NULL)
return jwidget_send_message(widget->parent, msg);
return widget->parent->sendMessage(msg);
else {
jmouse_set_cursor(JI_CURSOR_NORMAL);
return true;
@ -1543,7 +1540,7 @@ bool Widget::onProcessMessage(JMessage msg)
void Widget::onPreferredSize(PreferredSizeEvent& ev)
{
JMessage msg = jmessage_new(JM_REQSIZE);
jwidget_send_message(this, msg);
sendMessage(msg);
Size sz(msg->reqsize.w, msg->reqsize.h);
jmessage_free(msg);

1
src/gui/widget.h
View File

@ -97,7 +97,6 @@ bool jwidget_emit_signal(JWidget widget, int signal_num);
/* manager handler */
bool jwidget_send_message(JWidget widget, JMessage msg);
void jwidget_close_window(JWidget widget);
/* miscellaneous */