diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2006-12-01 13:18:46 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2006-12-01 13:18:46 +0000 |
commit | 28a6f6308679d7d918008b4bdf4ffa22367d0b85 (patch) | |
tree | f226d0e8f0dcbdd417ad07c0f24c152d5fcffaa8 /extensions/source/plugin/inc/plugin/unx/plugcon.hxx | |
parent | 2c49a220851b6aeb4555c87b7ed3f7ac14aa5199 (diff) |
INTEGRATION: CWS cmcfixes29 (1.9.202); FILE MERGED
2006/11/24 10:33:04 cmc 1.9.202.1: #i64463# optionally disable Xaw for the extensions plugin in favour of direct Xt
Diffstat (limited to 'extensions/source/plugin/inc/plugin/unx/plugcon.hxx')
-rw-r--r-- | extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx index 9ad6b9679321..8b669a241cd8 100644 --- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx +++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx @@ -4,9 +4,9 @@ * * $RCSfile: plugcon.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-01-20 12:58:34 $ + * last change: $Author: rt $ $Date: 2006-12-01 14:18:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -69,7 +69,11 @@ #if defined USE_MOTIF #include <Xm/DrawingA.h> #else -#include <X11/Xaw/Label.h> +# if defined DISABLE_XAW +# include <X11/Composite.h> +# else +# include <X11/Xaw/Label.h> +# endif #endif #include <X11/Xatom.h> #define XP_UNIX |