Changed c-> to uiControl(c)-> in the various newcontrol files for consistency.

This commit is contained in:
Pietro Gagliardi 2015-05-03 14:44:46 -04:00
parent 51cdb1817e
commit 2186192502
3 changed files with 32 additions and 33 deletions

View File

@ -152,16 +152,15 @@ void uiDarwinMakeControl(uiControl *c, Class class, BOOL inScrollView, BOOL scro
// and keep a reference to s->immediate for when we remove the control from its parent // and keep a reference to s->immediate for when we remove the control from its parent
[s->immediate retain]; [s->immediate retain];
// TODO update all of these to say uiControl(c) uiControl(c)->Internal = s;
c->Internal = s; uiControl(c)->Destroy = singleDestroy;
c->Destroy = singleDestroy; uiControl(c)->Handle = singleHandle;
c->Handle = singleHandle; uiControl(c)->SetParent = singleSetParent;
c->SetParent = singleSetParent; uiControl(c)->PreferredSize = singlePreferredSize;
c->PreferredSize = singlePreferredSize; uiControl(c)->Resize = singleResize;
c->Resize = singleResize; uiControl(c)->Visible = singleVisible;
c->Visible = singleVisible; uiControl(c)->Show = singleShow;
c->Show = singleShow; uiControl(c)->Hide = singleHide;
c->Hide = singleHide; uiControl(c)->Enable = singleEnable;
c->Enable = singleEnable; uiControl(c)->Disable = singleDisable;
c->Disable = singleDisable;
} }

View File

@ -157,15 +157,15 @@ void uiUnixMakeControl(uiControl *c, GType type, gboolean inScrolledWindow, gboo
// finally, call gtk_widget_show_all() here to set the initial visibility of the widget // finally, call gtk_widget_show_all() here to set the initial visibility of the widget
gtk_widget_show_all(s->immediate); gtk_widget_show_all(s->immediate);
c->Internal = s; uiControl(c)->Internal = s;
c->Destroy = singleDestroy; uiControl(c)->Destroy = singleDestroy;
c->Handle = singleHandle; uiControl(c)->Handle = singleHandle;
c->SetParent = singleSetParent; uiControl(c)->SetParent = singleSetParent;
c->PreferredSize = singlePreferredSize; uiControl(c)->PreferredSize = singlePreferredSize;
c->Resize = singleResize; uiControl(c)->Resize = singleResize;
c->Visible = singleVisible; uiControl(c)->Visible = singleVisible;
c->Show = singleShow; uiControl(c)->Show = singleShow;
c->Hide = singleHide; uiControl(c)->Hide = singleHide;
c->Enable = singleEnable; uiControl(c)->Enable = singleEnable;
c->Disable = singleDisable; uiControl(c)->Disable = singleDisable;
} }

View File

@ -151,16 +151,16 @@ void uiWindowsMakeControl(uiControl *c, uiWindowsMakeControlParams *p)
if ((*fv_SetWindowSubclass)(s->hwnd, singleSubclassProc, 0, (DWORD_PTR) c) == FALSE) if ((*fv_SetWindowSubclass)(s->hwnd, singleSubclassProc, 0, (DWORD_PTR) c) == FALSE)
logLastError("error subclassing Windows control in uiWindowsMakeControl()"); logLastError("error subclassing Windows control in uiWindowsMakeControl()");
c->Internal = s; uiControl(c)->Internal = s;
c->Destroy = singleDestroy; uiControl(c)->Destroy = singleDestroy;
c->Handle = singleHandle; uiControl(c)->Handle = singleHandle;
c->SetParent = singleSetParent; uiControl(c)->SetParent = singleSetParent;
c->Resize = singleResize; uiControl(c)->Resize = singleResize;
c->Visible = singleVisible; uiControl(c)->Visible = singleVisible;
c->Show = singleShow; uiControl(c)->Show = singleShow;
c->Hide = singleHide; uiControl(c)->Hide = singleHide;
c->Enable = singleEnable; uiControl(c)->Enable = singleEnable;
c->Disable = singleDisable; uiControl(c)->Disable = singleDisable;
} }
char *uiWindowsControlText(uiControl *c) char *uiWindowsControlText(uiControl *c)