Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleans up declarations in window_cocoa.mm #7193

Merged
merged 1 commit into from Sep 14, 2016
Merged

Cleans up declarations in window_cocoa.mm #7193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 7 additions & 23 deletions modules/highgui/src/window_cocoa.mm
View file
Open in desktop
Expand Up @@ -82,42 +82,26 @@ CV_IMPL void cvSetTrackbarMin(const char* trackbar_name, const char* window_name
static NSMutableDictionary *windows = nil;
static bool wasInitialized = false;

@interface CVView : NSView {
NSImage *image;
}
@property(retain) NSImage *image;
@interface CVView : NSView
@property(strong) NSImage *image;
- (void)setImageData:(CvArr *)arr;
@end

@interface CVSlider : NSView {
NSSlider *slider;
NSTextField *name;
int *value;
void *userData;
CvTrackbarCallback callback;
CvTrackbarCallback2 callback2;
}
@property(retain) NSSlider *slider;
@property(retain) NSTextField *name;
@interface CVSlider : NSView
@property(strong) NSSlider *slider;
@property(strong) NSTextField *name;
@property(assign) int *value;
@property(assign) void *userData;
@property(assign) CvTrackbarCallback callback;
@property(assign) CvTrackbarCallback2 callback2;
@end

@interface CVWindow : NSWindow {
NSMutableDictionary *sliders;
CvMouseCallback mouseCallback;
void *mouseParam;
BOOL autosize;
BOOL firstContent;
int status;
}
@interface CVWindow : NSWindow
@property(assign) CvMouseCallback mouseCallback;
@property(assign) void *mouseParam;
@property(assign) BOOL autosize;
@property(assign) BOOL firstContent;
@property(retain) NSMutableDictionary *sliders;
@property(strong) NSMutableDictionary *sliders;
@property(readwrite) int status;
- (CVView *)contentView;
- (void)cvSendMouseEvent:(NSEvent *)event type:(int)type flags:(int)flags;
Expand Down