From b62d4f2b807c0a57dc4d07ca09778058741dc3f4 Mon Sep 17 00:00:00 2001 From: wdlkmpx Date: Sat, 9 Jan 2021 15:53:27 +0800 Subject: [PATCH] replace some deprecated functions that are easy to spot and replace without major changes --- src/gfx.c | 24 +++++++++++++++++++----- src/gtkballs.c | 2 -- src/gtkutils.c | 23 ++++++++++++----------- src/inputname.c | 12 +++++++----- src/mainwin.c | 8 +++++++- 5 files changed, 45 insertions(+), 24 deletions(-) diff --git a/src/gfx.c b/src/gfx.c index 4051ebb..658fcc2 100644 --- a/src/gfx.c +++ b/src/gfx.c @@ -67,13 +67,14 @@ void update_rectangle(gint x, gint y, gint w, gint h) { if(!widget || !_pixmap) { return; } - gdk_draw_drawable(widget->window, widget->style->fg_gc[GTK_WIDGET_STATE(widget)], + gdk_draw_drawable (gtk_widget_get_window (widget), + widget->style->fg_gc[gtk_widget_get_state(widget)], _pixmap, x, y, x, y, w, h); } void draw_ball_no_update(gint ballcolor, gint x, gint y, gint jumpnum, gint destroynum) { GtkWidget *widget = mw_get_da(); - GdkGC *gc = widget->style->fg_gc[GTK_WIDGET_STATE(widget)]; + GdkGC *gc = widget->style->fg_gc[gtk_widget_get_state(widget)]; gint cxs = gtkbTheme->emptycell.xsize; gint cys = gtkbTheme->emptycell.ysize; GtkbPixmap *obj; @@ -88,7 +89,13 @@ void draw_ball_no_update(gint ballcolor, gint x, gint y, gint jumpnum, gint dest } else { obj = >kbTheme->emptycell; } - gdk_pixbuf_render_to_drawable(obj->pixbuf, _pixmap, gc, 0, 0, x * cxs, y * cys, cxs, cys, GDK_RGB_DITHER_NONE, 0, 0); + gdk_draw_pixbuf (_pixmap, + gc, + obj->pixbuf, + 0, 0, + x * cxs, y * cys, + cxs, cys, + GDK_RGB_DITHER_NONE, 0, 0); if(ballcolor > 0) { /* ball */ if(!jumpnum && !destroynum) { /* still ball */ @@ -106,7 +113,13 @@ void draw_ball_no_update(gint ballcolor, gint x, gint y, gint jumpnum, gint dest xr = x * cxs + (cxs - obj->xsize) / 2; yr = y * cys + (cys - obj->ysize) / 2; - gdk_pixbuf_render_to_drawable(obj->pixbuf, _pixmap, gc, 0, 0, xr, yr, obj->xsize, obj->ysize, GDK_RGB_DITHER_NONE, 0, 0); + gdk_draw_pixbuf (_pixmap, + gc, + obj->pixbuf, + 0, 0, + xr, yr, + obj->xsize, obj->ysize, + GDK_RGB_DITHER_NONE, 0, 0); } void draw_ball(gint ballcolor, gint x, gint y, gint jumpnum, gint destroynum) { @@ -340,7 +353,8 @@ gint expose_event(GtkWidget *widget, GdkEventExpose *event) { gdk_region_get_rectangles(event->region, &rects, &n_rects); for(i = 0; i < n_rects; i++) { - gdk_draw_drawable(widget->window, widget->style->fg_gc[GTK_WIDGET_STATE(widget)], + gdk_draw_drawable (gtk_widget_get_window (widget), + widget->style->fg_gc[gtk_widget_get_state(widget)], _pixmap, rects[i].x, rects[i].y, rects[i].x, rects[i].y, rects[i].width, rects[i].height); } diff --git a/src/gtkballs.c b/src/gtkballs.c index f34aee6..f0bee44 100644 --- a/src/gtkballs.c +++ b/src/gtkballs.c @@ -119,7 +119,6 @@ int main(int argc, char **argv) { gchar *err, *mapfile; /* setup all i18n stuff */ - gtk_set_locale(); #ifdef ENABLE_NLS bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); @@ -156,7 +155,6 @@ int main(int argc, char **argv) { return 1; } } - gtk_quit_add(0, (GtkFunction)gtkb_theme_free_handler, NULL); /* create main application window */ mw_create(rules_get_width() * theme_get_width(), rules_get_height() * theme_get_height()); diff --git a/src/gtkutils.c b/src/gtkutils.c index 3179675..25182de 100644 --- a/src/gtkutils.c +++ b/src/gtkutils.c @@ -23,7 +23,7 @@ GtkWidget *ut_window_new(gchar *title, gchar *wmname, gchar *wmclass, gtk_window_set_modal(GTK_WINDOW(window), modal); gtk_window_set_resizable(GTK_WINDOW(window), resizable); gtk_window_set_title(GTK_WINDOW(window), title); - gtk_window_set_wmclass(GTK_WINDOW(window), wmname, wmclass); + gtk_window_set_role(GTK_WINDOW(window), wmname); if(escaable) { g_signal_connect(G_OBJECT(window), "key_press_event", G_CALLBACK(ut_key_pressed_cb), NULL); } @@ -47,7 +47,7 @@ GtkWidget *ut_button_new(gchar *label, gpointer func, gpointer func_data, GtkWid button = gtk_button_new_with_label(label); g_signal_connect(G_OBJECT(button), "clicked", func, func_data); gtk_box_pack_start(GTK_BOX(parent), button, TRUE, TRUE, 0); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (button, TRUE); return button; } @@ -58,7 +58,7 @@ GtkWidget *ut_button_new_stock(const gchar *stock_id, gpointer func, gpointer fu button = gtk_button_new_from_stock(stock_id); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(func), func_data); gtk_box_pack_start(GTK_BOX(parent), button, TRUE, TRUE, 0); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (button, TRUE); return button; } @@ -69,13 +69,13 @@ GtkWidget *ut_button_new_stock_swap(const gchar *stock_id, gpointer func, gpoint button = gtk_button_new_from_stock(stock_id); g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(func), func_data); gtk_box_pack_start(GTK_BOX(parent), button, TRUE, TRUE, 0); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (button, TRUE); return button; } GtkWidget *ut_spin_button_new(gchar *label, gint min, gint max, gint val, GtkWidget *parent) { - GtkObject *adj; + GtkAdjustment *adj; GtkWidget *button, *hbox, *labelw; hbox = gtk_hbox_new(FALSE, 0); @@ -84,16 +84,17 @@ GtkWidget *ut_spin_button_new(gchar *label, gint min, gint max, gint val, GtkWid labelw = gtk_label_new(label); gtk_box_pack_start(GTK_BOX(hbox), labelw, FALSE, FALSE, 5); - adj = gtk_adjustment_new(val, min, max, 1, 10, 10); - button = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 1, 0); + adj = GTK_ADJUSTMENT (gtk_adjustment_new(val, min, max, 1, 10, 10)); + button = gtk_spin_button_new(adj, 1, 0); gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(button), TRUE); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5); return button; } -GtkWidget *ut_spin_button_start_new(gchar *label, gint min, gint max, gint val, GtkWidget *parent) { - GtkObject *adj; +GtkWidget *ut_spin_button_start_new(gchar *label, gint min, gint max, gint val, GtkWidget *parent) +{ + GtkAdjustment *adj; GtkWidget *button, *hbox, *labelw; hbox = gtk_hbox_new(FALSE, 0); @@ -102,8 +103,8 @@ GtkWidget *ut_spin_button_start_new(gchar *label, gint min, gint max, gint val, labelw = gtk_label_new(label); gtk_box_pack_start(GTK_BOX(hbox), labelw, FALSE, FALSE, 5); - adj = gtk_adjustment_new(val, min, max, 1, 10, 10); - button = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 1, 0); + adj = GTK_ADJUSTMENT (gtk_adjustment_new(val, min, max, 1, 10, 10)); + button = gtk_spin_button_new(adj, 1, 0); gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(button), TRUE); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5); diff --git a/src/inputname.c b/src/inputname.c index 91d354c..d5a1a5c 100644 --- a/src/inputname.c +++ b/src/inputname.c @@ -75,7 +75,7 @@ void read_entry(GtkWidget *widget, gpointer data) { } void input_name_dialog(void) { - GtkWidget *prompt_label; + GtkWidget *prompt_label, * vbox; GtkWidget *name; GtkWidget *button; gchar *s; @@ -84,11 +84,13 @@ void input_name_dialog(void) { _saved_score = game_get_score(); _dialog = gtk_dialog_new(); - gtk_window_set_wmclass(GTK_WINDOW(_dialog), "GtkBalls_Inputname", "GtkBalls"); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(_dialog)->vbox), 2); + gtk_window_set_role(GTK_WINDOW(_dialog), "GtkBalls_Inputname"); + + vbox = gtk_dialog_get_content_area (GTK_DIALOG (_dialog)); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 2); prompt_label = gtk_label_new(_("Enter your name")); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(_dialog)->vbox), prompt_label, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX(vbox), prompt_label, TRUE, TRUE, 0); name = gtk_entry_new(); gtk_entry_set_max_length(GTK_ENTRY(name), 14); @@ -102,7 +104,7 @@ void input_name_dialog(void) { } gtk_entry_set_text(GTK_ENTRY(name), _last_player_name); gtk_editable_select_region(GTK_EDITABLE(name), 0, -1); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(_dialog)->vbox), name, TRUE, TRUE, 5); + gtk_box_pack_start (GTK_BOX(vbox), name, TRUE, TRUE, 5); button=ut_button_new_stock(GTK_STOCK_OK, read_entry, name, GTK_DIALOG(_dialog)->action_area); diff --git a/src/mainwin.c b/src/mainwin.c index 72dd6f2..9719835 100644 --- a/src/mainwin.c +++ b/src/mainwin.c @@ -137,6 +137,12 @@ gint _user_action_event(GtkWidget *w, GdkEvent *ev) { return FALSE; } +static void main_window_destroy_cb (GtkWidget * w, gpointer user_data) +{ + gtkb_theme_free_handler (NULL, NULL); + gtk_main_quit (); +} + void mw_create(gint da_width, gint da_height) { GtkWidget *mainwin; GtkWidget *menubar; @@ -147,7 +153,7 @@ void mw_create(gint da_width, gint da_height) { mainwin = ut_window_new(_("GtkBalls"), "GtkBalls_Main", "GtkBalls", FALSE, FALSE, FALSE, 0); main_window = GTK_WINDOW (mainwin); - g_signal_connect(G_OBJECT(mainwin), "destroy", G_CALLBACK(gtk_main_quit), mainwin); + g_signal_connect (G_OBJECT(mainwin), "destroy", G_CALLBACK(main_window_destroy_cb), mainwin); icon = gdk_pixbuf_new_from_file(DATADIR "/gtkballs/gtkballs_16x16.png", &error); if(icon) {