diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-04-12 13:14:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-04-12 13:14:27 +0100 |
| commit | 11f649ac2f2ee20ce9447d7c3aceb05f08b11170 (patch) | |
| tree | a0fda424bfee1bdb66d445c4f10f164095635e26 /extensions | |
| parent | d72d5e631ab1611e4fa92a6765e042311e135b09 (diff) | |
get rid of legacy libXaw usage
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/plugin/base/makefile.mk | 4 | ||||
| -rw-r--r-- | extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 6 | ||||
| -rw-r--r-- | extensions/source/plugin/unx/makefile.mk | 7 | ||||
| -rw-r--r-- | extensions/source/plugin/unx/npwrap.cxx | 4 |
4 files changed, 1 insertions, 20 deletions
diff --git a/extensions/source/plugin/base/makefile.mk b/extensions/source/plugin/base/makefile.mk index 35390c6e6322..3049d9e9c0f9 100644 --- a/extensions/source/plugin/base/makefile.mk +++ b/extensions/source/plugin/base/makefile.mk @@ -40,10 +40,6 @@ INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr CDEFS+=-DOJI .ENDIF -.IF "$(DISABLE_XAW)" != "" -CDEFS+=-DDISABLE_XAW -.ENDIF - .IF "$(WITH_MOZILLA)" != "NO" .IF "$(GUIBASE)"=="aqua" diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx index 2b8bf4f7a89d..d13068576663 100644 --- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx +++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx @@ -58,11 +58,7 @@ extern "C" { #if defined USE_MOTIF #include <Xm/DrawingA.h> #else -# if defined DISABLE_XAW -# include <X11/Composite.h> -# else -# include <X11/Xaw/Label.h> -# endif +#include <X11/Composite.h> #endif #include <X11/Xatom.h> #ifndef XP_UNIX diff --git a/extensions/source/plugin/unx/makefile.mk b/extensions/source/plugin/unx/makefile.mk index 7ed18c291a4c..9dcdf1ace314 100644 --- a/extensions/source/plugin/unx/makefile.mk +++ b/extensions/source/plugin/unx/makefile.mk @@ -50,10 +50,6 @@ CDEFS+=-DOJI .IF "$(WITH_MOZILLA)" != "NO" -.IF "$(DISABLE_XAW)" == "TRUE" -CDEFS+=-DDISABLE_XAW -.ENDIF - SLOFILES=\ $(SLO)$/nppapi.obj \ $(SLO)$/sysplug.obj \ @@ -74,9 +70,6 @@ APP1STDLIBS= $(SALLIB) .IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO" APP1STDLIBS+=-lXm -lXt $(X11LINK_DYNAMIC) -ldl .ELSE -.IF "$(DISABLE_XAW)" != "TRUE" -APP1STDLIBS+=-lXaw -.ENDIF .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD" || "$(OS)"=="DRAGONFLY" APP1STDLIBS+= -lXt -lXext -lX11 .ELIF "$(OS)"=="AIX" diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx index 32daa95d512e..78a56c2e3401 100644 --- a/extensions/source/plugin/unx/npwrap.cxx +++ b/extensions/source/plugin/unx/npwrap.cxx @@ -125,11 +125,7 @@ Widget createSubWidget( char* /*pPluginText*/, Widget shell, XLIB_Window aParent xmDrawingAreaWidgetClass, #else "", -# if defined DISABLE_XAW compositeWidgetClass, -# else - labelWidgetClass, -# endif #endif shell, XtNwidth, 200, |