From 7b0780be2af39bc2c5de2d60d49633eb19d1b4ad Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Mon, 25 Apr 2016 17:52:16 -0400 Subject: [PATCH] Made SyncEnableState() a uiDarwinControl method instead of a uiControl method since it's not needed on GTK+. --- common/control.c | 5 ----- darwin/box.m | 6 +++--- darwin/control.m | 5 +++++ darwin/group.m | 6 +++--- darwin/tab.m | 2 +- darwin/window.m | 6 +++--- ui.h | 2 -- ui_darwin.h | 10 ++++++---- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/common/control.c b/common/control.c index 04a81289..d6da78bf 100644 --- a/common/control.c +++ b/common/control.c @@ -57,11 +57,6 @@ void uiControlDisable(uiControl *c) (*(c->Disable))(c); } -void uiControlSyncEnableState(uiControl *c, int state) -{ - (*(c->SyncEnableState))(c, state); -} - #define uiControlSignature 0x7569436F uiControl *uiAllocControl(size_t size, uint32_t OSsig, uint32_t typesig, const char *typenamestr) diff --git a/darwin/box.m b/darwin/box.m index de7c4657..d4c88a14 100644 --- a/darwin/box.m +++ b/darwin/box.m @@ -65,7 +65,7 @@ uiDarwinControlDefaultEnabled(uiBox, view) uiDarwinControlDefaultEnable(uiBox, view) uiDarwinControlDefaultDisable(uiBox, view) -static void uiBoxSyncEnableState(uiControl *c, int enabled) +static void uiBoxSyncEnableState(uiDarwinControl *c, int enabled) { uiBox *b = uiBox(c); NSUInteger i; @@ -77,7 +77,7 @@ static void uiBoxSyncEnableState(uiControl *c, int enabled) v = (NSValue *) [b->children objectAtIndex:i]; // TODO change all these other instances of casts to conversions child = uiControl([v pointerValue]); - uiControlSyncEnableState(child, enabled); + uiDarwinControlSyncEnableState(uiDarwinControl(child), enabled); } } @@ -229,7 +229,7 @@ void uiBoxAppend(uiBox *b, uiControl *c, int stretchy) uiControlSetParent(c, uiControl(b)); uiDarwinControlSetSuperview(uiDarwinControl(c), b->view); - uiControlSyncEnableState(c, uiControlEnabledToUser(uiControl(b))); + uiDarwinControlSyncEnableState(uiDarwinControl(c), uiControlEnabledToUser(uiControl(b))); // TODO save the old hugging priorities // if a control is stretchy, it should not hug in the primary direction diff --git a/darwin/control.m b/darwin/control.m index fd46a66b..cb847d7e 100644 --- a/darwin/control.m +++ b/darwin/control.m @@ -1,6 +1,11 @@ // 16 august 2015 #import "uipriv_darwin.h" +void uiDarwinControlSyncEnableState(uiDarwinControl *c, int state) +{ + (*(c->SyncEnableState))(c, state); +} + void uiDarwinControlSetSuperview(uiDarwinControl *c, NSView *superview) { (*(c->SetSuperview))(c, superview); diff --git a/darwin/group.m b/darwin/group.m index 516d9708..c5f876e4 100644 --- a/darwin/group.m +++ b/darwin/group.m @@ -31,12 +31,12 @@ uiDarwinControlDefaultEnabled(uiGroup, box) uiDarwinControlDefaultEnable(uiGroup, box) uiDarwinControlDefaultDisable(uiGroup, box) -static void uiGroupSyncEnableState(uiControl *c, int enabled) +static void uiGroupSyncEnableState(uiDarwinControl *c, int enabled) { uiGroup *g = uiGroup(c); if (g->child != NULL) - uiControlSyncEnableState(g->child, enabled); + uiDarwinControlSyncEnableState(uiDarwinControl(g->child), enabled); } uiDarwinControlDefaultSetSuperview(uiGroup, box) @@ -89,7 +89,7 @@ void uiGroupSetChild(uiGroup *g, uiControl *child) // otherwise, things get really glitchy // we also need to call -sizeToFit, but we'll do that in the relayout that's triggered below (see above) uiDarwinControlSetSuperview(uiDarwinControl(g->child), g->box); - uiControlSyncEnableState(g->child, uiControlEnabledToUser(uiControl(g))); + uiDarwinControlSyncEnableState(uiDarwinControl(g->child), uiControlEnabledToUser(uiControl(g))); } groupRelayout(g); } diff --git a/darwin/tab.m b/darwin/tab.m index 3ad191d9..660ef012 100644 --- a/darwin/tab.m +++ b/darwin/tab.m @@ -98,7 +98,7 @@ void uiTabInsertAt(uiTab *t, const char *name, uintmax_t n, uiControl *child) view = [[NSView alloc] initWithFrame:NSZeroRect]; // TODO if we turn off the autoresizing mask, nothing shows up; didn't this get documented somewhere? uiDarwinControlSetSuperview(uiDarwinControl(child), view); - uiControlSyncEnableState(child, uiControlEnabledToUser(uiControl(t))); + uiDarwinControlSyncEnableState(uiDarwinControl(child), uiControlEnabledToUser(uiControl(t))); [t->pages insertObject:[NSValue valueWithPointer:child] atIndex:n]; [t->views insertObject:view atIndex:n]; diff --git a/darwin/window.m b/darwin/window.m index 958915af..1c66f52c 100644 --- a/darwin/window.m +++ b/darwin/window.m @@ -126,12 +126,12 @@ uiDarwinControlDefaultEnabled(uiWindow, window) uiDarwinControlDefaultEnable(uiWindow, window) uiDarwinControlDefaultDisable(uiWindow, window) -static void uiWindowSyncEnableState(uiControl *c, int enabled) +static void uiWindowSyncEnableState(uiDarwinControl *c, int enabled) { uiWindow *w = uiWindow(c); if (w->child != NULL) - uiControlSyncEnableState(w->child, enabled); + uiDarwinControlSyncEnableState(uiDarwinControl(w->child), enabled); } static void uiWindowSetSuperview(uiDarwinControl *c, NSView *superview) @@ -187,7 +187,7 @@ void uiWindowSetChild(uiWindow *w, uiControl *child) uiControlSetParent(w->child, uiControl(w)); childView = (NSView *) uiControlHandle(w->child); uiDarwinControlSetSuperview(uiDarwinControl(w->child), [w->window contentView]); - uiControlSyncEnableState(w->child, uiControlEnabledToUser(uiControl(w))); + uiDarwinControlSyncEnableState(uiDarwinControl(w->child), uiControlEnabledToUser(uiControl(w))); } windowRelayout(w); } diff --git a/ui.h b/ui.h index 7f1d8863..26da72df 100644 --- a/ui.h +++ b/ui.h @@ -58,7 +58,6 @@ struct uiControl { int (*Enabled)(uiControl *); void (*Enable)(uiControl *); void (*Disable)(uiControl *); - void (*SyncEnableState)(uiControl *, int); }; // TOOD add argument names to all arguments #define uiControl(this) ((uiControl *) (this)) @@ -73,7 +72,6 @@ _UI_EXTERN void uiControlHide(uiControl *); _UI_EXTERN int uiControlEnabled(uiControl *); _UI_EXTERN void uiControlEnable(uiControl *); _UI_EXTERN void uiControlDisable(uiControl *); -_UI_EXTERN void uiControlSyncEnableState(uiControl *, int); _UI_EXTERN uiControl *uiAllocControl(size_t n, uint32_t OSsig, uint32_t typesig, const char *typenamestr); _UI_EXTERN void uiFreeControl(uiControl *); diff --git a/ui_darwin.h b/ui_darwin.h index d5dcb9a5..8f74fd11 100644 --- a/ui_darwin.h +++ b/ui_darwin.h @@ -17,10 +17,12 @@ struct uiDarwinControl { uiControl *parent; BOOL enabled; BOOL visible; + void (*SyncEnableState)(uiDarwinControl *, int); void (*SetSuperview)(uiDarwinControl *, NSView *); }; #define uiDarwinControl(this) ((uiDarwinControl *) (this)) // TODO document +_UI_EXTERN void uiDarwinControlSyncEnableState(uiDarwinControl *, int); _UI_EXTERN void uiDarwinControlSetSuperview(uiDarwinControl *, NSView *); #define uiDarwinControlDefaultDestroy(type, handlefield) \ @@ -77,16 +79,16 @@ _UI_EXTERN void uiDarwinControlSetSuperview(uiDarwinControl *, NSView *); static void type ## Enable(uiControl *c) \ { \ uiDarwinControl(c)->enabled = YES; \ - uiControlSyncEnableState(c, uiControlEnabledToUser(c)); \ + uiDarwinControlSyncEnableState(uiDarwinControl(c), uiControlEnabledToUser(c)); \ } #define uiDarwinControlDefaultDisable(type, handlefield) \ static void type ## Disable(uiControl *c) \ { \ uiDarwinControl(c)->enabled = NO; \ - uiControlSyncEnableState(c, uiControlEnabledToUser(c)); \ + uiDarwinControlSyncEnableState(uiDarwinControl(c), uiControlEnabledToUser(c)); \ } #define uiDarwinControlDefaultSyncEnableState(type, handlefield) \ - static void type ## SyncEnableState(uiControl *c, int enabled) \ + static void type ## SyncEnableState(uiDarwinControl *c, int enabled) \ { \ if ([type(c)->handlefield respondsToSelector:@selector(setEnabled:)]) \ [((id) type(c)->handlefield) setEnabled:enabled]; /* id cast to make compiler happy; thanks mikeash in irc.freenode.net/#macdev */ \ @@ -133,7 +135,7 @@ _UI_EXTERN void uiDarwinControlSetSuperview(uiDarwinControl *, NSView *); uiControl(var)->Enabled = type ## Enabled; \ uiControl(var)->Enable = type ## Enable; \ uiControl(var)->Disable = type ## Disable; \ - uiControl(var)->SyncEnableState = type ## SyncEnableState; \ + uiDarwinControl(var)->SyncEnableState = type ## SyncEnableState; \ uiDarwinControl(var)->SetSuperview = type ## SetSuperview; \ uiDarwinControl(var)->visible = YES; \ uiDarwinControl(var)->enabled = YES;