Got rid of UtilText and UtilSetText.

This commit is contained in:
Pietro Gagliardi 2016-04-22 20:04:30 -04:00
parent b49091b897
commit b514ba7cb0
6 changed files with 12 additions and 12 deletions

View File

@ -56,12 +56,12 @@ static void defaultOnClicked(uiButton *b, void *data)
char *uiButtonText(uiButton *b) char *uiButtonText(uiButton *b)
{ {
return uiWindowsUtilText(b->hwnd); return uiWindowsWindowText(b->hwnd);
} }
void uiButtonSetText(uiButton *b, const char *text) void uiButtonSetText(uiButton *b, const char *text)
{ {
uiWindowsUtilSetText(b->hwnd, text); uiWindowsSetWindowText(b->hwnd, text);
// changing the text might necessitate a change in the button's size // changing the text might necessitate a change in the button's size
uiWindowsControlQueueRelayout(uiWindowsControl(b)); uiWindowsControlQueueRelayout(uiWindowsControl(b));
} }

View File

@ -53,12 +53,12 @@ static void defaultOnToggled(uiCheckbox *c, void *data)
char *uiCheckboxText(uiCheckbox *c) char *uiCheckboxText(uiCheckbox *c)
{ {
return uiWindowsUtilText(c->hwnd); return uiWindowsWindowText(c->hwnd);
} }
void uiCheckboxSetText(uiCheckbox *c, const char *text) void uiCheckboxSetText(uiCheckbox *c, const char *text)
{ {
uiWindowsUtilSetText(c->hwnd, text); uiWindowsSetWindowText(c->hwnd, text);
// changing the text might necessitate a change in the checkbox's size // changing the text might necessitate a change in the checkbox's size
uiWindowsControlQueueRelayout(uiWindowsControl(c)); uiWindowsControlQueueRelayout(uiWindowsControl(c));
} }

View File

@ -45,14 +45,14 @@ static void defaultOnChanged(uiEntry *e, void *data)
char *uiEntryText(uiEntry *e) char *uiEntryText(uiEntry *e)
{ {
return uiWindowsUtilText(e->hwnd); return uiWindowsWindowText(e->hwnd);
} }
void uiEntrySetText(uiEntry *e, const char *text) void uiEntrySetText(uiEntry *e, const char *text)
{ {
// doing this raises an EN_CHANGED // doing this raises an EN_CHANGED
e->inhibitChanged = TRUE; e->inhibitChanged = TRUE;
uiWindowsUtilSetText(e->hwnd, text); uiWindowsSetWindowText(e->hwnd, text);
e->inhibitChanged = FALSE; e->inhibitChanged = FALSE;
// don't queue the control for resize; entry sizes are independent of their contents // don't queue the control for resize; entry sizes are independent of their contents
} }

View File

@ -97,12 +97,12 @@ static void groupArrangeChildrenControlIDsZOrder(uiWindowsControl *c)
char *uiGroupTitle(uiGroup *g) char *uiGroupTitle(uiGroup *g)
{ {
return uiWindowsUtilText(g->hwnd); return uiWindowsWindowText(g->hwnd);
} }
void uiGroupSetTitle(uiGroup *g, const char *text) void uiGroupSetTitle(uiGroup *g, const char *text)
{ {
uiWindowsUtilSetText(g->hwnd, text); uiWindowsSetWindowText(g->hwnd, text);
// changing the text might necessitate a change in the groupbox's size // changing the text might necessitate a change in the groupbox's size
uiWindowsControlQueueRelayout(uiWindowsControl(g)); uiWindowsControlQueueRelayout(uiWindowsControl(g));
} }

View File

@ -49,14 +49,14 @@ static void defaultOnChanged(uiMultilineEntry *e, void *data)
char *uiMultilineEntryText(uiMultilineEntry *e) char *uiMultilineEntryText(uiMultilineEntry *e)
{ {
return uiWindowsUtilText(e->hwnd); return uiWindowsWindowText(e->hwnd);
} }
void uiMultilineEntrySetText(uiMultilineEntry *e, const char *text) void uiMultilineEntrySetText(uiMultilineEntry *e, const char *text)
{ {
// doing this raises an EN_CHANGED // doing this raises an EN_CHANGED
e->inhibitChanged = TRUE; e->inhibitChanged = TRUE;
uiWindowsUtilSetText(e->hwnd, text); uiWindowsSetWindowText(e->hwnd, text);
e->inhibitChanged = FALSE; e->inhibitChanged = FALSE;
// don't queue the control for resize; entry sizes are independent of their contents // don't queue the control for resize; entry sizes are independent of their contents
} }

View File

@ -195,12 +195,12 @@ static void windowArrangeChildrenControlIDsZOrder(uiWindowsControl *c)
char *uiWindowTitle(uiWindow *w) char *uiWindowTitle(uiWindow *w)
{ {
return uiWindowsUtilText(w->hwnd); return uiWindowsWindowText(w->hwnd);
} }
void uiWindowSetTitle(uiWindow *w, const char *title) void uiWindowSetTitle(uiWindow *w, const char *title)
{ {
uiWindowsUtilSetText(w->hwnd, title); uiWindowsSetWindowText(w->hwnd, title);
// don't queue resize; the caption isn't part of what affects layout and sizing of the client area (it'll be ellipsized if too long) // don't queue resize; the caption isn't part of what affects layout and sizing of the client area (it'll be ellipsized if too long)
} }