interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated common uipriv names on OS X.

This commit is contained in:
Pietro Gagliardi 2018-04-18 10:06:43 -04:00
parent ae2eea7975
commit d441455112
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
darwin/table.m
View File

@ -186,7 +186,7 @@ done:
break; break;
} }
if (row == -1) if (row == -1)
implbug("table model action triggered on view with no associated table"); uiprivImplBug("table model action triggered on view with no associated table");
if ([view isKindOfClass:[NSTextField class]]) if ([view isKindOfClass:[NSTextField class]])
data = [[((NSTextField *) view) stringValue] UTF8String]; data = [[((NSTextField *) view) stringValue] UTF8String];
@ -200,7 +200,7 @@ done:
if(1); else if(1); else
data = NULL; data = NULL;
} else } else
implbug("table model editing action triggered on non-editable view"); uiprivImplBug("table model editing action triggered on non-editable view");
// note the use of [view tag] — we need the model column, which we store in the view tag for relevant views below // note the use of [view tag] — we need the model column, which we store in the view tag for relevant views below
(*(m->mh->SetCellValue))(m->mh, m, (*(m->mh->SetCellValue))(m->mh, m,
@ -240,7 +240,7 @@ if(1); else
case partText: case partText:
data = (*(m->mh->CellValue))(m->mh, m, row, self.textColumn); data = (*(m->mh->CellValue))(m->mh, m, row, self.textColumn);
str = toNSString((char *) data); str = toNSString((char *) data);
uiFree(data); uiprivFree(data);
tf = newLabel(str); tf = newLabel(str);
// TODO set wrap and ellipsize modes? // TODO set wrap and ellipsize modes?
if (self.textColorColumn != -1) { if (self.textColorColumn != -1) {
@ -364,7 +364,7 @@ void *uiTableModelStrdup(const char *str)
// TODO don't we have this already? // TODO don't we have this already?
char *dup; char *dup;
dup = (char *) uiAlloc((strlen(str) + 1) * sizeof (char), "char[]"); dup = (char *) uiprivAlloc((strlen(str) + 1) * sizeof (char), "char[]");
strcpy(dup, str); strcpy(dup, str);
return dup; return dup;
} }
@ -373,7 +373,7 @@ uiTableModel *uiNewTableModel(uiTableModelHandler *mh)
{ {
uiTableModel *m; uiTableModel *m;
m = uiNew(uiTableModel); m = uiprivNew(uiTableModel);
m->mh = mh; m->mh = mh;
m->m = [[tableModel alloc] initWithModel:m]; m->m = [[tableModel alloc] initWithModel:m];
m->tables = [NSMutableArray new]; m->tables = [NSMutableArray new];
@ -388,10 +388,10 @@ void *uiTableModelGiveColor(double r, double g, double b, double a)
void uiFreeTableModel(uiTableModel *m) void uiFreeTableModel(uiTableModel *m)
{ {
if ([m->tables count] != 0) if ([m->tables count] != 0)
userbug("You cannot free a uiTableModel while uiTables are using it."); uiprivUserBug("You cannot free a uiTableModel while uiTables are using it.");
[m->tables release]; [m->tables release];
[m->m release]; [m->m release];
uiFree(m); uiprivFree(m);
} }
void uiTableModelRowInserted(uiTableModel *m, int newIndex) void uiTableModelRowInserted(uiTableModel *m, int newIndex)
@ -519,7 +519,7 @@ uiTableColumn *uiTableAppendColumn(uiTable *t, const char *name)
{ {
uiTableColumn *c; uiTableColumn *c;
c = uiNew(uiTableColumn); c = uiprivNew(uiTableColumn);
c->c = [[tableColumn alloc] initWithIdentifier:@""]; c->c = [[tableColumn alloc] initWithIdentifier:@""];
c->c.libui_col = c; c->c.libui_col = c;
// via Interface Builder // via Interface Builder