xgiovio/dvdisaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use more accessors

Browse Source
This commit is contained in:
Paul Dicker
2025-03-30 22:01:32 +02:00
committed by Stéphane Lesimple
parent eadbf54aae
commit e9b44a04f0
13 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/help-dialogs.c
View File

@@ -72,7 +72,7 @@ static int* get_new_int(LabelWithOnlineHelp* lwoh)
*/ */
static gint help_cb(GtkWidget *widget, GdkEvent *event, gpointer data) static gint help_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
{ GtkWidget *lab = GTK_BIN(widget)->child; { GtkWidget *lab = gtk_bin_get_child(GTK_BIN(widget));
LabelWithOnlineHelp *lwoh = (LabelWithOnlineHelp*)data; LabelWithOnlineHelp *lwoh = (LabelWithOnlineHelp*)data;
switch(event->type) switch(event->type)
@@ -358,7 +358,7 @@ static gboolean log_jump_func(gpointer data)
gtk_text_buffer_place_cursor(Closure->logBuffer, &end); gtk_text_buffer_place_cursor(Closure->logBuffer, &end);
a = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(Closure->logScroll)); a = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(Closure->logScroll));
gtk_adjustment_set_value(a, a->upper - a->page_size); gtk_adjustment_set_value(a, gtk_adjustment_get_upper(a) - gtk_adjustment_get_page_size(a));
gtk_scrolled_window_set_vadjustment(GTK_SCROLLED_WINDOW(Closure->logScroll), a); gtk_scrolled_window_set_vadjustment(GTK_SCROLLED_WINDOW(Closure->logScroll), a);
g_mutex_unlock(Closure->logLock); g_mutex_unlock(Closure->logLock);
@@ -550,7 +550,7 @@ GtkWidget* GuiShowTextfile(char *title, char *explanation, char *file,
g_signal_connect_swapped(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog); g_signal_connect_swapped(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog);
vbox = gtk_vbox_new(FALSE, 0); vbox = gtk_vbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), vbox, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
lab = gtk_label_new(NULL); lab = gtk_label_new(NULL);
@@ -593,7 +593,7 @@ GtkWidget* GuiShowTextfile(char *title, char *explanation, char *file,
*/ */
static gint about_cb(GtkWidget *widget, GdkEvent *event, gpointer data) static gint about_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
{ GtkWidget *lab = GTK_BIN(widget)->child; { GtkWidget *lab = gtk_bin_get_child(GTK_BIN(widget));
char *label = (char*)data; char *label = (char*)data;
char text[strlen(label)+80]; char text[strlen(label)+80];
char *utf; char *utf;
@@ -730,7 +730,7 @@ void GuiAboutDialog()
g_signal_connect_swapped(about, "response", G_CALLBACK(gtk_widget_destroy), about); g_signal_connect_swapped(about, "response", G_CALLBACK(gtk_widget_destroy), about);
vbox = gtk_vbox_new(FALSE, 0); vbox = gtk_vbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(about)->vbox), vbox, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(about))), vbox, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 10); gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
/* Insert the labels */ /* Insert the labels */

2
src/medium-info.c
View File

@@ -338,7 +338,7 @@ void GuiCreateMediumInfoWindow()
/*** Inner vbox and title */ /*** Inner vbox and title */
vbox = gtk_vbox_new(FALSE, 0); vbox = gtk_vbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), vbox, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 10); gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
lab = gtk_label_new(NULL); lab = gtk_label_new(NULL);

2
src/misc-gui.c
View File

@@ -606,7 +606,7 @@ static void insert_button(GtkDialog *dialog)
{ GtkWidget *check,*align; { GtkWidget *check,*align;
align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0); align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), align, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), align, FALSE, FALSE, 0);
check = gtk_check_button_new_with_label(_utf("Do not ask again")); check = gtk_check_button_new_with_label(_utf("Do not ask again"));
gtk_container_add(GTK_CONTAINER(align), check); gtk_container_add(GTK_CONTAINER(align), check);

2
src/preferences.c
View File

