[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 0ab603e2e4a4c138756e5e4afcae3c2fde80866d
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 25 22:15:00 2003 +0000

    	Fixed 3434854.  Written by Ed.  Correctly handle window modality in carbon.
    
            Reviewed by Richard.
    
            * Carbon.subproj/CarbonWindowAdapter.m:
            (-[CarbonWindowAdapter initWithCarbonWindowRef:takingOwnership:disableOrdering:carbon:]):
    
    2003-09-25  Maciej Stachowiak  <mjs at apple.com>
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5064 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon.subproj/CarbonWindowAdapter.m b/WebKit/Carbon.subproj/CarbonWindowAdapter.m
index 4ad8e78..2c566aa 100644
--- a/WebKit/Carbon.subproj/CarbonWindowAdapter.m
+++ b/WebKit/Carbon.subproj/CarbonWindowAdapter.m
@@ -203,14 +203,6 @@ extern const OSType NSCarbonWindowPropertyTag;
         return nil;
     }
     
-    if (windowModality == kWindowModalityNone || windowModality == kWindowModalityWindowModal) {
-        if (inDisableOrdering) {
-            // Take over the ordering of the window from Carbon.
-            osStatus = _SetWindowCGOrderingEnabled(inWindowRef, FALSE);
-            if (osStatus!=noErr) NSLog(@"A Carbon window's ordering couldn't be disabled.");
-        }
-    }
-
     // Create one of our special content views.
     carbonWindowContentView = [[[CarbonWindowContentView alloc] init] autorelease];
 
@@ -229,37 +221,35 @@ extern const OSType NSCarbonWindowPropertyTag;
     // We didn't even really try to get it right at _initContent:... time, because it's more trouble that it's worth to write a real +[NSCarbonWindow frameRectForContentRect:styleMask:].  M.P. Notice - 10/10/00
     [self reconcileToCarbonWindowBounds];
 
-	if (windowModality == kWindowModalityNone || windowModality == kWindowModalityWindowModal || inDisableOrdering) {
-		// Install an event handler for the Carbon window events in which we're interested.
-		const EventTypeSpec kEvents[] = {
-			{ kEventClassWindow, kEventWindowActivated },
-			{ kEventClassWindow, kEventWindowDeactivated },
-			{ kEventClassWindow, kEventWindowBoundsChanged },
-			{ kEventClassWindow, kEventWindowShown },
-			{ kEventClassWindow, kEventWindowHidden }
-		};
-		
-		const EventTypeSpec kControlBoundsChangedEvent = { kEventClassControl, kEventControlBoundsChanged };
-		
-		osStatus = InstallEventHandler( GetWindowEventTarget(_windowRef), NSCarbonWindowHandleEvent, GetEventTypeCount( kEvents ), kEvents, (void*)self, &_eventHandler);
-		if (osStatus!=noErr) {
-			[self release];
-			return nil;
-		}
-
-		osStatus = InstallEventHandler( GetControlEventTarget( HIViewGetRoot( _windowRef ) ), NSCarbonWindowHandleEvent, 1, &kControlBoundsChangedEvent, (void*)self, &_eventHandler);
-		if (osStatus!=noErr) {
-			[self release];
-			return nil;
-		}
-
-		HIViewFindByID( HIViewGetRoot( _windowRef ), kHIViewWindowContentID, &contentView );
-		osStatus = InstallEventHandler( GetControlEventTarget( contentView ), NSCarbonWindowHandleEvent, 1, &kControlBoundsChangedEvent, (void*)self, &_eventHandler);
-		if (osStatus!=noErr) {
-			[self release];
-			return nil;
-		}
-	}
+    // Install an event handler for the Carbon window events in which we're interested.
+    const EventTypeSpec kEvents[] = {
+            { kEventClassWindow, kEventWindowActivated },
+            { kEventClassWindow, kEventWindowDeactivated },
+            { kEventClassWindow, kEventWindowBoundsChanged },
+            { kEventClassWindow, kEventWindowShown },
+            { kEventClassWindow, kEventWindowHidden }
+    };
+    
+    const EventTypeSpec kControlBoundsChangedEvent = { kEventClassControl, kEventControlBoundsChanged };
+    
+    osStatus = InstallEventHandler( GetWindowEventTarget(_windowRef), NSCarbonWindowHandleEvent, GetEventTypeCount( kEvents ), kEvents, (void*)self, &_eventHandler);
+    if (osStatus!=noErr) {
+            [self release];
+            return nil;
+    }
+
+    osStatus = InstallEventHandler( GetControlEventTarget( HIViewGetRoot( _windowRef ) ), NSCarbonWindowHandleEvent, 1, &kControlBoundsChangedEvent, (void*)self, &_eventHandler);
+    if (osStatus!=noErr) {
+            [self release];
+            return nil;
+    }
+
+    HIViewFindByID( HIViewGetRoot( _windowRef ), kHIViewWindowContentID, &contentView );
+    osStatus = InstallEventHandler( GetControlEventTarget( contentView ), NSCarbonWindowHandleEvent, 1, &kControlBoundsChangedEvent, (void*)self, &_eventHandler);
+    if (osStatus!=noErr) {
+            [self release];
+            return nil;
+    }
 	
     // Put a pointer to this Cocoa NSWindow in a Carbon window property tag.
     // Right now, this is just used by NSViewCarbonControl.  M.P. Notice - 10/9/00
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 142c9d7..3dd4431 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-25  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3434854.  Written by Ed.  Correctly handle window modality in carbon.
+
+        Reviewed by Richard.
+
+        * Carbon.subproj/CarbonWindowAdapter.m:
+        (-[CarbonWindowAdapter initWithCarbonWindowRef:takingOwnership:disableOrdering:carbon:]):
+
 2003-09-25  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.

-- 
WebKit Debian packaging