From 535c918064f43bc8a2dd5dd254f26f0ed65cf69f Mon Sep 17 00:00:00 2001
From: spider <spider>
Date: Tue, 2 Jun 1998 01:22:56 +0000
Subject: [PATCH] Unix support

---
 shell/public/nsIShellInstance.h |  1 +
 shell/src/Makefile              | 10 ++--------
 shell/src/nsShellInstance.cpp   |  6 ++++++
 shell/src/nsShellInstance.h     |  1 +
 shell/tests/apptest/Makefile    | 12 ++++++------
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/shell/public/nsIShellInstance.h b/shell/public/nsIShellInstance.h
index cf130de3d4b8..40bccf443bf0 100644
--- a/shell/public/nsIShellInstance.h
+++ b/shell/public/nsIShellInstance.h
@@ -52,6 +52,7 @@ public:
   NS_IMETHOD ShowApplicationWindow(PRBool show) = 0 ;
 
   NS_IMETHOD_(void *) GetApplicationWindowNativeInstance() = 0; 
+  NS_IMETHOD_(nsIWidget *) GetApplicationWidget() = 0; 
 
   NS_IMETHOD ExitApplication() = 0 ;
 
diff --git a/shell/src/Makefile b/shell/src/Makefile
index 51cda43f07ee..0f6ee0312d81 100644
--- a/shell/src/Makefile
+++ b/shell/src/Makefile
@@ -26,14 +26,8 @@ LIBRARY_NAME = shell
 DEFINES = -D_IMPL_NS_SHELL
 
 EXTRA_DSO_LDOPTS+= -L$(DIST)/lib \
-		$(DIST)/lib/libxpcom.a \
-		$(DIST)/lib/libraptorbase.a \
-		$(DIST)/lib/libraptorgfx.a \
-		$(DIST)/lib/libnspr21.a \
-		$(DIST)/lib/libplds21.a \
-		$(DIST)/lib/libplc21.a \
-		$(DIST)/lib/libmsgc21.a \
-		$(DIST)/lib/libreg.a
+		$(DIST)/bin/libxpcom.so \
+		$(DIST)/bin/libreg.so -lXm -lXt -lX11 $(LIBNSPR)
 
 ifeq ($(OS_ARCH),linux)
 EXTRA_DSO_LDOPTS+= /usr/lib/libc.a /usr/lib/libstdc++.a 
diff --git a/shell/src/nsShellInstance.cpp b/shell/src/nsShellInstance.cpp
index f89428d2ecb3..d51447a946bc 100644
--- a/shell/src/nsShellInstance.cpp
+++ b/shell/src/nsShellInstance.cpp
@@ -84,6 +84,7 @@ nsresult nsShellInstance::Run()
   extern   XtAppContext app_context ;
 
   XtAppMainLoop(app_context) ;
+  return NS_OK;
 #else
   return NS_OK;
 #endif
@@ -224,6 +225,11 @@ void * nsShellInstance::GetApplicationWindowNativeInstance()
   return (mApplicationWindow->GetNativeData(NS_NATIVE_WINDOW));
 }
 
+nsIWidget * nsShellInstance::GetApplicationWidget()
+{
+  return (mApplicationWindow);
+}
+
 nsShellInstanceFactory::nsShellInstanceFactory()
 {    
 }
diff --git a/shell/src/nsShellInstance.h b/shell/src/nsShellInstance.h
index 14355c0bce14..656805165ab5 100644
--- a/shell/src/nsShellInstance.h
+++ b/shell/src/nsShellInstance.h
@@ -57,6 +57,7 @@ public:
   NS_IMETHOD ShowApplicationWindow(PRBool show) ;
 
   NS_IMETHOD_(void *) GetApplicationWindowNativeInstance() ; 
+  NS_IMETHOD_(nsIWidget *) GetApplicationWidget() ; 
 
   NS_IMETHOD ExitApplication() ;
 
diff --git a/shell/tests/apptest/Makefile b/shell/tests/apptest/Makefile
index 0ea0fab1858d..2644250c0976 100644
--- a/shell/tests/apptest/Makefile
+++ b/shell/tests/apptest/Makefile
@@ -30,14 +30,14 @@ DIRS	=
 OBJS	= $(CPPSRCS:.cpp=.o)
 
 EX_LIBS = $(DIST)/lib/libshell_s.a \
-	$(DIST)/lib/libxpcom.a	\
-	$(DIST)/lib/libreg.a	\
-	$(DIST)/lib/libraptorbase.a	\
-	$(DIST)/lib/libraptorgfx.a	\
+	$(DIST)/bin/libxpcom.so	\
+	$(DIST)/bin/libreg.so	\
+	$(DIST)/bin/libraptorbase.so	\
+	$(DIST)/bin/libraptorgfx.so	\
 	$(DIST)/lib/libplc21.a	\
 	$(DIST)/lib/libplds21.a	\
 	$(DIST)/lib/libnspr21.a	\
-	$(DIST)/lib/libshell.a \
+	$(DIST)/bin/libshell.so \
 	$(NULL)
 
 PROGS	= $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
@@ -55,7 +55,7 @@ $(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EX_LIBS)
 ifeq ($(OS_ARCH),linux)
 	$(CCC) -rdynamic -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS) -lXm -lXt -lX11 -lXp -lXext
 else
-	$(CCC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS) -lXt -lX11 
+	$(CCC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS) -lXm -lXt -lX11 
 endif
 
 export::