tDon't use deprecated progress bar functions - vaccinewars - be a doctor and try to vaccinate the world
(HTM) git clone git://src.adamsgaard.dk/vaccinewars
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 21f870e3d9e5747082ef99b7aa686f3d59d899f3
(DIR) parent f7f888151cd2dcf4a18323345a383a154930e97f
(HTM) Author: Ben Webb <ben@salilab.org>
Date: Fri, 20 Nov 2020 00:49:27 -0800
Don't use deprecated progress bar functions
Diffstat:
M src/gtkport/gtkport.c | 8 +-------
M src/gtkport/gtkport.h | 4 +---
M src/gui_client/gtk_client.c | 10 ++++------
3 files changed, 6 insertions(+), 16 deletions(-)
---
(DIR) diff --git a/src/gtkport/gtkport.c b/src/gtkport/gtkport.c
t@@ -4961,13 +4961,7 @@ GtkWidget *gtk_progress_bar_new()
return GTK_WIDGET(prog);
}
-void gtk_progress_bar_set_orientation(GtkProgressBar *pbar,
- GtkProgressBarOrientation orientation)
-{
- pbar->orient = orientation;
-}
-
-void gtk_progress_bar_update(GtkProgressBar *pbar, gfloat percentage)
+void gtk_progress_bar_set_fraction(GtkProgressBar *pbar, gfloat percentage)
{
GtkWidget *widget;
(DIR) diff --git a/src/gtkport/gtkport.h b/src/gtkport/gtkport.h
t@@ -645,9 +645,7 @@ void gtk_spin_button_set_adjustment(GtkSpinButton *spin_button,
void gtk_spin_button_update(GtkSpinButton *spin_button);
void gtk_misc_set_alignment(GtkMisc *misc, gfloat xalign, gfloat yalign);
GtkWidget *gtk_progress_bar_new();
-void gtk_progress_bar_set_orientation(GtkProgressBar *pbar,
- GtkProgressBarOrientation orientation);
-void gtk_progress_bar_update(GtkProgressBar *pbar, gfloat percentage);
+void gtk_progress_bar_set_fraction(GtkProgressBar *pbar, gfloat percentage);
guint gtk_main_level(void);
GtkObject *GtkNewObject(GtkClass *klass);
BOOL GetTextSize(HWND hWnd, char *text, LPSIZE lpSize, HFONT hFont);
(DIR) diff --git a/src/gui_client/gtk_client.c b/src/gui_client/gtk_client.c
t@@ -1062,8 +1062,8 @@ static void UpdateCombatant(gchar *DefendName, int DefendBitches,
gtk_label_set_text(GTK_LABEL(compt->bitches), BitchText);
}
gtk_label_set_text(GTK_LABEL(compt->healthlabel), HealthText);
- gtk_progress_bar_update(GTK_PROGRESS_BAR(compt->healthprog),
- ProgPercent);
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(compt->healthprog),
+ ProgPercent);
} else {
/* Display of the current player's name during combat */
compt->name = gtk_label_new(DefendName[0] ? DefendName : _("You"));
t@@ -1074,10 +1074,8 @@ static void UpdateCombatant(gchar *DefendName, int DefendBitches,
gtk_table_attach(GTK_TABLE(table), compt->bitches, 1, 2,
RowIndex, RowIndex + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
compt->healthprog = gtk_progress_bar_new();
- gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(compt->healthprog),
- GTK_PROGRESS_LEFT_TO_RIGHT);
- gtk_progress_bar_update(GTK_PROGRESS_BAR(compt->healthprog),
- ProgPercent);
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(compt->healthprog),
+ ProgPercent);
gtk_table_attach_defaults(GTK_TABLE(table), compt->healthprog, 2, 3,
RowIndex, RowIndex + 1);
compt->healthlabel = gtk_label_new(HealthText);