summaryrefslogtreecommitdiff
path: root/tikzit/src/gtk/WidgetSurface.m
diff options
context:
space:
mode:
authorAlex Merry <alex.merry@cs.ox.ac.uk>2012-12-04 12:02:12 +0000
committerAlex Merry <alex.merry@cs.ox.ac.uk>2012-12-04 12:02:12 +0000
commit134de8169993f23f2c3a733a7bf96622965e7d7d (patch)
treed9caeac0f95e658b6a2a2c409bc2098e8f72e1d4 /tikzit/src/gtk/WidgetSurface.m
parent94ff07fc9d728d97dde159e0c3e6ab80e29e0855 (diff)
Turn InputDelegate into a protocol
We require support for the @optional keyword, so we should make use of it.
Diffstat (limited to 'tikzit/src/gtk/WidgetSurface.m')
-rw-r--r--tikzit/src/gtk/WidgetSurface.m16
1 files changed, 8 insertions, 8 deletions
diff --git a/tikzit/src/gtk/WidgetSurface.m b/tikzit/src/gtk/WidgetSurface.m
index 14d799b..91e0218 100644
--- a/tikzit/src/gtk/WidgetSurface.m
+++ b/tikzit/src/gtk/WidgetSurface.m
@@ -170,11 +170,11 @@ static gboolean scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, Widge
}
}
-- (id) inputDelegate {
+- (id<InputDelegate>) inputDelegate {
return inputDelegate;
}
-- (void) setInputDelegate:(id)delegate {
+- (void) setInputDelegate:(id<InputDelegate>)delegate {
if (delegate == inputDelegate) {
return;
}
@@ -471,7 +471,7 @@ static gboolean button_press_event_cb(GtkWidget *widget, GdkEventButton *event,
}
}
- id delegate = [surface inputDelegate];
+ id<InputDelegate> delegate = [surface inputDelegate];
if (delegate != nil) {
NSPoint pos = NSMakePoint (event->x, event->y);
MouseButton button = (MouseButton)event->button;
@@ -491,7 +491,7 @@ static gboolean button_press_event_cb(GtkWidget *widget, GdkEventButton *event,
static gboolean button_release_event_cb(GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface) {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- id delegate = [surface inputDelegate];
+ id<InputDelegate> delegate = [surface inputDelegate];
if (delegate != nil) {
if ([delegate respondsToSelector:@selector(mouseReleaseAt:withButton:andMask:)]) {
NSPoint pos = NSMakePoint (event->x, event->y);
@@ -508,7 +508,7 @@ static gboolean button_release_event_cb(GtkWidget *widget, GdkEventButton *event
static gboolean motion_notify_event_cb(GtkWidget *widget, GdkEventMotion *event, WidgetSurface *surface) {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- id delegate = [surface inputDelegate];
+ id<InputDelegate> delegate = [surface inputDelegate];
if (delegate != nil) {
if ([delegate respondsToSelector:@selector(mouseMoveTo:withButtons:andMask:)]) {
NSPoint pos = NSMakePoint (event->x, event->y);
@@ -525,7 +525,7 @@ static gboolean motion_notify_event_cb(GtkWidget *widget, GdkEventMotion *event,
static gboolean key_press_event_cb(GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface) {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- id delegate = [surface inputDelegate];
+ id<InputDelegate> delegate = [surface inputDelegate];
if (delegate != nil) {
if ([delegate respondsToSelector:@selector(keyPressed:withMask:)]) {
InputMask mask = mask_from_gdk_modifier_state (event->state);
@@ -540,7 +540,7 @@ static gboolean key_press_event_cb(GtkWidget *widget, GdkEventKey *event, Widget
static gboolean key_release_event_cb(GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface) {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- id delegate = [surface inputDelegate];
+ id<InputDelegate> delegate = [surface inputDelegate];
if (delegate != nil) {
if ([delegate respondsToSelector:@selector(keyReleased:withMask:)]) {
InputMask mask = mask_from_gdk_modifier_state (event->state);
@@ -555,7 +555,7 @@ static gboolean key_release_event_cb(GtkWidget *widget, GdkEventKey *event, Widg
static gboolean scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, WidgetSurface *surface) {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- id delegate = [surface inputDelegate];
+ id<InputDelegate> delegate = [surface inputDelegate];
if (delegate != nil) {
if ([delegate respondsToSelector:@selector(mouseScrolledAt:inDirection:withMask:)]) {
NSPoint pos = NSMakePoint (event->x, event->y);