X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=tests%2Ftestmerge.c;h=ee0b38f8384c8cec232297753457bc479757b360;hb=HEAD;hp=37c470ac3a0a619dcb6176b4dc13ee00183c1d61;hpb=5ae01f82c06a49fa4c660a735a5832ebda0451fc;p=~andy%2Fgtk
diff --git a/tests/testmerge.c b/tests/testmerge.c
index 37c470ac3..ee0b38f83 100644
--- a/tests/testmerge.c
+++ b/tests/testmerge.c
@@ -12,9 +12,7 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
#include "config.h"
@@ -24,6 +22,9 @@
#ifdef HAVE_UNISTD_H
#include
#endif
+
+#define GDK_DISABLE_DEPRECATION_WARNINGS
+
#include
#ifndef STDOUT_FILENO
@@ -209,11 +210,11 @@ enum {
static GtkRadioActionEntry radio_entries[] = {
{ "justify-left", GTK_STOCK_JUSTIFY_LEFT, NULL, "L",
"Left justify the text", JUSTIFY_LEFT },
- { "justify-center", GTK_STOCK_JUSTIFY_CENTER, NULL, "E",
+ { "justify-center", GTK_STOCK_JUSTIFY_CENTER, NULL, "E",
"Center justify the text", JUSTIFY_CENTER },
- { "justify-right", GTK_STOCK_JUSTIFY_RIGHT, NULL, "R",
+ { "justify-right", GTK_STOCK_JUSTIFY_RIGHT, NULL, "R",
"Right justify the text", JUSTIFY_RIGHT },
- { "justify-fill", GTK_STOCK_JUSTIFY_FILL, NULL, "J",
+ { "justify-fill", GTK_STOCK_JUSTIFY_FILL, NULL, "J",
"Fill justify the text", JUSTIFY_FILL },
};
static guint n_radio_entries = G_N_ELEMENTS (radio_entries);
@@ -361,7 +362,7 @@ iter_compare_func (GtkTreeModel *model,
GtkTreeIter *b,
gpointer user_data)
{
- GValue a_value = { 0, }, b_value = { 0, };
+ GValue a_value = G_VALUE_INIT, b_value = G_VALUE_INIT;
GtkAction *a_action, *b_action;
const gchar *a_name, *b_name;
gint retval = 0;
@@ -458,7 +459,7 @@ area_press (GtkWidget *drawing_area,
{
gtk_widget_grab_focus (drawing_area);
- if (event->button == 3 &&
+ if (gdk_event_triggers_context_menu ((GdkEvent *) event) &&
event->type == GDK_BUTTON_PRESS)
{
GtkWidget *menu = gtk_ui_manager_get_widget (merge, "/FileMenu");