diff --git a/embedding/tests/cocoaEmbed/English.lproj/MainMenu.nib/classes.nib b/embedding/tests/cocoaEmbed/English.lproj/MainMenu.nib/classes.nib index 5c24c4f13f02..27737414093e 100644 --- a/embedding/tests/cocoaEmbed/English.lproj/MainMenu.nib/classes.nib +++ b/embedding/tests/cocoaEmbed/English.lproj/MainMenu.nib/classes.nib @@ -5,7 +5,7 @@ ACTIONS = {load = id; }; CLASS = MyBrowserView; LANGUAGE = ObjC; - OUTLETS = {progress = id; status = id; urlbar = id; }; + OUTLETS = {progress = id; progressSuper = id; status = id; urlbar = id; }; SUPERCLASS = NSView; } ); diff --git a/embedding/tests/cocoaEmbed/English.lproj/MainMenu.nib/info.nib b/embedding/tests/cocoaEmbed/English.lproj/MainMenu.nib/info.nib index 1203a3a26026..cb3d8d87fba1 100644 --- a/embedding/tests/cocoaEmbed/English.lproj/MainMenu.nib/info.nib +++ b/embedding/tests/cocoaEmbed/English.lproj/MainMenu.nib/info.nib @@ -3,11 +3,11 @@ IBDocumentLocation - 38 70 356 240 0 0 1024 746 + 36 102 356 240 0 0 1024 746 IBFramework Version 219.0 IBMainMenuLocation - 100 481 318 44 0 0 1024 746 + 100 481 302 44 0 0 1024 746 IBSystem Version 5L14 IBUserGuides diff --git a/embedding/tests/cocoaEmbed/English.lproj/MainMenu.nib/objects.nib b/embedding/tests/cocoaEmbed/English.lproj/MainMenu.nib/objects.nib index 191a9b101a10..6b0973c76942 100644 Binary files a/embedding/tests/cocoaEmbed/English.lproj/MainMenu.nib/objects.nib and b/embedding/tests/cocoaEmbed/English.lproj/MainMenu.nib/objects.nib differ diff --git a/embedding/tests/cocoaEmbed/MyBrowserView.h b/embedding/tests/cocoaEmbed/MyBrowserView.h index 01f2bbe0126e..846d74b5f4cf 100644 --- a/embedding/tests/cocoaEmbed/MyBrowserView.h +++ b/embedding/tests/cocoaEmbed/MyBrowserView.h @@ -6,6 +6,7 @@ IBOutlet id urlbar; IBOutlet id status; IBOutlet id progress; + IBOutlet id progressSuper; NSBrowserView* browserView; NSString* defaultStatus; NSString* loadingStatus; diff --git a/embedding/tests/cocoaEmbed/MyBrowserView.mm b/embedding/tests/cocoaEmbed/MyBrowserView.mm index cededcd6c966..b9f83200655f 100644 --- a/embedding/tests/cocoaEmbed/MyBrowserView.mm +++ b/embedding/tests/cocoaEmbed/MyBrowserView.mm @@ -24,7 +24,8 @@ loadingStatus = DOCUMENT_DONE_STRING; [status setStringValue:loadingStatus]; - [progress setControlTint:NSClearControlTint]; + [progress retain]; + [progress removeFromSuperview]; } - (void)setFrame:(NSRect)frameRect @@ -41,7 +42,8 @@ defaultStatus = NULL; } - [progress setControlTint:NSDefaultControlTint]; + [progressSuper addSubview:progress]; + [progress release]; [progress setIndeterminate:YES]; [progress startAnimation:self]; @@ -57,7 +59,8 @@ { [progress setIndeterminate:YES]; [progress stopAnimation:self]; - [progress setControlTint:NSClearControlTint]; + [progress retain]; + [progress removeFromSuperview]; loadingStatus = DOCUMENT_DONE_STRING; if (defaultStatus) {