Fix shr.el/image build problem

[gnu-emacs] / lwlib / xlwmenu.h

diff --git a/lwlib/xlwmenu.h b/lwlib/xlwmenu.h
index 1f0f973d7b9b2bad0e6d604c84b18cf30aa53719..43c17f19be0ce72d86e07e44ddd43ddec0a18896 100644 (file)
--- a/lwlib/xlwmenu.h
+++ b/lwlib/xlwmenu.h
@@ -1,6 +1,6 @@
 /* Interface of a lightweight menubar widget.
 
 /* Interface of a lightweight menubar widget.
 

-Copyright (C) 2002-2011  Free Software Foundation, Inc.
+Copyright (C) 2002-2016 Free Software Foundation, Inc.

 Copyright (C) 1992 Lucid, Inc.
 
 This file is part of the Lucid Widget Library.
 Copyright (C) 1992 Lucid, Inc.
 
 This file is part of the Lucid Widget Library.


@@ -16,9 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License

-along with GNU Emacs; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #ifndef _XlwMenu_h
 #define _XlwMenu_h
 
 #ifndef _XlwMenu_h
 #define _XlwMenu_h


@@ -58,10 +56,6 @@ Boston, MA 02110-1301, USA.  */
 #define XtCResizeToPreferred "ResizeToPreferred"
 #define XtNallowResize "allowResize"
 #define XtCAllowResize "AllowResize"
 #define XtCResizeToPreferred "ResizeToPreferred"
 #define XtNallowResize "allowResize"
 #define XtCAllowResize "AllowResize"

-#define XtNfaceName "faceName"
-#define XtCFaceName "FaceName"
-#define XtNdefaultFace "defaultFace"
-#define XtCDefaultFace "DefaultFace"

 
 /* Motif-compatible resource names */
 #define XmNshadowThickness     "shadowThickness"
 
 /* Motif-compatible resource names */
 #define XmNshadowThickness     "shadowThickness"


@@ -85,4 +79,3 @@ extern int xlwmenu_window_p (Widget w, Window window);
 extern void xlwmenu_redisplay (Widget);
 
 #endif /* _XlwMenu_h */
 extern void xlwmenu_redisplay (Widget);
 
 #endif /* _XlwMenu_h */

-