diff OSWindow.cpp @ 1834:0b44f4d67c18

Merge
author Ritor1
date Tue, 08 Oct 2013 15:27:57 +0600
parents bd899dfd976c
children 0c75c3e7e436
line wrap: on
line diff
--- a/OSWindow.cpp	Tue Oct 08 15:27:43 2013 +0600
+++ b/OSWindow.cpp	Tue Oct 08 15:27:57 2013 +0600
@@ -19,12 +19,11 @@
 #include "ErrorHandling.h"
 
 
-bool OSWindow::OnKey(int)     {return false;}
-bool OSWindow::OnMouseEnter() {return false;}
-bool OSWindow::OnMouseLeave() {return false;}
-
 bool OSWindow::OnMouseLeftClick(int x, int y)
 {
+  if (UIControl::OnMouseLeftClick(x, y))
+    return true;
+
   if (pVideoPlayer->pVideoFrame.pPixels)
     pVideoPlayer->bStopBeforeSchedule = true;
 
@@ -42,6 +41,9 @@
 
 bool OSWindow::OnMouseRightClick(int x, int y)
 {
+  if (UIControl::OnMouseRightClick(x, y))
+    return true;
+
   if (pVideoPlayer->pVideoFrame.pPixels)
     pVideoPlayer->bStopBeforeSchedule = true;