[MPlayer-cvslog] r36113 - in trunk/gui/dialog: about.c dialog.c dialog.h equalizer.c fileselect.c playlist.c preferences.c skinbrowser.c url.c
ib
subversion at mplayerhq.hu
Sun Mar 31 19:08:31 CEST 2013
Author: ib
Date: Sun Mar 31 19:08:30 2013
New Revision: 36113
Log:
Cosmetic: Rename gtkActive() gtkRaise().
Modified:
trunk/gui/dialog/about.c
trunk/gui/dialog/dialog.c
trunk/gui/dialog/dialog.h
trunk/gui/dialog/equalizer.c
trunk/gui/dialog/fileselect.c
trunk/gui/dialog/playlist.c
trunk/gui/dialog/preferences.c
trunk/gui/dialog/skinbrowser.c
trunk/gui/dialog/url.c
Modified: trunk/gui/dialog/about.c
==============================================================================
--- trunk/gui/dialog/about.c Sun Mar 31 14:42:47 2013 (r36112)
+++ trunk/gui/dialog/about.c Sun Mar 31 19:08:30 2013 (r36113)
@@ -352,7 +352,7 @@ static GtkWidget * CreateAbout( void )
void ShowAbout( void )
{
- if ( About ) gtkActive( About );
+ if ( About ) gtkRaise( About );
else About=CreateAbout();
gtk_widget_show( About );
}
Modified: trunk/gui/dialog/dialog.c
==============================================================================
--- trunk/gui/dialog/dialog.c Sun Mar 31 14:42:47 2013 (r36112)
+++ trunk/gui/dialog/dialog.c Sun Mar 31 19:08:30 2013 (r36113)
@@ -277,7 +277,7 @@ void gtkMessageBox(int type, const gchar
void gtkSetLayer(GtkWidget *window)
{
wsWindowLayer(gdk_display, GDK_WINDOW_XWINDOW(window->window), guiApp.videoWindow.isFullScreen);
- gtkActive(window);
+ gtkRaise(window);
}
/**
@@ -285,7 +285,7 @@ void gtkSetLayer(GtkWidget *window)
*
* @param window pointer to a GtkWindow widget
*/
-void gtkActive(GtkWidget *window)
+void gtkRaise(GtkWidget *window)
{
wsWindowRaiseTop(gdk_display, GDK_WINDOW_XWINDOW(window->window));
}
Modified: trunk/gui/dialog/dialog.h
==============================================================================
--- trunk/gui/dialog/dialog.h Sun Mar 31 14:42:47 2013 (r36112)
+++ trunk/gui/dialog/dialog.h Sun Mar 31 19:08:30 2013 (r36113)
@@ -76,6 +76,6 @@ void gtkEventHandling(void);
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 */
Modified: trunk/gui/dialog/equalizer.c
==============================================================================
--- trunk/gui/dialog/equalizer.c Sun Mar 31 14:42:47 2013 (r36112)
+++ trunk/gui/dialog/equalizer.c Sun Mar 31 19:08:30 2013 (r36113)
@@ -474,7 +474,7 @@ static GtkWidget * CreateEqualizer( void
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 @@ void ShowEquConfig( void )
{
GList * Items = NULL;
- if ( EquConfig ) gtkActive( EquConfig );
+ if ( EquConfig ) gtkRaise( EquConfig );
else EquConfig=CreateEquConfig();
Items=g_list_append( Items,(gpointer)MSGTR_EQU_Front_Right );
Modified: trunk/gui/dialog/fileselect.c
==============================================================================
--- trunk/gui/dialog/fileselect.c Sun Mar 31 14:42:47 2013 (r36112)
+++ trunk/gui/dialog/fileselect.c Sun Mar 31 19:08:30 2013 (r36113)
@@ -726,7 +726,7 @@ void ShowFileSelector(int type)
struct stat f;
if (FileSelector)
- gtkActive(FileSelector);
+ gtkRaise(FileSelector);
else
FileSelector = CreateFileSelect();
Modified: trunk/gui/dialog/playlist.c
==============================================================================
--- trunk/gui/dialog/playlist.c Sun Mar 31 14:42:47 2013 (r36112)
+++ trunk/gui/dialog/playlist.c Sun Mar 31 19:08:30 2013 (r36113)
@@ -586,7 +586,7 @@ void ShowPlaylist( void )
{
plItem * next;
- if ( Playlist ) gtkActive( Playlist );
+ if ( Playlist ) gtkRaise( Playlist );
else Playlist=CreatePlaylist();
if ( old_path && *old_path )
Modified: trunk/gui/dialog/preferences.c
==============================================================================
--- trunk/gui/dialog/preferences.c Sun Mar 31 14:42:47 2013 (r36112)
+++ trunk/gui/dialog/preferences.c Sun Mar 31 19:08:30 2013 (r36113)
@@ -447,7 +447,7 @@ static void prToggled( GtkToggleButton *
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 @@ static GtkWidget * CreatePreferences( vo
void ShowPreferences( void )
{
- if ( Preferences ) gtkActive( Preferences );
+ if ( Preferences ) gtkRaise( Preferences );
else Preferences=CreatePreferences();
/* 1st page */
@@ -1677,7 +1677,7 @@ static GtkWidget *CreateAudioConfig( voi
}
void ShowAudioConfig( void ) {
- if (AudioConfig) gtkActive(AudioConfig);
+ if (AudioConfig) gtkRaise(AudioConfig);
else AudioConfig = CreateAudioConfig();
#ifdef CONFIG_OSS_AUDIO
@@ -1723,7 +1723,7 @@ GtkWidget * CreateDXR3Config( void );
void ShowDXR3Config( void )
{
- if ( DXR3Config ) gtkActive( DXR3Config );
+ if ( DXR3Config ) gtkRaise( DXR3Config );
else DXR3Config=CreateDXR3Config();
gtk_entry_set_text( GTK_ENTRY( CEDXR3Device ),gtkDXR3Device );
Modified: trunk/gui/dialog/skinbrowser.c
==============================================================================
--- trunk/gui/dialog/skinbrowser.c Sun Mar 31 14:42:47 2013 (r36112)
+++ trunk/gui/dialog/skinbrowser.c Sun Mar 31 19:08:30 2013 (r36113)
@@ -75,7 +75,7 @@ static void on_SkinList_select_row( GtkC
{
prev=sbSelectedSkin;
uiChangeSkin( sbSelectedSkin );
- gtkActive( SkinBrowser );
+ gtkRaise( SkinBrowser );
}
if( !event ) return;
if( event->type == GDK_2BUTTON_PRESS )
@@ -166,7 +166,7 @@ static GtkWidget * CreateSkinBrowser( vo
void ShowSkinBrowser( void )
{
- if ( SkinBrowser ) gtkActive( SkinBrowser );
+ if ( SkinBrowser ) gtkRaise( SkinBrowser );
else SkinBrowser=CreateSkinBrowser();
}
Modified: trunk/gui/dialog/url.c
==============================================================================
--- trunk/gui/dialog/url.c Sun Mar 31 14:42:47 2013 (r36112)
+++ trunk/gui/dialog/url.c Sun Mar 31 19:08:30 2013 (r36113)
@@ -139,7 +139,7 @@ void ShowURLDialog(void)
urlItem *item;
if (URLDialog)
- gtkActive(URLDialog);
+ gtkRaise(URLDialog);
else
URLDialog = CreateURLDialog();
More information about the MPlayer-cvslog
mailing list