diff options
Diffstat (limited to 'gui')
-rw-r--r-- | gui/mplayer/gtk/about.c | 8 | ||||
-rw-r--r-- | gui/mplayer/gtk/opts.c | 2 | ||||
-rw-r--r-- | gui/mplayer/widgets.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/gui/mplayer/gtk/about.c b/gui/mplayer/gtk/about.c index ccb04ff8ad..d14d449e5f 100644 --- a/gui/mplayer/gtk/about.c +++ b/gui/mplayer/gtk/about.c @@ -45,10 +45,10 @@ GtkWidget * create_About( void ) GtkWidget * AboutText; GtkWidget * Ok; -#ifdef HAVE_GTK2_GUI +#ifdef CONFIG_GTK2 GtkTextBuffer * AboutTextBuffer; GtkTextIter iter; -#endif //HAVE_GTK2_GUI +#endif /* CONFIG_GTK2 */ GtkStyle * pixmapstyle; GdkPixmap * pixmapwid; @@ -89,7 +89,7 @@ GtkWidget * create_About( void ) gtk_box_pack_start( GTK_BOX( vbox ),scrolledwindow1,TRUE,TRUE,0 ); gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolledwindow1 ),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC ); -#ifdef HAVE_GTK2_GUI +#ifdef CONFIG_GTK2 AboutText = gtk_text_view_new(); gtk_text_view_set_editable(GTK_TEXT_VIEW(AboutText), FALSE); gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(AboutText), FALSE); @@ -102,7 +102,7 @@ GtkWidget * create_About( void ) gtk_widget_set_name( AboutText,"AboutText" ); gtk_widget_show( AboutText ); gtk_container_add( GTK_CONTAINER( scrolledwindow1 ),AboutText ); -#ifdef HAVE_GTK2_GUI +#ifdef CONFIG_GTK2 gtk_text_buffer_insert (AboutTextBuffer, &iter, #else gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL, diff --git a/gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c index feb189171b..8e78dcb53d 100644 --- a/gui/mplayer/gtk/opts.c +++ b/gui/mplayer/gtk/opts.c @@ -782,7 +782,7 @@ static void prCListRow( GtkCList * clist,gint row,gint column,GdkEvent * event,g !strncmp( ao_driver[0],"esd",3 ) || !strncmp( ao_driver[0],"sdl",3 ) ) gtk_widget_set_sensitive( AConfig,TRUE ); -#ifndef HAVE_GTK2_GUI +#ifndef CONFIG_GTK2 if ( !strncmp( ao_driver[0],"arts",4 ) ) gtkMessageBox(GTK_MB_WARNING|GTK_MB_SIMPLE, MSGTR_PREFERENCES_ArtsBroken); #endif diff --git a/gui/mplayer/widgets.c b/gui/mplayer/widgets.c index bf3dd61989..0cf3c1fbd9 100644 --- a/gui/mplayer/widgets.c +++ b/gui/mplayer/widgets.c @@ -76,7 +76,7 @@ Pixmap guiIconMask; void gtkInit( void ) { mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[widget] init GTK ...\n" ); -#ifdef HAVE_GTK2_GUI +#ifdef CONFIG_GTK2 gtk_disable_setlocale(); #endif gtk_init( 0,NULL ); |