comparison OSWindow.cpp @ 1834:0b44f4d67c18

Merge
author Ritor1
date Tue, 08 Oct 2013 15:27:57 +0600
parents bd899dfd976c
children 0c75c3e7e436
comparison
equal deleted inserted replaced
1833:724af9295e53 1834:0b44f4d67c18
17 #include "AIL.h" 17 #include "AIL.h"
18 #include "Bink_Smacker.h" 18 #include "Bink_Smacker.h"
19 #include "ErrorHandling.h" 19 #include "ErrorHandling.h"
20 20
21 21
22 bool OSWindow::OnKey(int) {return false;}
23 bool OSWindow::OnMouseEnter() {return false;}
24 bool OSWindow::OnMouseLeave() {return false;}
25
26 bool OSWindow::OnMouseLeftClick(int x, int y) 22 bool OSWindow::OnMouseLeftClick(int x, int y)
27 { 23 {
24 if (UIControl::OnMouseLeftClick(x, y))
25 return true;
26
28 if (pVideoPlayer->pVideoFrame.pPixels) 27 if (pVideoPlayer->pVideoFrame.pPixels)
29 pVideoPlayer->bStopBeforeSchedule = true; 28 pVideoPlayer->bStopBeforeSchedule = true;
30 29
31 pMouse->SetMouseClick(x, y); 30 pMouse->SetMouseClick(x, y);
32 31
40 return true; 39 return true;
41 } 40 }
42 41
43 bool OSWindow::OnMouseRightClick(int x, int y) 42 bool OSWindow::OnMouseRightClick(int x, int y)
44 { 43 {
44 if (UIControl::OnMouseRightClick(x, y))
45 return true;
46
45 if (pVideoPlayer->pVideoFrame.pPixels) 47 if (pVideoPlayer->pVideoFrame.pPixels)
46 pVideoPlayer->bStopBeforeSchedule = true; 48 pVideoPlayer->bStopBeforeSchedule = true;
47 49
48 pMouse->SetMouseClick(x, y); 50 pMouse->SetMouseClick(x, y);
49 51