@@ -749,7 +749,7 @@ static void update_color_buttons(color_button_info *a, color_button_info *b, int
if(window) if(window)
{ gdk_window_get_geometry(window, &rect.x, &rect.y, &rect.width, &rect.height, &ignore); { gdk_window_get_geometry(window, &rect.x, &rect.y, &rect.width, &rect.height, &ignore);
gdk_window_invalidate_rect(a->button->window, &rect, TRUE); gdk_window_invalidate_rect(gtk_widget_get_window(a->button), &rect, TRUE);
} }
} }

2
src/raw-editor.c
View File

@@ -541,7 +541,7 @@ static void evaluate_vectors(raw_editor_context *rec)
/* Render the sector */ /* Render the sector */
static void render_sector(raw_editor_context *rec) static void render_sector(raw_editor_context *rec)
{ GdkDrawable *d = rec->drawingArea->window; { GdkWindow *d = gtk_widget_get_window(rec->drawingArea);
unsigned char *buf = rec->rb->recovered; unsigned char *buf = rec->rb->recovered;
int idx=0; int idx=0;
int i,j,w,h,x,y; int i,j,w,h,x,y;

6
src/read-adaptive-window.c
View File

@@ -338,7 +338,7 @@ void GuiResetAdaptiveReadWindow()
readable = correctable = missing = 0; readable = correctable = missing = 0;
percent = min_required = 0; percent = min_required = 0;
if(Closure->readAdaptiveDrawingArea->window) if(gtk_widget_get_window(Closure->readAdaptiveDrawingArea))
{ static GdkRectangle rect; { static GdkRectangle rect;
GtkAllocation a = {0}; GtkAllocation a = {0};
gtk_widget_get_allocation(Closure->readAdaptiveDrawingArea, &a); gtk_widget_get_allocation(Closure->readAdaptiveDrawingArea, &a);
@@ -347,8 +347,8 @@ void GuiResetAdaptiveReadWindow()
rect.width = a.width; rect.width = a.width;
rect.height = a.height; rect.height = a.height;
gdk_window_clear(Closure->readAdaptiveDrawingArea->window); gdk_window_clear(gtk_widget_get_window(Closure->readAdaptiveDrawingArea));
gdk_window_invalidate_rect(Closure->readAdaptiveDrawingArea->window, &rect, FALSE); gdk_window_invalidate_rect(gtk_widget_get_window(Closure->readAdaptiveDrawingArea), &rect, FALSE);
} }
} }

6
src/read-linear-window.c
View File

