diff options
| author | Simon Tatham <anakin@pobox.com> | 2015-10-03 12:28:04 +0100 |
|---|---|---|
| committer | Simon Tatham <anakin@pobox.com> | 2015-10-03 16:07:04 +0100 |
| commit | 3d0d54e3b407619fa859bf35b115d473afee63db (patch) | |
| tree | e4c585d8c3283d2a5a785bed9d927a74dc015938 | |
| parent | fd7882fb45829e38d2aa2f44169ae657a229ccec (diff) | |
| download | puzzles-3d0d54e3b407619fa859bf35b115d473afee63db.zip puzzles-3d0d54e3b407619fa859bf35b115d473afee63db.tar.gz puzzles-3d0d54e3b407619fa859bf35b115d473afee63db.tar.bz2 puzzles-3d0d54e3b407619fa859bf35b115d473afee63db.tar.xz | |
GTK 3 prep: use GTK instead of GDK window-icon functions.
We now build cleanly with -DGDK_DISABLE_DEPRECATED.
| -rw-r--r-- | gtk.c | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -2153,7 +2153,6 @@ static frontend *new_window(char *arg, int argtype, char **error) frontend *fe; GtkBox *vbox, *hbox; GtkWidget *menu, *menuitem; - GdkPixmap *iconpm; GList *iconlist; int x, y, n; char errbuf[1024]; @@ -2515,12 +2514,10 @@ static frontend *new_window(char *arg, int argtype, char **error) GDK_POINTER_MOTION_HINT_MASK); if (n_xpm_icons) { - gtk_widget_realize(fe->window); - iconpm = gdk_pixmap_create_from_xpm_d - (gtk_widget_get_window(fe->window), NULL, NULL, - (gchar **)xpm_icons[0]); - gdk_window_set_icon(gtk_widget_get_window(fe->window), - NULL, iconpm, NULL); + gtk_window_set_icon(GTK_WINDOW(fe->window), + gdk_pixbuf_new_from_xpm_data + ((const gchar **)xpm_icons[0])); + iconlist = NULL; for (n = 0; n < n_xpm_icons; n++) { iconlist = @@ -2528,7 +2525,7 @@ static frontend *new_window(char *arg, int argtype, char **error) gdk_pixbuf_new_from_xpm_data((const gchar **) xpm_icons[n])); } - gdk_window_set_icon_list(gtk_widget_get_window(fe->window), iconlist); + gtk_window_set_icon_list(GTK_WINDOW(fe->window), iconlist); } gtk_widget_show(fe->area); |