Camino only - Fix rollover tracking for close buttons as part of bug 355323. r=smorgan sr=pink

camino/src/extensions/RolloverImageButton.m

@@ -38,25 +38,36 @@
 #import "RolloverImageButton.h"
 
 @interface RolloverImageButton (Private)
-  - (void)updateImage:(BOOL)inIsInside;
-  - (BOOL)isMouseInside;
-  - (void)removeTrackingRect;
-  - (void)updateTrackingRect;
+
+- (void)updateImage:(BOOL)inIsInside;
+- (BOOL)isMouseInside;
+- (void)removeTrackingRect;
+- (void)updateTrackingRect;
+- (void)setupDefaults;
+
 @end
 
 @implementation RolloverImageButton
 
 - (id)initWithFrame:(NSRect)inFrame
 {
-  if ((self = [super initWithFrame:inFrame])) {
-    mImage = nil;
-    mHoverImage = nil;
-    mTrackingTag = -1;
-    mTrackingIsEnabled = YES;
-  }
+  if ((self = [super initWithFrame:inFrame]))
+    [self setupDefaults];
+
   return self;
 }
 
+- (void)awakeFromNib
+{
+  [self setupDefaults];
+}
+
+- (void)setupDefaults
+{
+  mTrackingTag = -1;
+  mTrackingIsEnabled = YES;
+}
+
 - (void)dealloc
 {
   [mImage release];
@@ -195,10 +206,6 @@
   [self updateTrackingRect];
 }
 
-@end
-
-@implementation RolloverImageButton (Private)
-
 - (void)updateImage:(BOOL)inIsInside
 {
   if (inIsInside) {