@@ -47,7 +47,7 @@ static void update_geometry(void);
static gboolean max_speed_idle_func(gpointer data) static gboolean max_speed_idle_func(gpointer data)
{ {
gdk_window_clear(Closure->readLinearDrawingArea->window); gdk_window_clear(gtk_widget_get_window(Closure->readLinearDrawingArea));
update_geometry(); update_geometry();
redraw_curve(); redraw_curve();
@@ -143,7 +143,7 @@ static gboolean curve_idle_func(gpointer data)
{ Closure->readLinearCurve->maxY = Closure->readLinearCurve->fvalue[ci->percent] + 1; { Closure->readLinearCurve->maxY = Closure->readLinearCurve->fvalue[ci->percent] + 1;
update_geometry(); update_geometry();
gdk_window_clear(Closure->readLinearDrawingArea->window); gdk_window_clear(gtk_widget_get_window(Closure->readLinearDrawingArea));
redraw_curve(); redraw_curve();
rc->lastPlotted = ci->percent; rc->lastPlotted = ci->percent;
rc->lastPlottedY = GuiCurveY(Closure->readLinearCurve, Closure->readLinearCurve->fvalue[ci->percent]); rc->lastPlottedY = GuiCurveY(Closure->readLinearCurve, Closure->readLinearCurve->fvalue[ci->percent]);
@@ -311,7 +311,7 @@ static void update_geometry(void)
} }
static void redraw_curve(void) static void redraw_curve(void)
{ GdkDrawable *d = Closure->readLinearDrawingArea->window; { GdkWindow *d = gtk_widget_get_window(Closure->readLinearDrawingArea);
int x,w,h; int x,w,h;
int pos = 1; int pos = 1;

8
src/rs01-window.c
View File

@@ -235,7 +235,7 @@ static gboolean curve_idle_func(gpointer data)
wl->fixCurve->maxY = wl->fixCurve->maxY - (wl->fixCurve->maxY % 5) + 5; wl->fixCurve->maxY = wl->fixCurve->maxY - (wl->fixCurve->maxY % 5) + 5;
update_geometry(wl); update_geometry(wl);
gdk_window_clear(wl->fixCurve->widget->window); gdk_window_clear(gtk_widget_get_window(wl->fixCurve->widget));
redraw_curve(wl); redraw_curve(wl);
wl->lastPercent = wl->percent; wl->lastPercent = wl->percent;
@@ -256,7 +256,7 @@ static gboolean curve_idle_func(gpointer data)
y = GuiCurveY(wl->fixCurve, wl->eccBytes); y = GuiCurveY(wl->fixCurve, wl->eccBytes);
gdk_gc_set_rgb_fg_color(Closure->drawGC, Closure->greenSector); gdk_gc_set_rgb_fg_color(Closure->drawGC, Closure->greenSector);
gdk_draw_line(wl->fixCurve->widget->window, gdk_draw_line(gtk_widget_get_window(wl->fixCurve->widget),
Closure->drawGC, Closure->drawGC,
wl->fixCurve->leftX-6, y, wl->fixCurve->rightX+6, y); wl->fixCurve->leftX-6, y, wl->fixCurve->rightX+6, y);
return FALSE; return FALSE;
@@ -308,7 +308,7 @@ static void redraw_curve(RS01Widgets *wl)
y = GuiCurveY(wl->fixCurve, wl->eccBytes); y = GuiCurveY(wl->fixCurve, wl->eccBytes);
gdk_gc_set_rgb_fg_color(Closure->drawGC, Closure->greenSector); gdk_gc_set_rgb_fg_color(Closure->drawGC, Closure->greenSector);
gdk_draw_line(wl->fixCurve->widget->window, gdk_draw_line(gtk_widget_get_window(wl->fixCurve->widget),
Closure->drawGC, Closure->drawGC,
wl->fixCurve->leftX-6, y, wl->fixCurve->rightX+6, y); wl->fixCurve->leftX-6, y, wl->fixCurve->rightX+6, y);
} }
@@ -343,7 +343,7 @@ void ResetRS01FixWindow(Method *method)
RS01UpdateFixResults(wl, 0, 0); RS01UpdateFixResults(wl, 0, 0);
if(wl->fixCurve && wl->fixCurve->widget) if(wl->fixCurve && wl->fixCurve->widget)
{ gdk_window_clear(wl->fixCurve->widget->window); { gdk_window_clear(gtk_widget_get_window(wl->fixCurve->widget));
redraw_curve(wl); redraw_curve(wl);
} }

2
src/rs02-recognize.c
View File

@@ -51,7 +51,7 @@ static void insert_buttons(GtkDialog *dialog)
_utf("Continue searching"), 0, NULL); _utf("Continue searching"), 0, NULL);
align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0); align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), align, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), align, FALSE, FALSE, 0);
check = gtk_check_button_new_with_label(_utf("Disable RS02 initialization in the preferences")); check = gtk_check_button_new_with_label(_utf("Disable RS02 initialization in the preferences"));
gtk_container_add(GTK_CONTAINER(align), check); gtk_container_add(GTK_CONTAINER(align), check);

4
src/rs02-window.c
View File

@@ -175,7 +175,7 @@ static gboolean curve_idle_func(gpointer data)
wl->fixCurve->maxY = wl->fixCurve->maxY - (wl->fixCurve->maxY % 5) + 5; wl->fixCurve->maxY = wl->fixCurve->maxY - (wl->fixCurve->maxY % 5) + 5;
update_geometry(wl); update_geometry(wl);
gdk_window_clear(wl->fixCurve->widget->window); gdk_window_clear(gtk_widget_get_window(wl->fixCurve->widget));
redraw_curve(wl); redraw_curve(wl);
wl->lastPercent = wl->percent; wl->lastPercent = wl->percent;
@@ -278,7 +278,7 @@ void ResetRS02FixWindow(Method *method)
RS02UpdateFixResults(wl, 0, 0); RS02UpdateFixResults(wl, 0, 0);
if(wl->fixCurve && wl->fixCurve->widget) if(wl->fixCurve && wl->fixCurve->widget)
{ gdk_window_clear(wl->fixCurve->widget->window); { gdk_window_clear(gtk_widget_get_window(wl->fixCurve->widget));
redraw_curve(wl); redraw_curve(wl);
} }

