# 33859

r= mkaply@us.ibm.com
OS/2 changes for Mozilla - basic OS/2 enablement in widgets

widget/src/os2/nsModule.cpp

@@ -38,6 +38,10 @@
 
 #include <unidef.h>
 
+#ifdef XP_OS2_VACPP
+#define KBD_CTRL KBD_CONTROL
+#endif
+
 #define WARPZILLA_PRESPARAM "PP_WARPZILLA"
 
 static void GetKeyboardName( char *buff);
@@ -86,8 +90,9 @@ void nsWidgetModuleData::Init( nsIAppShell *aPrimaevalAppShell)
 
    fontService = nsnull;
 
-   dragService = new nsDragService;
-   NS_ADDREF(dragService);
+   // XXXX KNOCKED OUT UNTIL nsDragService.cpp builds again
+   //   dragService = new nsDragService;
+   //   NS_ADDREF(dragService);
 
    // keep a ref beyond the client app so we shut ourselves down properly.
    appshell = aPrimaevalAppShell;

widget/src/os2/nsPopupMenu.cpp

@@ -105,3 +105,9 @@ nsresult nsPopupMenu::ShowMenu( PRInt32 aX, PRInt32 aY)
                  PU_KEYBOARD | PU_MOUSEBUTTON1 | PU_MOUSEBUTTON2);
    return NS_OK;
 }
+
+NS_METHOD nsPopUpMenu::AddMenu(nsIMenu * aMenu)
+{
+  return NS_OK;
+
+}

widget/src/os2/nsPopupMenu.h

@@ -43,6 +43,7 @@ class nsPopupMenu : public nsIPopUpMenu, public nsMenuBase
    NS_IMETHOD Create( nsIWidget *aParent);
    NS_IMETHOD GetParent( nsIWidget *&aParent);
    NS_IMETHOD ShowMenu( PRInt32 aX, PRInt32 aY);
+   NS_IMETHOD AddMenu(nsIMenu * aMenu);
 
    // Common methods with nsMenu
    DECL_MENU_BASE_METHODS