[MPlayer-cvslog] CVS: main/Gui/mplayer mw.c, 1.115, 1.116 pb.c, 1.5, 1.6 sw.c, 1.41, 1.42 widgets.c, 1.45, 1.46

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mail:/var2/tmp/cvs-serv31802/mplayer

Modified Files:
	mw.c pb.c sw.c widgets.c 
Log Message:
Fix popup menu problems: GTK cannot get a grab while the button is down,
so show it on button release instead of button press.


Index: mw.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- mw.c	25 Jan 2005 12:44:37 -0000	1.115
+++ mw.c	4 Dec 2005 15:58:52 -0000	1.116
@@ -443,7 +443,7 @@
           itemtype=0;
           break;
 
-   case wsPRMouseButton:
+   case wsRRMouseButton:
         gtkShow( evShowPopUpMenu,NULL );
         break;
 

Index: pb.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/pb.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pb.c	20 Mar 2003 12:42:09 -0000	1.5
+++ pb.c	4 Dec 2005 15:58:52 -0000	1.6
@@ -121,7 +121,7 @@
    case wsRMMouseButton:
         mplHideMenu( RX,RY,0 );
         break;
-   case wsPRMouseButton:
+   case wsRRMouseButton:
         gtkShow( evShowPopUpMenu,NULL );
 	break;
 // ---

Index: sw.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/sw.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sw.c	20 Mar 2003 12:42:09 -0000	1.41
+++ sw.c	4 Dec 2005 15:58:52 -0000	1.42
@@ -47,7 +47,7 @@
 
  switch( Button )
   {
-   case wsPRMouseButton:
+   case wsRRMouseButton:
           gtkShow( evShowPopUpMenu,NULL );
           break;
    case wsPMMouseButton:

Index: widgets.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/widgets.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- widgets.c	17 Aug 2005 18:41:15 -0000	1.45
+++ widgets.c	4 Dec 2005 15:58:52 -0000	1.46
@@ -217,15 +217,7 @@
 	  gtk_widget_destroy( PopUpMenu );
 	 }
         PopUpMenu=create_PopUpMenu();
-#ifdef HAVE_GTK2_GUI
-        // Ugly hack, but we don't want to loose events
-        while(!GTK_WIDGET_VISIBLE(PopUpMenu)) {
-           gtk_menu_popup(GTK_MENU(PopUpMenu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
-           gtk_main_iteration();
-        }
-#else
         gtk_menu_popup( GTK_MENU( PopUpMenu ),NULL,NULL,NULL,NULL,0,0 );
-#endif //HAVE_GTK2_GUI
         break;
    case evHidePopUpMenu:
         if ( PopUpMenu )