diff options
| author | Miles Bader <miles@gnu.org> | 2007-06-16 22:33:42 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-06-16 22:33:42 +0000 |
| commit | 262d5ce7c21d6c1136fd2b8df67736e41e8e8953 (patch) | |
| tree | 853a5d30babd0abd585ccbe7f4e228bf43a42d5c /lwlib | |
| parent | 5534694247d2b5259325ff43af0624aa2f8abb3e (diff) | |
| parent | af41f8a8d6660ad1fefad5bda69d1acb8e40b4d1 (diff) | |
| download | emacs-262d5ce7c21d6c1136fd2b8df67736e41e8e8953.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 793-802)
- Update from CVS
- Remove RCS keywords
- Merge from emacs--rel--22
* emacs--rel--22 (patch 42-50)
- Update from CVS
- Merge from gnus--rel--5.10
- Gnus ChangeLog tweaks
* gnus--rel--5.10 (patch 229-232)
- Merge from emacs--devo--0, emacs--rel--22
- ChangeLog tweak
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-23
Diffstat (limited to 'lwlib')
| -rw-r--r-- | lwlib/ChangeLog | 4 | ||||
| -rw-r--r-- | lwlib/lwlib-Xaw.c | 9 | ||||
| -rw-r--r-- | lwlib/lwlib.c | 4 |
3 files changed, 17 insertions, 0 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index f6764e87e17..fb722be920f 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,7 @@ +2007-06-13 Chong Yidong <cyd@stupidchicken.com> + + * lwlib-Xaw.c, lwlib.c: Link to xaw3d if available. + 2007-06-02 Chong Yidong <cyd@stupidchicken.com> * Version 22.1 released. diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c index be1990ed6fe..4ef2d3fcb67 100644 --- a/lwlib/lwlib-Xaw.c +++ b/lwlib/lwlib-Xaw.c @@ -35,12 +35,21 @@ Boston, MA 02110-1301, USA. */ #include <X11/CoreP.h> #include <X11/Shell.h> +#ifdef HAVE_XAW3D +#include <X11/Xaw3d/Scrollbar.h> +#include <X11/Xaw3d/Paned.h> +#include <X11/Xaw3d/Dialog.h> +#include <X11/Xaw3d/Form.h> +#include <X11/Xaw3d/Command.h> +#include <X11/Xaw3d/Label.h> +#else /* !HAVE_XAW3D */ #include <X11/Xaw/Scrollbar.h> #include <X11/Xaw/Paned.h> #include <X11/Xaw/Dialog.h> #include <X11/Xaw/Form.h> #include <X11/Xaw/Command.h> #include <X11/Xaw/Label.h> +#endif /* HAVE_XAW3D */ #include <X11/Xatom.h> diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c index bd5d9adbf9d..542b3ba5a60 100644 --- a/lwlib/lwlib.c +++ b/lwlib/lwlib.c @@ -48,7 +48,11 @@ Boston, MA 02110-1301, USA. */ #endif /* not USE_MOTIF && USE_LUCID */ #endif #if defined (USE_XAW) +#ifdef HAVE_XAW3D +#include <X11/Xaw3d/Paned.h> +#else /* !HAVE_XAW3D */ #include <X11/Xaw/Paned.h> +#endif /* HAVE_XAW3D */ #include "lwlib-Xaw.h" #endif |