diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-06-24 14:27:47 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-06-24 14:27:47 +0000 |
| commit | 57ebc3fdd233f97886bab4fd513e92530d4c3dc9 (patch) | |
| tree | 92bf8399a6669a60d9aa0e4c5dd10786bf29f1cd /src/emacs-icon.h | |
| parent | aa4a938453c9dfd3630042687651784b91787882 (diff) | |
| download | emacs-57ebc3fdd233f97886bab4fd513e92530d4c3dc9.tar.gz | |
* emacs-icon.h: Always define gnu_xpm_bits on GTK (bug#3671).
Diffstat (limited to 'src/emacs-icon.h')
| -rw-r--r-- | src/emacs-icon.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/emacs-icon.h b/src/emacs-icon.h index 56cd5c601df..0bd216e99ef 100644 --- a/src/emacs-icon.h +++ b/src/emacs-icon.h @@ -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 |