tDon't use deprecated GtkVPaned widget - vaccinewars - be a doctor and try to v… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 716bcc4acfaee8c200ef0b2edf178f5ad3efd3ce | |
parent ea743d77cfc8d4823eceb70266a7e6fbb6ab583b | |
Author: Ben Webb <[email protected]> | |
Date: Thu, 31 Dec 2020 01:26:57 -0800 | |
Don't use deprecated GtkVPaned widget | |
Replace gtk_vpaned_new() with gtk_paned_new() as the | |
former is deprecated in GTK3 and removed in GTK4. | |
Provide Win32 implementation and GTK2 compatibility. | |
Diffstat: | |
M src/gtkport/gtkport.c | 35 +++++++++++++++++------------… | |
M src/gtkport/gtkport.h | 4 ++-- | |
M src/gui_client/gtk_client.c | 2 +- | |
3 files changed, 22 insertions(+), 19 deletions(-) | |
--- | |
diff --git a/src/gtkport/gtkport.c b/src/gtkport/gtkport.c | |
t@@ -4367,24 +4367,18 @@ void gtk_widget_remove_accelerator(GtkWidget *widget, | |
{ | |
} | |
-GtkWidget *gtk_vpaned_new() | |
+GtkWidget *gtk_paned_new(GtkOrientation orientation) | |
{ | |
- GtkVPaned *vpaned; | |
- | |
- vpaned = GTK_VPANED(GtkNewObject(&GtkVPanedClass)); | |
- GTK_PANED(vpaned)->handle_size = 5; | |
- GTK_PANED(vpaned)->handle_pos = PANED_STARTPOS; | |
- return GTK_WIDGET(vpaned); | |
-} | |
- | |
-GtkWidget *gtk_hpaned_new() | |
-{ | |
- GtkHPaned *hpaned; | |
+ GtkPaned *paned; | |
- hpaned = GTK_HPANED(GtkNewObject(&GtkHPanedClass)); | |
- GTK_PANED(hpaned)->handle_size = 5; | |
- GTK_PANED(hpaned)->handle_pos = PANED_STARTPOS; | |
- return GTK_WIDGET(hpaned); | |
+ if (orientation == GTK_ORIENTATION_HORIZONTAL) { | |
+ paned = GTK_PANED(GtkNewObject(&GtkHPanedClass)); | |
+ } else { | |
+ paned = GTK_PANED(GtkNewObject(&GtkVPanedClass)); | |
+ } | |
+ GTK_PANED(paned)->handle_size = 5; | |
+ GTK_PANED(paned)->handle_pos = PANED_STARTPOS; | |
+ return GTK_WIDGET(paned); | |
} | |
static void gtk_paned_pack(GtkPaned *paned, gint pos, GtkWidget *child, | |
t@@ -5253,6 +5247,15 @@ GtkWidget *gtk_separator_new(GtkOrientation orientation) | |
} | |
} | |
+GtkWidget *gtk_paned_new(GtkOrientation orientation) | |
+{ | |
+ if (orientation == GTK_ORIENTATION_HORIZONTAL) { | |
+ return gtk_hpaned_new(); | |
+ } else { | |
+ return gtk_vpaned_new(); | |
+ } | |
+} | |
+ | |
#endif | |
guint SetAccelerator(GtkWidget *labelparent, gchar *Text, | |
diff --git a/src/gtkport/gtkport.h b/src/gtkport/gtkport.h | |
t@@ -493,8 +493,7 @@ void gtk_widget_remove_accelerator(GtkWidget *widget, | |
GtkAccelGroup *accel_group, | |
guint accel_key, guint accel_mods); | |
extern const GtkType GTK_TYPE_WINDOW, GTK_TYPE_MENU_BAR; | |
-GtkWidget *gtk_vpaned_new(); | |
-GtkWidget *gtk_hpaned_new(); | |
+GtkWidget *gtk_paned_new(GtkOrientation orientation); | |
void gtk_paned_add1(GtkPaned *paned, GtkWidget *child); | |
void gtk_paned_add2(GtkPaned *paned, GtkWidget *child); | |
void gtk_paned_pack1(GtkPaned *paned, GtkWidget *child, gboolean resize, | |
t@@ -585,6 +584,7 @@ void MapWidgetOrigin(GtkWidget *widget, POINT *pt); | |
GtkWidget *gtk_button_box_new(GtkOrientation orientation); | |
GtkWidget *gtk_box_new(GtkOrientation orientation, gint spacing); | |
GtkWidget *gtk_separator_new(GtkOrientation orientation); | |
+GtkWidget *gtk_paned_new(GtkOrientation orientation); | |
#endif | |
/* Defines for GtkMessageBox options */ | |
diff --git a/src/gui_client/gtk_client.c b/src/gui_client/gtk_client.c | |
t@@ -2309,7 +2309,7 @@ gboolean GtkLoop(int *argc, char **argv[], | |
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0); | |
- vpaned = gtk_vpaned_new(); | |
+ vpaned = gtk_paned_new(GTK_ORIENTATION_VERTICAL); | |
text = ClientData.messages = gtk_scrolled_text_view_new(&hbox); | |
make_tags(GTK_TEXT_VIEW(text)); |