Mercurial > mplayer.hg

diff gui/ui/menu.c @ 35675:9e2183017f1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move wgIsRect from ws.h to gui.h. It's not window system specific. Additionally, rename it isInside.
author ib
date Thu, 17 Jan 2013 17:11:46 +0000
parents d798beebfe71
children 80c5c89f77d6
line wrap: on
line diff
--- a/gui/ui/menu.c	Thu Jan 17 16:53:15 2013 +0000
+++ b/gui/ui/menu.c	Thu Jan 17 17:11:46 2013 +0000
@@ -87,7 +87,7 @@
 
  for( i=0;i<=guiApp.IndexOfMenuItems;i++ )
   {
-   if ( wgIsRect( x,y,
+   if ( isInside( x,y,
          guiApp.menuItems[i].x,guiApp.menuItems[i].y,
          guiApp.menuItems[i].x+guiApp.menuItems[i].width,guiApp.menuItems[i].y+guiApp.menuItems[i].height ) ) { menuItem=i; break; }
   }
@@ -134,7 +134,7 @@
 
 // printf( "---------> %d %d,%d\n",i,x,y );
 // printf( "--------> mi: %d,%d %dx%d\n",guiApp.menuItems[i].x,guiApp.menuItems[i].y,guiApp.menuItems[i].width,guiApp.menuItems[i].height );
- if ( wgIsRect( x,y,
+ if ( isInside( x,y,
         guiApp.menuItems[i].x,guiApp.menuItems[i].y,
         guiApp.menuItems[i].x+guiApp.menuItems[i].width,
         guiApp.menuItems[i].y+guiApp.menuItems[i].height ) )