rev |
line source |
slaxemulator@8661
|
1 diff -ru gens/src/gens/ui/gtk/about/about_window.cpp gens-build/src/gens/ui/gtk/about/about_window.cpp
|
slaxemulator@8661
|
2 --- gens/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 16:32:29.000000000 +0000
|
slaxemulator@8661
|
3 +++ gens-build/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 15:46:25.000000000 +0000
|
slaxemulator@8661
|
4 @@ -84,7 +84,7 @@
|
slaxemulator@8661
|
5 gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_CENTER);
|
slaxemulator@8661
|
6 gtk_window_set_resizable(GTK_WINDOW(about_window), FALSE);
|
slaxemulator@8661
|
7 gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG);
|
slaxemulator@8661
|
8 - gtk_dialog_set_has_separator(GTK_DIALOG(about_window), FALSE);
|
slaxemulator@8661
|
9 + g_object_set(GTK_DIALOG(about_window), "has-separator", FALSE, NULL);
|
slaxemulator@8661
|
10
|
slaxemulator@8661
|
11 // Callbacks for if the window is closed.
|
slaxemulator@8661
|
12 g_signal_connect((gpointer)about_window, "delete_event",
|
slaxemulator@8661
|
13 diff -ru gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp
|
slaxemulator@8661
|
14 --- gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 16:32:29.000000000 +0000
|
slaxemulator@8661
|
15 +++ gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 15:33:03.000000000 +0000
|
slaxemulator@8661
|
16 @@ -84,7 +84,7 @@
|
slaxemulator@8661
|
17 gtk_window_set_position(GTK_WINDOW(bmf_window), GTK_WIN_POS_CENTER);
|
slaxemulator@8661
|
18 gtk_window_set_resizable(GTK_WINDOW(bmf_window), FALSE);
|
slaxemulator@8661
|
19 gtk_window_set_type_hint(GTK_WINDOW(bmf_window), GDK_WINDOW_TYPE_HINT_DIALOG);
|
slaxemulator@8661
|
20 - gtk_dialog_set_has_separator(GTK_DIALOG(bmf_window), FALSE);
|
slaxemulator@8661
|
21 + g_object_set(GTK_DIALOG(bmf_window), "has-separator", FALSE, NULL);
|
slaxemulator@8661
|
22
|
slaxemulator@8661
|
23 // Callbacks for if the window is closed.
|
slaxemulator@8661
|
24 g_signal_connect((gpointer)bmf_window, "delete_event",
|
slaxemulator@8661
|
25 diff -ru gens/src/gens/ui/gtk/directory_config/dir_window.cpp gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp
|
slaxemulator@8661
|
26 --- gens/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 16:32:29.000000000 +0000
|
slaxemulator@8661
|
27 +++ gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 15:34:21.000000000 +0000
|
slaxemulator@8661
|
28 @@ -110,7 +110,7 @@
|
slaxemulator@8661
|
29 gtk_window_set_position(GTK_WINDOW(dir_window), GTK_WIN_POS_CENTER);
|
slaxemulator@8661
|
30 gtk_window_set_resizable(GTK_WINDOW(dir_window), FALSE);
|
slaxemulator@8661
|
31 gtk_window_set_type_hint(GTK_WINDOW(dir_window), GDK_WINDOW_TYPE_HINT_DIALOG);
|
slaxemulator@8661
|
32 - gtk_dialog_set_has_separator(GTK_DIALOG(dir_window), FALSE);
|
slaxemulator@8661
|
33 + g_object_set(GTK_DIALOG(dir_window), "has-separator", FALSE, NULL);
|
slaxemulator@8661
|
34
|
slaxemulator@8661
|
35 // Callbacks for if the window is closed.
|
slaxemulator@8661
|
36 g_signal_connect((gpointer)(dir_window), "delete_event",
|
slaxemulator@8661
|
37 diff -ru gens/src/gens/ui/gtk/general_options/genopt_window.cpp gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp
|
slaxemulator@8661
|
38 --- gens/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 16:32:29.000000000 +0000
|
slaxemulator@8661
|
39 +++ gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 15:36:00.000000000 +0000
|
slaxemulator@8661
|
40 @@ -138,7 +138,7 @@
|
slaxemulator@8661
|
41 gtk_window_set_position(GTK_WINDOW(genopt_window), GTK_WIN_POS_CENTER);
|
slaxemulator@8661
|
42 gtk_window_set_resizable(GTK_WINDOW(genopt_window), false);
|
slaxemulator@8661
|
43 gtk_window_set_type_hint(GTK_WINDOW(genopt_window), GDK_WINDOW_TYPE_HINT_DIALOG);
|
slaxemulator@8661
|
44 - gtk_dialog_set_has_separator(GTK_DIALOG(genopt_window), false);
|
slaxemulator@8661
|
45 + g_object_set(GTK_DIALOG(genopt_window), "has-separator", false, NULL);
|
slaxemulator@8661
|
46
|
slaxemulator@8661
|
47 // Callbacks for if the window is closed.
|
slaxemulator@8661
|
48 g_signal_connect((gpointer)genopt_window, "delete_event",
|
slaxemulator@8661
|
49 diff -ru gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp
|
slaxemulator@8661
|
50 --- gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 16:32:29.000000000 +0000
|
slaxemulator@8661
|
51 +++ gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 15:21:28.000000000 +0000
|
slaxemulator@8661
|
52 @@ -157,9 +157,9 @@
|
slaxemulator@8661
|
53 GSFT_UNUSED_PARAMETER(y);
|
slaxemulator@8661
|
54 GSFT_UNUSED_PARAMETER(user_data);
|
slaxemulator@8661
|
55
|
slaxemulator@8661
|
56 - if (context->targets)
|
slaxemulator@8661
|
57 + if (gdk_drag_context_list_targets(context))
|
slaxemulator@8661
|
58 {
|
slaxemulator@8661
|
59 - GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets, 0));
|
slaxemulator@8661
|
60 + GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(gdk_drag_context_list_targets(context), 0));
|
slaxemulator@8661
|
61 gtk_drag_get_data(widget, context, target_type, time);
|
slaxemulator@8661
|
62 return true;
|
slaxemulator@8661
|
63 }
|
slaxemulator@8661
|
64 diff -ru gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp
|
slaxemulator@8661
|
65 --- gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 16:32:29.000000000 +0000
|
slaxemulator@8661
|
66 +++ gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 15:46:21.000000000 +0000
|
slaxemulator@8661
|
67 @@ -75,7 +75,7 @@
|
slaxemulator@8661
|
68 gtk_window_set_position(GTK_WINDOW(glres_window), GTK_WIN_POS_CENTER);
|
slaxemulator@8661
|
69 gtk_window_set_resizable(GTK_WINDOW(glres_window), FALSE);
|
slaxemulator@8661
|
70 gtk_window_set_type_hint(GTK_WINDOW(glres_window), GDK_WINDOW_TYPE_HINT_DIALOG);
|
slaxemulator@8661
|
71 - gtk_dialog_set_has_separator(GTK_DIALOG(glres_window), FALSE);
|
slaxemulator@8661
|
72 + g_object_set(GTK_DIALOG(glres_window), "has-separator", FALSE, NULL);
|
slaxemulator@8661
|
73
|
slaxemulator@8661
|
74 // Callbacks for if the window is closed.
|
slaxemulator@8661
|
75 g_signal_connect((gpointer)(glres_window), "delete_event",
|
slaxemulator@8661
|
76 diff -ru gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp
|
slaxemulator@8661
|
77 --- gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 16:32:29.000000000 +0000
|
slaxemulator@8661
|
78 +++ gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 15:46:29.000000000 +0000
|
slaxemulator@8661
|
79 @@ -80,8 +80,7 @@
|
slaxemulator@8661
|
80 // Callbacks.
|
slaxemulator@8661
|
81 static gboolean pmgr_window_callback_close(GtkWidget *widget, GdkEvent *event, gpointer user_data);
|
slaxemulator@8661
|
82 static void pmgr_window_callback_response(GtkDialog *dialog, gint response_id, gpointer user_data);
|
slaxemulator@8661
|
83 -static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page,
|
slaxemulator@8661
|
84 - guint page_num, gpointer user_data);
|
slaxemulator@8661
|
85 +static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data);
|
slaxemulator@8661
|
86 static void pmgr_window_callback_lstPluginList_cursor_changed(GtkTreeView *tree_view, gpointer user_data);
|
slaxemulator@8661
|
87 static void pmgr_window_callback_fraPluginDesc_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data);
|
slaxemulator@8661
|
88
|
slaxemulator@8661
|
89 @@ -119,7 +118,7 @@
|
slaxemulator@8661
|
90 gtk_window_set_position(GTK_WINDOW(pmgr_window), GTK_WIN_POS_CENTER);
|
slaxemulator@8661
|
91 gtk_window_set_resizable(GTK_WINDOW(pmgr_window), FALSE);
|
slaxemulator@8661
|
92 gtk_window_set_type_hint(GTK_WINDOW(pmgr_window), GDK_WINDOW_TYPE_HINT_DIALOG);
|
slaxemulator@8661
|
93 - gtk_dialog_set_has_separator(GTK_DIALOG(pmgr_window), FALSE);
|
slaxemulator@8661
|
94 + g_object_set(GTK_DIALOG(pmgr_window), "has-separator", FALSE, NULL);
|
slaxemulator@8661
|
95
|
slaxemulator@8661
|
96 // Callbacks for if the window is closed.
|
slaxemulator@8661
|
97 g_signal_connect((gpointer)pmgr_window, "delete_event",
|
slaxemulator@8661
|
98 @@ -559,11 +558,9 @@
|
slaxemulator@8661
|
99 * @param page_num New notebook page index.
|
slaxemulator@8661
|
100 * @param user_data User data.
|
slaxemulator@8661
|
101 */
|
slaxemulator@8661
|
102 -static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page,
|
slaxemulator@8661
|
103 - guint page_num, gpointer user_data)
|
slaxemulator@8661
|
104 +static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data)
|
slaxemulator@8661
|
105 {
|
slaxemulator@8661
|
106 GSFT_UNUSED_PARAMETER(notebook);
|
slaxemulator@8661
|
107 - GSFT_UNUSED_PARAMETER(page);
|
slaxemulator@8661
|
108 GSFT_UNUSED_PARAMETER(user_data);
|
slaxemulator@8661
|
109
|
slaxemulator@8661
|
110 // Activate the "cursor-changed" callback for the page.
|
slaxemulator@8661
|
111 diff -ru gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp
|
slaxemulator@8661
|
112 --- gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 16:32:29.000000000 +0000
|
slaxemulator@8661
|
113 +++ gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 15:46:16.000000000 +0000
|
slaxemulator@8661
|
114 @@ -94,7 +94,7 @@
|
slaxemulator@8661
|
115 gtk_window_set_position(GTK_WINDOW(selcd_window), GTK_WIN_POS_CENTER);
|
slaxemulator@8661
|
116 gtk_window_set_resizable(GTK_WINDOW(selcd_window), FALSE);
|
slaxemulator@8661
|
117 gtk_window_set_type_hint(GTK_WINDOW(selcd_window), GDK_WINDOW_TYPE_HINT_DIALOG);
|
slaxemulator@8661
|
118 - gtk_dialog_set_has_separator(GTK_DIALOG(selcd_window), FALSE);
|
slaxemulator@8661
|
119 + g_object_set(GTK_DIALOG(selcd_window), "has-separator", FALSE, NULL);
|
slaxemulator@8661
|
120
|
slaxemulator@8661
|
121 // Callbacks for if the window is closed.
|
slaxemulator@8661
|
122 g_signal_connect((gpointer)(selcd_window), "delete_event",
|
slaxemulator@8661
|
123 diff -ru gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp
|
slaxemulator@8661
|
124 --- gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 16:32:29.000000000 +0000
|
slaxemulator@8661
|
125 +++ gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 15:52:05.000000000 +0000
|
slaxemulator@8661
|
126 @@ -111,7 +111,7 @@
|
slaxemulator@8661
|
127 gtk_window_set_position(GTK_WINDOW(gg_window), GTK_WIN_POS_CENTER);
|
slaxemulator@8661
|
128 gtk_window_set_resizable(GTK_WINDOW(gg_window), TRUE);
|
slaxemulator@8661
|
129 gtk_window_set_type_hint(GTK_WINDOW(gg_window), GDK_WINDOW_TYPE_HINT_DIALOG);
|
slaxemulator@8661
|
130 - gtk_dialog_set_has_separator(GTK_DIALOG(gg_window), FALSE);
|
slaxemulator@8661
|
131 + g_object_set(GTK_DIALOG(gg_window), "has-separator", FALSE, NULL);
|
slaxemulator@8661
|
132
|
slaxemulator@8661
|
133 // Add the window icon.
|
slaxemulator@8661
|
134 GList *icon_list = NULL;
|