projects/dwt-mac: dwt/widgets/Control.d comparison

comparison dwt/widgets/Control.d @ 37:642f460a0908

Fixed a lot of compile errors, a "hello world" app compiles now

author	Jacob Carlborg <doob@me.com> <jacob.carlborg@gmail.com>
date	Fri, 10 Oct 2008 12:29:48 +0200
parents	453387bb0706
children	d8635bb48c7c

comparison

equal deleted inserted replaced

-:db5a898b2119
+:642f460a0908
 * IMPORTANT: This class is intended to be subclassed <em>only</em>
 * within the DWT implementation.
 * </p>
 */
 public abstract class Control : Widget , Drawable {
+alias Widget.setInputState setInputState;
 /**
 * the handle to the OS resource
 * (Warning: This field is platform dependent)
 * <p>
 * <b>IMPORTANT:</b> This field is <em>not</em> part of the DWT
 bool acceptsFirstResponder () {
 objc_super super_struct = objc_super();
 super_struct.receiver = view.id_;
 super_struct.cls = cast(objc.Class) OS.objc_msgSend(view.id_, OS.sel_superclass);
-return OS.objc_msgSendSuper(super_struct, OS.sel_acceptsFirstResponder) !is null;
+return OS.objc_msgSendSuper(&super_struct, OS.sel_acceptsFirstResponder) !is null;
 }
 bool becomeFirstResponder () {
 //TODO - query focusControl() in DWT.FocusIn/Out is the control
 sendEvent (DWT.FocusIn);
 objc_super super_struct = objc_super();
 super_struct.receiver = view.id_;
-super_struct.cls = OS.objc_msgSend(view.id_, OS.sel_superclass);
+super_struct.cls = cast(objc.Class) OS.objc_msgSend(view.id_, OS.sel_superclass);
-return OS.objc_msgSendSuper(super_struct, OS.sel_becomeFirstResponder) !is null;
+return OS.objc_msgSendSuper(&super_struct, OS.sel_becomeFirstResponder) !is null;
 }
 bool resignFirstResponder () {
 //TODO - query focusControl() in DWT.FocusIn/Out is the control
 sendEvent (DWT.FocusOut);
 objc_super super_struct = objc_super();
 super_struct.receiver = view.id_;
-super_struct.cls = OS.objc_msgSend(view.id_, OS.sel_superclass);
+super_struct.cls = cast(objc.Class) OS.objc_msgSend(view.id_, OS.sel_superclass);
-return OS.objc_msgSendSuper(super_struct, OS.sel_resignFirstResponder) !is null;
+return OS.objc_msgSendSuper(&super_struct, OS.sel_resignFirstResponder) !is null;
 }
 /**
 * Adds the listener to the collection of listeners who will
 * be notified when the control is moved or resized, by sending
 }
 Control[] computeTabList() {
 if (isTabGroup()) {
 if (getVisible() && getEnabled()) {
-return new Control[] [this];
+return [this];
 }
 }
 return new Control[0];
 }
 bool drawGripper (int x, int y, int width, int height, bool vertical) {
 return false;
 }
-void drawRect(int id, NSRect rect) {
+void drawRect(objc.id id, NSRect rect) {
 super.drawRect(id, rect);
 if (!hooks (DWT.Paint) && !filters (DWT.Paint)) return;
 /* Send paint event */
 GCData data = new GCData ();
-data.paintRect = rect;
+data.paintRectStruct = rect;
+data.paintRect = &data.paintRectStruct;
 GC gc = GC.cocoa_new (this, data);
 Event event = new Event ();
 event.gc = gc;
 event.x = cast(int)rect.x;
 event.y = cast(int)rect.y;
 if (backgroundImage !is null || background !is null) return this;
 return (state & PARENT_BACKGROUND) !is 0 ? parent.findBackgroundControl () : null;
 }
 Menu [] findMenus (Control control) {
-if (menu !is null && this !is control) return new Menu [] [menu];
+if (menu !is null && this !is control) return [menu];
 return new Menu [0];
 }
 void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, Decorations oldDecorations, Menu [] menus) {
 oldShell.fixShell (newShell, this);
 * </p>
 *
 * @param hDC the platform specific GC handle
 * @param data the platform specific GC data
 */
-public void internal_dispose_GC (int context, GCData data) {
+public void internal_dispose_GC (objc.id context, GCData data) {
 checkWidget ();
 }
 /**
 * Returns <code>true</code> if the receiver is enabled and all
 int y = cast(int) pt.y;
 Event event = new Event ();
 event.x = x;
 event.y = y;
 sendEvent (DWT.MenuDetect, event);
-if (!event.doit) return 0;
+if (!event.doit) return null;
 Menu menu = getMenu ();
 if (menu !is null && !menu.isDisposed ()) {
 if (x !is event.x || y !is event.y) {
 menu.setLocation (event.x, event.y);
 }
 return menu.nsMenu.id_;
 }
 objc_super super_struct = objc_super();
 super_struct.receiver = view.id_;
-super_struct.cls = OS.objc_msgSend(view.id_, OS.sel_superclass);
+super_struct.cls = cast(objc.Class) OS.objc_msgSend(view.id_, OS.sel_superclass);
-return OS.objc_msgSendSuper(super_struct, OS.sel_menuForEvent_1, nsEvent);
+return OS.objc_msgSendSuper(&super_struct, OS.sel_menuForEvent_1, nsEvent);
 }
 Decorations menuShell () {
 return parent.menuShell ();
 }
 event.y = cast(int) point.y;
 setInputState (event, nsEvent, type);
 sendEvent (type, event);
 }
-void mouseDown(int theEvent) {
+void mouseDown(objc.id theEvent) {
 NSEvent nsEvent = new NSEvent (theEvent);
 sendMouseEvent (nsEvent, DWT.MouseDown, 1);
 }
 void mouseDragged(objc.id theEvent) {
-NSEvent nsEvent = new NSEvent (objc.id);
+NSEvent nsEvent = new NSEvent (theEvent);
 sendMouseEvent (nsEvent, DWT.MouseMove, 1);
 }
 void mouseUp(objc.id theEvent) {
 NSEvent nsEvent = new NSEvent (theEvent);
 //TODO - get unshifted values for Shift+1
 event.keyCode = keyCodes.characterAtIndex (i);
 }
 setInputState (event, nsEvent, type);
 if (!setKeyState(event, type, nsEvent)) return false;
-if (sendKeyEvent (type, event)) {
+if ((cast(Widget)this).sendKeyEvent (type, event)) {
 chars [count++] = chars [i];
 }
 }
 //  if (count is 0) return false;
 if (count !is keys.length () - 1) {
 */
 public void setEnabled (bool enabled) {
 checkWidget();
 if (((state & DISABLED) is 0) is enabled) return;
 Control control = null;
-bool fixFocus = false;
+bool fixFocus_ = false;
 if (!enabled) {
 //      if (display.focusEvent !is DWT.FocusOut) {
 control = display.getFocusControl ();
-fixFocus = isFocusAncestor (control);
+fixFocus_ = isFocusAncestor (control);
 //      }
 }
 if (enabled) {
 state &= ~DISABLED;
 } else {
 state |= DISABLED;
 }
 enableWidget (enabled);
-if (fixFocus) fixFocus (control);
+if (fixFocus_) fixFocus (control);
 }
 /**
 * Causes the receiver to have the <em>keyboard focus</em>,
 * such that all keyboard events will be delivered to it.  Focus
 * the caret.  The fix is to assign focus to the first ancestor
 * control that takes focus.  If no control will take focus, clear
 * the focus control.
 */
 Control control = null;
-bool fixFocus = false;
+bool fixFocus_ = false;
 if (!visible) {
 //      if (display.focusEvent !is DWT.FocusOut) {
 control = display.getFocusControl ();
-fixFocus = isFocusAncestor (control);
+fixFocus_ = isFocusAncestor (control);
 //      }
 }
 topView().setHidden(!visible);
 if (!visible) {
 /*
 * event.  If this happens, just return.
 */
 sendEvent (DWT.Hide);
 if (isDisposed ()) return;
 }
-if (fixFocus) fixFocus (control);
+if (fixFocus_) fixFocus (control);
 }
 void setZOrder () {
 //  int topHandle = topHandle ();
 //  int parentHandle = parent.handle;
 void setZOrder (Control control, bool above) {
 NSView otherView = control is null ? null : control.topView ();
 view.retain();
 view.removeFromSuperview();
-parent.contentView().addSubview_positioned_relativeTo_(view, above ? OS.NSWindowAbove : OS.NSWindowBelow, otherView);
+parent.contentView().addSubview_positioned_relativeTo_(view, above ? NSWindowAbove : NSWindowBelow, otherView);
 view.release();
 }
 void sort (int [] items) {
 /* Shell Sort from K&R, pg 108 */

Mercurial > projects > dwt-mac

comparison dwt/widgets/Control.d @ 37:642f460a0908