Mercurial > dwindows
comparison gtk3/dw.c @ 1937:eb488c379969
Fixed a few deprecation warnings on GTK3.
Also fixed a potential buffer too small issue shown by newer gcc versions.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Thu, 20 Jun 2019 22:53:44 +0000 |
parents | 758f49e54566 |
children | a17cc1958369 |
comparison
equal
deleted
inserted
replaced
1936:ebde5ef666a6 | 1937:eb488c379969 |
---|---|
1 /* | 1 /* |
2 * Dynamic Windows: | 2 * Dynamic Windows: |
3 * A GTK like cross-platform GUI | 3 * A GTK like cross-platform GUI |
4 * GTK3 forwarder module for portabilty. | 4 * GTK3 forwarder module for portabilty. |
5 * | 5 * |
6 * (C) 2000-2017 Brian Smith <brian@dbsoft.org> | 6 * (C) 2000-2019 Brian Smith <brian@dbsoft.org> |
7 * (C) 2003-2011 Mark Hessling <mark@rexx.org> | 7 * (C) 2003-2011 Mark Hessling <mark@rexx.org> |
8 * (C) 2002 Nickolay V. Shmyrev <shmyrev@yandex.ru> | 8 * (C) 2002 Nickolay V. Shmyrev <shmyrev@yandex.ru> |
9 */ | 9 */ |
10 #include "config.h" | 10 #include "config.h" |
11 #include "dw.h" | 11 #include "dw.h" |
2447 /* Clear out the data so we don't do it again */ | 2447 /* Clear out the data so we don't do it again */ |
2448 g_object_set_data(G_OBJECT(handle), "_dw_pos", NULL); | 2448 g_object_set_data(G_OBJECT(handle), "_dw_pos", NULL); |
2449 } | 2449 } |
2450 | 2450 |
2451 gdk_window_raise(window); | 2451 gdk_window_raise(window); |
2452 gdk_flush(); | 2452 gdk_display_flush(gdk_display_get_default()); |
2453 gdk_window_show(window); | 2453 gdk_window_show(window); |
2454 gdk_flush(); | 2454 gdk_display_flush(gdk_display_get_default()); |
2455 } | 2455 } |
2456 defaultitem = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_defaultitem"); | 2456 defaultitem = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_defaultitem"); |
2457 if (defaultitem) | 2457 if (defaultitem) |
2458 gtk_widget_grab_focus(defaultitem); | 2458 gtk_widget_grab_focus(defaultitem); |
2459 } | 2459 } |
5688 #define _DW_CONTAINER_STORE_EXTRA 2 | 5688 #define _DW_CONTAINER_STORE_EXTRA 2 |
5689 | 5689 |
5690 static int _dw_container_setup(HWND handle, unsigned long *flags, char **titles, int count, int separator, int extra) | 5690 static int _dw_container_setup(HWND handle, unsigned long *flags, char **titles, int count, int separator, int extra) |
5691 { | 5691 { |
5692 int z; | 5692 int z; |
5693 char numbuf[21]; | 5693 char numbuf[25]; |
5694 GtkWidget *tree; | 5694 GtkWidget *tree; |
5695 GtkListStore *store; | 5695 GtkListStore *store; |
5696 GtkTreeViewColumn *col; | 5696 GtkTreeViewColumn *col; |
5697 GtkCellRenderer *rend; | 5697 GtkCellRenderer *rend; |
5698 GtkTreeSelection *sel; | 5698 GtkTreeSelection *sel; |
5743 tree = _tree_setup(handle, GTK_TREE_MODEL(store)); | 5743 tree = _tree_setup(handle, GTK_TREE_MODEL(store)); |
5744 g_object_set_data(G_OBJECT(tree), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER)); | 5744 g_object_set_data(G_OBJECT(tree), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER)); |
5745 /* Second loop... create the columns */ | 5745 /* Second loop... create the columns */ |
5746 for(z=0;z<count;z++) | 5746 for(z=0;z<count;z++) |
5747 { | 5747 { |
5748 snprintf(numbuf, 20, "_dw_cont_col%d", z); | 5748 snprintf(numbuf, 24, "_dw_cont_col%d", z); |
5749 g_object_set_data(G_OBJECT(tree), numbuf, GINT_TO_POINTER(flags[z])); | 5749 g_object_set_data(G_OBJECT(tree), numbuf, GINT_TO_POINTER(flags[z])); |
5750 col = gtk_tree_view_column_new(); | 5750 col = gtk_tree_view_column_new(); |
5751 rend = NULL; | 5751 rend = NULL; |
5752 void **params = calloc(sizeof(void *), 3); | 5752 void **params = calloc(sizeof(void *), 3); |
5753 | 5753 |
8030 void dw_beep(int freq, int dur) | 8030 void dw_beep(int freq, int dur) |
8031 { | 8031 { |
8032 int _locked_by_me = FALSE; | 8032 int _locked_by_me = FALSE; |
8033 | 8033 |
8034 DW_MUTEX_LOCK; | 8034 DW_MUTEX_LOCK; |
8035 gdk_beep(); | 8035 gdk_display_beep(gdk_display_get_default()); |
8036 DW_MUTEX_UNLOCK; | 8036 DW_MUTEX_UNLOCK; |
8037 } | 8037 } |
8038 | 8038 |
8039 void _my_strlwr(char *buf) | 8039 void _my_strlwr(char *buf) |
8040 { | 8040 { |