Mercurial > mplayer.hg

comparison gui/mplayer/widgets.c @ 33508:72b4bbb515f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename gtkIcon variables gdkIcon. Since they hold GDK objects this is the more appropriate name.
author ib
date Sun, 12 Jun 2011 06:56:43 +0000
parents 2a1a52ba0d70
children 645b0990ba4c
comparison
equal deleted inserted replaced
33507:2a1a52ba0d70 33508:72b4bbb515f3
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 static GdkPixmap * gtkIcon; 72 static GdkPixmap * gdkIcon;
73 static GdkBitmap * gtkIconMask; 73 static GdkBitmap * gdkIconMask;
74 Pixmap guiIcon; 74 Pixmap guiIcon;
75 Pixmap guiIconMask; 75 Pixmap guiIconMask;
76 76
77 void gtkInit( void ) 77 void gtkInit( void )
78 { 78 {
96 96
97 { 97 {
98 GtkWidget * win; 98 GtkWidget * win;
99 win=gtk_window_new( GTK_WINDOW_TOPLEVEL ); 99 win=gtk_window_new( GTK_WINDOW_TOPLEVEL );
100 100
101 if ( !gtkIcon ) 101 if ( !gdkIcon )
102 gtkIcon=gdk_pixmap_colormap_create_from_xpm_d( win->window,gdk_colormap_get_system(),&gtkIconMask,&win->style->bg[GTK_STATE_NORMAL],(gchar **) mplayer_xpm ); 102 gdkIcon=gdk_pixmap_colormap_create_from_xpm_d( win->window,gdk_colormap_get_system(),&gdkIconMask,&win->style->bg[GTK_STATE_NORMAL],(gchar **) mplayer_xpm );
103 103
104 guiIcon=GDK_WINDOW_XWINDOW( gtkIcon ); 104 guiIcon=GDK_WINDOW_XWINDOW( gdkIcon );
105 guiIconMask=GDK_WINDOW_XWINDOW( gtkIconMask ); 105 guiIconMask=GDK_WINDOW_XWINDOW( gdkIconMask );
106 106
107 gtk_widget_destroy( win ); 107 gtk_widget_destroy( win );
108 } 108 }
109 109
110 gtkInitialized=1; 110 gtkInitialized=1;