# HG changeset patch
# User ib
# Date 1359049002 0
# Node ID 16ed8155439badd45dbb874beb81fb9742982c0b
# Parent  42827680dfb9b73c15e930ac21b9f2ea866ecc4d
Rename uiShowMenu() uiMenuShow() and uiHideMenu() uiMenuHide().

diff -r 42827680dfb9 -r 16ed8155439b gui/ui/main.c
--- 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:
diff -r 42827680dfb9 -r 16ed8155439b gui/ui/menu.c
--- 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;
 
diff -r 42827680dfb9 -r 16ed8155439b gui/ui/playbar.c
--- 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 );
diff -r 42827680dfb9 -r 16ed8155439b gui/ui/ui.h
--- 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 );
diff -r 42827680dfb9 -r 16ed8155439b gui/ui/video.c
--- 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;
 /* --- */