#include <windows.h>
#include <commctrl.h>
#include <assert.h>
+#include <ctype.h>
#include "winstuff.h"
#include "misc.h"
SWP_NOACTIVATE | SWP_NOCOPYBITS |
SWP_NOMOVE | SWP_NOZORDER);
}
- }
+ } else
+ ctl = NULL;
return ctl;
}
*/
char *staticwrap(struct ctlpos *cp, HWND hwnd, char *text, int *lines)
{
- HFONT font = (HFONT) cp->font;
HDC hdc = GetDC(hwnd);
int lpx = GetDeviceCaps(hdc, LOGPIXELSX);
int width, nlines, j;
SIZE size;
char *ret, *p, *q;
RECT r;
+ HFONT oldfont, newfont;
ret = smalloc(1+strlen(text));
p = text;
* Work out the width the text will need to fit in, by doing
* the same adjustment that the `statictext' function itself
* will perform.
- *
- * We must first convert from dialog-box units into pixels, and
- * then from pixels into the `logical units' that Windows uses
- * within GDI. You can't make this stuff up.
*/
+ SetMapMode(hdc, MM_TEXT); /* ensure logical units == pixels */
r.left = r.top = r.bottom = 0;
r.right = cp->width;
MapDialogRect(hwnd, &r);
- width = MulDiv(r.right, lpx, 72);
+ width = r.right;
nlines = 1;
+ /*
+ * We must select the correct font into the HDC before calling
+ * GetTextExtent*, or silly things will happen.
+ */
+ newfont = (HFONT)SendMessage(hwnd, WM_GETFONT, 0, 0);
+ oldfont = SelectObject(hdc, newfont);
+
while (*p) {
if (!GetTextExtentExPoint(hdc, p, strlen(p), width,
&nfit, pwidths, &size) ||
nlines++;
}
+ SelectObject(hdc, oldfont);
ReleaseDC(cp->hwnd, hdc);
if (lines) *lines = nlines;
if ((int)wParam == hdl->listid) {
DRAGLISTINFO *dlm = (DRAGLISTINFO *)lParam;
- int dest;
+ int dest = 0; /* initialise to placate gcc */
switch (dlm->uNotification) {
case DL_BEGINDRAG:
hdl->dummyitem =
struct ctlpos pos;
- char shortcuts[MAX_SHORTCUTS_PER_CTRL], nshortcuts;
+ char shortcuts[MAX_SHORTCUTS_PER_CTRL];
+ int nshortcuts;
char *escaped;
- int i, base_id, num_ids, orig_tabdelay;
+ int i, base_id, num_ids;
void *data;
base_id = *id;
for (i = 0; i < s->ncontrols; i++) {
union control *ctrl = s->ctrls[i];
- orig_tabdelay = FALSE;
-
/*
* Generic processing that pertains to all control types.
* At the end of this if statement, we'll have produced
assert(!ctrl->generic.tabdelay);
ctrl = ctrl->tabdelay.ctrl;
- orig_tabdelay = TRUE;
for (i = 0; i < ntabdelays; i++)
if (tabdelayed[i] == ctrl)
pos = tabdelays[i]; /* structure copy */
+ colstart = colspan = -1; /* indicate this was tab-delayed */
+
} else {
/*
* If it wasn't one of those, it's a genuine control;
break;
default:
assert(!"Can't happen");
+ num_ids = 0; /* placate gcc */
break;
}
base_id += num_ids;
}
- if (!orig_tabdelay) {
+ if (colstart >= 0) {
/*
* Update the ypos in all columns crossed by this
* control.
/*
* Look up the control ID in our data.
*/
+ c = NULL;
for (i = 0; i < dp->nctrltrees; i++) {
c = winctrl_findbyid(dp->controltrees[i], LOWORD(wParam));
if (c)
RECT r = di->rcItem;
SIZE s;
+ SetMapMode(hdc, MM_TEXT); /* ensure logical units == pixels */
+
GetTextExtentPoint32(hdc, (char *)c->data,
strlen((char *)c->data), &s);
DrawEdge(hdc, &r, EDGE_ETCHED, BF_ADJUST | BF_RECT);
* checked before generating an event.
*/
if (msg == WM_COMMAND &&
- HIWORD(wParam) == BN_CLICKED ||
- HIWORD(wParam) == BN_DOUBLECLICKED &&
+ (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED) &&
IsDlgButtonChecked(dp->hwnd, LOWORD(wParam))) {
ctrl->generic.handler(ctrl, dp, dp->data, EVENT_VALCHANGE);
}
/*
* Look up the control ID in our data.
*/
+ c = NULL;
for (i = 0; i < dp->nctrltrees; i++) {
c = winctrl_findbyid(dp->controltrees[i], id);
if (c)
int msg;
assert(c &&
(c->ctrl->generic.type == CTRL_LISTBOX ||
- c->ctrl->generic.type == CTRL_EDITBOX &&
- c->ctrl->editbox.has_list));
+ (c->ctrl->generic.type == CTRL_EDITBOX &&
+ c->ctrl->editbox.has_list)));
msg = (c->ctrl->generic.type==CTRL_LISTBOX && c->ctrl->listbox.height!=0 ?
LB_RESETCONTENT : CB_RESETCONTENT);
SendDlgItemMessage(dp->hwnd, c->base_id+1, msg, 0, 0);
int msg;
assert(c &&
(c->ctrl->generic.type == CTRL_LISTBOX ||
- c->ctrl->generic.type == CTRL_EDITBOX &&
- c->ctrl->editbox.has_list));
+ (c->ctrl->generic.type == CTRL_EDITBOX &&
+ c->ctrl->editbox.has_list)));
msg = (c->ctrl->generic.type==CTRL_LISTBOX && c->ctrl->listbox.height!=0 ?
LB_DELETESTRING : CB_DELETESTRING);
SendDlgItemMessage(dp->hwnd, c->base_id+1, msg, index, 0);
int msg;
assert(c &&
(c->ctrl->generic.type == CTRL_LISTBOX ||
- c->ctrl->generic.type == CTRL_EDITBOX &&
- c->ctrl->editbox.has_list));
+ (c->ctrl->generic.type == CTRL_EDITBOX &&
+ c->ctrl->editbox.has_list)));
msg = (c->ctrl->generic.type==CTRL_LISTBOX && c->ctrl->listbox.height!=0 ?
LB_ADDSTRING : CB_ADDSTRING);
SendDlgItemMessage(dp->hwnd, c->base_id+1, msg, 0, (LPARAM)text);
int msg, msg2, index;
assert(c &&
(c->ctrl->generic.type == CTRL_LISTBOX ||
- c->ctrl->generic.type == CTRL_EDITBOX &&
- c->ctrl->editbox.has_list));
+ (c->ctrl->generic.type == CTRL_EDITBOX &&
+ c->ctrl->editbox.has_list)));
msg = (c->ctrl->generic.type==CTRL_LISTBOX && c->ctrl->listbox.height!=0 ?
LB_ADDSTRING : CB_ADDSTRING);
msg2 = (c->ctrl->generic.type==CTRL_LISTBOX && c->ctrl->listbox.height!=0 ?