Mercurial > mplayer.hg

diff gui/mplayer/widgets.h @ 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 2a1a52ba0d70
children 64e43eb13ebf
line wrap: on
line diff
--- a/gui/mplayer/widgets.h	Tue Jun 14 18:01:22 2011 +0000
+++ b/gui/mplayer/widgets.h	Tue Jun 14 18:55:04 2011 +0000
@@ -23,13 +23,13 @@
 #include <stdlib.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
+#include <X11/Xlib.h>
 
 #include "config.h"
 #include "osdep/shmem.h"
 #include "play.h"
 #include "mplayer.h"
 #include "gui/interface.h"
-#include "gui/wm/ws.h"
 
 #define GTK_MB_SIMPLE 0
 #define GTK_MB_MODAL 1
@@ -53,8 +53,12 @@
 extern char          * sbMPlayerDirInHome;
 extern char          * sbMPlayerPrefixDir;
 
-extern Pixmap      guiIcon;
-extern Pixmap	   guiIconMask;
+typedef struct {
+  Pixmap normal;
+  Pixmap normal_mask;
+} guiIcon_t;
+
+extern guiIcon_t guiIcon;
 
 void widgetsCreate( void );