From 448911930d8d6bf43a67769d50ee4048f296b7f4 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Mon, 23 Jul 2012 03:01:05 +0200
Subject: WINTERMUTE: Remove unused code from platform_osystem.h

---
 engines/wintermute/ui/ui_button.cpp | 5 ++---
 engines/wintermute/ui/ui_edit.cpp   | 9 ++++-----
 engines/wintermute/ui/ui_window.cpp | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'engines/wintermute/ui')

diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp
index 21a60ef922..235a73e8a6 100644
--- a/engines/wintermute/ui/ui_button.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -38,7 +38,6 @@
 #include "engines/wintermute/base/base_string_table.h"
 #include "engines/wintermute/base/base_sprite.h"
 #include "engines/wintermute/base/base_file_manager.h"
-#include "engines/wintermute/platform_osystem.h"
 #include "engines/wintermute/base/scriptables/script_value.h"
 #include "engines/wintermute/base/scriptables/script.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
@@ -590,7 +589,7 @@ bool UIButton::display(int offsetX, int offsetY) {
 	_hover = (!_disable && _gameRef->_activeObject == this && (_gameRef->_interactive || _gameRef->_state == GAME_SEMI_FROZEN));
 
 	if ((_press && _hover && !_gameRef->_mouseLeftDown) ||
-	        (_oneTimePress && BasePlatform::getTime() - _oneTimePressTime >= 100)) press();
+	        (_oneTimePress && g_system->getMillis() - _oneTimePressTime >= 100)) press();
 
 
 	if (_disable) {
@@ -907,7 +906,7 @@ bool UIButton::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 
 		if (_visible && !_disable) {
 			_oneTimePress = true;
-			_oneTimePressTime = BasePlatform::getTime();
+			_oneTimePressTime = g_system->getMillis();
 		}
 		stack->pushNULL();
 
diff --git a/engines/wintermute/ui/ui_edit.cpp b/engines/wintermute/ui/ui_edit.cpp
index df3bd85bb8..3d847408b5 100644
--- a/engines/wintermute/ui/ui_edit.cpp
+++ b/engines/wintermute/ui/ui_edit.cpp
@@ -40,7 +40,6 @@
 #include "engines/wintermute/base/base_sprite.h"
 #include "engines/wintermute/base/base_string_table.h"
 #include "engines/wintermute/base/base_game.h"
-#include "engines/wintermute/platform_osystem.h"
 #include "engines/wintermute/base/scriptables/script_value.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
 #include "engines/wintermute/base/scriptables/script.h"
@@ -629,8 +628,8 @@ bool UIEdit::display(int offsetX, int offsetY) {
 		// cursor
 		if (focused && curFirst) {
 			if (Count) {
-				if (BasePlatform::getTime() - _lastBlinkTime >= _cursorBlinkRate) {
-					_lastBlinkTime = BasePlatform::getTime();
+				if (g_system->getMillis() - _lastBlinkTime >= _cursorBlinkRate) {
+					_lastBlinkTime = g_system->getMillis();
 					_cursorVisible = !_cursorVisible;
 				}
 				if (_cursorVisible)
@@ -652,8 +651,8 @@ bool UIEdit::display(int offsetX, int offsetY) {
 		// cursor
 		if (focused && !curFirst) {
 			if (Count) {
-				if (BasePlatform::getTime() - _lastBlinkTime >= _cursorBlinkRate) {
-					_lastBlinkTime = BasePlatform::getTime();
+				if (g_system->getMillis() - _lastBlinkTime >= _cursorBlinkRate) {
+					_lastBlinkTime = g_system->getMillis();
 					_cursorVisible = !_cursorVisible;
 				}
 				if (_cursorVisible)
diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp
index 1f7dc0bee9..2c3d7b78ea 100644
--- a/engines/wintermute/ui/ui_window.cpp
+++ b/engines/wintermute/ui/ui_window.cpp
@@ -1137,7 +1137,7 @@ bool UIWindow::handleMouse(TMouseEvent event, TMouseButton button) {
 			Rect32 dragRect = _dragRect;
 			int offsetX, offsetY;
 			getTotalOffset(&offsetX, &offsetY);
-			BasePlatform::offsetRect(&dragRect, _posX + offsetX, _posY + offsetY);
+			dragRect.offsetRect(_posX + offsetX, _posY + offsetY);
 
 			if (BasePlatform::ptInRect(&dragRect, _gameRef->_mousePos)) {
 				_dragFrom.x = _gameRef->_mousePos.x;
-- 
cgit v1.2.3