Fixed panther build problem. Shouldn't include

	changes for 3968753 on panther.

        Reviewed by John.

        * WebView.subproj/WebView.m:
        (-[WebView _commonInitializationWithFrameName:groupName:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8798 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 51faff7199cd9707511d73d62c6926c02728103f..002749fa8fcab5f92fd13d49613debb633ee64a8 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2005-03-05  Richard Williamson   <rjw@apple.com>
+
+       Fixed panther build problem.  Shouldn't include
+       changes for 3968753 on panther.
+
+        Reviewed by John.
+
+        * WebView.subproj/WebView.m:
+        (-[WebView _commonInitializationWithFrameName:groupName:]):
+
 2005-03-05  Darin Adler  <darin@apple.com>
 
         Reviewed by John.

diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index e4e96b95389d4b56e14d0cd3721321d3d92d8a7c..24c28b00a75cea8c927dd8c7902e5ea9d06b41b4 100644 (file)
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -66,7 +66,9 @@
 #import <Foundation/NSURLRequestPrivate.h>
 #import <Foundation/NSUserDefaults_NSURLExtras.h>
 
+#if !BUILDING_ON_PANTHER         
 #include <CoreGraphics/CGSConnection.h>
+#endif
 
 #define FOR_EACH_RESPONDER_SELECTOR(macro) \
 macro(alignCenter) \
@@ -171,9 +173,11 @@ macro(yankAndSelect) \
 - (BOOL)_shouldAutoscrollForDraggingInfo:(id)dragInfo;
 @end
 
+#if !BUILDING_ON_PANTHER         
 @interface NSApplication (AppKitSecrectsIKnow)
 - (CGSConnectionID)contextID;
 @end
+#endif
 
 @interface WebView (WebFileInternal)
 - (void)_preflightSpellChecker;
@@ -1479,15 +1483,19 @@ NSMutableDictionary *countInvocations;
     [types release];
 }
 
+#if !BUILDING_ON_PANTHER
 static bool CGContextInitialized = false;
+#endif
 
 - (void)_commonInitializationWithFrameName:(NSString *)frameName groupName:(NSString *)groupName
 {
+#if !BUILDING_ON_PANTHER         
     if (!CGContextInitialized) {
-       CFStringRef key = CFSTR(kCGSDisableDeferredUpdates);
-       CGSSetConnectionProperty([NSApp contextID], [NSApp contextID], (CGSValueObj)key, (CGSValueObj)kCFBooleanTrue);
-       CGContextInitialized = true;
+        CFStringRef key = CFSTR(kCGSDisableDeferredUpdates);
+        CGSSetConnectionProperty([NSApp contextID], [NSApp contextID], (CGSValueObj)key, (CGSValueObj)kCFBooleanTrue);
+        CGContextInitialized = true;
     }
+#endif
 
     _private->drawsBackground = YES;
     _private->smartInsertDeleteEnabled = YES;