Mercurial > dwindows
comparison gtk3/dw.c @ 2208:3343ae3ac327
GTK3: Fixes for building prior on GTK 3.20 and earlier.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Fri, 04 Dec 2020 23:56:11 +0000 |
parents | a43a3f80ed32 |
children | 0b6e1b5c8b5e |
comparison
equal
deleted
inserted
replaced
2207:7c1e46dbc858 | 2208:3343ae3ac327 |
---|---|
2371 gtkbuttons = GTK_BUTTONS_OK_CANCEL; | 2371 gtkbuttons = GTK_BUTTONS_OK_CANCEL; |
2372 else if(flags & (DW_MB_YESNO | DW_MB_YESNOCANCEL)) | 2372 else if(flags & (DW_MB_YESNO | DW_MB_YESNOCANCEL)) |
2373 gtkbuttons = GTK_BUTTONS_YES_NO; | 2373 gtkbuttons = GTK_BUTTONS_YES_NO; |
2374 | 2374 |
2375 DW_MUTEX_LOCK; | 2375 DW_MUTEX_LOCK; |
2376 dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL | GTK_DIALOG_USE_HEADER_BAR, gtkicon, gtkbuttons, "%s", title); | 2376 dialog = gtk_message_dialog_new(NULL, |
2377 #if GTK_CHECK_VERSION(3,12,0) | |
2378 GTK_DIALOG_USE_HEADER_BAR | | |
2379 #endif | |
2380 GTK_DIALOG_MODAL, gtkicon, gtkbuttons, "%s", title); | |
2377 gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", outbuf); | 2381 gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", outbuf); |
2378 if(flags & DW_MB_YESNOCANCEL) | 2382 if(flags & DW_MB_YESNOCANCEL) |
2379 gtk_dialog_add_button(GTK_DIALOG(dialog), "Cancel", GTK_RESPONSE_CANCEL); | 2383 gtk_dialog_add_button(GTK_DIALOG(dialog), "Cancel", GTK_RESPONSE_CANCEL); |
2380 response = gtk_dialog_run(GTK_DIALOG(dialog)); | 2384 response = gtk_dialog_run(GTK_DIALOG(dialog)); |
2381 gtk_widget_destroy(dialog); | 2385 gtk_widget_destroy(dialog); |
3048 gtk_widget_get_window(handle), | 3052 gtk_widget_get_window(handle), |
3049 GDK_SEAT_CAPABILITY_ALL_POINTING, | 3053 GDK_SEAT_CAPABILITY_ALL_POINTING, |
3050 FALSE, NULL, NULL, NULL, NULL); | 3054 FALSE, NULL, NULL, NULL, NULL); |
3051 #else | 3055 #else |
3052 _dw_grab_manager = gdk_display_get_device_manager(gtk_widget_get_display(handle)); | 3056 _dw_grab_manager = gdk_display_get_device_manager(gtk_widget_get_display(handle)); |
3053 gdk_device_grab(gdk_device_manager_get_client_pointer(manager), | 3057 gdk_device_grab(gdk_device_manager_get_client_pointer(_dw_grab_manager), |
3054 gtk_widget_get_window(handle), | 3058 gtk_widget_get_window(handle), |
3055 GDK_OWNERSHIP_WINDOW, | 3059 GDK_OWNERSHIP_WINDOW, |
3056 FALSE, | 3060 FALSE, |
3057 GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK, | 3061 GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK, |
3058 NULL, | 3062 NULL, |
3100 #if GTK_CHECK_VERSION(3,20,0) | 3104 #if GTK_CHECK_VERSION(3,20,0) |
3101 if(_dw_grab_seat) | 3105 if(_dw_grab_seat) |
3102 gdk_seat_ungrab(_dw_grab_seat); | 3106 gdk_seat_ungrab(_dw_grab_seat); |
3103 _dw_grab_seat = NULL; | 3107 _dw_grab_seat = NULL; |
3104 #else | 3108 #else |
3105 gdk_device_ungrab(gdk_device_manager_get_client_pointer(manager), GDK_CURRENT_TIME); | 3109 gdk_device_ungrab(gdk_device_manager_get_client_pointer(_dw_grab_manager), GDK_CURRENT_TIME); |
3106 manager = NULL; | 3110 _dw_grab_manager = NULL; |
3107 #endif | 3111 #endif |
3108 DW_MUTEX_UNLOCK; | 3112 DW_MUTEX_UNLOCK; |
3109 } | 3113 } |
3110 | 3114 |
3111 /* | 3115 /* |