/* cancel pressed */
{
if(dlg == BoardWindow) ExitEvent(0);
- PopDown(dlg);
+ if(dlg == FatalDlg) ErrorOK(1); else PopDown(dlg);
}
shells[dlg] = sh; // restore
return TRUE;
#endif
static void
+ExposeDraw (Option *graph, GdkEventExpose *eevent)
+{
+ int w = eevent->area.width;
+ cairo_t *cr;
+ if(eevent->area.x + w > graph->max) w--; // cut off fudge pixel
+ cr = gdk_cairo_create(((GtkWidget *) (graph->handle))->window);
+ cairo_set_source_surface(cr, (cairo_surface_t *) graph->choice, 0, 0);
+//cairo_set_source_rgb(cr, 1, 0, 0);
+ cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
+ cairo_rectangle(cr, eevent->area.x, eevent->area.y, w, eevent->area.height);
+ cairo_fill(cr);
+ cairo_destroy(cr);
+}
+
+static void
GraphEventProc(GtkWidget *widget, GdkEvent *event, gpointer gdata)
{ // handle expose and mouse events on Graph widget
int w, h;
GdkEventMotion *mevent = (GdkEventMotion *) event;
GdkEventScroll *sevent = (GdkEventScroll *) event;
GtkAllocation a;
- cairo_t *cr;
// if (!XtIsRealized(widget)) return;
// to give drawing routines opportunity to use it before first expose event
// (which are only processed when main gets to the event loop, so after all init!)
// so only change when size is no longer good
- cairo_t *cr;
- if(graph->choice) cairo_surface_destroy((cairo_surface_t *) graph->choice);
- graph->choice = (char**) cairo_image_surface_create (CAIRO_FORMAT_ARGB32, w, h);
- // paint white, to prevent weirdness when people maximize window and drag pieces over space next to board
- cr = cairo_create ((cairo_surface_t *) graph->choice);
- cairo_rectangle (cr, 0, 0, w, h);
- cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 1.0);
- cairo_fill(cr);
- cairo_destroy (cr);
+// NewCanvas(graph);
+ graph->min |= REPLACE; // defer making new canvas
break;
}
- w = eevent->area.width;
- if(eevent->area.x + w > graph->max) w--; // cut off fudge pixel
- cr = gdk_cairo_create(((GtkWidget *) (graph->handle))->window);
- cairo_set_source_surface(cr, (cairo_surface_t *) graph->choice, 0, 0);
-//cairo_set_source_rgb(cr, 1, 0, 0);
- cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
- cairo_rectangle(cr, eevent->area.x, eevent->area.y, w, eevent->area.height);
- cairo_fill(cr);
- cairo_destroy(cr);
+ ExposeDraw(graph, eevent);
default:
return;
case GDK_SCROLL:
GdkEventExpose e;
if(!opt->handle) return;
e.area.x = x; e.area.y = y; e.area.width = w; e.area.height = h; e.count = -1; e.type = GDK_EXPOSE; // count = -1: kludge to suppress sizing
- GraphEventProc(opt->handle, (GdkEvent *) &e, (gpointer) opt); // fake expose event
+ ExposeDraw(opt, &e); // fake expose event
}
void GenericCallback(GtkWidget *widget, gpointer gdata)
}
else if (option[i].type == FileName || option[i].type == PathName) {
gtk_table_attach(GTK_TABLE(table), entry, left+1, left+2, top, top+1, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 1);
- button = gtk_button_new_with_label ("Browse");
+ button = gtk_button_new_with_label (_("Browse"));
gtk_table_attach(GTK_TABLE(table), button, left+2, left+r, top, top+1, GTK_FILL, GTK_FILL, 2, 1); // Browse button does not expand
g_signal_connect (button, "clicked", G_CALLBACK (BrowseGTK), (gpointer)(intptr_t) i);
option[i].handle = (void*)entry;
label = frame;
}
gtk_widget_set_size_request(label, option[i].max ? option[i].max : -1, -1);
- if(option[i].target || dlgNr != ErrorDlg && option[i].name && !strchr(option[i].name, '\n')) { // allow user to specify event handler for button presses
+ if(option[i].target || dlgNr != ErrorDlg && option[i].name) { // allow user to specify event handler for button presses
button = gtk_event_box_new();
gtk_container_add(GTK_CONTAINER(button), label);
label = button;
gtk_widget_add_events(GTK_WIDGET(label), GDK_BUTTON_PRESS_MASK);
if(option[i].target)
g_signal_connect(label, "button-press-event", G_CALLBACK(MemoEvent), (gpointer) &option[i]);
-// else g_signal_connect(label, "button-press-event", G_CALLBACK(HelpEvent), (gpointer) option[i].name);
+ else g_signal_connect(label, "button-press-event", G_CALLBACK(HelpEvent), (gpointer) option[i].name);
gtk_widget_set_sensitive(label, TRUE);
}
Pack(hbox, table, label, left, left+r, top, 0);