~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More serialisation changes: the game_aux_info structure has now been
[sgt/puzzles]
/
gtk.c
diff --git
a/gtk.c
b/gtk.c
index
4b789cb
..
88f4a0a
100644
(file)
--- a/
gtk.c
+++ b/
gtk.c
@@
-998,7
+998,11
@@
static void menu_preset_event(GtkMenuItem *menuitem, gpointer data)
fe->w = x;
fe->h = y;
gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), x, y);
fe->w = x;
fe->h = y;
gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), x, y);
- gtk_window_resize(GTK_WINDOW(fe->window), 1, 1);
+ {
+ GtkRequisition req;
+ gtk_widget_size_request(GTK_WIDGET(fe->window), &req);
+ gtk_window_resize(GTK_WINDOW(fe->window), req.width, req.height);
+ }
}
GdkAtom compound_text_atom, utf8_string_atom;
}
GdkAtom compound_text_atom, utf8_string_atom;
@@
-1143,7
+1147,11
@@
static void menu_config_event(GtkMenuItem *menuitem, gpointer data)
fe->w = x;
fe->h = y;
gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), x, y);
fe->w = x;
fe->h = y;
gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), x, y);
- gtk_window_resize(GTK_WINDOW(fe->window), 1, 1);
+ {
+ GtkRequisition req;
+ gtk_widget_size_request(GTK_WIDGET(fe->window), &req);
+ gtk_window_resize(GTK_WINDOW(fe->window), req.width, req.height);
+ }
}
static void menu_about_event(GtkMenuItem *menuitem, gpointer data)
}
static void menu_about_event(GtkMenuItem *menuitem, gpointer data)
@@
-1492,12
+1500,11
@@
int main(int argc, char **argv)
}
while (n-- > 0) {
}
while (n-- > 0) {
-
game_aux_info
*aux = NULL;
+
char
*aux = NULL;
char *desc = thegame.new_desc(par, rs, &aux, FALSE);
printf("%s:%s\n", parstr, desc);
sfree(desc);
char *desc = thegame.new_desc(par, rs, &aux, FALSE);
printf("%s:%s\n", parstr, desc);
sfree(desc);
- if (aux)
- thegame.free_aux_info(aux);
+ sfree(aux);
}
return 0;
}
return 0;