[Mplayer-cvslog] CVS: main/Gui/mplayer/gtk about.c,1.9,1.10 eq.c,1.6,1.7 fs.c,1.21,1.22 mb.c,1.10,1.11 opts.c,1.6,1.7 pl.c,1.5,1.6 sb.c,1.11,1.12 url.c,1.4,1.5

Zoltan Ponekker pontscho at mplayerhq.hu
Wed Jul 31 01:09:27 CEST 2002


Update of /cvsroot/mplayer/main/Gui/mplayer/gtk
In directory mail:/var/tmp.root/cvs-serv7200/mplayer/gtk

Modified Files:
	about.c eq.c fs.c mb.c opts.c pl.c sb.c url.c 
Log Message:
gtk dialog bug fix

Index: about.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/about.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- about.c	25 Jul 2002 20:26:37 -0000	1.9
+++ about.c	30 Jul 2002 23:09:24 -0000	1.10
@@ -15,7 +15,7 @@
  if ( gtkVAboutBox ) gtkActive( AboutBox );
    else AboutBox=create_About();
  gtk_widget_show( AboutBox );
- gtkVisible++;
+ gtkIncVisible();
 }
 
 void ab_AboutBox_show( GtkButton * button,gpointer user_data )
@@ -25,7 +25,7 @@
 {
  gtkVAboutBox=(int)user_data; 
  gtk_widget_destroy( AboutBox );
- gtkVisible--;
+ gtkDecVisible();
 }
 
 GtkWidget * create_About( void )

Index: eq.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/eq.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eq.c	30 Jul 2002 11:50:20 -0000	1.6
+++ eq.c	30 Jul 2002 23:09:24 -0000	1.7
@@ -142,13 +142,13 @@
 
  if ( gtk_notebook_get_current_page( GTK_NOTEBOOK( Notebook ) ) == 0 ) gtk_widget_show( Config );
  gtk_widget_show( Equalizer );
- gtkVisible++;
+ gtkIncVisible();
 }
 
 void HideEqualizer( void )
 {
  if ( !gtkVEqualizer ) return;
- gtkVEqualizer=0; gtkVisible--;
+ gtkVEqualizer=0; gtkDecVisible();
  gtk_widget_hide( Equalizer );
  gtk_widget_destroy( Equalizer );
  if ( gtkVEquConfig ) HideEquConfig();

Index: fs.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/fs.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- fs.c	30 Jul 2002 11:50:20 -0000	1.21
+++ fs.c	30 Jul 2002 23:09:24 -0000	1.22
@@ -286,7 +286,7 @@
   
  gtk_window_set_modal( GTK_WINDOW( fsFileSelect ),modal );
 
- gtk_widget_show( fsFileSelect ); gtkVisible++;
+ gtk_widget_show( fsFileSelect ); gtkIncVisible();
 }
 
 void HideFileSelect( void )
@@ -294,7 +294,7 @@
  if ( !gtkVFileSelect ) return;
  gtk_widget_hide( fsFileSelect );
  gtk_widget_destroy( fsFileSelect );
- gtkVFileSelect=0; gtkVisible--;
+ gtkVFileSelect=0; gtkDecVisible();
 }
 
 void fs_fsFileSelect_destroy( GtkObject * object,gpointer user_data )

Index: mb.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/mb.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mb.c	25 Jul 2002 20:26:37 -0000	1.10
+++ mb.c	30 Jul 2002 23:09:24 -0000	1.11
@@ -20,11 +20,11 @@
    else MessageBox=create_MessageBox( 0 );
  gtkSetLayer( MessageBox );
  if ( strlen( msg ) < 20 ) gtk_widget_set_usize( MessageBox,196,-1 );
- gtkVisible++;
+ gtkIncVisible();
 }
 
 static void on_Ok_released( GtkButton * button,gpointer user_data  )
-{ gtkVMessageBox=0; gtk_widget_hide( MessageBox ); gtk_widget_destroy( MessageBox ); gtkVisible--; }
+{ gtkVMessageBox=0; gtk_widget_hide( MessageBox ); gtk_widget_destroy( MessageBox ); gtkDecVisible(); }
 
 static void on_MessageBox_show( GtkButton * button,gpointer user_data  )
 { gtkVMessageBox=(int)user_data; }

