diff --git a/src/gui/box.cpp b/src/gui/box.cpp index 0554a4dd2..606cbba05 100644 --- a/src/gui/box.cpp +++ b/src/gui/box.cpp @@ -18,10 +18,6 @@ using namespace gfx; -static bool box_msg_proc(JWidget widget, Message* msg); -static void box_request_size(JWidget widget, int *w, int *h); -static void box_set_position(JWidget widget, JRect rect); - Box::Box(int align) : Widget(JI_BOX) { @@ -34,7 +30,7 @@ bool Box::onProcessMessage(Message* msg) switch (msg->type) { case JM_SETPOS: - box_set_position(&msg->setpos.rect); + layoutBox(&msg->setpos.rect); return true; } @@ -111,7 +107,7 @@ void Box::onPaint(PaintEvent& ev) getTheme()->paintBox(ev); } -void Box::box_set_position(JRect rect) +void Box::layoutBox(JRect rect) { #define FIXUP(x, y, w, h, l, t, r, b) \ { \ diff --git a/src/gui/box.h b/src/gui/box.h index 0d75ed02a..91d596097 100644 --- a/src/gui/box.h +++ b/src/gui/box.h @@ -22,7 +22,7 @@ protected: void onPaint(PaintEvent& ev) OVERRIDE; private: - void box_set_position(JRect rect); + void layoutBox(JRect rect); }; class VBox : public Box diff --git a/src/gui/image_view.cpp b/src/gui/image_view.cpp index 506d124ca..4e6beac95 100644 --- a/src/gui/image_view.cpp +++ b/src/gui/image_view.cpp @@ -16,8 +16,6 @@ #include "gui/system.h" #include "gui/theme.h" -static bool image_msg_proc(JWidget widget, Message* msg); - ImageView::ImageView(BITMAP* bmp, int align) : Widget(JI_IMAGE_VIEW) {