diff options
| author | Matthew Hoops | 2011-05-03 17:17:27 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-03 17:25:41 -0400 |
| commit | 9cb600099f4c29298707787cafad2741a1cd6686 (patch) | |
| tree | fb1930fa56b611317831d66442cba19b18d2e57a /gui/widgets/scrollbar.cpp | |
| parent | 3b2283daf850605ca897002afbafe44489c35473 (diff) | |
| parent | 95a6098f672191dc0792bd4f9bfa18706bbe8e3a (diff) | |
| download | scummvm-rg350-9cb600099f4c29298707787cafad2741a1cd6686.tar.gz scummvm-rg350-9cb600099f4c29298707787cafad2741a1cd6686.tar.bz2 scummvm-rg350-9cb600099f4c29298707787cafad2741a1cd6686.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'gui/widgets/scrollbar.cpp')
| -rw-r--r-- | gui/widgets/scrollbar.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gui/widgets/scrollbar.cpp b/gui/widgets/scrollbar.cpp index 5e963e04fe..38383c0e55 100644 --- a/gui/widgets/scrollbar.cpp +++ b/gui/widgets/scrollbar.cpp @@ -22,11 +22,12 @@ * $Id$ */ +#include "common/rect.h" +#include "common/system.h" +#include "common/timer.h" #include "gui/widgets/scrollbar.h" -#include "gui/dialog.h" #include "gui/gui-manager.h" - -#include "common/timer.h" +#include "gui/ThemeEngine.h" namespace GUI { |