Index: opts.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/opts.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- opts.c	30 Jul 2002 11:50:20 -0000	1.6
+++ opts.c	30 Jul 2002 23:09:24 -0000	1.7
@@ -228,7 +228,7 @@
  gtk_signal_connect( GTK_OBJECT( CLADrivers ),"select_row",GTK_SIGNAL_FUNC( prCListRow ),(void*)0 );
  gtk_signal_connect( GTK_OBJECT( CLVDrivers ),"select_row",GTK_SIGNAL_FUNC( prCListRow ),(void*)1 );
 
- gtkVPreferences=1; gtkVisible++;
+ gtkVPreferences=1; gtkIncVisible();
  gtk_widget_show( Preferences );
  gtkSetLayer( Preferences );
  gtkMessageBox( GTK_MB_WARNING,MSGTR_PREFERENCES_Message );
@@ -237,7 +237,7 @@
 void HidePreferences( void )
 {
  if ( !gtkVPreferences ) return;
- gtkVPreferences=0; gtkVisible--;
+ gtkVPreferences=0; gtkDecVisible();
  gtk_widget_hide( Preferences ); gtk_widget_destroy( Preferences );
  HideOSSConfig();
 }
@@ -1465,7 +1465,7 @@
 
  gtk_widget_show( OSSConfig );
  gtkSetLayer( OSSConfig );
- gtkVOSSConfig=1; gtkVisible++;
+ gtkVOSSConfig=1; gtkIncVisible();
 }
 
 void HideOSSConfig( void )
@@ -1473,7 +1473,7 @@
  if ( !gtkVOSSConfig ) return;
  gtk_widget_hide( OSSConfig );
  gtk_widget_destroy( OSSConfig ); 
- gtkVOSSConfig=0; gtkVisible--;
+ gtkVOSSConfig=0; gtkDecVisible();
 }
 
 static void ossDestroy( GtkObject * object,gpointer user_data )

Index: pl.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/pl.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pl.c	19 Jul 2002 20:51:46 -0000	1.5
+++ pl.c	30 Jul 2002 23:09:24 -0000	1.6
@@ -169,7 +169,7 @@
   }
  gtk_clist_thaw( GTK_CLIST( CLSelected ) );
 
- gtk_widget_show( PlayList ); gtkVisible++;
+ gtk_widget_show( PlayList ); gtkIncVisible();
 }
 
 void HidePlayList( void )
@@ -180,7 +180,7 @@
  if ( CLFileSelected ) free( CLFileSelected ); CLFileSelected=NULL;
  if ( old_path ) free( old_path ); old_path=strdup( current_path );
  gtk_widget_hide( PlayList );
- gtk_widget_destroy( PlayList ); gtkVisible--;
+ gtk_widget_destroy( PlayList ); gtkDecVisible();
 }
 
 static void plDestroy( GtkObject * object,gpointer user_data )

Index: sb.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/sb.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sb.c	25 Jul 2002 20:26:37 -0000	1.11
+++ sb.c	30 Jul 2002 23:09:24 -0000	1.12
@@ -29,13 +29,13 @@
 {
  if ( gtkVSkinBrowser ) gtkActive( SkinBrowser );
    else SkinBrowser=create_SkinBrowser();
- gtkVisible++;
+ gtkIncVisible();
 }
 
 void HideSkinBrowser( void )
 {
  if ( !gtkVSkinBrowser ) return;
- gtkVSkinBrowser=0; gtkVisible--;
+ gtkVSkinBrowser=0; gtkDecVisible();
  gtk_widget_destroy( SkinBrowser );
 }
 

Index: url.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/url.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- url.c	19 Jul 2002 20:51:46 -0000	1.4
+++ url.c	30 Jul 2002 23:09:24 -0000	1.5
@@ -34,7 +34,7 @@
   }
  
  gtk_widget_show( URL );
- gtkVURLDialogBox=1; gtkVisible++;
+ gtkVURLDialogBox=1; gtkIncVisible();
 }
 
 void HideURLDialogBox( void )
@@ -42,7 +42,7 @@
  if ( !gtkVURLDialogBox ) return;
  gtk_widget_hide( URL );
  gtk_widget_destroy( URL );
- gtkVURLDialogBox=0; gtkVisible--;
+ gtkVURLDialogBox=0; gtkDecVisible();
 }
 
 static gboolean on_URL_destroy_event( GtkWidget * widget,GdkEvent * event,gpointer user_data )




More information about the MPlayer-cvslog mailing list