Fix some complilation errors, change line endings on scrollbar. [not part of build]

widget/src/cocoa/nsChildView.mm

@@ -1116,6 +1116,7 @@ void nsChildView::EndDraw()
 void
 nsChildView::Flash(nsPaintEvent &aEvent)
 {
+#if DEBUG
   Rect flashRect;
   if (debug_WantPaintFlashing() && aEvent.rect ) {
     ::SetRect ( &flashRect, aEvent.rect->x, aEvent.rect->y, aEvent.rect->x + aEvent.rect->width,
@@ -1126,6 +1127,7 @@ nsChildView::Flash(nsPaintEvent &aEvent)
     ::Delay(10, &endTicks);
     ::InvertRect ( &flashRect );
   }
+#endif
 }
 
 
@@ -1468,7 +1470,7 @@ void nsChildView::CalcWindowRegions()
 NS_IMETHODIMP nsChildView::CalcOffset(PRInt32 &aX,PRInt32 &aY)
 {
   aX = aY = 0;
-  NSRect bounds = {0, 0, 0, 0};
+  NSRect bounds = {{0, 0}, {0, 0}};
   bounds = [mView convertRect:bounds toView:nil];
   aX += NS_STATIC_CAST(PRInt32, bounds.origin.x);
   aY += NS_STATIC_CAST(PRInt32, bounds.origin.y);

widget/src/cocoa/nsCocoaWindow.h

@@ -40,7 +40,6 @@
 #undef DARWIN
 #import <Cocoa/Cocoa.h>
 
-#include "nsIEventSink.h"
 
 //#include <memory>	// for auto_ptr
 #include <Controls.h>
@@ -71,7 +70,7 @@ class nsCocoaWindow;
 //-------------------------------------------------------------------------
 //	Cocoa native window
 
-class nsCocoaWindow : public nsBaseWidget, public nsIEventSink
+class nsCocoaWindow : public nsBaseWidget
 {
 private:
 	typedef nsBaseWidget Inherited;
@@ -84,7 +83,6 @@ public:
     virtual ~nsCocoaWindow();
 
     NS_DECL_ISUPPORTS_INHERITED
-    NS_DECL_NSIEVENTSINK 
       
     NS_IMETHOD              Create(nsNativeWidget aParent,
                                      const nsRect &aRect,

widget/src/cocoa/nsCocoaWindow.mm

@@ -281,7 +281,7 @@ nsCocoaWindow :: DragReceiveHandler (WindowPtr theWindow, void *handlerRefCon,
 #endif
 
 
-NS_IMPL_ISUPPORTS_INHERITED1(nsCocoaWindow, Inherited, nsIEventSink);
+NS_IMPL_ISUPPORTS_INHERITED0(nsCocoaWindow, Inherited);
 
 
 //-------------------------------------------------------------------------
@@ -1521,6 +1521,8 @@ OnMacOSX()
 }
 
 
+#if 0
+
 //
 // DispatchEvent
 //
@@ -1599,6 +1601,8 @@ nsCocoaWindow::DispatchEvent ( void* anEvent, void* aView, PRBool *_retval )
   return NS_OK;
 }
 
+#endif
+
 
 //-------------------------------------------------------------------------
 //