# 25555

r= alecf@netscape.com
OS/2 changes for Mozilla - add #ifdef, change #ifdef

webshell/tests/viewer/nsSetupRegistry.cpp

@@ -61,7 +61,24 @@
 #include "prmem.h"
 #include "prlog.h"	// PR_ASSERT
 
-#ifdef XP_PC
+#ifdef XP_OS2
+    #define WIDGET_DLL      "WDGTOS2"
+    #define GFXWIN_DLL      "GFX_OS2"
+    #define VIEW_DLL        "NGVIEW"
+    #define WEB_DLL         "WEBSHELL"
+    #define PLUGIN_DLL      "NGPLUGIN"
+    #define PREF_DLL        "PREF"
+    #define PARSER_DLL      "HTMLPARS"
+    #define DOM_DLL         "JSDOM"
+    #define LAYOUT_DLL      "NGLAYOUT"
+    #define NETLIB_DLL      "NECKO"
+    #define EDITOR_DLL      "ENDER"
+    #define APPSHELL_DLL    "APPSHELL"
+    #define APPCORES_DLL    "APPCORES"
+    #define CAPS_DLL        "CAPS"
+    #define LIVECONNECT_DLL "JSJ"
+    #define OJI_DLL         "OJI"
+#elif defined(XP_PC)
     #define WIDGET_DLL "gkwidget.dll"
     #define GFXWIN_DLL "gkgfxwin.dll"
     #define VIEW_DLL   "gkview.dll"

webshell/tests/viewer/nsViewerApp.cpp

@@ -84,7 +84,7 @@
 #define DIALOG_FONT_SIZE 10
 
 
-#ifdef XP_PC
+#if defined(XP_PC) && !defined(XP_OS2)
 #include "JSConsole.h"
 #ifdef NGPREFS
 #include "ngprefs.h"
@@ -873,7 +873,7 @@ static void* GetWidgetNativeData(nsISupports* aObject)
 
 
 
-#ifdef XP_PC
+#if defined(XP_PC) && !defined(XP_OS2)
 extern JSConsole *gConsole;
 // XXX temporary robot code until it's made XP
 extern HINSTANCE gInstance, gPrevInstance;
@@ -1158,7 +1158,7 @@ nsViewerApp::CreateRobot(nsBrowserWindow* aWindow)
         }
         nsVoidArray * gWorkList = new nsVoidArray();
         gWorkList->AppendElement(new nsString(str));
-#if defined(XP_PC) && defined(NS_DEBUG)
+#if defined(XP_PC) && defined(NS_DEBUG) && !defined(XP_OS2)
         DebugRobot( 
           gWorkList, 
           gVisualDebug ? aWindow->mDocShell : nsnull, 
@@ -1519,7 +1519,8 @@ nsViewerApp::CreateSiteWalker(nsBrowserWindow* aWindow)
 
 //----------------------------------------
 
-#ifdef XP_PC
+
+#if defined(XP_PC) && !defined(XP_OS2)
 #include "jsconsres.h"
 
 static void DestroyConsole()
@@ -1567,7 +1568,7 @@ static void ShowConsole(nsBrowserWindow* aWindow)
 NS_IMETHODIMP
 nsViewerApp::CreateJSConsole(nsBrowserWindow* aWindow)
 {
-#ifdef XP_PC
+#if defined(XP_PC) && !defined(XP_OS2)
   if (nsnull == gConsole) {
     ShowConsole(aWindow);
   }
@@ -1578,7 +1579,8 @@ nsViewerApp::CreateJSConsole(nsBrowserWindow* aWindow)
 NS_IMETHODIMP
 nsViewerApp::DoPrefs(nsBrowserWindow* aWindow)
 {
-#if defined(XP_PC) && defined(NGPREFS)
+#if defined(XP_PC) && defined(NGPREFS) && !defined(XP_OS2)
+
   INGLayoutPrefs *pPrefs;
   CoInitialize(NULL);