8
src/rs03-window.c
View File

@@ -205,7 +205,7 @@ static gboolean curve_idle_func(gpointer data)
wl->fixCurve->maxY = wl->fixCurve->maxY - (wl->fixCurve->maxY % 5) + 5; wl->fixCurve->maxY = wl->fixCurve->maxY - (wl->fixCurve->maxY % 5) + 5;
update_geometry(wl); update_geometry(wl);
gdk_window_clear(wl->fixCurve->widget->window); gdk_window_clear(gtk_widget_get_window(wl->fixCurve->widget));
redraw_curve(wl); redraw_curve(wl);
wl->lastPercent = wl->percent; wl->lastPercent = wl->percent;
@@ -226,7 +226,7 @@ static gboolean curve_idle_func(gpointer data)
y = GuiCurveY(wl->fixCurve, wl->eccBytes); y = GuiCurveY(wl->fixCurve, wl->eccBytes);
gdk_gc_set_rgb_fg_color(Closure->drawGC, Closure->greenSector); gdk_gc_set_rgb_fg_color(Closure->drawGC, Closure->greenSector);
gdk_draw_line(wl->fixCurve->widget->window, gdk_draw_line(gtk_widget_get_window(wl->fixCurve->widget),
Closure->drawGC, Closure->drawGC,
wl->fixCurve->leftX-6, y, wl->fixCurve->rightX+6, y); wl->fixCurve->leftX-6, y, wl->fixCurve->rightX+6, y);
return FALSE; return FALSE;
@@ -278,7 +278,7 @@ static void redraw_curve(RS03Widgets *wl)
y = GuiCurveY(wl->fixCurve, wl->eccBytes); y = GuiCurveY(wl->fixCurve, wl->eccBytes);
gdk_gc_set_rgb_fg_color(Closure->drawGC, Closure->greenSector); gdk_gc_set_rgb_fg_color(Closure->drawGC, Closure->greenSector);
gdk_draw_line(wl->fixCurve->widget->window, gdk_draw_line(gtk_widget_get_window(wl->fixCurve->widget),
Closure->drawGC, Closure->drawGC,
wl->fixCurve->leftX-6, y, wl->fixCurve->rightX+6, y); wl->fixCurve->leftX-6, y, wl->fixCurve->rightX+6, y);
} }
@@ -308,7 +308,7 @@ void ResetRS03FixWindow(Method *method)
RS03UpdateFixResults(wl, 0, 0); RS03UpdateFixResults(wl, 0, 0);
if(wl->fixCurve && wl->fixCurve->widget) if(wl->fixCurve && wl->fixCurve->widget)
{ gdk_window_clear(wl->fixCurve->widget->window); { gdk_window_clear(gtk_widget_get_window(wl->fixCurve->widget));
redraw_curve(wl); redraw_curve(wl);
} }

2
src/spiral.c
View File

@@ -74,7 +74,7 @@ void GuiSetSpiralWidget(Spiral *spiral, GtkWidget *widget)
gtk_widget_get_allocation(widget, &a); gtk_widget_get_allocation(widget, &a);
if(!spiral->drawable) if(!spiral->drawable)
{ spiral->drawable = widget->window; { spiral->drawable = gtk_widget_get_window(widget);
spiral->mx = a.width/2; spiral->mx = a.width/2;
spiral->my = a.height/2; spiral->my = a.height/2;
} }

2
src/welcome-window.c
View File

@@ -47,7 +47,7 @@ static gboolean expose_cb(GtkWidget *widget, GdkEventExpose *event, gpointer dat
{ GdkColor *bg = &widget->style->bg[0]; { GdkColor *bg = &widget->style->bg[0];
GdkColormap *cmap = gdk_colormap_get_system(); GdkColormap *cmap = gdk_colormap_get_system();
Closure->drawGC = gdk_gc_new(widget->window); Closure->drawGC = gdk_gc_new(gtk_widget_get_window(widget));
memcpy(Closure->background, bg, sizeof(GdkColor)); memcpy(Closure->background, bg, sizeof(GdkColor));