changeset 36019:d2d776c8e040

Cosmetic: Rename gtkActive() gtkRaise().

--- a/gui/dialog/about.c	Sun Mar 31 12:42:47 2013 +0000
+++ b/gui/dialog/about.c	Sun Mar 31 17:08:30 2013 +0000
@@ -352,7 +352,7 @@
 
 void ShowAbout( void )
 {
- if ( About ) gtkActive( About );
+ if ( About ) gtkRaise( About );
    else About=CreateAbout();
  gtk_widget_show( About );
 }

--- a/gui/dialog/dialog.c	Sun Mar 31 12:42:47 2013 +0000
+++ b/gui/dialog/dialog.c	Sun Mar 31 17:08:30 2013 +0000
@@ -277,7 +277,7 @@
 void gtkSetLayer(GtkWidget *window)
 {
     wsWindowLayer(gdk_display, GDK_WINDOW_XWINDOW(window->window), guiApp.videoWindow.isFullScreen);
-    gtkActive(window);
+    gtkRaise(window);
 }
 
 /**
@@ -285,7 +285,7 @@
  *
  * @param window pointer to a GtkWindow widget
  */
-void gtkActive(GtkWidget *window)
+void gtkRaise(GtkWidget *window)
 {
     wsWindowRaiseTop(gdk_display, GDK_WINDOW_XWINDOW(window->window));
 }

--- a/gui/dialog/dialog.h	Sun Mar 31 12:42:47 2013 +0000
+++ b/gui/dialog/dialog.h	Sun Mar 31 17:08:30 2013 +0000
@@ -76,6 +76,6 @@
 void gtkShow(int type, char *param);
 void gtkMessageBox(int type, const gchar *str);
 void gtkSetLayer(GtkWidget *window);
-void gtkActive(GtkWidget *window);
+void gtkRaise(GtkWidget *window);
 
 #endif /* MPLAYER_GUI_DIALOG_H */

--- a/gui/dialog/equalizer.c	Sun Mar 31 12:42:47 2013 +0000
+++ b/gui/dialog/equalizer.c	Sun Mar 31 17:08:30 2013 +0000
@@ -474,7 +474,7 @@
 
 void ShowEqualizer( void )
 {
- if ( Equalizer ) gtkActive( Equalizer );
+ if ( Equalizer ) gtkRaise( Equalizer );
     else Equalizer=CreateEqualizer();
 
  if ( !gtkEquChannel1 ) gtkEquChannel1=strdup( MSGTR_EQU_Front_Right );
@@ -537,7 +537,7 @@
 {
  GList * Items = NULL;
 
- if ( EquConfig ) gtkActive( EquConfig );
+ if ( EquConfig ) gtkRaise( EquConfig );
     else EquConfig=CreateEquConfig();
 
  Items=g_list_append( Items,(gpointer)MSGTR_EQU_Front_Right  );

--- a/gui/dialog/fileselect.c	Sun Mar 31 12:42:47 2013 +0000
+++ b/gui/dialog/fileselect.c	Sun Mar 31 17:08:30 2013 +0000
@@ -726,7 +726,7 @@
     struct stat f;
 
     if (FileSelector)
-        gtkActive(FileSelector);
+        gtkRaise(FileSelector);
     else
         FileSelector = CreateFileSelect();
 

--- a/gui/dialog/playlist.c	Sun Mar 31 12:42:47 2013 +0000
+++ b/gui/dialog/playlist.c	Sun Mar 31 17:08:30 2013 +0000
@@ -586,7 +586,7 @@
 {
  plItem * next;
 
- if ( Playlist ) gtkActive( Playlist );
+ if ( Playlist ) gtkRaise( Playlist );
   else Playlist=CreatePlaylist();
 
  if ( old_path && *old_path )

--- a/gui/dialog/preferences.c	Sun Mar 31 12:42:47 2013 +0000
+++ b/gui/dialog/preferences.c	Sun Mar 31 17:08:30 2013 +0000
@@ -447,7 +447,7 @@
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) ) )
 	 {
 	  window=wsShowWindow;
-	  gtkActive( Preferences );
+	  gtkRaise( Preferences );
 	 } else window=wsHideWindow;
 	// NOTE TO MYSELF: doesn't work with a fullscreen window
 	if ( !guiInfo.Playing ) wsWindowVisibility( &guiApp.videoWindow,window );
@@ -1097,7 +1097,7 @@
 
 void ShowPreferences( void )
 {
- if ( Preferences ) gtkActive( Preferences );
+ if ( Preferences ) gtkRaise( Preferences );
    else Preferences=CreatePreferences();
 
 /* 1st page */
@@ -1677,7 +1677,7 @@
 }
 
 void ShowAudioConfig( void ) {
-  if (AudioConfig) gtkActive(AudioConfig);
+  if (AudioConfig) gtkRaise(AudioConfig);
   else AudioConfig = CreateAudioConfig();
 
 #ifdef CONFIG_OSS_AUDIO
@@ -1723,7 +1723,7 @@
 
 void ShowDXR3Config( void )
 {
- if ( DXR3Config ) gtkActive( DXR3Config );
+ if ( DXR3Config ) gtkRaise( DXR3Config );
   else DXR3Config=CreateDXR3Config();
 
  gtk_entry_set_text( GTK_ENTRY( CEDXR3Device ),gtkDXR3Device );

--- a/gui/dialog/skinbrowser.c	Sun Mar 31 12:42:47 2013 +0000
+++ b/gui/dialog/skinbrowser.c	Sun Mar 31 17:08:30 2013 +0000
@@ -75,7 +75,7 @@
   {
    prev=sbSelectedSkin;
    uiChangeSkin( sbSelectedSkin );
-   gtkActive( SkinBrowser );
+   gtkRaise( SkinBrowser );
   }
  if( !event ) return;
  if( event->type == GDK_2BUTTON_PRESS )
@@ -166,7 +166,7 @@
 
 void ShowSkinBrowser( void )
 {
- if ( SkinBrowser ) gtkActive( SkinBrowser );
+ if ( SkinBrowser ) gtkRaise( SkinBrowser );
    else SkinBrowser=CreateSkinBrowser();
 }
 

--- a/gui/dialog/url.c	Sun Mar 31 12:42:47 2013 +0000
+++ b/gui/dialog/url.c	Sun Mar 31 17:08:30 2013 +0000
@@ -139,7 +139,7 @@
     urlItem *item;
 
     if (URLDialog)
-        gtkActive(URLDialog);
+        gtkRaise(URLDialog);
     else
         URLDialog = CreateURLDialog();