Mercurial > mplayer.hg

changeset 35766:16ed8155439b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename uiShowMenu() uiMenuShow() and uiHideMenu() uiMenuHide().
author ib
date Thu, 24 Jan 2013 17:36:42 +0000
parents 42827680dfb9
children 23e241430e9c
files gui/ui/main.c gui/ui/menu.c gui/ui/playbar.c gui/ui/ui.h gui/ui/video.c
diffstat 5 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/gui/ui/main.c	Thu Jan 24 17:31:57 2013 +0000
+++ b/gui/ui/main.c	Thu Jan 24 17:36:42 2013 +0000
@@ -323,7 +323,7 @@
         /*if (guiApp.menuIsPresent)   NOTE TO MYSELF: Uncomment only after mouse
          {                                            pointer and cursor keys work
           gtkShow( ivHidePopUpMenu,NULL );            with this menu from skin as
-          uiShowMenu( 0,0 );                          they do with normal menus.
+          uiMenuShow( 0,0 );                          they do with normal menus.
          }
         else*/ gtkShow( ivShowPopUpMenu,NULL );
         break;
@@ -438,11 +438,11 @@
   {
    case wsPMMouseButton:
 	  gtkShow( ivHidePopUpMenu,NULL );
-          uiShowMenu( RX,RY );
+          uiMenuShow( RX,RY );
           itemtype=itPRMButton;
           break;
    case wsRMMouseButton:
-          uiHideMenu( RX,RY,0 );
+          uiMenuHide( RX,RY,0 );
           break;
 
    case wsPLMouseButton:
--- a/gui/ui/menu.c	Thu Jan 24 17:31:57 2013 +0000
+++ b/gui/ui/menu.c	Thu Jan 24 17:36:42 2013 +0000
@@ -94,7 +94,7 @@
  wsWindowRedraw( &guiApp.menuWindow );
 }
 
-void uiShowMenu( int mx,int my )
+void uiMenuShow( int mx,int my )
 {
  int x,y;
 
@@ -117,7 +117,7 @@
  wsWindowRedraw( &guiApp.menuWindow );
 }
 
-void uiHideMenu( int mx,int my,int w )
+void uiMenuHide( int mx,int my,int w )
 {
  int x,y,i=menuItem;
 
--- a/gui/ui/playbar.c	Thu Jan 24 17:31:57 2013 +0000
+++ b/gui/ui/playbar.c	Thu Jan 24 17:36:42 2013 +0000
@@ -134,10 +134,10 @@
   {
    case wsPMMouseButton:
         gtkShow( ivHidePopUpMenu,NULL );
-        uiShowMenu( RX,RY );
+        uiMenuShow( RX,RY );
         break;
    case wsRMMouseButton:
-        uiHideMenu( RX,RY,0 );
+        uiMenuHide( RX,RY,0 );
         break;
    case wsRRMouseButton:
         gtkShow( ivShowPopUpMenu,NULL );
--- a/gui/ui/ui.h	Thu Jan 24 17:31:57 2013 +0000
+++ b/gui/ui/ui.h	Thu Jan 24 17:36:42 2013 +0000
@@ -40,8 +40,8 @@
 void uiVideoMouse( int Button, int X, int Y, int RX, int RY );
 
 void uiMenuInit( void );
-void uiHideMenu( int mx, int my, int w );
-void uiShowMenu( int mx, int my );
+void uiMenuHide( int mx, int my, int w );
+void uiMenuShow( int mx, int my );
 void uiMenuMouse( int RX, int RY );
 
 void uiPlaybarInit( void );
--- a/gui/ui/video.c	Thu Jan 24 17:31:57 2013 +0000
+++ b/gui/ui/video.c	Thu Jan 24 17:36:42 2013 +0000
@@ -64,11 +64,11 @@
           break;
    case wsPMMouseButton:
           gtkShow( ivHidePopUpMenu,NULL );
-          uiShowMenu( RX,RY );
+          uiMenuShow( RX,RY );
           msButton=wsPMMouseButton;
           break;
    case wsRMMouseButton:
-          uiHideMenu( RX,RY,1 );
+          uiMenuHide( RX,RY,1 );
           msButton=0;
           break;
 /* --- */