Skip to content

Commit 664323e

Browse files
committed
patch 8.1.0405: too many #ifdefs for GTK
Problem: Too many #ifdefs for GTK. Solution: Define macros instead of using #ifdef. (Ken Takata, closes #3436)
1 parent e961cba commit 664323e

6 files changed

Lines changed: 89 additions & 726 deletions

File tree

src/gui_beval.c

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -244,16 +244,9 @@ addEventHandler(GtkWidget *target, BalloonEval *beval)
244244
* This allows us to catch events independently of the signal handlers
245245
* in gui_gtk_x11.c.
246246
*/
247-
# if GTK_CHECK_VERSION(3,0,0)
248247
g_signal_connect(G_OBJECT(target), "event",
249248
G_CALLBACK(target_event_cb),
250249
beval);
251-
# else
252-
/* Should use GTK_OBJECT() here, but that causes a lint warning... */
253-
gtk_signal_connect((GtkObject*)(target), "event",
254-
GTK_SIGNAL_FUNC(target_event_cb),
255-
beval);
256-
# endif
257250
/*
258251
* Nasty: Key press events go to the main window thus the drawing area
259252
* will never see them. This means we have to connect to the main window
@@ -262,45 +255,25 @@ addEventHandler(GtkWidget *target, BalloonEval *beval)
262255
if (gtk_socket_id == 0 && gui.mainwin != NULL
263256
&& gtk_widget_is_ancestor(target, gui.mainwin))
264257
{
265-
# if GTK_CHECK_VERSION(3,0,0)
266258
g_signal_connect(G_OBJECT(gui.mainwin), "event",
267259
G_CALLBACK(mainwin_event_cb),
268260
beval);
269-
# else
270-
gtk_signal_connect((GtkObject*)(gui.mainwin), "event",
271-
GTK_SIGNAL_FUNC(mainwin_event_cb),
272-
beval);
273-
# endif
274261
}
275262
}
276263

277264
static void
278265
removeEventHandler(BalloonEval *beval)
279266
{
280-
/* LINTED: avoid warning: dubious operation on enum */
281-
# if GTK_CHECK_VERSION(3,0,0)
282267
g_signal_handlers_disconnect_by_func(G_OBJECT(beval->target),
283268
FUNC2GENERIC(target_event_cb),
284269
beval);
285-
# else
286-
gtk_signal_disconnect_by_func((GtkObject*)(beval->target),
287-
GTK_SIGNAL_FUNC(target_event_cb),
288-
beval);
289-
# endif
290270

291271
if (gtk_socket_id == 0 && gui.mainwin != NULL
292272
&& gtk_widget_is_ancestor(beval->target, gui.mainwin))
293273
{
294-
/* LINTED: avoid warning: dubious operation on enum */
295-
# if GTK_CHECK_VERSION(3,0,0)
296274
g_signal_handlers_disconnect_by_func(G_OBJECT(gui.mainwin),
297275
FUNC2GENERIC(mainwin_event_cb),
298276
beval);
299-
# else
300-
gtk_signal_disconnect_by_func((GtkObject*)(gui.mainwin),
301-
GTK_SIGNAL_FUNC(mainwin_event_cb),
302-
beval);
303-
# endif
304277
}
305278
}
306279

@@ -433,13 +406,8 @@ pointer_event(BalloonEval *beval, int x, int y, unsigned state)
433406
}
434407
else
435408
{
436-
# if GTK_CHECK_VERSION(3,0,0)
437409
beval->timerID = g_timeout_add((guint)p_bdlay,
438410
&timeout_cb, beval);
439-
# else
440-
beval->timerID = gtk_timeout_add((guint32)p_bdlay,
441-
&timeout_cb, beval);
442-
# endif
443411
}
444412
}
445413
}
@@ -1039,11 +1007,7 @@ cancelBalloon(BalloonEval *beval)
10391007

10401008
if (beval->timerID != 0)
10411009
{
1042-
# if GTK_CHECK_VERSION(3,0,0)
10431010
g_source_remove(beval->timerID);
1044-
# else
1045-
gtk_timeout_remove(beval->timerID);
1046-
# endif
10471011
beval->timerID = 0;
10481012
}
10491013
beval->showState = ShS_NEUTRAL;
@@ -1055,17 +1019,9 @@ createBalloonEvalWindow(BalloonEval *beval)
10551019
beval->balloonShell = gtk_window_new(GTK_WINDOW_POPUP);
10561020

10571021
gtk_widget_set_app_paintable(beval->balloonShell, TRUE);
1058-
# if GTK_CHECK_VERSION(3,0,0)
10591022
gtk_window_set_resizable(GTK_WINDOW(beval->balloonShell), FALSE);
1060-
# else
1061-
gtk_window_set_policy(GTK_WINDOW(beval->balloonShell), FALSE, FALSE, TRUE);
1062-
# endif
10631023
gtk_widget_set_name(beval->balloonShell, "gtk-tooltips");
1064-
# if GTK_CHECK_VERSION(3,0,0)
10651024
gtk_container_set_border_width(GTK_CONTAINER(beval->balloonShell), 4);
1066-
# else
1067-
gtk_container_border_width(GTK_CONTAINER(beval->balloonShell), 4);
1068-
# endif
10691025

10701026
# if GTK_CHECK_VERSION(3,0,0)
10711027
g_signal_connect(G_OBJECT(beval->balloonShell), "draw",

0 commit comments

Comments
 (0)