diff options
author | 2002-08-04 19:23:58 +0000 | |
---|---|---|
committer | 2002-08-04 19:23:58 +0000 | |
commit | 0cfdf68bfbace49b8e1cd0954542da86bc0aa0f6 (patch) | |
tree | 0800301bcfcb1bc07bdc38c791aced32a6052772 /Gui/mplayer/widgets.c | |
parent | b049fdd4f759b5713a266bd380e96e8a80a571b2 (diff) |
- fix mixer handling
- some change in menu
- fix evLoadPlay bug
- etc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6904 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/mplayer/widgets.c')
-rw-r--r-- | Gui/mplayer/widgets.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/Gui/mplayer/widgets.c b/Gui/mplayer/widgets.c index bad3a27609..aea04e6481 100644 --- a/Gui/mplayer/widgets.c +++ b/Gui/mplayer/widgets.c @@ -38,7 +38,6 @@ GtkWidget * ErrorPixmap; int gtkPopupMenu = 0; int gtkPopupMenuParam = 0; int gtkInited = 0; -int gtkVisible = 0; #include "gtk/sb.h" #include "gtk/pl.h" @@ -117,8 +116,7 @@ void gtkSetDefaultToCList( GtkWidget * list,char * item ) void gtkEventHandling( void ) { int i; - if ( gtkVisible > 0 ) - for( i=0;i < 25;i++ ) gtk_main_iteration_do( 0 ); + for( i=0;i < 25;i++ ) gtk_main_iteration_do( 0 ); } // --- funcs @@ -185,7 +183,7 @@ void gtkShow( int type,char * param ) } else { - gtk_widget_destroy( SkinBrowser ); gtkDecVisible(); + gtk_widget_destroy( SkinBrowser ); gtkMessageBox( GTK_MB_ERROR,"Skin dirs not found ... Please install skins." ); } break; @@ -219,13 +217,12 @@ void gtkShow( int type,char * param ) case evShowPopUpMenu: gtkPopupMenu=evNone; gtkPopupMenuParam=0; - if ( PopUpMenu ) { gtk_widget_hide_on_delete( PopUpMenu ); gtkDecVisible(); } + if ( PopUpMenu ) { gtk_widget_hide_on_delete( PopUpMenu ); } PopUpMenu=create_PopUpMenu(); gtk_menu_popup( GTK_MENU( PopUpMenu ),NULL,NULL,NULL,NULL,0,0 ); - gtkIncVisible(); break; case evHidePopUpMenu: - if ( PopUpMenu ) { gtk_widget_hide_on_delete( PopUpMenu ); /*gtkVisible--;*/ PopUpMenu=NULL; } + if ( PopUpMenu ) { gtk_widget_hide_on_delete( PopUpMenu ); PopUpMenu=NULL; } break; case evPlayNetwork: ShowURLDialogBox(); @@ -233,7 +230,3 @@ void gtkShow( int type,char * param ) break; } } - -void gtkIncVisible( void ) { gtkVisible++; } -void gtkDecVisible( void ) { if ( gtkVisible > 0 ) gtkVisible--; } - |