Commit acb62692 authored by Valeriy Van's avatar Valeriy Van

Cleans up declarations in window_cocoa.mm removing unnecessary iVars…

Cleans up declarations in window_cocoa.mm removing unnecessary iVars declarations and changing retain property attribute to strong
parent 4e8f8922
...@@ -82,42 +82,26 @@ static NSAutoreleasePool *pool = nil; ...@@ -82,42 +82,26 @@ static NSAutoreleasePool *pool = nil;
static NSMutableDictionary *windows = nil; static NSMutableDictionary *windows = nil;
static bool wasInitialized = false; static bool wasInitialized = false;
@interface CVView : NSView { @interface CVView : NSView
NSImage *image; @property(strong) NSImage *image;
}
@property(retain) NSImage *image;
- (void)setImageData:(CvArr *)arr; - (void)setImageData:(CvArr *)arr;
@end @end
@interface CVSlider : NSView { @interface CVSlider : NSView
NSSlider *slider; @property(strong) NSSlider *slider;
NSTextField *name; @property(strong) NSTextField *name;
int *value;
void *userData;
CvTrackbarCallback callback;
CvTrackbarCallback2 callback2;
}
@property(retain) NSSlider *slider;
@property(retain) NSTextField *name;
@property(assign) int *value; @property(assign) int *value;
@property(assign) void *userData; @property(assign) void *userData;
@property(assign) CvTrackbarCallback callback; @property(assign) CvTrackbarCallback callback;
@property(assign) CvTrackbarCallback2 callback2; @property(assign) CvTrackbarCallback2 callback2;
@end @end
@interface CVWindow : NSWindow { @interface CVWindow : NSWindow
NSMutableDictionary *sliders;
CvMouseCallback mouseCallback;
void *mouseParam;
BOOL autosize;
BOOL firstContent;
int status;
}
@property(assign) CvMouseCallback mouseCallback; @property(assign) CvMouseCallback mouseCallback;
@property(assign) void *mouseParam; @property(assign) void *mouseParam;
@property(assign) BOOL autosize; @property(assign) BOOL autosize;
@property(assign) BOOL firstContent; @property(assign) BOOL firstContent;
@property(retain) NSMutableDictionary *sliders; @property(strong) NSMutableDictionary *sliders;
@property(readwrite) int status; @property(readwrite) int status;
- (CVView *)contentView; - (CVView *)contentView;
- (void)cvSendMouseEvent:(NSEvent *)event type:(int)type flags:(int)flags; - (void)cvSendMouseEvent:(NSEvent *)event type:(int)type flags:(int)flags;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment