mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-03 08:30:09 +00:00
Code Issues Releases Activity

* emacs-icon.h: Always define gnu_xpm_bits on GTK (bug#3671).

Browse Source
This commit is contained in:
Chong Yidong 2009-06-24 14:27:47 +00:00
parent aa4a938453
commit 57ebc3fdd2
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2009-06-24 Chong Yidong <cyd@stupidchicken.com>
* emacs-icon.h: Always define gnu_xpm_bits on GTK (bug#3671).
2009-06-24 Kenichi Handa <handa@m17n.org>
* fontset.c (fontset_get_font_group): Return 0 if no font-group is

7
src/emacs-icon.h
View File

@ -20,8 +20,9 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)
/* Note that the GTK port uses gdk to display the icon, so Emacs need
not have XPM support compiled in. */
#if (defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)) || defined (USE_GTK)
static char * gnu_xpm_bits[] = {
/* width height ncolors chars_per_pixel */
"32 32 255 2",
@ -314,7 +315,7 @@ static char * gnu_xpm_bits[] = {
"OPOPOPOPOPOPOPOPILILBIILPKCBJAAHJFBPILILOBOBAIOPOPOPOPOPOPOPOPOP",
"OPOPOPOPOPOPOPOPOPOPILMIGECABCPKGHAIILOBOBOPOPOPOPOPOPOPOPOPOPOP",
"OPOPOPOPOPOPOPOPOPOPOPOPOPCAOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOP"};
#endif /* defined (HAVE_XPM) && defined (HAVE_X_WINDOWS) */
#endif /* (defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)) || defined (USE_GTK) */
#define gnu_xbm_width 50
#define gnu_xbm_height 50