Mercurial > hg > xemacs-beta

comparison src/toolbar-x.c @ 227:0e522484dd2a r20-5b12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-5b12
author cvs
date Mon, 13 Aug 2007 10:12:37 +0200
parents 1f0dabaa0855
children c5d627a313b1
comparison
equal deleted inserted replaced
226:eea38c7ad7b4 227:0e522484dd2a
840 EmacsFrame ef = (EmacsFrame) FRAME_X_TEXT_WIDGET (f); 840 EmacsFrame ef = (EmacsFrame) FRAME_X_TEXT_WIDGET (f);
841 XGCValues gcv; 841 XGCValues gcv;
842 unsigned long flags = (GCForeground | GCBackground | GCGraphicsExposures); 842 unsigned long flags = (GCForeground | GCBackground | GCGraphicsExposures);
843 843
844 /* 844 /*
845 * If the user specified the global background resource, use it. 845 * If backgroundToolBarColor is specified, use it.
846 * Otherwise use the backgroundToolBarColor resource. 846 * Otherwise use the background resource.
847 */ 847 */
848 if (ef->emacs_frame.background_pixel != -1) 848 if (ef->emacs_frame.background_toolbar_pixel == -1)
849 ef->emacs_frame.background_toolbar_pixel = 849 ef->emacs_frame.background_toolbar_pixel =
850 ef->emacs_frame.background_pixel; 850 ef->emacs_frame.background_pixel;
851
852 /*
853 * ####
854 * If foregroundToolBarColor is specified, use it.
855 * Otherwise use the foreground resource.
856 *
857 * The foreground pixel is currently unused, but will likely be
858 * used when toolbar captions are generated by the toolbar code
859 * instead being incorporated into the icon image.
860 */
861 if (ef->emacs_frame.foreground_toolbar_pixel == -1)
862 ef->emacs_frame.foreground_toolbar_pixel =
863 ef->emacs_frame.foreground_pixel;
851 864
852 gcv.foreground = ef->emacs_frame.background_toolbar_pixel; 865 gcv.foreground = ef->emacs_frame.background_toolbar_pixel;
853 gcv.background = ef->core.background_pixel; 866 gcv.background = ef->core.background_pixel;
854 gcv.graphics_exposures = False; 867 gcv.graphics_exposures = False;
855 FRAME_X_TOOLBAR_BLANK_BACKGROUND_GC (f) = 868 FRAME_X_TOOLBAR_BLANK_BACKGROUND_GC (f) =