In Windows/Gtk front-ends, consistently use the ellipsis convention for naming

[sgt/puzzles] / gtk.c

diff --git a/gtk.c b/gtk.c
index 27c3ea5..4335a07 100644 (file)
--- a/gtk.c
+++ b/gtk.c
@@ -1616,12 +1616,12 @@ static frontend *new_window(char *arg, int argtype, char **error)
     }
 
     add_menu_separator(GTK_CONTAINER(menu));
-    menuitem = gtk_menu_item_new_with_label("Load");
+    menuitem = gtk_menu_item_new_with_label("Load...");
     gtk_container_add(GTK_CONTAINER(menu), menuitem);
     gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
                       GTK_SIGNAL_FUNC(menu_load_event), fe);
     gtk_widget_show(menuitem);
-    menuitem = gtk_menu_item_new_with_label("Save");
+    menuitem = gtk_menu_item_new_with_label("Save...");
     gtk_container_add(GTK_CONTAINER(menu), menuitem);
     gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
                       GTK_SIGNAL_FUNC(menu_save_event), fe);
@@ -1954,6 +1954,11 @@ int main(int argc, char **argv)
        }
     }
 
+    if (*errbuf) {
+       fputs(errbuf, stderr);
+       return 1;
+    }
+
     /*
      * Special standalone mode for generating puzzle IDs on the
      * command line. Useful for generating puzzles to be printed
@@ -1981,11 +1986,6 @@ int main(int argc, char **argv)
        char *id;
        document *doc = NULL;
 
-       if (*errbuf) {
-           fputs(errbuf, stderr);
-           return 1;
-       }
-
        n = ngenerate;
 
        me = midend_new(NULL, &thegame, NULL, NULL);
@@ -2097,12 +2097,13 @@ int main(int argc, char **argv)
 
        if (screenshot_file) {
            GdkPixbuf *pb;
+            GError *gerror = NULL;
 
            midend_redraw(fe->me);
 
            pb = gdk_pixbuf_get_from_drawable(NULL, fe->pixmap,
                                              NULL, 0, 0, 0, 0, -1, -1);
-           gdk_pixbuf_save(pb, screenshot_file, "png", NULL);
+           gdk_pixbuf_save(pb, screenshot_file, "png", &gerror, NULL);
 
            exit(0);
        }