comparison src/emacs-icon.h @ 103583:36fd6f9e6463

* emacs-icon.h: Always define gnu_xpm_bits on GTK (bug#3671).
author Chong Yidong <cyd@stupidchicken.com>
date Wed, 24 Jun 2009 14:27:47 +0000
parents e038c1a8307c
children 1d1d5d9bd884
comparison
equal deleted inserted replaced
103582:4c2e3daa1f4b 103583:36fd6f9e6463
18 GNU General Public License for more details. 18 GNU General Public License for more details.
19 19
20 You should have received a copy of the GNU General Public License 20 You should have received a copy of the GNU General Public License
21 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 21 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
22 22
23 23 /* Note that the GTK port uses gdk to display the icon, so Emacs need
24 #if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS) 24 not have XPM support compiled in. */
25 #if (defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)) || defined (USE_GTK)
25 static char * gnu_xpm_bits[] = { 26 static char * gnu_xpm_bits[] = {
26 /* width height ncolors chars_per_pixel */ 27 /* width height ncolors chars_per_pixel */
27 "32 32 255 2", 28 "32 32 255 2",
28 /* colors */ 29 /* colors */
29 "AA c #FFFFFFFFFFFF", 30 "AA c #FFFFFFFFFFFF",
312 "OPOPOPOPOPILILBIILGEHBOAGJMCHMHGFHAHLLDLKAPLBIAMNPNPOPOPOPOPOPOP", 313 "OPOPOPOPOPILILBIILGEHBOAGJMCHMHGFHAHLLDLKAPLBIAMNPNPOPOPOPOPOPOP",
313 "OPOPOPOPOPOPOPILBIBIFIDEFKBFDAJAAHGFBFIDJFOBFLOBAIOPOPOPOPOPOPOP", 314 "OPOPOPOPOPOPOPILBIBIFIDEFKBFDAJAAHGFBFIDJFOBFLOBAIOPOPOPOPOPOPOP",
314 "OPOPOPOPOPOPOPOPILILBIILPKCBJAAHJFBPILILOBOBAIOPOPOPOPOPOPOPOPOP", 315 "OPOPOPOPOPOPOPOPILILBIILPKCBJAAHJFBPILILOBOBAIOPOPOPOPOPOPOPOPOP",
315 "OPOPOPOPOPOPOPOPOPOPILMIGECABCPKGHAIILOBOBOPOPOPOPOPOPOPOPOPOPOP", 316 "OPOPOPOPOPOPOPOPOPOPILMIGECABCPKGHAIILOBOBOPOPOPOPOPOPOPOPOPOPOP",
316 "OPOPOPOPOPOPOPOPOPOPOPOPOPCAOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOP"}; 317 "OPOPOPOPOPOPOPOPOPOPOPOPOPCAOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOP"};
317 #endif /* defined (HAVE_XPM) && defined (HAVE_X_WINDOWS) */ 318 #endif /* (defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)) || defined (USE_GTK) */
318 319
319 #define gnu_xbm_width 50 320 #define gnu_xbm_width 50
320 #define gnu_xbm_height 50 321 #define gnu_xbm_height 50
321 static unsigned char gnu_xbm_bits[] = { 322 static unsigned char gnu_xbm_bits[] = {
322 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 323 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,