Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-03-23 23:48:07 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[gtk] fix depreciated gtk2 elements

Browse Source
This commit is contained in:
Gautier Hattenberger
2020-03-27 00:40:38 +01:00
parent 30f63ac86d
commit 00d0c27c4e
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sw/ground_segment/misc/Makefile
View File

@@ -36,7 +36,7 @@ else
endif
CFLAGS += -Wall -fPIC -g
GTK_CFLAGS = $(shell pkg-config gtk+-2.0 --cflags)
GTK_CFLAGS = $(shell pkg-config gtk+-2.0 --cflags) -DGTK_DISABLE_DEPRECATED
GTK_LDFLAGS = $(shell pkg-config gtk+-2.0 --libs) $(shell pkg-config --libs ivy-glib) $(shell pcre-config --libs) -fPIC
GLIBIVY_CFLAGS = $(shell pkg-config --cflags ivy-glib)

6
sw/ground_segment/misc/sbs2ivy.c
View File

@@ -597,14 +597,14 @@ int main(int argc, char **argv)
IvyStart(options.ivy_bus);
// Add Timer
gtk_timeout_add(delay / 4, timeout_callback, NULL);
g_timeout_add(delay / 4, timeout_callback, NULL);
// GTK Window
GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), "SBS2Ivy");
gtk_signal_connect(GTK_OBJECT(window), "delete_event",
GTK_SIGNAL_FUNC(delete_event), NULL);
g_signal_connect(GTK_OBJECT(window), "delete_event",
G_CALLBACK(delete_event), NULL);
GtkWidget *box = gtk_vbox_new(TRUE, 1);
gtk_container_add(GTK_CONTAINER(window), box);

4
sw/ground_segment/misc/video_synchronizer.c
View File

@@ -217,7 +217,7 @@ static void on_quit(GtkWidget *object, gpointer user_data) {
static void on_video_sync_changed(GtkWidget *widget, gpointer data) {
startVideoAfter = gtk_spin_button_get_value_as_float((GtkSpinButton *)spinButton);
startVideoAfter = gtk_spin_button_get_value((GtkSpinButton *)spinButton);
calcCurrentPlayingTime();
sendCurrentPlayingTime();
@@ -225,7 +225,7 @@ static void on_video_sync_changed(GtkWidget *widget, gpointer data) {
static void on_video_time_tag_changed(GtkWidget *widget, gpointer data) {
timeTagInVideo = gtk_spin_button_get_value_as_float((GtkSpinButton *)spinButtonVideo);
timeTagInVideo = gtk_spin_button_get_value((GtkSpinButton *)spinButtonVideo);
calcCurrentPlayingTime();
sendCurrentPlayingTime();

2
sw/ground_segment/tmtc/Makefile
View File

@@ -112,7 +112,7 @@ settings.cmo : ../cockpit/page_settings.cmi
CC = gcc
GTK_CFLAGS = $(shell pkg-config gtk+-2.0 --cflags)
GTK_CFLAGS = $(shell pkg-config gtk+-2.0 --cflags) -DGTK_DISABLE_DEPRECATED
GTK_LDFLAGS = $(shell pkg-config gtk+-2.0 --libs) $(shell pcre-config --libs)
GLIBIVY_CFLAGS = -Wall -fPIC $(shell pkg-config --cflags ivy-glib)

6
sw/ground_segment/tmtc/ivy_serial_bridge.c
View File

@@ -780,14 +780,14 @@ int main ( int argc, char** argv)
IvyStart("127.255.255.255");
// Add Timer
gtk_timeout_add(delay / 4, timeout_callback, NULL);
g_timeout_add(delay / 4, timeout_callback, NULL);
// GTK Window
GtkWidget *window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (window), "IVY_Serial_Bridge");
gtk_signal_connect (GTK_OBJECT (window), "delete_event",
GTK_SIGNAL_FUNC (delete_event), NULL);
g_signal_connect (GTK_OBJECT (window), "delete_event",
G_CALLBACK (delete_event), NULL);
GtkWidget *box = gtk_vbox_new(TRUE, 1);
gtk_container_add (GTK_CONTAINER (window), box);

2
sw/lib/ocaml/Makefile
View File

@@ -131,7 +131,7 @@ tests : lib-pprz.cma $(TESTS_CMO)
$(XCMO) $(XCMX): PKGCOMMON=$(XPKGCOMMON)
GTKCFLAGS := $(shell pkg-config --cflags gtk+-2.0)
GTKCFLAGS := $(shell pkg-config --cflags gtk+-2.0) -DGTK_DISABLE_DEPRECATED
ml_gtk_drag.o : ml_gtk_drag.c
@echo OC $<
$(Q)$(OCAMLC) $(INCLUDES) -package $(PKGCOMMON) -c -ccopt "$(GTKCFLAGS)" $<