diff --git a/zOLD_common/control.c b/zOLD_common/control.c index 98cb94aa..16cce968 100644 --- a/zOLD_common/control.c +++ b/zOLD_common/control.c @@ -2,11 +2,6 @@ #include "../ui.h" #include "uipriv.h" -void uiControlDestroy(uiControl *c) -{ - (*(c->Destroy))(c); -} - uintptr_t uiControlHandle(uiControl *c) { return (*(c->Handle))(c); @@ -57,26 +52,6 @@ void uiControlDisable(uiControl *c) (*(c->Disable))(c); } -#define uiprivControlSignature 0x7569436F - -uiControl *uiAllocControl(size_t size, uint32_t OSsig, uint32_t typesig, const char *typenamestr) -{ - uiControl *c; - - c = (uiControl *) uiprivAlloc(size, typenamestr); - c->Signature = uiprivControlSignature; - c->OSSignature = OSsig; - c->TypeSignature = typesig; - return c; -} - -void uiFreeControl(uiControl *c) -{ - if (uiControlParent(c) != NULL) - uiprivUserBug("You cannot destroy a uiControl while it still has a parent. (control: %p)", c); - uiprivFree(c); -} - void uiControlVerifySetParent(uiControl *c, uiControl *parent) { uiControl *curParent; diff --git a/zOLD_common/controlsigs.h b/zOLD_common/controlsigs.h deleted file mode 100644 index 944afa9b..00000000 --- a/zOLD_common/controlsigs.h +++ /dev/null @@ -1,27 +0,0 @@ -// 24 april 2016 - -// LONGTERM if I don't decide to remove these outright, should they be renamed uiprivTypeNameSignature? these aren't real symbols, so... - -#define uiAreaSignature 0x41726561 -#define uiBoxSignature 0x426F784C -#define uiButtonSignature 0x42746F6E -#define uiCheckboxSignature 0x43686B62 -#define uiColorButtonSignature 0x436F6C42 -#define uiComboboxSignature 0x436F6D62 -#define uiDateTimePickerSignature 0x44545069 -#define uiEditableComboboxSignature 0x45644362 -#define uiEntrySignature 0x456E7472 -#define uiFontButtonSignature 0x466F6E42 -#define uiFormSignature 0x466F726D -#define uiGridSignature 0x47726964 -#define uiGroupSignature 0x47727062 -#define uiLabelSignature 0x4C61626C -#define uiMultilineEntrySignature 0x4D6C6E45 -#define uiProgressBarSignature 0x50426172 -#define uiRadioButtonsSignature 0x5264696F -#define uiSeparatorSignature 0x53657061 -#define uiSliderSignature 0x536C6964 -#define uiSpinboxSignature 0x5370696E -#define uiTabSignature 0x54616273 -#define uiTableSignature 0x5461626C -#define uiWindowSignature 0x57696E64