diff options
| author | Ira Rice <irarice@gmail.com> | 2009-03-14 13:21:35 -0600 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-03-14 13:21:35 -0600 |
| commit | 3575c7a606c2d24c0d444e9999892c0390fa5ae8 (patch) | |
| tree | 399bd2ce51577aa721a460884b397f52d4a4590c /src/gui/setup_joystick.cpp | |
| parent | f0c6bed3d879e1c7b9a6d5b7e676a4f1c6a29a54 (diff) | |
| download | mana-3575c7a606c2d24c0d444e9999892c0390fa5ae8.tar.gz mana-3575c7a606c2d24c0d444e9999892c0390fa5ae8.tar.bz2 mana-3575c7a606c2d24c0d444e9999892c0390fa5ae8.tar.xz mana-3575c7a606c2d24c0d444e9999892c0390fa5ae8.zip | |
Made a label class derived from the guichan label class which utilizes
the palette colors. While technically, this can be accomplished through
other means, it's rather clumsy overall, and is prone to introducing in
programmer errors.
This commit finally catches every case where text is used, and applies
the text color from the color dialog to each of them appropriately.
Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'src/gui/setup_joystick.cpp')
| -rw-r--r-- | src/gui/setup_joystick.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp index 5bbaa368..4d80e0dd 100644 --- a/src/gui/setup_joystick.cpp +++ b/src/gui/setup_joystick.cpp @@ -20,10 +20,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <guichan/widgets/label.hpp> - #include "button.h" #include "checkbox.h" +#include "label.h" #include "setup_joystick.h" #include "widgets/layouthelper.h" @@ -36,7 +35,7 @@ extern Joystick *joystick; Setup_Joystick::Setup_Joystick(): - mCalibrateLabel(new gcn::Label(_("Press the button to start calibration"))), + mCalibrateLabel(new Label(_("Press the button to start calibration"))), mCalibrateButton(new Button(_("Calibrate"), "calibrate", this)), mJoystickEnabled(new CheckBox(_("Enable joystick"))) { |