diff options
| author | Willem Jan Palenstijn | 2013-09-24 13:55:54 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-09-24 13:55:54 +0200 |
| commit | 6417192584873f98737a0928adefeb9aa9cad894 (patch) | |
| tree | 0d238f05c406ae70fff8c907bd10d29a16f2d6a4 /backends/vkeybd/virtual-keyboard-gui.h | |
| parent | f3514534ce46bad5e3ffadfdf0b3af403045e5ef (diff) | |
| parent | 74cc4aec8aa80da2541857e3120b31a566ccdff3 (diff) | |
| download | scummvm-rg350-6417192584873f98737a0928adefeb9aa9cad894.tar.gz scummvm-rg350-6417192584873f98737a0928adefeb9aa9cad894.tar.bz2 scummvm-rg350-6417192584873f98737a0928adefeb9aa9cad894.zip | |
Merge branch 'master' into zvision
Conflicts:
video/avi_decoder.cpp
Diffstat (limited to 'backends/vkeybd/virtual-keyboard-gui.h')
| -rw-r--r-- | backends/vkeybd/virtual-keyboard-gui.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/backends/vkeybd/virtual-keyboard-gui.h b/backends/vkeybd/virtual-keyboard-gui.h index d0f9c884ed..a2000adea0 100644 --- a/backends/vkeybd/virtual-keyboard-gui.h +++ b/backends/vkeybd/virtual-keyboard-gui.h @@ -99,7 +99,7 @@ private: VirtualKeyboard *_kbd; Rect _kbdBound; Graphics::Surface *_kbdSurface; - OverlayColor _kbdTransparentColor; + uint32 _kbdTransparentColor; Point _dragPoint; bool _drag; @@ -113,7 +113,7 @@ private: const Graphics::Font *_dispFont; int16 _dispX, _dispY; uint _dispI; - OverlayColor _dispForeColor, _dispBackColor; + uint32 _dispForeColor, _dispBackColor; int _lastScreenChanged; int16 _screenW, _screenH; @@ -121,7 +121,7 @@ private: bool _displaying; bool _firstRun; - void setupDisplayArea(Rect &r, OverlayColor forecolor); + void setupDisplayArea(Rect &r, uint32 forecolor); void move(int16 x, int16 y); void moveToDefaultPosition(); void screenChanged(); |