Mercurial > mplayer.hg

comparison 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
comparison
equal deleted inserted replaced
33528:6f20f2a42b76 33529:276eef06fb3d
67 67
68 #include "pixmaps/mplayer.xpm" 68 #include "pixmaps/mplayer.xpm"
69 69
70 // --- init & close gtk 70 // --- init & close gtk
71 71
72 Pixmap guiIcon; 72 guiIcon_t guiIcon;
73 Pixmap guiIconMask;
74 73
75 void gtkInit( void ) 74 void gtkInit( void )
76 { 75 {
77 int argc = 0; 76 int argc = 0;
78 char *arg[3], **argv = arg; 77 char *arg[3], **argv = arg;
98 gdkIcon=gdk_pixmap_colormap_create_from_xpm_d( NULL,gdk_colormap_get_system(),&gdkIconMask,NULL,(gchar **) mplayer_xpm ); 97 gdkIcon=gdk_pixmap_colormap_create_from_xpm_d( NULL,gdk_colormap_get_system(),&gdkIconMask,NULL,(gchar **) mplayer_xpm );
99 98
100 // start up GTK which realizes the pixmaps 99 // start up GTK which realizes the pixmaps
101 gtk_main_iteration_do(FALSE); 100 gtk_main_iteration_do(FALSE);
102 101
103 guiIcon=GDK_PIXMAP_XID( gdkIcon ); 102 guiIcon.normal=GDK_PIXMAP_XID( gdkIcon );
104 guiIconMask=GDK_PIXMAP_XID( gdkIconMask ); 103 guiIcon.normal_mask=GDK_PIXMAP_XID( gdkIconMask );
105 104
106 gtkInitialized=1; 105 gtkInitialized=1;
107 } 106 }
108 107
109 void gtkAddIcon( GtkWidget * window ) 108 void gtkAddIcon( GtkWidget * window )
110 { wsSetIcon( gdk_display,GDK_WINDOW_XWINDOW( window->window ),guiIcon,guiIconMask ); } 109 { wsSetIcon( gdk_display,GDK_WINDOW_XWINDOW( window->window ),&guiIcon ); }
111 110
112 void gtkClearList( GtkWidget * list ) 111 void gtkClearList( GtkWidget * list )
113 { gtk_clist_clear( GTK_CLIST( list ) ); } 112 { gtk_clist_clear( GTK_CLIST( list ) ); }
114 113
115 int gtkFindCList( GtkWidget * list,char * item ) 114 int gtkFindCList( GtkWidget * list,char * item )