Mercurial > emacs
changeset 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 | 4c2e3daa1f4b |
| children | fcd539c2b40d |
| files | src/ChangeLog src/emacs-icon.h |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Jun 24 13:04:25 2009 +0000 +++ b/src/ChangeLog Wed Jun 24 14:27:47 2009 +0000 @@ -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
--- a/src/emacs-icon.h Wed Jun 24 13:04:25 2009 +0000 +++ b/src/emacs-icon.h Wed Jun 24 14:27:47 2009 +0000 @@ -20,8 +20,9 @@ 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 @@ "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