1 files changed, 9 insertions, 13 deletions
diff --git a/tikzit/src/gtk/WidgetSurface.h b/tikzit/src/gtk/WidgetSurface.h
index 32c8222..667749f 100644
--- a/tikzit/src/gtk/WidgetSurface.h
+++ b/tikzit/src/gtk/WidgetSurface.h
@@ -17,6 +17,7 @@
 
 #import "TZFoundation.h"
 #import <gtk/gtk.h>
+#import <InputDelegate.h>
 #import <Surface.h>
 
 /**
@@ -26,27 +27,22 @@
     GtkWidget           *widget;
     Transformer         *transformer;
     id <RenderDelegate>  renderDelegate;
-    id                   inputDelegate;
+    id <InputDelegate>   inputDelegate;
     BOOL                 keepCentered;
-    BOOL                 grabsFocusOnClick;
+    BOOL                 buttonPressesRequired;
     CGFloat              defaultScale;
     NSSize               lastKnownSize;
 }
 
+@property (assign) BOOL canFocus;
+@property (assign) BOOL keepCentered;
+@property (assign) CGFloat defaultScale;
+
 - (id) initWithWidget:(GtkWidget*)widget;
 - (GtkWidget*) widget;
 
-- (id) inputDelegate;
-- (void) setInputDelegate:(id)delegate;
-
-- (BOOL) keepCentered;
-- (void) setKeepCentered:(BOOL)centered;
-
-- (BOOL) grabsFocusOnClick;
-- (void) setGrabsFocusOnClick:(BOOL)focusOnClick;
-
-- (CGFloat) defaultScale;
-- (void) setDefaultScale:(CGFloat)scale;
+- (id<InputDelegate>) inputDelegate;
+- (void) setInputDelegate:(id<InputDelegate>)delegate;
 
 /**
  * Set the minimum size that this widget wants