if (fe->drawstatus == PRINTING) {
int hatch;
float r, g, b;
- print_get_colour(fe->dr, colour, &hatch, &r, &g, &b);
- if (fe->printcolour)
- SetTextColor(fe->hdc, RGB(r * 255, g * 255, b * 255));
- else
- SetTextColor(fe->hdc,
- hatch == HATCH_CLEAR ? RGB(255,255,255) : RGB(0,0,0));
+ print_get_colour(fe->dr, colour, fe->printcolour, &hatch, &r, &g, &b);
+
+ /*
+ * Displaying text in hatched colours is not permitted.
+ */
+ assert(hatch < 0);
+
+ SetTextColor(fe->hdc, RGB(r * 255, g * 255, b * 255));
} else {
SetTextColor(fe->hdc, fe->colours[colour]);
}
if (fe->drawstatus == PRINTING) {
int hatch;
float r, g, b;
- print_get_colour(fe->dr, colour, &hatch, &r, &g, &b);
+ print_get_colour(fe->dr, colour, fe->printcolour, &hatch, &r, &g, &b);
- if (fe->printcolour) {
+ if (hatch < 0) {
br = CreateSolidBrush(RGB(r * 255, g * 255, b * 255));
- } else if (hatch == HATCH_SOLID) {
- br = CreateSolidBrush(RGB(0,0,0));
- } else if (hatch == HATCH_CLEAR) {
- br = CreateSolidBrush(RGB(255,255,255));
} else {
#ifdef _WIN32_WCE
/*
float r, g, b;
int width = thin ? 0 : fe->linewidth;
- print_get_colour(fe->dr, colour, &hatch, &r, &g, &b);
- if (fe->printcolour)
- pen = CreatePen(PS_SOLID, width,
- RGB(r * 255, g * 255, b * 255));
- else if (hatch == HATCH_SOLID)
- pen = CreatePen(PS_SOLID, width, RGB(0, 0, 0));
- else if (hatch == HATCH_CLEAR)
- pen = CreatePen(PS_SOLID, width, RGB(255,255,255));
- else {
- assert(!"This shouldn't happen");
- pen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
- }
+ print_get_colour(fe->dr, colour, fe->printcolour, &hatch, &r, &g, &b);
+ /*
+ * Stroking in hatched colours is not permitted.
+ */
+ assert(hatch < 0);
+ pen = CreatePen(PS_SOLID, width, RGB(r * 255, g * 255, b * 255));
} else {
pen = fe->pens[colour];
}
static int check_window_resize(frontend *fe, int cx, int cy,
int *px, int *py,
- int *wx, int *wy, int expand)
+ int *wx, int *wy, int resize)
{
RECT r;
int x, y, sy = get_statusbar_height(fe), changed = 0;
* See if we actually got the window size we wanted, and adjust
* the puzzle size if not.
*/
- midend_size(fe->me, &x, &y, expand);
+ midend_size(fe->me, &x, &y, resize);
if (x != cx || y != cy) {
/*
* Resize the window, now we know what size we _really_
if (help_topic) {
char *item;
assert(thegame.name);
- item = snewn(9+strlen(thegame.name), char); /*ick*/
+ item = snewn(10+strlen(thegame.name), char); /*ick*/
sprintf(item, "&Help on %s", thegame.name);
AppendMenu(menu, MF_ENABLED, IDM_GAMEHELP, item);
sfree(item);
y += height/2; /* extra space before OK */
mkctrl(fe, width*2, maxwid+width*2, y, y+height*7/4, "BUTTON",
- BS_PUSHBUTTON | BS_NOTIFY | WS_TABSTOP | BS_DEFPUSHBUTTON, 0,
+ BS_PUSHBUTTON | WS_TABSTOP | BS_DEFPUSHBUTTON, 0,
"OK", IDOK);
SendMessage(fe->cfgbox, WM_INITDIALOG, 0, 0);
y += height/2; /* extra space before OK and Cancel */
mkctrl(fe, col1l, (col1l+col2r)/2-width, y, y+height*7/4, "BUTTON",
- BS_PUSHBUTTON | BS_NOTIFY | WS_TABSTOP | BS_DEFPUSHBUTTON, 0,
+ BS_PUSHBUTTON | WS_TABSTOP | BS_DEFPUSHBUTTON, 0,
"OK", IDOK);
mkctrl(fe, (col1l+col2r)/2+width, col2r, y, y+height*7/4, "BUTTON",
- BS_PUSHBUTTON | BS_NOTIFY | WS_TABSTOP, 0, "Cancel", IDCANCEL);
+ BS_PUSHBUTTON | WS_TABSTOP, 0, "Cancel", IDCANCEL);
SendMessage(fe->cfgbox, WM_INITDIALOG, 0, 0);