Mercurial > mplayer.hg

diff gui/mplayer/widgets.c @ 33529:276eef06fb3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Store icon data in a struct variable. This is a preparation for differently sized icons to come.
author ib
date Tue, 14 Jun 2011 18:55:04 +0000
parents 6f20f2a42b76
children 7ced3616af42
line wrap: on
line diff
--- a/gui/mplayer/widgets.c	Tue Jun 14 18:01:22 2011 +0000
+++ b/gui/mplayer/widgets.c	Tue Jun 14 18:55:04 2011 +0000
@@ -69,8 +69,7 @@
 
 // --- init & close gtk
 
-Pixmap	    guiIcon;
-Pixmap	    guiIconMask;
+guiIcon_t guiIcon;
 
 void gtkInit( void )
 {
@@ -100,14 +99,14 @@
  // start up GTK which realizes the pixmaps
  gtk_main_iteration_do(FALSE);
 
- guiIcon=GDK_PIXMAP_XID( gdkIcon );
- guiIconMask=GDK_PIXMAP_XID( gdkIconMask );
+ guiIcon.normal=GDK_PIXMAP_XID( gdkIcon );
+ guiIcon.normal_mask=GDK_PIXMAP_XID( gdkIconMask );
 
  gtkInitialized=1;
 }
 
 void gtkAddIcon( GtkWidget * window )
-{ wsSetIcon( gdk_display,GDK_WINDOW_XWINDOW( window->window ),guiIcon,guiIconMask ); }
+{ wsSetIcon( gdk_display,GDK_WINDOW_XWINDOW( window->window ),&guiIcon ); }
 
 void gtkClearList( GtkWidget * list )
 { gtk_clist_clear( GTK_CLIST( list ) ); }