tMore GTK+3 fixes - 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 6b5a20bd79872de4d3a6b005b8111fe7d3e2f204
(DIR) parent 99edbade181540c22b394d1818c8000debb0a93f
(HTM) Author: Ben Webb <ben@salilab.org>
Date: Thu, 26 Nov 2020 01:06:31 -0800
More GTK+3 fixes
Diffstat:
M src/gtkport/gtkport.c | 4 ++--
M src/gtkport/gtkport.h | 5 ++++-
M src/gtkport/gtktypes.h | 20 ++++++++++----------
3 files changed, 16 insertions(+), 13 deletions(-)
---
(DIR) diff --git a/src/gtkport/gtkport.c b/src/gtkport/gtkport.c
t@@ -1867,7 +1867,7 @@ GtkWidget *gtk_radio_button_new_with_label_from_widget(GtkRadioButton *group,
{
GSList *list;
- list = gtk_radio_button_group(group);
+ list = gtk_radio_button_get_group(group);
return (gtk_radio_button_new_with_label(list, label));
}
t@@ -1978,7 +1978,7 @@ GtkWidget *gtk_entry_new()
return GTK_WIDGET(entry);
}
-GSList *gtk_radio_button_group(GtkRadioButton *radio_button)
+GSList *gtk_radio_button_get_group(GtkRadioButton *radio_button)
{
return radio_button->group;
}
(DIR) diff --git a/src/gtkport/gtkport.h b/src/gtkport/gtkport.h
t@@ -33,6 +33,9 @@
/* GTK+ emulation prototypes etc. for Win32 platform */
+/* Provide prototypes compatible with GTK+3 */
+#define GTK_MAJOR_VERSION 3
+
#include <winsock2.h>
#include <windows.h>
#include <glib.h>
t@@ -377,7 +380,7 @@ GtkWidget *gtk_entry_new();
void gtk_entry_set_visibility(GtkEntry *entry, gboolean visible);
GtkWidget *gtk_table_new(guint rows, guint cols, gboolean homogeneous);
void gtk_table_resize(GtkTable *table, guint rows, guint cols);
-GSList *gtk_radio_button_group(GtkRadioButton *radio_button);
+GSList *gtk_radio_button_get_group(GtkRadioButton *radio_button);
void gtk_editable_insert_text(GtkEditable *editable, const gchar *new_text,
gint new_text_length, gint *position);
void gtk_editable_delete_text(GtkEditable *editable,
(DIR) diff --git a/src/gtkport/gtktypes.h b/src/gtkport/gtktypes.h
t@@ -39,16 +39,16 @@
extern HICON mainIcon;
-#define GDK_KP_0 0xFFB0
-#define GDK_KP_1 0xFFB1
-#define GDK_KP_2 0xFFB2
-#define GDK_KP_3 0xFFB3
-#define GDK_KP_4 0xFFB4
-#define GDK_KP_5 0xFFB5
-#define GDK_KP_6 0xFFB6
-#define GDK_KP_7 0xFFB7
-#define GDK_KP_8 0xFFB8
-#define GDK_KP_9 0xFFB9
+#define GDK_KEY_KP_0 0xFFB0
+#define GDK_KEY_KP_1 0xFFB1
+#define GDK_KEY_KP_2 0xFFB2
+#define GDK_KEY_KP_3 0xFFB3
+#define GDK_KEY_KP_4 0xFFB4
+#define GDK_KEY_KP_5 0xFFB5
+#define GDK_KEY_KP_6 0xFFB6
+#define GDK_KEY_KP_7 0xFFB7
+#define GDK_KEY_KP_8 0xFFB8
+#define GDK_KEY_KP_9 0xFFB9
typedef gint (*GtkFunction) (gpointer data);
typedef void (*GtkDestroyNotify) (gpointer data);