Ken Thomases : winemac: Move memory management of liveResizeDisplayTimer into property setter.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d55d2ec85a769fb5d41b61e3b64ee773bf32880c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d55d2ec85a769fb5d41b61e3b6...

Author: Ken Thomases 
Date:   Wed Sep 18 13:00:51 2013 -0500

winemac: Move memory management of liveResizeDisplayTimer into property setter.

---

dlls/winemac.drv/cocoa_window.m |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index e8ac79c..d833d04 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -158,6 +158,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
 @property (assign, nonatomic) void* imeData;
 @property (nonatomic) BOOL commandDone;

+@property (retain, nonatomic) NSTimer* liveResizeDisplayTimer;
+
     - (void) updateColorSpace;

- (BOOL) becameEligibleParentOrChild;
@@ -468,6 +470,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
     @synthesize colorKeyed, colorKeyRed, colorKeyGreen, colorKeyBlue;
     @synthesize usePerPixelAlpha;
     @synthesize imeData, commandDone;
+    @synthesize liveResizeDisplayTimer;

+ (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)wf
                                  windowFrame:(NSRect)window_frame
@@ -1183,6 +1186,16 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
         [self checkTransparency];
     }

+    - (void) setLiveResizeDisplayTimer:(NSTimer*)newTimer
+    {
+        if (newTimer != liveResizeDisplayTimer)
+        {
+            [liveResizeDisplayTimer invalidate];
+            [liveResizeDisplayTimer release];
+            liveResizeDisplayTimer = [newTimer retain];
+        }
+    }
+
     - (void) makeFocused:(BOOL)activate
     {
         [self orderBelow:nil orAbove:nil activate:activate];
@@ -1463,9 +1476,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)

- (void) windowDidEndLiveResize:(NSNotification *)notification
     {
-        [liveResizeDisplayTimer invalidate];
-        [liveResizeDisplayTimer release];
-        liveResizeDisplayTimer = nil;
+        self.liveResizeDisplayTimer = nil;
     }

- (void)windowDidMiniaturize:(NSNotification *)notification
@@ -1587,13 +1598,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
         //
         // We address this by "manually" asking our windows to check if they need
         // redrawing every so often (during live resize only).
-        [self windowDidEndLiveResize:nil];
-        liveResizeDisplayTimer = [NSTimer scheduledTimerWithTimeInterval:1.0/30.0
-                                                                  target:self
-                                                                selector:@selector(displayIfNeeded)
-                                                                userInfo:nil
-                                                                 repeats:YES];
-        [liveResizeDisplayTimer retain];
+        self.liveResizeDisplayTimer = [NSTimer scheduledTimerWithTimeInterval:1.0/30.0
+                                                                       target:self
+                                                                     selector:@selector(displayIfNeeded)
+                                                                     userInfo:nil
+                                                                      repeats:YES];
         [[NSRunLoop currentRunLoop] addTimer:liveResizeDisplayTimer
                                      forMode:NSRunLoopCommonModes];
     }